Merge pull request #1468 from rust-lang/runtime-cli-iterations

Allow specifying the number of executed iterations for runtime benchmarks

Author: Kobzol

collector/src/bin/collector.rs

@@ -575,6 +575,10 @@ enum Commands {
         /// Include only benchmarks matching a prefix in this comma-separated list
         #[clap(long)]
         include: Option<String>,
+
+        /// How many iterations of each benchmark should be executed.
+        #[clap(long, default_value = "5")]
+        iterations: u32,
     },
     /// Benchmarks a local rustc
     BenchLocal {
@@ -706,12 +710,14 @@ fn main_result() -> anyhow::Result<i32> {
             id,
             exclude,
             include,
+            iterations,
         } => {
             bench_runtime(
                 &rustc,
                 id.as_deref(),
                 BenchmarkFilter::new(exclude, include),
                 runtime_benchmark_dir,
+                iterations,
             )?;
             Ok(0)
         }

collector/src/runtime/mod.rs

@@ -18,6 +18,7 @@ pub fn bench_runtime(
     id: Option<&str>,
     filter: BenchmarkFilter,
     benchmark_dir: PathBuf,
+    iterations: u32,
 ) -> anyhow::Result<()> {
     let toolchain = get_local_toolchain(&[Profile::Opt], rustc, None, None, id, "")?;
     let suite = benchmark::discover_benchmarks(&toolchain, &benchmark_dir)?;
@@ -32,7 +33,7 @@ pub fn bench_runtime(
 
     let mut benchmark_index = 0;
     for binary in suite.groups {
-        for message in execute_runtime_benchmark_binary(&binary.binary, &filter)? {
+        for message in execute_runtime_benchmark_binary(&binary.binary, &filter, iterations)? {
             let message = message.map_err(|err| {
                 anyhow::anyhow!(
                     "Cannot parse BenchmarkMessage from benchmark {}: {err:?}",
@@ -64,13 +65,16 @@ pub fn bench_runtime(
 fn execute_runtime_benchmark_binary(
     binary: &Path,
     filter: &BenchmarkFilter,
+    iterations: u32,
 ) -> anyhow::Result<impl Iterator<Item = anyhow::Result<BenchmarkMessage>>> {
     // Turn off ASLR
     let mut command = Command::new("setarch");
     command.arg(std::env::consts::ARCH);
     command.arg("-R");
     command.arg(binary);
     command.arg("run");
+    command.arg("--iterations");
+    command.arg(&iterations.to_string());
 
     if let Some(ref exclude) = filter.exclude {
         command.args(&["--exclude", exclude]);