fix test.ts

sola-st · Aug 16, 2024 · a59da57 · a59da57
1 parent 0b30651
commit a59da57
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/evaluation/get_benchmark_fidx.py b/evaluation/get_benchmark_fidx.py
@@ -26,7 +26,7 @@ def get_subset_fidx(testname: str) -> list:
     subset_of_fidx = []
     try:
         subprocess.run(
-            [f"{WASMR3_PATH}/target/release/slice_dice", replay_wasm_path],
+            [f"{WASMR3_PATH}/crates/target/release/slice_dice", replay_wasm_path],
             check=True,
             capture_output=True,
             text=True,

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/test-slice-dice.ts b/src/test-slice-dice.ts
@@ -24,14 +24,15 @@ export default async function runSliceDiceTests(names: string[], options) {
 function runSliceDice(replayWasmPath: string, fidx: string) {
   const startTime = Date.now();
   process.stdout.write('    Running slice-dice: ');
-  const command = `./target/release/slice_dice ${replayWasmPath} ${fidx} 1`;
+  const command = `./crates/target/release/slice_dice ${replayWasmPath} ${fidx} 1`;
   execSync(command);
   const endTime = Date.now();
   // We do not actually check what's generated runs to completion. This is misleading.
   // TODO: check for completion
   console.log(`${endTime - startTime}ms`);
 }
 
+// TODO: this got slower by 2x from 01b34a3952ea29706d29d29d07b6f5148e119065. Investigate why.
 async function runWasmR3(options: any, subsetPath: string, benchmarkPath: string, fidx: string) {
   const startTime = Date.now();
   process.stdout.write('    Running wasm-r3: ');
@@ -78,7 +79,7 @@ function getSubsetFidx(replayWasmPath: string, name: string) {
   try {
   } catch (e) {
   }
-  const command = `./target/release/slice_dice ${replayWasmPath}`;
+  const command = `./crates/target/release/slice_dice ${replayWasmPath}`;
   const stdout = execSync(command, { stdio: ['pipe', 'pipe', 'ignore'] });
   const matches = stdout.toString().match(/\d+/g);
   if (matches) {

diff --git a/src/test.ts b/src/test.ts
@@ -104,7 +104,8 @@ async function analyzeAndSaveBenchmark(options: any, testJsPath: string, website
       path.join(process.cwd(), "benchmarks")
     );
     if (options.testcases !== undefined) {
-      testNames = testNames.filter((n) => options.testcases === (n));
+      testNames = testNames.filter((n) => options.testcases.includes(n));
+      testNames = Array.from(new Set([...testNames, ...options.testcases]));
     }
     await runSliceDiceTests(testNames, options);
   }

diff --git a/third_party/wizard-engine b/third_party/wizard-engine