Merge pull request #398 from cuviper/bench-deps

Simplify benchmark dependencies

Author: cuviper

Cargo.toml

@@ -30,10 +30,9 @@ default-features = false
 
 [dev-dependencies]
 itertools = "0.14"
-rand = {version = "0.9", features = ["small_rng"] }
+fastrand = { version = "2", default-features = false }
 quickcheck = { version = "1.0", default-features = false }
 fnv = "1.0"
-lazy_static = "1.3"
 serde_derive = "1.0"
 
 [features]

benches/bench.rs

@@ -1,12 +1,11 @@
 #![feature(test)]
 
 extern crate test;
-#[macro_use]
-extern crate lazy_static;
 
 use fnv::FnvHasher;
 use std::hash::BuildHasherDefault;
 use std::hash::Hash;
+use std::sync::LazyLock;
 type FnvBuilder = BuildHasherDefault<FnvHasher>;
 
 use test::black_box;
@@ -16,14 +15,10 @@ use indexmap::IndexMap;
 
 use std::collections::HashMap;
 
-use rand::rngs::SmallRng;
-use rand::seq::SliceRandom;
-use rand::SeedableRng;
-
 /// Use a consistently seeded Rng for benchmark stability
-fn small_rng() -> SmallRng {
+fn small_rng() -> fastrand::Rng {
     let seed = u64::from_le_bytes(*b"indexmap");
-    SmallRng::seed_from_u64(seed)
+    fastrand::Rng::with_seed(seed)
 }
 
 #[bench]
@@ -280,7 +275,7 @@ where
 {
     let mut v = Vec::from_iter(iter);
     let mut rng = small_rng();
-    v.shuffle(&mut rng);
+    rng.shuffle(&mut v);
     v
 }
 
@@ -357,53 +352,45 @@ const LOOKUP_MAP_SIZE: u32 = 100_000_u32;
 const LOOKUP_SAMPLE_SIZE: u32 = 5000;
 const SORT_MAP_SIZE: usize = 10_000;
 
-// use lazy_static so that comparison benchmarks use the exact same inputs
-lazy_static! {
-    static ref KEYS: Vec<u32> = shuffled_keys(0..LOOKUP_MAP_SIZE);
-}
+// use (lazy) statics so that comparison benchmarks use the exact same inputs
 
-lazy_static! {
-    static ref HMAP_100K: HashMap<u32, u32> = {
-        let c = LOOKUP_MAP_SIZE;
-        let mut map = HashMap::with_capacity(c as usize);
-        let keys = &*KEYS;
-        for &key in keys {
-            map.insert(key, key);
-        }
-        map
-    };
-}
+static KEYS: LazyLock<Vec<u32>> = LazyLock::new(|| shuffled_keys(0..LOOKUP_MAP_SIZE));
 
-lazy_static! {
-    static ref IMAP_100K: IndexMap<u32, u32> = {
-        let c = LOOKUP_MAP_SIZE;
-        let mut map = IndexMap::with_capacity(c as usize);
-        let keys = &*KEYS;
-        for &key in keys {
-            map.insert(key, key);
-        }
-        map
-    };
-}
+static HMAP_100K: LazyLock<HashMap<u32, u32>> = LazyLock::new(|| {
+    let c = LOOKUP_MAP_SIZE;
+    let mut map = HashMap::with_capacity(c as usize);
+    let keys = &*KEYS;
+    for &key in keys {
+        map.insert(key, key);
+    }
+    map
+});
 
-lazy_static! {
-    static ref IMAP_SORT_U32: IndexMap<u32, u32> = {
-        let mut map = IndexMap::with_capacity(SORT_MAP_SIZE);
-        for &key in &KEYS[..SORT_MAP_SIZE] {
-            map.insert(key, key);
-        }
-        map
-    };
-}
-lazy_static! {
-    static ref IMAP_SORT_S: IndexMap<String, String> = {
-        let mut map = IndexMap::with_capacity(SORT_MAP_SIZE);
-        for &key in &KEYS[..SORT_MAP_SIZE] {
-            map.insert(format!("{:^16x}", &key), String::new());
-        }
-        map
-    };
-}
+static IMAP_100K: LazyLock<IndexMap<u32, u32>> = LazyLock::new(|| {
+    let c = LOOKUP_MAP_SIZE;
+    let mut map = IndexMap::with_capacity(c as usize);
+    let keys = &*KEYS;
+    for &key in keys {
+        map.insert(key, key);
+    }
+    map
+});
+
+static IMAP_SORT_U32: LazyLock<IndexMap<u32, u32>> = LazyLock::new(|| {
+    let mut map = IndexMap::with_capacity(SORT_MAP_SIZE);
+    for &key in &KEYS[..SORT_MAP_SIZE] {
+        map.insert(key, key);
+    }
+    map
+});
+
+static IMAP_SORT_S: LazyLock<IndexMap<String, String>> = LazyLock::new(|| {
+    let mut map = IndexMap::with_capacity(SORT_MAP_SIZE);
+    for &key in &KEYS[..SORT_MAP_SIZE] {
+        map.insert(format!("{:^16x}", &key), String::new());
+    }
+    map
+});
 
 #[bench]
 fn lookup_hashmap_100_000_multi(b: &mut Bencher) {
@@ -523,7 +510,7 @@ fn hashmap_merge_shuffle(b: &mut Bencher) {
     b.iter(|| {
         let mut merged = first_map.clone();
         v.extend(second_map.iter().map(|(&k, &v)| (k, v)));
-        v.shuffle(&mut rng);
+        rng.shuffle(&mut v);
         merged.extend(v.drain(..));
 
         merged
@@ -550,7 +537,7 @@ fn indexmap_merge_shuffle(b: &mut Bencher) {
     b.iter(|| {
         let mut merged = first_map.clone();
         v.extend(second_map.iter().map(|(&k, &v)| (k, v)));
-        v.shuffle(&mut rng);
+        rng.shuffle(&mut v);
         merged.extend(v.drain(..));
 
         merged
@@ -562,7 +549,7 @@ fn swap_remove_indexmap_100_000(b: &mut Bencher) {
     let map = IMAP_100K.clone();
     let mut keys = Vec::from_iter(map.keys().copied());
     let mut rng = small_rng();
-    keys.shuffle(&mut rng);
+    rng.shuffle(&mut keys);
 
     b.iter(|| {
         let mut map = map.clone();
@@ -579,7 +566,7 @@ fn shift_remove_indexmap_100_000_few(b: &mut Bencher) {
     let map = IMAP_100K.clone();
     let mut keys = Vec::from_iter(map.keys().copied());
     let mut rng = small_rng();
-    keys.shuffle(&mut rng);
+    rng.shuffle(&mut keys);
     keys.truncate(50);
 
     b.iter(|| {
@@ -600,7 +587,7 @@ fn shift_remove_indexmap_2_000_full(b: &mut Bencher) {
         map.insert(key, key);
     }
     let mut rng = small_rng();
-    keys.shuffle(&mut rng);
+    rng.shuffle(&mut keys);
 
     b.iter(|| {
         let mut map = map.clone();

benches/faststring.rs

@@ -8,19 +8,15 @@ use indexmap::IndexMap;
 
 use std::collections::HashMap;
 
-use rand::rngs::SmallRng;
-use rand::seq::SliceRandom;
-use rand::SeedableRng;
-
 use std::hash::{Hash, Hasher};
 
 use std::borrow::Borrow;
 use std::ops::Deref;
 
 /// Use a consistently seeded Rng for benchmark stability
-fn small_rng() -> SmallRng {
+fn small_rng() -> fastrand::Rng {
     let seed = u64::from_le_bytes(*b"indexmap");
-    SmallRng::seed_from_u64(seed)
+    fastrand::Rng::with_seed(seed)
 }
 
 #[derive(PartialEq, Eq, Copy, Clone)]
@@ -68,7 +64,7 @@ where
 {
     let mut v = Vec::from_iter(iter);
     let mut rng = small_rng();
-    v.shuffle(&mut rng);
+    rng.shuffle(&mut v);
     v
 }