Merge branch 'main' into time-scale-benches

Author: art049

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: moonrepo/setup-rust@v1
         with:
           components: rustfmt, clippy
-      - uses: pre-commit/action@v2.0.0
+      - uses: pre-commit/action@v3.0.1
         with:
           extra_args: --all-files
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "codspeed-bencher-compat"
-version = "2.9.1"
+version = "2.10.0"
 rust-version = "1.74" # MSRV
 edition = "2021"
 description = "Bencher compatibility layer for CodSpeed"
@@ -19,7 +19,7 @@ keywords = ["codspeed", "benchmark", "bencher"]
 
 [dependencies]
 bencher = "0.1.5"
-codspeed = { path = "../codspeed", version = "=2.9.1" }
+codspeed = { path = "../codspeed", version = "=2.10.0" }
 
 [[bench]]
 name = "bencher_example"

crates/bencher_compat/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cargo-codspeed"
-version = "2.9.1"
+version = "2.10.0"
 edition = "2021"
 description = "Cargo extension to build & run your codspeed benchmarks"
 authors = ["Arthur Pastel <arthur@codspeed.io>"]
@@ -18,15 +18,15 @@ categories = [
 keywords = ["codspeed", "benchmark", "cargo"]
 
 [dependencies]
-cargo_metadata = "0.19.1"
+cargo_metadata = "0.19.2"
 clap = { version = "=4.5.17", features = ["derive", "env"] }
 termcolor = "1.4"
 anyhow = "1.0.86"
 itertools = { workspace = true }
 anstyle = "1.0.8"
 serde = { workspace = true }
 serde_json = { workspace = true }
-codspeed = { path = "../codspeed", version = "=2.9.1" }
+codspeed = { path = "../codspeed", version = "=2.10.0" }
 glob = "0.3.2"
 statrs = "0.18.0"
 

crates/cargo-codspeed/Cargo.toml

@@ -61,6 +61,10 @@ enum Commands {
         #[arg(long)]
         no_default_features: bool,
 
+        /// Number of parallel jobs, defaults to # of CPUs.
+        #[arg(short, long)]
+        jobs: Option<u32>,
+
         /// Build the benchmarks with the specified profile
         #[arg(long, default_value = "release")]
         profile: String,
@@ -84,6 +88,7 @@ pub fn run(args: impl Iterator<Item = OsString>) -> Result<()> {
             filters,
             features,
             all_features,
+            jobs,
             no_default_features,
             profile,
         } => {
@@ -98,6 +103,10 @@ pub fn run(args: impl Iterator<Item = OsString>) -> Result<()> {
                     passthrough_flags.push("--no-default-features".to_string());
                 }
 
+                if let Some(jobs) = jobs {
+                    passthrough_flags.push(format!("--jobs={jobs}"));
+                }
+
                 passthrough_flags
             };
             let features =

crates/cargo-codspeed/src/app.rs

@@ -115,6 +115,15 @@ impl BuildOptions<'_> {
         // Add debug info (equivalent to -g)
         rust_flags.push_str(" -C debuginfo=2");
 
+        // Prevent debug info stripping
+        // https://doc.rust-lang.org/cargo/reference/profiles.html#release
+        // According to cargo docs, for release profile which we default to:
+        // `strip = "none"` and `debug = false`.
+        // In practice, if we set debug info through RUSTFLAGS, cargo still strips them, most
+        // likely because debug = false in the release profile.
+        // We also need to disable stripping through rust flags.
+        rust_flags.push_str(" -C strip=none");
+
         // Add the codspeed cfg flag if instrumentation mode is enabled
         if measurement_mode == MeasurementMode::Instrumentation {
             rust_flags.push_str(" --cfg codspeed");

crates/cargo-codspeed/src/build.rs

@@ -1,6 +1,6 @@
 [package]
 name = "codspeed"
-version = "2.9.1"
+version = "2.10.0"
 rust-version = "1.74" # MSRV
 edition = "2021"
 description = "Core instrumentation library for CodSpeed"

crates/codspeed/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "codspeed-criterion-compat"
-version = "2.9.1"
+version = "2.10.0"
 rust-version = "1.74" # MSRV
 edition = "2021"
 description = "Criterion.rs compatibility layer for CodSpeed"
@@ -17,8 +17,8 @@ categories = [
 ]
 keywords = ["codspeed", "benchmark", "criterion"]
 [dependencies]
-criterion = { package = "codspeed-criterion-compat-walltime", path = "./criterion_fork", version = "=2.9.1", default-features = false }
-codspeed = { path = "../codspeed", version = "=2.9.1" }
+criterion = { package = "codspeed-criterion-compat-walltime", path = "./criterion_fork", version = "=2.10.0", default-features = false }
+codspeed = { path = "../codspeed", version = "=2.10.0" }
 colored = "2.1.0"
 
 futures = { version = "0.3", default-features = false, optional = true }

crates/criterion_compat/Cargo.toml

@@ -4,7 +4,7 @@ authors = [
   "Brook Heisler <brookheisler@gmail.com>",
 ]
 name = "codspeed-criterion-compat-walltime"
-version = "2.9.1"
+version = "2.10.0"
 edition = "2018"
 
 description = "Statistics-driven micro-benchmarking library"
@@ -17,7 +17,7 @@ license     = "Apache-2.0 OR MIT"
 exclude     = ["book/*"]
 
 [dependencies]
-codspeed = { path = "../../codspeed", version = "=2.9.1" }
+codspeed = { path = "../../codspeed", version = "=2.10.0" }
 anes           = "0.1.4"
 once_cell      = "1.14"
 criterion-plot = { version = "0.5.0" }

crates/criterion_compat/criterion_fork/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "codspeed-divan-compat"
-version = "2.9.1"
+version = "2.10.0"
 rust-version = "1.80"
 edition = "2021"
 description = "Divan compatibility layer for CodSpeed"
@@ -18,9 +18,9 @@ categories = [
 keywords = ["codspeed", "benchmark", "divan"]
 
 [dependencies]
-codspeed = { path = "../codspeed", version = "=2.9.1" }
-divan = { package = "codspeed-divan-compat-walltime", path = "./divan_fork", version = "=2.9.1" }
-codspeed-divan-compat-macros = { version = "=2.9.1", path = './macros' }
+codspeed = { path = "../codspeed", version = "=2.10.0" }
+divan = { package = "codspeed-divan-compat-walltime", path = "./divan_fork", version = "=2.10.0" }
+codspeed-divan-compat-macros = { version = "=2.10.0", path = './macros' }
 
 [[bench]]
 name = "basic_example"

crates/divan_compat/Cargo.toml

@@ -1,6 +1,6 @@
 use codspeed_divan_compat::Bencher;
 
-fn fibo(n: i32) -> i32 {
+fn fibo(n: u64) -> u64 {
     let mut a = 0;
     let mut b = 1;
 
@@ -14,12 +14,12 @@ fn fibo(n: i32) -> i32 {
 }
 
 #[codspeed_divan_compat::bench]
-fn fibo_500() -> i32 {
-    codspeed_divan_compat::black_box(fibo(500))
+fn fibo_50() -> u64 {
+    codspeed_divan_compat::black_box(fibo(50))
 }
 
 #[codspeed_divan_compat::bench]
-fn fibo_10() -> i32 {
+fn fibo_10() -> u64 {
     codspeed_divan_compat::black_box(fibo(10))
 }
 

crates/divan_compat/benches/basic_example.rs

@@ -1,6 +1,6 @@
 [package]
 name = "codspeed-divan-compat-walltime"
-version = "2.9.1"
+version = "2.10.0"
 rust-version = "1.80.0"
 edition = "2021"
 authors = ["Nikolai Vazquez"]
@@ -23,7 +23,7 @@ regex = { package = "regex-lite", version = "0.1", default-features = false, fea
     "std",
     "string",
 ] }
-codspeed = { path = "../../codspeed", version = "=2.9.1" }
+codspeed = { path = "../../codspeed", version = "=2.10.0" }
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2.148"

crates/divan_compat/divan_fork/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "codspeed-divan-compat-macros"
-version = "2.9.1"
+version = "2.10.0"
 rust-version = "1.80"
 edition = "2021"
 description = "Macros for the Divan compatibility layer for CodSpeed"