Merge branch 'main' of github.com:danleh/JetStream into zlib-wasm

Author: danleh

JetStreamDriver.js

@@ -1950,6 +1950,7 @@ const BENCHMARKS = [
         preload: {
             wasmBinary: "./wasm/HashSet/build/HashSet.wasm"
         },
+        iterations: 50,
         testGroup: WasmGroup
     }),
     new WasmEMCCBenchmark({
@@ -1961,8 +1962,7 @@ const BENCHMARKS = [
         preload: {
             wasmBinary: "./wasm/TSF/build/tsf.wasm"
         },
-        iterations: 15,
-        worstCaseCount: 2,
+        iterations: 50,
         testGroup: WasmGroup
     }),
     new WasmEMCCBenchmark({
@@ -1998,8 +1998,7 @@ const BENCHMARKS = [
         preload: {
             wasmBinary: "./wasm/richards/build/richards.wasm"
         },
-        iterations: 20,
-        worstCaseCount: 2,
+        iterations: 50,
         testGroup: WasmGroup
     }),
     new WasmEMCCBenchmark({
@@ -2011,7 +2010,7 @@ const BENCHMARKS = [
         preload: {
             wasmBinary: "./sqlite3/build/jswasm/speedtest1.wasm"
         },
-        iterations: 15,
+        iterations: 30,
         worstCaseCount: 2,
         testGroup: WasmGroup
     }),

sqlite3/benchmark.js

@@ -85,7 +85,7 @@ class Benchmark {
       //"--memdb", // note that memdb trumps the filename arg
       "--nomemstat",
       "--big-transactions" /*important for tests 410 and 510!*/,
-      "--size", "10", // To speedup, default is 100 (and takes about 4s).
+      "--size", "2", // To speedup, default is 100 (and takes about 4s).
       "--vfs", vfs, // See VFS comment above.
     ];
 

tests/run.mjs

@@ -83,20 +83,27 @@ async function testEnd2End() {
     try {
         await driver.get(`http://localhost:${PORT}/index.html?worstCaseCount=2&iterationCount=3`);
         await driver.executeAsyncScript((callback) => {
-            globalThis.addEventListener("JetStreamReady", callback);
+            // callback() is explicitly called without the default event
+            // as argument to avoid serialization issues with chromedriver.
+            globalThis.addEventListener("JetStreamReady", () => callback());
             // We might not get a chance to install the on-ready listener, thus
             // we also check if the runner is ready synchronously.
             if (globalThis?.JetStream?.isReady)
                 callback()
         });
-        await driver.manage().setTimeouts({ script: 60_000 });
+        await driver.manage().setTimeouts({ script: 3 * 60_000 });
         results = await driver.executeAsyncScript((callback) => {
             globalThis.addEventListener("JetStreamDone", event => callback(event.detail));
             JetStream.start();
         });
-    } finally {
-        console.log("\nTests complete!");
+        console.log("\n✅ Tests completed!");
+        console.log("RESULTS:")
         console.log(results)
+    } catch(e) {
+        console.error("\n❌ Tests failed!");
+        console.error(e);
+        throw e;
+    } finally {
         driver.quit();
         server.close();
     }

wasm/TSF/benchmark.js

@@ -28,6 +28,6 @@ class Benchmark {
         if (!Module._runIteration)
             await setupModule(Module);
 
-        Module._runIteration(150);
+        Module._runIteration(50);
     }
 };

wasm/richards/build.log

@@ -1,4 +1,4 @@
-Built on 2025-01-20T14:41:13Z
+Built on 2025-01-29T18:38:57Z
 Toolchain versions
 emcc (Emscripten gcc/clang-like replacement + linker emulating GNU ld) 3.1.73 (ac676d5e437525d15df5fd46bc2c208ec6d376a3)
 Building...

wasm/richards/build/richards.wasm

@@ -16,9 +16,9 @@
 #include <stdlib.h>
 
 #if 1
-#define                Count           10000*100
-#define                Qpktcountval    2326410
-#define                Holdcountval     930563
+#define                Count           200000
+#define                Qpktcountval    465212
+#define                Holdcountval    186084
 #endif
 
 #define                TRUE            1