Improve the error on benchmarking on low optimizer modes

matter-labs · Apr 17, 2024 · bf943e3 · bf943e3
1 parent 6839147
commit bf943e3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/compiler_tester/src/compiler_tester/main.rs b/compiler_tester/src/compiler_tester/main.rs
@@ -165,7 +165,7 @@ fn main_inner(arguments: Arguments) -> anyhow::Result<()> {
     );
 
     if let Some(path) = arguments.benchmark {
-        let benchmark = summary.benchmark();
+        let benchmark = summary.benchmark()?;
         benchmark.write_to_file(path)?;
     }
 

diff --git a/compiler_tester/src/summary/mod.rs b/compiler_tester/src/summary/mod.rs
@@ -75,7 +75,7 @@ impl Summary {
     ///
     /// Returns the benchmark structure.
     ///
-    pub fn benchmark(&self) -> benchmark_analyzer::Benchmark {
+    pub fn benchmark(&self) -> anyhow::Result<benchmark_analyzer::Benchmark> {
         let mut benchmark = benchmark_analyzer::Benchmark::default();
         benchmark.groups.insert(
             format!(
@@ -132,16 +132,17 @@ impl Summary {
                     .insert(key.clone(), benchmark_element.clone());
             }
 
+            let group_key = format!("{} {}", benchmark_analyzer::BENCHMARK_ALL_GROUP_NAME, mode);
             benchmark
                 .groups
                 .get_mut(
-                    format!("{} {}", benchmark_analyzer::BENCHMARK_ALL_GROUP_NAME, mode).as_str(),
+                    group_key.as_str(),
                 )
-                .expect("Always exists")
+                .ok_or_else(|| anyhow::anyhow!("Group `{group_key}` not found. Only M3 and Mz groups are allowed in benchmarking"))?
                 .elements
                 .insert(key, benchmark_element);
         }
-        benchmark
+        Ok(benchmark)
     }
 
     ///