Pass --stop-after <phase> through to benchmarking subprocesses

Fixes bytecodealliance#113
fitzgen · May 28, 2021 · 947b373 · 947b373
1 parent 1db9512
commit 947b373
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 2 deletions.
diff --git a/crates/cli/src/benchmark.rs b/crates/cli/src/benchmark.rs
@@ -300,12 +300,18 @@ impl BenchmarkCommand {
                 .arg("--measure")
                 .arg(self.measure.to_string())
                 .arg("--output-format")
-                .arg(self.output_format.to_string())
-                .arg(&wasm);
+                .arg(self.output_format.to_string());
+
             if self.small_workloads {
                 command.env("WASM_BENCH_USE_SMALL_WORKLOAD", "1");
             }
 
+            if let Some(phase) = self.stop_after_phase {
+                command.arg("--stop-after").arg(phase.to_string());
+            }
+
+            command.arg("--").arg(&wasm);
+
             let output = command
                 .output()
                 .context("failed to run benchmark subprocess")?;

diff --git a/crates/cli/tests/tests.rs b/crates/cli/tests/tests.rs
@@ -47,6 +47,44 @@ fn help() {
     sightglass_cli().arg("help").assert().success();
 }
 
+#[test]
+fn benchmark_stop_after_compilation() {
+    sightglass_cli_benchmark()
+        .arg("--processes")
+        .arg("2")
+        .arg("--iterations-per-process")
+        .arg("1")
+        .arg("--stop-after")
+        .arg("compilation")
+        .arg(benchmark("noop"))
+        .assert()
+        .success()
+        .stdout(
+            predicate::str::contains("Compilation")
+                .and(predicate::str::contains("Instantiation").not())
+                .and(predicate::str::contains("Execution").not()),
+        );
+}
+
+#[test]
+fn benchmark_stop_after_instantiation() {
+    sightglass_cli_benchmark()
+        .arg("--processes")
+        .arg("2")
+        .arg("--iterations-per-process")
+        .arg("1")
+        .arg("--stop-after")
+        .arg("instantiation")
+        .arg(benchmark("noop"))
+        .assert()
+        .success()
+        .stdout(
+            predicate::str::contains("Compilation")
+                .and(predicate::str::contains("Instantiation"))
+                .and(predicate::str::contains("Execution").not()),
+        );
+}
+
 #[test]
 fn benchmark_json() {
     let assert = sightglass_cli_benchmark()