Merge remote-tracking branch 'origin/main' into dart-flute-wasm-squash

Author: danleh

JetStreamDriver.js

@@ -1695,17 +1695,6 @@ const BENCHMARKS = [
         deterministicRandom: true,
         testGroup: OctaneGroup
     }),
-    new DefaultBenchmark({
-        name: "octane-zlib",
-        files: [
-            "./Octane/zlib-data.js"
-            , "./Octane/zlib.js"
-        ],
-        iterations: 15,
-        worstCaseCount: 2,
-        deterministicRandom: true,
-        testGroup: OctaneGroup
-    }),
     // RexBench
     new DefaultBenchmark({
         name: "FlightPlanner",
@@ -1955,14 +1944,16 @@ const BENCHMARKS = [
         testGroup: GeneratorsGroup,
     }),
     // Wasm
-    new WasmLegacyBenchmark({
+    new WasmEMCCBenchmark({
         name: "HashSet-wasm",
         files: [
-            "./wasm/HashSet.js"
+            "./wasm/HashSet/build/HashSet.js",
+            "./wasm/HashSet/benchmark.js"
         ],
         preload: {
-            wasmBinary: "./wasm/HashSet.wasm"
+            wasmBinary: "./wasm/HashSet/build/HashSet.wasm"
         },
+        iterations: 50,
         testGroup: WasmGroup
     }),
     new WasmEMCCBenchmark({
@@ -1974,18 +1965,19 @@ const BENCHMARKS = [
         preload: {
             wasmBinary: "./wasm/TSF/build/tsf.wasm"
         },
-        iterations: 15,
-        worstCaseCount: 2,
+        iterations: 50,
         testGroup: WasmGroup
     }),
-    new WasmLegacyBenchmark({
+    new WasmEMCCBenchmark({
         name: "quicksort-wasm",
         files: [
-            "./wasm/quicksort.js"
+            "./wasm/quicksort/build/quicksort.js",
+            "./wasm/quicksort/benchmark.js",
         ],
         preload: {
-            wasmBinary: "./wasm/quicksort.wasm"
+            wasmBinary: "./wasm/quicksort/build/quicksort.wasm"
         },
+        iterations: 50,
         testGroup: WasmGroup
     }),
     new WasmEMCCBenchmark({
@@ -2009,21 +2001,20 @@ const BENCHMARKS = [
         preload: {
             wasmBinary: "./wasm/richards/build/richards.wasm"
         },
-        iterations: 20,
-        worstCaseCount: 2,
+        iterations: 50,
         testGroup: WasmGroup
     }),
-    new WasmLegacyBenchmark({
+    new WasmEMCCBenchmark({
         name: "sqlite3-wasm",
         files: [
-            "./sqlite3/polyfills.js",
-            "./sqlite3/build/jswasm/speedtest1.js",
             "./sqlite3/benchmark.js",
+            "./sqlite3/build/jswasm/speedtest1.js",
         ],
         preload: {
             wasmBinary: "./sqlite3/build/jswasm/speedtest1.wasm"
         },
-        benchmarkClass: WasmLegacyBenchmark,
+        iterations: 30,
+        worstCaseCount: 2,
         testGroup: WasmGroup
     }),
     new WasmEMCCBenchmark({

Octane/run.js

@@ -42,8 +42,6 @@ load(base_dir + 'gbemu-part1.js');
 load(base_dir + 'gbemu-part2.js');
 load(base_dir + 'code-load.js');
 load(base_dir + 'box2d.js');
-load(base_dir + 'zlib.js');
-load(base_dir + 'zlib-data.js');
 load(base_dir + 'typescript.js');
 load(base_dir + 'typescript-input.js');
 load(base_dir + 'typescript-compiler.js');

Octane/zlib-data.js

@@ -333,16 +333,6 @@ <h3>
          Source code: <a href="RexBench/OfflineAssembler/parser.js">OfflineAssembler.js</a>
         </dd>
 
-        <dt id="octane-zlib">octane-zlib</dt>
-        <dd>
-         A benchmark based on compiling <a href="http://zlib.net">zlib</a> to JavaScript using
-         <a href="https://emscripten.org">Emscripten</a>. Based on the
-         <a href="https://github.com/kripken/emscripten/tree/master/tests/zlib">zlib emscripten test</a>
-         but modified to restrict code caching opportunities.
-         A similar version of this benchmark was previously published in Octane version 2.
-         Source code: <a href="Octane/zlib.js">zlib.js</a>
-        </dd>
-
         <dt id="octane-code-load">octane-code-load</dt>
         <dd>
          Test of code load speed of the jQuery and Closure libraries. Because this test allows
@@ -465,13 +455,6 @@ <h3>
          Source code: <a href="SeaMonster/gaussian-blur.js">gaussian-blur.js</a>
         </dd>
 
-        <dt id="float-mm.c">float-mm.c</dt>
-        <dd>
-         Floating point matrix multiply benchmark, compiled to JavaScript with <a href="https://emscripten.org">Emscripten</a>.
-         The original C version of this benchmark was previously published in the LLVM test suite.
-         Source code: <a href="simple/float-mm.c">float-mm.c</a>, <a href="simple/float-mm.c.js">float-mm.c.js</a>
-        </dd>
-
         <dt id="FlightPlanner">FlightPlanner</dt>
         <dd>
           Flight Planner is a benchmark taken from a flight management web application.