Sort scenarios for deterministic output

Author: Kobzol

collector/src/compile/benchmark/mod.rs

@@ -277,7 +277,7 @@ impl Benchmark {
 
         struct BenchmarkDir {
             dir: TempDir,
-            scenarios: HashSet<Scenario>,
+            scenarios: Vec<Scenario>,
             profile: Profile,
             backend: CodegenBackend,
             target: Target,
@@ -291,7 +291,7 @@ impl Benchmark {
             for profile in &profiles {
                 for target in targets {
                     // Do we have any scenarios left to compute?
-                    let remaining_scenarios = scenarios
+                    let mut remaining_scenarios = scenarios
                         .iter()
                         .flat_map(|scenario| {
                             self.create_test_cases(scenario, profile, backend, target)
@@ -300,10 +300,13 @@ impl Benchmark {
                         })
                         .filter(|(_, test_case)| !already_computed.contains(test_case))
                         .map(|(scenario, _)| scenario)
-                        .collect::<HashSet<Scenario>>();
+                        .collect::<HashSet<Scenario>>()
+                        .into_iter()
+                        .collect::<Vec<Scenario>>();
                     if remaining_scenarios.is_empty() {
                         continue;
                     }
+                    remaining_scenarios.sort();
 
                     let temp_dir = self.make_temp_dir(&self.path)?;
                     benchmark_dirs.push(BenchmarkDir {

collector/src/compile/benchmark/scenario.rs

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