add codspeed-criterion-compat

vercel · Aug 22, 2024 · de89ee6 · de89ee6
1 parent 1e6d204
commit de89ee6
Show file tree

Hide file tree

Showing 20 changed files with 89 additions and 76 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -132,10 +132,11 @@ atty = "0.2.14"
 bytes = "1.1.0"
 chrono = "0.4.23"
 clap = "4.5.2"
+codspeed-criterion-compat = "2.6.0"
 concurrent-queue = "2.5.0"
 console = "0.15.5"
 console-subscriber = "0.1.8"
-criterion = "0.4.0"
+criterion = "0.5.1"
 crossbeam-channel = "0.5.8"
 dashmap = "5.4.0"
 dhat = { version = "0.3.2" }

diff --git a/turbopack/crates/turbo-tasks-fs/Cargo.toml b/turbopack/crates/turbo-tasks-fs/Cargo.toml
@@ -49,6 +49,7 @@ turbo-tasks-hash = { workspace = true }
 unicode-segmentation = { workspace = true }
 
 [dev-dependencies]
+codspeed-criterion-compat = { workspace = true, features = ["async_tokio"] }
 criterion = { workspace = true, features = ["async_tokio"] }
 rstest = { workspace = true }
 sha2 = "0.10.2"

diff --git a/turbopack/crates/turbo-tasks-fs/benches/mod.rs b/turbopack/crates/turbo-tasks-fs/benches/mod.rs
@@ -5,7 +5,7 @@ use std::{
     time::{Duration, Instant},
 };
 
-use criterion::{
+use codspeed_criterion_compat::{
     criterion_group, criterion_main,
     measurement::{Measurement, WallTime},
     BenchmarkId, Criterion,

diff --git a/turbopack/crates/turbo-tasks-memory/Cargo.toml b/turbopack/crates/turbo-tasks-memory/Cargo.toml
@@ -34,6 +34,7 @@ turbo-tasks-hash = { workspace = true }
 turbo-tasks-malloc = { workspace = true, default-features = false }
 
 [dev-dependencies]
+codspeed-criterion-compat = { workspace = true, features = ["async_tokio"] }
 criterion = { workspace = true, features = ["async_tokio"] }
 loom = "0.7.2"
 rand = { workspace = true, features = ["small_rng"] }

diff --git a/turbopack/crates/turbo-tasks-memory/benches/mod.rs b/turbopack/crates/turbo-tasks-memory/benches/mod.rs
@@ -1,6 +1,6 @@
 #![feature(arbitrary_self_types)]
 
-use criterion::{criterion_group, criterion_main, Criterion};
+use codspeed_criterion_compat::{criterion_group, criterion_main, Criterion};
 
 pub(crate) mod scope_stress;
 pub(crate) mod stress;

diff --git a/turbopack/crates/turbo-tasks-memory/benches/scope_stress.rs b/turbopack/crates/turbo-tasks-memory/benches/scope_stress.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use criterion::{BenchmarkId, Criterion};
+use codspeed_criterion_compat::{BenchmarkId, Criterion};
 use turbo_tasks::{Completion, ReadConsistency, TryJoinIterExt, TurboTasks, Vc};
 use turbo_tasks_memory::MemoryBackend;
 

diff --git a/turbopack/crates/turbo-tasks-memory/benches/stress.rs b/turbopack/crates/turbo-tasks-memory/benches/stress.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use criterion::{BenchmarkId, Criterion};
+use codspeed_criterion_compat::{BenchmarkId, Criterion};
 use turbo_tasks::{ReadConsistency, TryJoinIterExt, TurboTasks, Vc};
 use turbo_tasks_memory::MemoryBackend;
 

diff --git a/turbopack/crates/turbopack-bench/Cargo.toml b/turbopack/crates/turbopack-bench/Cargo.toml
@@ -21,6 +21,7 @@ anyhow = { workspace = true, features = ["backtrace"] }
 chromiumoxide = { workspace = true, features = [
   "tokio-runtime",
 ], default-features = false }
+codspeed-criterion-compat = { workspace = true, features = ["async_tokio"] }
 criterion = { workspace = true, features = ["async_tokio"] }
 futures = { workspace = true }
 once_cell = { workspace = true }

diff --git a/turbopack/crates/turbopack-bench/benches/mod.rs b/turbopack/crates/turbopack-bench/benches/mod.rs
@@ -1,4 +1,4 @@
-use criterion::{criterion_group, criterion_main, Criterion};
+use codspeed_criterion_compat::{criterion_group, criterion_main, Criterion};
 use turbopack_bench::bundlers::Bundler;
 
 fn get_bundlers() -> Vec<Box<dyn Bundler>> {

diff --git a/turbopack/crates/turbopack-bench/src/lib.rs b/turbopack/crates/turbopack-bench/src/lib.rs
@@ -10,7 +10,7 @@ use std::{
 };
 
 use anyhow::{anyhow, Context, Result};
-use criterion::{
+use codspeed_criterion_compat::{
     measurement::{Measurement, WallTime},
     BenchmarkGroup, BenchmarkId, Criterion,
 };

diff --git a/turbopack/crates/turbopack-bench/src/util/mod.rs b/turbopack/crates/turbopack-bench/src/util/mod.rs
@@ -12,7 +12,9 @@ use chromiumoxide::{
     browser::{Browser, BrowserConfig},
     error::CdpError::Ws,
 };
-use criterion::{async_executor::AsyncExecutor, black_box, measurement::WallTime, AsyncBencher};
+use codspeed_criterion_compat::{
+    async_executor::AsyncExecutor, black_box, measurement::WallTime, AsyncBencher,
+};
 use futures::{Future, StreamExt};
 pub use page_guard::PageGuard;
 use parking_lot::Mutex;
@@ -155,7 +157,7 @@ pub trait AsyncBencherExtension<A: AsyncExecutor> {
         TF: Future<Output = ()>;
 }
 
-impl<'a, 'b, A: AsyncExecutor> AsyncBencherExtension<A> for AsyncBencher<'a, 'b, A, WallTime> {
+impl<'a, 'b, A: AsyncExecutor> AsyncBencherExtension<A> for AsyncBencher<'a, 'b, A> {
     fn try_iter_custom<R, F>(&mut self, routine: R)
     where
         R: Fn(u64, WallTime) -> F,