Merge pull request rust-random#1439 from dhardy/upgrade-criterion

Upgrade criterion
vks · Apr 29, 2024 · 089d993 · 089d993
2 parents d42daab + bf0301b
commit 089d993
Show file tree

Hide file tree

Showing 16 changed files with 112 additions and 109 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -79,8 +79,7 @@ jobs:
         run: |
           cargo test --target ${{ matrix.target }} --features=nightly
           cargo test --target ${{ matrix.target }} --all-features
-          cargo test --target ${{ matrix.target }} --benches --features=small_rng,nightly
-          cargo test --target ${{ matrix.target }} --manifest-path rand_distr/Cargo.toml --benches
+          cargo test --target ${{ matrix.target }} --manifest-path benches/Cargo.toml --benches
           cargo test --target ${{ matrix.target }} --lib --tests --no-default-features
       - name: Test rand
         run: |
@@ -104,7 +103,7 @@ jobs:
       - name: Test rand_pcg
         run: cargo test --target ${{ matrix.target }} --manifest-path rand_pcg/Cargo.toml --features=serde1
       - name: Test rand_chacha
-        run: cargo test --target ${{ matrix.target }} --manifest-path rand_chacha/Cargo.toml
+        run: cargo test --target ${{ matrix.target }} --manifest-path rand_chacha/Cargo.toml --features=serde1
 
   test-cross:
     runs-on: ${{ matrix.os }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ You may also find the [Upgrade Guide](https://rust-random.github.io/book/update.
 ## [Unreleased]
 - Add `rand::distributions::WeightedIndex::{weight, weights, total_weight}` (#1420)
 - Bump the MSRV to 1.61.0
+- Move all benchmarks to new `benches` crate (#1439)
 
 ## [0.9.0-alpha.1] - 2024-03-18
 - Add the `Slice::num_choices` method to the Slice distribution (#1402)

diff --git a/Cargo.lock.msrv b/Cargo.lock.msrv
diff --git a/Cargo.toml b/Cargo.toml
@@ -58,6 +58,7 @@ unbiased = []
 
 [workspace]
 members = [
+    "benches",
     "rand_core",
     "rand_distr",
     "rand_chacha",
@@ -75,25 +76,4 @@ zerocopy = { version = "=0.8.0-alpha.6", default-features = false, features = ["
 rand_pcg = { path = "rand_pcg", version = "=0.9.0-alpha.1" }
 # Only to test serde1
 bincode = "1.2.1"
-rayon = "1.5.3"
-criterion = { version = "0.4" }
-
-[[bench]]
-name = "uniform"
-path = "benches/uniform.rs"
-harness = false
-
-[[bench]]
-name = "seq_choose"
-path = "benches/seq_choose.rs"
-harness = false
-
-[[bench]]
-name = "shuffle"
-path = "benches/shuffle.rs"
-harness = false
-
-[[bench]]
-name = "uniform_float"
-path = "benches/uniform_float.rs"
-harness = false
+rayon = "1.7"
diff --git a/benches/Cargo.toml b/benches/Cargo.toml
@@ -0,0 +1,40 @@
+[package]
+name = "benches"
+version = "0.1.0"
+edition = "2021"
+publish = false
+
+[dependencies]
+
+[dev-dependencies]
+rand = { path = "..", features = ["small_rng", "nightly"] }
+rand_pcg = { path = "../rand_pcg" }
+rand_chacha = { path = "../rand_chacha" }
+rand_distr = { path = "../rand_distr" }
+criterion = "0.5"
+criterion-cycles-per-byte = "0.6"
+
+[[bench]]
+name = "distributions"
+path = "src/distributions.rs"
+harness = false
+
+[[bench]]
+name = "uniform"
+path = "src/uniform.rs"
+harness = false
+
+[[bench]]
+name = "seq_choose"
+path = "src/seq_choose.rs"
+harness = false
+
+[[bench]]
+name = "shuffle"
+path = "src/shuffle.rs"
+harness = false
+
+[[bench]]
+name = "uniform_float"
+path = "src/uniform_float.rs"
+harness = false
diff --git a/benches/distributions.rs → benches/benches/base_distributions.rs b/benches/distributions.rs → benches/benches/base_distributions.rs
diff --git a/benches/generators.rs → benches/benches/generators.rs b/benches/generators.rs → benches/benches/generators.rs
diff --git a/benches/misc.rs → benches/benches/misc.rs b/benches/misc.rs → benches/benches/misc.rs
diff --git a/benches/seq.rs → benches/benches/seq.rs b/benches/seq.rs → benches/benches/seq.rs
diff --git a/benches/weighted.rs → benches/benches/weighted.rs b/benches/weighted.rs → benches/benches/weighted.rs
diff --git a/rand_distr/benches/src/distributions.rs → benches/src/distributions.rs b/rand_distr/benches/src/distributions.rs → benches/src/distributions.rs
diff --git a/benches/seq_choose.rs → benches/src/seq_choose.rs b/benches/seq_choose.rs → benches/src/seq_choose.rs
diff --git a/benches/shuffle.rs → benches/src/shuffle.rs b/benches/shuffle.rs → benches/src/shuffle.rs
diff --git a/benches/uniform.rs → benches/src/uniform.rs b/benches/uniform.rs → benches/src/uniform.rs
diff --git a/benches/uniform_float.rs → benches/src/uniform_float.rs b/benches/uniform_float.rs → benches/src/uniform_float.rs
diff --git a/rand_distr/benches/Cargo.toml b/rand_distr/benches/Cargo.toml