Merge pull request #1443 from rust-lang/excluded-scenarios

Add the option to exclude certain scenarios in `perf-config.json`

Author: Kobzol

collector/src/benchmark/mod.rs

@@ -41,10 +41,16 @@ struct BenchmarkConfig {
     touch_file: Option<String>,
 
     category: Category,
+
     /// Profiles that are not useful for this benchmark.
     /// They will be ignored during benchmarking.
     #[serde(default)]
     excluded_profiles: HashSet<Profile>,
+
+    /// Scenarios that are not useful for this benchmark.
+    /// They will be ignored during benchmarking.
+    #[serde(default)]
+    excluded_scenarios: HashSet<Scenario>,
 }
 
 #[derive(Ord, PartialOrd, Eq, PartialEq, Clone, Hash)]
@@ -185,6 +191,11 @@ impl Benchmark {
         compiler: Compiler<'_>,
         iterations: Option<usize>,
     ) -> anyhow::Result<()> {
+        if self.config.disabled {
+            eprintln!("Skipping {}: disabled", self.name);
+            bail!("disabled benchmark");
+        }
+
         let iterations = iterations.unwrap_or(self.config.runs);
 
         let profiles: Vec<Profile> = profiles
@@ -193,16 +204,22 @@ impl Benchmark {
             .filter(|profile| !self.config.excluded_profiles.contains(profile))
             .collect();
 
-        if self.config.disabled {
-            eprintln!("Skipping {}: disabled", self.name);
-            bail!("disabled benchmark");
-        }
-
         if profiles.is_empty() {
             eprintln!("Skipping {}: no profiles selected", self.name);
             return Ok(());
         }
 
+        let scenarios: Vec<Scenario> = scenarios
+            .into_iter()
+            .copied()
+            .filter(|scenario| !self.config.excluded_scenarios.contains(scenario))
+            .collect();
+
+        if scenarios.is_empty() {
+            eprintln!("Skipping {}: no scenarios selected", self.name);
+            return Ok(());
+        }
+
         eprintln!("Preparing {}", self.name);
         let profile_dirs = profiles
             .iter()

collector/src/benchmark/scenario.rs

@@ -1,4 +1,4 @@
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, clap::ArgEnum)]
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, clap::ArgEnum, serde::Deserialize)]
 #[clap(rename_all = "PascalCase")]
 pub enum Scenario {
     Full,