Merge branch 'main' into 2025-08-12_bomb_workers_upper

Author: camillobruni

8bitbench/benchmark.js

@@ -38,8 +38,8 @@ class Benchmark {
   romBinary;
 
   async init() {
-    Module.wasmBinary = await getBinary(wasmBinary);
-    this.romBinary = await getBinary(romBinary);
+    Module.wasmBinary = await JetStream.getBinary(JetStream.preload.wasmBinary);
+    this.romBinary = await JetStream.getBinary(JetStream.preload.romBinary);
   }
 
   async runIteration() {

ARES-6/Babylon/benchmark.js

@@ -30,14 +30,14 @@ class Benchmark {
         let sources = [];
 
         const files = [
-              [airBlob, {}]
-            , [basicBlob, {}]
-            , [inspectorBlob, {}]
-            , [babylonBlob, {sourceType: "module"}]
+            [JetStream.preload.airBlob, {}],
+            [JetStream.preload.basicBlob, {}],
+            [JetStream.preload.inspectorBlob, {}],
+            [JetStream.preload.babylonBlob, {sourceType: "module"}],
         ];
 
         for (let [file, options] of files)
-            sources.push([file, await getString(file), options]);
+            sources.push([file, await JetStream.getString(file), options]);
 
         this.sources = sources;
     }

Dart/benchmark.js

@@ -2,8 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Excerpt from `build/run_wasm.js` to add own task queue implementation, since
-// `setTimeout` and `queueMicrotask` are not always available in shells.
+// Excerpt from `wasm_gc_benchmarks/tools/run_wasm.js` to add own task queue
+// implementation, since `setTimeout` and `queueMicrotask` are not always
+// available in shells.
+// TODO: Now (2025-08-14) that all shells have `setTimeout` available, can we
+// remove this? Talk to Dart2wasm folks.
 function addTaskQueue(self) {
   "use strict";
 
@@ -62,8 +65,7 @@ function addTaskQueue(self) {
       ms = Math.max(0, ms);
       var id = timerIdCounter++;
       // A callback can be scheduled at most once.
-      // (console.assert is only available on D8)
-      // if (isD8) console.assert(f.$timerId === undefined);
+      console.assert(f.$timerId === undefined);
       f.$timerId = id;
       timerIds[id] = f;
       if (ms == 0 && !isNextTimerDue()) {
@@ -262,8 +264,8 @@ class Benchmark {
     // The generated JavaScript code from dart2wasm is an ES module, which we
     // can only load with a dynamic import (since this file is not a module.)
 
-    Module.wasmBinary = await getBinary(wasmBinary);
-    this.dart2wasmJsModule = await dynamicImport(jsModule);
+    Module.wasmBinary = await JetStream.getBinary(JetStream.preload.wasmBinary);
+    this.dart2wasmJsModule = await JetStream.dynamicImport(JetStream.preload.jsModule);
   }
 
   async runIteration() {
@@ -283,7 +285,7 @@ class Benchmark {
     const framesToDraw = 100;
     const initialFramesToSkip = 0;
     const dartArgs = [
-      startTimeSinceEpochSeconds,
+      startTimeSinceEpochSeconds.toString(),
       framesToDraw.toString(),
       initialFramesToSkip.toString()
     ];

Dart/build.log

@@ -1,5 +1,5 @@
-Built on 2025-03-06 09:52:17+01:00
-Cloning into 'wasm_gc_benchmarks'...
-f80892d Update Dart SDK, switch wasm to -O2, recompile performance benchmarks
-Copying files from wasm_gc_benchmarks/ into build/
-Build success
+Built on Thu Aug 14 04:47:37 PM CEST 2025
+Cloning into 'wasm_gc_benchmarks'...
+13951e1 Roll new version of flute and regenerate flute-based benchmarks
+Copying files from wasm_gc_benchmarks/ into build/
+Build success

Dart/build.sh

@@ -7,19 +7,18 @@ rm -rf wasm_gc_benchmarks/
 rm -rf build/
 
 BUILD_LOG="$(realpath build.log)"
-echo -e "Built on $(date --rfc-3339=seconds)" | tee "$BUILD_LOG"
+echo -e "Built on $(date)" | tee "$BUILD_LOG"
 
-git clone https://github.com/mkustermann/wasm_gc_benchmarks |& tee -a "$BUILD_LOG"
+git clone https://github.com/mkustermann/wasm_gc_benchmarks 2>&1 | tee -a "$BUILD_LOG"
 pushd wasm_gc_benchmarks/
 git log -1 --oneline | tee -a "$BUILD_LOG"
 popd
 
 echo "Copying files from wasm_gc_benchmarks/ into build/" | tee -a "$BUILD_LOG"
 mkdir -p build/ | tee -a "$BUILD_LOG"
-# Generic Dart2wasm runner.
-cp wasm_gc_benchmarks/tools/run_wasm.js build/ | tee -a "$BUILD_LOG"
-# "Flute Complex" benchmark application.
-cp wasm_gc_benchmarks/benchmarks-out/flute.dart2wasm.{mjs,wasm} build/ | tee -a "$BUILD_LOG"
+# Two Flute benchmark applications: complex and todomvc
+cp wasm_gc_benchmarks/benchmarks-out/flute.complex.dart2wasm.{mjs,wasm} build/ | tee -a "$BUILD_LOG"
+cp wasm_gc_benchmarks/benchmarks-out/flute.todomvc.dart2wasm.{mjs,wasm} build/ | tee -a "$BUILD_LOG"
 
 echo "Build success" | tee -a "$BUILD_LOG"