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

Author: danleh

Diff for: JetStreamDriver.js

@@ -2162,7 +2162,20 @@ const BENCHMARKS = [
         },
         async: true,
         testGroup: WasmGroup
-    })
+    }),
+    // zlib-wasm
+    new WasmEMCCBenchmark({
+        name: "zlib-wasm",
+        files: [
+            "./wasm/zlib/build/zlib.js",
+            "./wasm/zlib/benchmark.js",
+        ],
+        preload: {
+            wasmBinary: "./wasm/zlib/build/zlib.wasm",
+        },
+        iterations: 40,
+        testGroup: WasmGroup
+    }),
 ];
 
 // LuaJSFight tests

Diff for: wasm-cli.js

@@ -36,6 +36,7 @@ testList = [
   "argon2-wasm-simd",
   "8bitbench-wasm",
   "Dart-flute-wasm",
+  "zlib-wasm",
 ];
 
 // Reuse the full CLI runner, just with the subset of Wasm line items above.

Diff for: wasm/richards/benchmark.js

@@ -9,7 +9,8 @@ class Benchmark {
       await setupModule(Module);
 
     // Set-up the problem (fill the work queue) on each run.
-    Module._setup();
+    const taskCount = 200_000;
+    Module._setup(taskCount);
 
     // Repeatedly call into Wasm to stress test JS-to-Wasm call performance.
     // I (dlehmann) suppose this wrapper was added (originally in JetStream 2)
@@ -21,7 +22,7 @@ class Benchmark {
   }
 
   validate() {
-    if (!Module._validate())
+    if (Module._getQpktcount() !== 465212 || Module._getHoldcount() !== 186084)
       throw new Error("Bad richards result!");
   }
 }

Diff for: wasm/richards/build.log

@@ -1,4 +1,4 @@
-Built on 2025-01-29T18:38:57Z
+Built on 2025-02-10T17:28:11Z
 Toolchain versions
 emcc (Emscripten gcc/clang-like replacement + linker emulating GNU ld) 3.1.73 (ac676d5e437525d15df5fd46bc2c208ec6d376a3)
 Building...

Diff for: wasm/richards/build.sh

@@ -15,7 +15,7 @@ emcc -o build/richards.js \
     -s WASM=1 -O2 -s TOTAL_MEMORY=83886080 \
     -g1 --emit-symbol-map \
     -s MODULARIZE=1 \
-    -s EXPORT_NAME=setupModule -s EXPORTED_FUNCTIONS=_setup,_scheduleIter,_validate \
+    -s EXPORT_NAME=setupModule -s EXPORTED_FUNCTIONS=_setup,_scheduleIter,_getQpktcount,_getHoldcount \
     richards.c | tee -a "$BUILD_LOG"
 
 echo "Building done" | tee -a "$BUILD_LOG"

Diff for: wasm/richards/build/richards.js

@@ -537,9 +537,11 @@ var ___wasm_call_ctors = () => (___wasm_call_ctors = wasmExports["__wasm_call_ct
 
 var _scheduleIter = Module["_scheduleIter"] = () => (_scheduleIter = Module["_scheduleIter"] = wasmExports["scheduleIter"])();
 
-var _setup = Module["_setup"] = () => (_setup = Module["_setup"] = wasmExports["setup"])();
+var _setup = Module["_setup"] = a0 => (_setup = Module["_setup"] = wasmExports["setup"])(a0);
 
-var _validate = Module["_validate"] = () => (_validate = Module["_validate"] = wasmExports["validate"])();
+var _getQpktcount = Module["_getQpktcount"] = () => (_getQpktcount = Module["_getQpktcount"] = wasmExports["getQpktcount"])();
+
+var _getHoldcount = Module["_getHoldcount"] = () => (_getHoldcount = Module["_getHoldcount"] = wasmExports["getHoldcount"])();
 
 var __emscripten_stack_restore = a0 => (__emscripten_stack_restore = wasmExports["_emscripten_stack_restore"])(a0);
 

Diff for: wasm/richards/build/richards.js.symbols

@@ -6,9 +6,10 @@
 5:handlerfn
 6:devfn
 7:setup
-8:validate
-9:emscripten_builtin_malloc
-10:sbrk
-11:_emscripten_stack_restore
-12:_emscripten_stack_alloc
-13:emscripten_stack_get_current
+8:getQpktcount
+9:getHoldcount
+10:emscripten_builtin_malloc
+11:sbrk
+12:_emscripten_stack_restore
+13:_emscripten_stack_alloc
+14:emscripten_stack_get_current

Diff for: wasm/richards/build/richards.wasm

@@ -1,4 +1,4 @@
-// $ emcc -o richards.html -O2 -s TOTAL_MEMORY=83886080 -g1 -s "EXPORTED_FUNCTIONS=[_setup, _scheduleIter, _validate]" ./richards.c
+// $ emcc -o richards.html -O2 -s TOTAL_MEMORY=83886080 -g1 -s "EXPORTED_FUNCTIONS=[_setup, _scheduleIter, _getQpktcount, _getHoldcount]" ./richards.c
 
 #include <emscripten.h>
 
@@ -15,12 +15,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#if 1
-#define                Count           200000
-#define                Qpktcountval    465212
-#define                Holdcountval    186084
-#endif
-
 #define                TRUE            1
 #define                FALSE           0
 #define                MAXINT          32767
@@ -335,11 +329,11 @@ void append(struct packet *pkt, struct packet *ptr)
     ptr->p_link = pkt;
 }
 
-void setup()
+void setup(int count)
 {
     struct packet *wkq = 0;
 
-    createtask(I_IDLE, 0, wkq, S_RUN, idlefn, 1, Count);
+    createtask(I_IDLE, 0, wkq, S_RUN, idlefn, 1, count);
 
     wkq = pkt(0, 0, K_WORK);
     wkq = pkt(wkq, 0, K_WORK);
@@ -370,7 +364,12 @@ void setup()
     layout = 0;
 }
 
-int validate()
+int getQpktcount()
+{
+    return qpktcount;
+}
+
+int getHoldcount()
 {
-    return qpktcount == Qpktcountval && holdcount == Holdcountval;
+    return holdcount;
 }

Diff for: wasm/richards/richards.c

@@ -0,0 +1,38 @@
+// Copyright 2025 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+class Benchmark {
+  async runIteration() {
+    if (!Module._main)
+      await setupModule(Module);
+
+    Module.FS.writeFile('input', Module.wasmBinary);
+
+    const inputStr = Module.stringToNewUTF8('input');
+    const inputzStr = Module.stringToNewUTF8('input.z');
+    const inputzoutStr = Module.stringToNewUTF8('input.z.out');
+
+    for (let i = 0; i < 10; i++) {
+      Module._compressFile(inputStr, inputzStr);
+      Module._decompressFile(inputzStr, inputzoutStr);
+      if (Module.FS.stat('input').size !== Module.FS.stat('input.z.out').size) {
+        throw new Error("Length after decompression doesn't match");
+      }
+    }
+
+    Module._free(inputzoutStr);
+    Module._free(inputzStr);
+    Module._free(inputStr);
+  }
+
+  validate() {
+    const input = Module.FS.readFile('input');
+    const outputRoundtrip = Module.FS.readFile('input.z.out');
+    for (let i = 0; i < input.length; i++) {
+      if (input[i] !== outputRoundtrip[i]) {
+        throw new Error("Content after decompression doesn't match at offset " + i);
+      }
+    }
+  }
+}

Diff for: wasm/zlib/benchmark.js

@@ -0,0 +1,6 @@
+Built on 2025-02-12T12:38:44Z
+Toolchain versions
+emcc (Emscripten gcc/clang-like replacement + linker emulating GNU ld) 3.1.73 (ac676d5e437525d15df5fd46bc2c208ec6d376a3)
+Getting zpipe.c example source...
+Building...
+Building done

Diff for: wasm/zlib/build.log

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -euo pipefail
+
+rm -rf build/
+rm -f src/zpipe.c
+
+touch build.log
+BUILD_LOG="$(realpath build.log)"
+echo "Built on $(date -u '+%Y-%m-%dT%H:%M:%SZ')" | tee "$BUILD_LOG"
+
+echo "Toolchain versions" | tee -a "$BUILD_LOG"
+emcc --version | head -n1 | tee -a "$BUILD_LOG"
+
+echo "Getting zpipe.c example source..." | tee -a "$BUILD_LOG"
+curl -o "src/zpipe.c" https://www.zlib.net/zpipe.c
+
+echo "Building..." | tee -a "$BUILD_LOG"
+mkdir build/
+emcc -o build/zlib.js \
+    -s WASM=1 -O2 \
+    -g1 --emit-symbol-map \
+    -s USE_ZLIB=1 -s FORCE_FILESYSTEM=1 \
+    -s MODULARIZE=1 -s EXPORT_NAME=setupModule -s EXPORTED_RUNTIME_METHODS=FS,stringToNewUTF8 -s EXPORTED_FUNCTIONS=_compressFile,_decompressFile,_free \
+    src/zpipe.c src/main.c | tee -a "$BUILD_LOG"
+# If you want the native build for reference:
+# clang -o build/zlib -O2 -lz src/zpipe.c src/main.c
+
+echo "Building done" | tee -a "$BUILD_LOG"
+ls -lth build/