replace q460_lfu_cache's benches with cache_util's ones

.github/workflows/ci.yml

@@ -40,7 +40,7 @@ jobs:
           # Output the JSON array to GitHub Actions output
           echo "subcrates=$SUBCRATES_JSON" >> "$GITHUB_OUTPUT"
 
-          SUBCRATES_FOR_BENCHES=$(echo "$SUBCRATES" | grep q146 || true)
+          SUBCRATES_FOR_BENCHES=$(echo "$SUBCRATES" || true)
 
           # Build a JSON array of objects
           # Each object: { "subcrate": "xxx", "bench": "yyy" }

implementations/q146_lru_cache/Cargo.toml

@@ -19,7 +19,7 @@ paste = "1.0.15"
 [lib]
 # specially for Criterion
 # without this option, cargo bench will fail by commands like this:
-#    cargo bench -p q146_lru_cache -- --verbose  # error: Unrecognized option: 'verbose'
+#    cargo bench -p SUBCRATE -- --verbose  # error: Unrecognized option: 'verbose'
 bench = false
 # https://bheisler.github.io/criterion.rs/book/faq.html#cargo-bench-gives-unrecognized-option-errors-for-valid-command-line-options
 

implementations/q146_lru_cache/benches/bench_intrusive_two_hashmaps.rs

@@ -1,5 +1,3 @@
 use cache_util::*;
 
-use q146_lru_cache::intrusive_two_hashmaps::LRUCache as CACHE;
-
-define_benchmark!(q146_lru_cache, intrusive_two_hashmaps);
+define_benchmark!(q146_lru_cache, intrusive_two_hashmaps, LRUCache);

implementations/q146_lru_cache/benches/bench_priority_queue.rs

@@ -1,5 +1,3 @@
 use cache_util::*;
 
-use q146_lru_cache::priority_queue::LRUCache as CACHE;
-
-define_benchmark!(q146_lru_cache, priority_queue);
+define_benchmark!(q146_lru_cache, priority_queue, LRUCache);

implementations/q146_lru_cache/benches/bench_two_hashmaps.rs

@@ -1,5 +1,3 @@
 use cache_util::*;
 
-use q146_lru_cache::two_hashmaps::LRUCache as CACHE;
-
-define_benchmark!(q146_lru_cache, two_hashmaps);
+define_benchmark!(q146_lru_cache, two_hashmaps, LRUCache);

implementations/q146_lru_cache/benches/bench_vec_hashmap.rs

@@ -1,5 +1,3 @@
 use cache_util::*;
 
-use q146_lru_cache::vec_hashmap::LRUCache as CACHE;
-
-define_benchmark!(q146_lru_cache, vec_hashmap);
+define_benchmark!(q146_lru_cache, vec_hashmap, LRUCache);

implementations/q460_lfu_cache/Cargo.toml

@@ -17,6 +17,25 @@ rand = "0.8.5"
 criterion = "0.5.1"
 paste = "1.0.15"
 
+[lib]
+# specially for Criterion
+# without this option, cargo bench will fail by commands like this:
+#    cargo bench -p SUBCRATE -- --verbose  # error: Unrecognized option: 'verbose'
+bench = false
+# https://bheisler.github.io/criterion.rs/book/faq.html#cargo-bench-gives-unrecognized-option-errors-for-valid-command-line-options
+
+[[bench]]
+name = "bench_priority_queue"
+harness = false               # Disables the default Rust benchmarking harness so that Criterion can use its own.
+
+[[bench]]
+name = "bench_vec_hashmap"
+harness = false            # Disables the default Rust benchmarking harness so that Criterion can use its own.
+
+[[bench]]
+name = "bench_two_hashmaps"
+harness = false             # Disables the default Rust benchmarking harness so that Criterion can use its own.
+
 [[bench]]
-name = "bench_all_impl"
-harness = false         # Disables the default Rust benchmarking harness so that Criterion can use its own.
+name = "bench_intrusive_two_hashmaps"
+harness = false                       # Disables the default Rust benchmarking harness so that Criterion can use its own.

implementations/q460_lfu_cache/benches/bench_intrusive_two_hashmaps.rs

@@ -0,0 +1,3 @@
+use cache_util::*;
+
+define_benchmark!(q460_lfu_cache, intrusive_two_hashmaps, LFUCache);

implementations/q460_lfu_cache/benches/bench_priority_queue.rs

@@ -0,0 +1,3 @@
+use cache_util::*;
+
+define_benchmark!(q460_lfu_cache, priority_queue, LFUCache);

implementations/q460_lfu_cache/benches/bench_two_hashmaps.rs

@@ -0,0 +1,3 @@
+use cache_util::*;
+
+define_benchmark!(q460_lfu_cache, two_hashmaps, LFUCache);

implementations/q460_lfu_cache/benches/bench_vec_hashmap.rs

@@ -0,0 +1,3 @@
+use cache_util::*;
+
+define_benchmark!(q460_lfu_cache, vec_hashmap, LFUCache);

implementations/q460_lfu_cache/src/lib.rs

@@ -1,5 +1,7 @@
-pub mod heap_node;
-pub mod impl_v1;
-pub mod impl_v2;
-pub mod impl_v3;
-pub mod impl_v4;
+mod freq_aware_heap_node;
+pub mod intrusive_two_hashmaps;
+pub mod priority_queue;
+pub mod two_hashmaps;
+pub mod vec_hashmap;
+
+pub use freq_aware_heap_node::*;

implementations/q460_lfu_cache/src/impl_v1.rs → implementations/q460_lfu_cache/src/priority_queue.rs

@@ -2,7 +2,7 @@ use priority_queue::PriorityQueue;
 use std::cmp::Reverse;
 use std::time::SystemTime;
 
-use crate::heap_node::FreqAwareHeapNode;
+use crate::FreqAwareHeapNode;
 
 pub struct LFUCache {
     pq: PriorityQueue<i32, Reverse<FreqAwareHeapNode>>,

implementations/q460_lfu_cache/src/impl_v2.rs → implementations/q460_lfu_cache/src/vec_hashmap.rs

@@ -1,4 +1,4 @@
-use crate::heap_node::FreqAwareHeapNode;
+use crate::FreqAwareHeapNode;
 use std::collections::HashMap;
 
 use std::cmp::Ordering;

implementations/q460_lfu_cache/tests/proptest.rs

@@ -29,10 +29,10 @@ fn operation_sequence_strategy() -> impl Strategy<Value = Vec<CacheOperation>> {
 }
 
 fn test_lfu_cache_with_operations(capacity: i32, operations: Vec<CacheOperation>) {
-    use q460_lfu_cache::impl_v1::LFUCache as LFUCache_v1;
-    use q460_lfu_cache::impl_v2::LFUCache as LFUCache_v2;
-    use q460_lfu_cache::impl_v3::LFUCache as LFUCache_v3;
-    use q460_lfu_cache::impl_v4::LFUCache as LFUCache_v4;
+    use q460_lfu_cache::intrusive_two_hashmaps::LFUCache as LFUCache_v4;
+    use q460_lfu_cache::priority_queue::LFUCache as LFUCache_v1;
+    use q460_lfu_cache::two_hashmaps::LFUCache as LFUCache_v3;
+    use q460_lfu_cache::vec_hashmap::LFUCache as LFUCache_v2;
 
     let mut cache_v1 = LFUCache_v1::new(capacity);
     let mut cache_v2 = LFUCache_v2::new(capacity);

implementations/q460_lfu_cache/tests/test_all_impl.rs

@@ -1,9 +1,9 @@
 use rstest::rstest;
 
-use q460_lfu_cache::impl_v1::LFUCache as LFUCache_v1;
-use q460_lfu_cache::impl_v2::LFUCache as LFUCache_v2;
-use q460_lfu_cache::impl_v3::LFUCache as LFUCache_v3;
-use q460_lfu_cache::impl_v4::LFUCache as LFUCache_v4;
+use q460_lfu_cache::intrusive_two_hashmaps::LFUCache as LFUCache_v4;
+use q460_lfu_cache::priority_queue::LFUCache as LFUCache_v1;
+use q460_lfu_cache::two_hashmaps::LFUCache as LFUCache_v3;
+use q460_lfu_cache::vec_hashmap::LFUCache as LFUCache_v2;
 
 #[rstest]
 #[case(vec!["LFUCache", "put", "put", "get", "put", "get", "get", "put", "get", "get", "get"], 

utilities/cache_util/src/macros.rs

@@ -18,6 +18,7 @@ macro_rules! bench_cache {
                             cache_util::CacheOperation::Get { key } => {
                                 ::criterion::black_box(cache.get(::criterion::black_box(*key)));
                             }
+                            _ => unreachable!(),
                         }
                     }
                 })
@@ -29,15 +30,17 @@ macro_rules! bench_cache {
 #[macro_export]
 // Define the custom macro using paste for identifier concatenation
 macro_rules! define_benchmark {
-    ($crate_path:path, $postfix:ident) => {
+    ($crate_name:ident, $impl:ident, $cache_type:ty) => {
         ::paste::paste! {
             use criterion::{criterion_group, criterion_main};
 
+            use $crate_name::$impl::$cache_type as CACHE;
+
             // Generate a unique benchmark function name
-            bench_cache!([<$crate_path _ bench_ $postfix>], CACHE);
+            bench_cache!([<$crate_name _bench_ $impl>], CACHE);
 
             // Collect the benchmark function into the group
-            criterion_group!(benches, [<$crate_path _ bench_ $postfix>]);
+            criterion_group!(benches, [<$crate_name _bench_ $impl>]);
             criterion_main!(benches);
         }
     };