feat(criterion_compat): add walltime support

Signed-off-by: not-matthias <[email protected]>

Author: not-matthias

crates/criterion_compat/Cargo.toml

@@ -17,7 +17,7 @@ categories = [
 ]
 keywords = ["codspeed", "benchmark", "criterion"]
 [dependencies]
-criterion = { package = "codspeed-criterion-compat-walltime", path = "criterion-0.5.1", version = "0.5.1", default-features = false }
+criterion = { package = "codspeed-criterion-compat-walltime", path = "./criterion-0.5.1", version = "0.5.1", default-features = false }
 codspeed = { path = "../codspeed", version = "=2.8.1" }
 colored = "2.1.0"
 

crates/criterion_compat/criterion-0.5.1/src/analysis/mod.rs

@@ -256,6 +256,60 @@ pub(crate) fn common<M: Measurement, T: ?Sized>(
             );
         }
     }
+
+    if criterion.should_save_baseline() && std::env::var("CODSPEED_ENV").is_ok() {
+        codspeed::collect_walltime_results(id, criterion, &iters, avg_times);
+    }
+}
+
+mod codspeed {
+    use crate::{measurement::Measurement, report::BenchmarkId, Criterion};
+
+    /// WARNING: Keep URI generation in sync with `codspeed-criterion-compat::compat::group::run_bench`
+    pub fn create_uri_and_name<M: Measurement>(
+        id: &BenchmarkId,
+        c: &Criterion<M>,
+    ) -> (String, String) {
+        let mut bench_name = id.group_id.clone();
+        if let Some(ref function_name) = id.function_id {
+            bench_name.push_str(&format!("::{}", function_name));
+        }
+        if let Some(ref parameter) = id.value_str {
+            bench_name.push_str(&format!("[{}]", parameter));
+        }
+
+        let git_relative_file_path = codspeed::utils::get_git_relative_path(&c.current_file);
+        let uri = format!(
+            "{}::{}::{}",
+            git_relative_file_path.to_string_lossy(),
+            &c.macro_group,
+            bench_name
+        );
+
+        (uri, bench_name)
+    }
+
+    pub(crate) fn collect_walltime_results<M: Measurement>(
+        id: &BenchmarkId,
+        c: &Criterion<M>,
+        iters: &[f64],
+        avg_times: &[f64],
+    ) {
+        let (uri, bench_name) = create_uri_and_name(id, c);
+
+        let avg_iter_per_round = iters.iter().sum::<f64>() / iters.len() as f64;
+        let max_time_ns = Some(c.config.measurement_time.as_nanos());
+        let times_ns = avg_times.iter().map(|t| *t as u128).collect();
+
+        ::codspeed::walltime::collect_raw_walltime_results(
+            "criterion",
+            bench_name,
+            uri,
+            avg_iter_per_round as u32,
+            max_time_ns,
+            times_ns,
+        );
+    }
 }
 
 fn base_dir_exists(id: &BenchmarkId, baseline: &str, output_directory: &Path) -> bool {

crates/criterion_compat/criterion-0.5.1/src/lib.rs

@@ -375,6 +375,26 @@ pub struct Criterion<M: Measurement = WallTime> {
     profiler: Box<RefCell<dyn Profiler>>,
     connection: Option<MutexGuard<'static, Connection>>,
     mode: Mode,
+
+    current_file: String,
+    macro_group: String,
+}
+
+pub use ::codspeed::abs_file; // Required by the `criterion_group!` macro
+mod codspeed {
+    use crate::{measurement::Measurement, Criterion};
+
+    impl<M: Measurement> Criterion<M> {
+        #[doc(hidden)]
+        pub fn set_current_file(&mut self, file: impl Into<String>) {
+            self.current_file = file.into();
+        }
+
+        #[doc(hidden)]
+        pub fn set_macro_group(&mut self, macro_group: impl Into<String>) {
+            self.macro_group = macro_group.into();
+        }
+    }
 }
 
 /// Returns the Cargo target directory, possibly calling `cargo metadata` to
@@ -445,6 +465,8 @@ impl Default for Criterion {
                 .as_ref()
                 .map(|mtx| mtx.lock().unwrap()),
             mode: Mode::Benchmark,
+            current_file: String::new(),
+            macro_group: String::new(),
         };
 
         if criterion.connection.is_some() {
@@ -477,6 +499,8 @@ impl<M: Measurement> Criterion<M> {
             profiler: self.profiler,
             connection: self.connection,
             mode: self.mode,
+            current_file: self.current_file,
+            macro_group: self.macro_group,
         }
     }
 

crates/criterion_compat/criterion-0.5.1/src/macros.rs

@@ -68,6 +68,10 @@ macro_rules! criterion_group {
             let mut criterion: $crate::Criterion<_> = $config
                 .configure_from_args();
             $(
+                if std::env::var("CODSPEED_ENV").is_ok() {
+                    criterion.set_current_file($crate::abs_file!());
+                    criterion.set_macro_group(format!("{}::{}", stringify!($name), stringify!($target)));
+                }
                 $target(&mut criterion);
             )+
         }

crates/criterion_compat/src/lib.rs

@@ -2,6 +2,7 @@ pub use codspeed::codspeed_uri;
 
 #[cfg(not(codspeed))]
 mod compat_criterion {
+    pub use codspeed::abs_file;
     pub use criterion::*;
 }