minor cleanups, update paths

Author: danleh

JetStreamDriver.js

@@ -2103,17 +2103,17 @@ let BENCHMARKS = [
             "./Kotlin-compose/benchmark.js",
         ],
         preload: {
-            wasmBinary: "./Kotlin-compose/build/compose-benchmarks-benchmarks-wasm-js.wasm",
+            wasmBinary: "./Kotlin-compose/build/compose-benchmarks-benchmarks.wasm",
             wasmSkikoBinary: "./Kotlin-compose/build/skiko.wasm",
             inputImageCompose: "./Kotlin-compose/build/compose-multiplatform.png",
             inputImageCat: "./Kotlin-compose/build/example1_cat.jpg",
             inputImageComposeCommunity: "./Kotlin-compose/build/example1_compose-community-primary.png",
             inputFontItalic: "./Kotlin-compose/build/jetbrainsmono_italic.ttf",
             inputFontRegular: "./Kotlin-compose/build/jetbrainsmono_regular.ttf"
         },
-        iterations: 10,
+        iterations: 15,
         worstCaseCount: 2,
-        testGroup: WasmGroup,
+        tags: ["Wasm"],
     }),
     new WasmLegacyBenchmark({
         name: "tfjs-wasm",

Kotlin-compose/.gitignore

@@ -1,2 +1 @@
-/cfw_d8_bench_bin/
 /compose-multiplatform/

Kotlin-compose/README.md

@@ -15,4 +15,4 @@ See `build.log` for the last build time, used sources, and toolchain versions.
 ## Running in JS shells
 
 To run the unmodified upstream benchmark, without the JetStream driver, see the
-upstream repo.
+upstream repo, specifically https://github.com/JetBrains/compose-multiplatform/blob/master/benchmarks/multiplatform/README.md

Kotlin-compose/benchmark.js

@@ -101,7 +101,7 @@ globalThis.skipFunMain = true;
 
 // Prevent this from being detected as a shell environment, so that we use the
 // same code paths as in the browser.
-// See `compose-benchmarks-benchmarks-wasm-js.uninstantiated.mjs`.
+// See `compose-benchmarks-benchmarks.uninstantiated.mjs`.
 delete globalThis.d8;
 delete globalThis.inIon;
 delete globalThis.jscOptions;
@@ -145,7 +145,7 @@ class Benchmark {
 
     preload = {
       'skiko.wasm': Module.wasmSkikoBinary,
-      './compose-benchmarks-benchmarks-wasm-js.wasm': Module.wasmBinary,
+      './compose-benchmarks-benchmarks.wasm': Module.wasmBinary,
       './composeResources/compose_benchmarks.benchmarks.generated.resources/drawable/compose-multiplatform.png': Module.inputImageCompose,
       './composeResources/compose_benchmarks.benchmarks.generated.resources/drawable/example1_cat.jpg': Module.inputImageCat,
       './composeResources/compose_benchmarks.benchmarks.generated.resources/files/example1_compose-community-primary.png': Module.inputImageComposeCommunity,
@@ -154,10 +154,10 @@ class Benchmark {
     };
 
     // We patched `skiko.mjs` to not immediately instantiate the `skiko.wasm`
-    // module, so that we can move the dynamic JS import here and measure 
+    // module, so that we can move the dynamic JS import here but measure 
     // WebAssembly compilation and instantiation as part of the first iteration.
     this.skikoInstantiate = (await dynamicJSImport('Kotlin-compose/build/skiko.mjs')).default;
-    this.mainInstantiate = (await dynamicJSImport('Kotlin-compose/build/compose-benchmarks-benchmarks-wasm-js.uninstantiated.mjs')).instantiate;
+    this.mainInstantiate = (await dynamicJSImport('Kotlin-compose/build/compose-benchmarks-benchmarks.uninstantiated.mjs')).instantiate;
   }
 
   async runIteration() {

Kotlin-compose/build.log

@@ -1,4 +1,5 @@
-Built on 2025-07-08 12:20:38+02:00
+Built on 2025-07-08 12:47:21+02:00
+Cloning into 'compose-multiplatform'...
 754dc25396 Update CHANGELOG for 1.9.0-alpha03 release (#5349)
 Copying generated files into build/
 Build success

Kotlin-compose/build.sh

@@ -16,13 +16,13 @@ pushd benchmarks/multiplatform
 ./gradlew :benchmarks:wasmJsProductionExecutableCompileSync
 # For building polyfills and JavaScript launcher to run in d8 (which inspires the benchmark.js launcher here):
 # ./gradlew :benchmarks:buildD8Distribution
-BUILD_SRC_DIR="compose-multiplatform/benchmarks/multiplatform/build/js/packages/compose-benchmarks-benchmarks-wasm-js/kotlin"
+BUILD_SRC_DIR="compose-multiplatform/benchmarks/multiplatform/build/wasm/packages/compose-benchmarks-benchmarks/kotlin"
 popd
 popd
 
 echo "Copying generated files into build/" | tee -a "$BUILD_LOG"
-mkdir -p build/drawable/ | tee -a "$BUILD_LOG"
-cp $BUILD_SRC_DIR/compose-benchmarks-benchmarks-wasm-js.{wasm,uninstantiated.mjs} build/ | tee -a "$BUILD_LOG"
+mkdir -p build/ | tee -a "$BUILD_LOG"
+cp $BUILD_SRC_DIR/compose-benchmarks-benchmarks.{wasm,uninstantiated.mjs} build/ | tee -a "$BUILD_LOG"
 git apply hook-print.patch | tee -a "$BUILD_LOG"
 cp $BUILD_SRC_DIR/skiko.{wasm,mjs} build/ | tee -a "$BUILD_LOG"
 git apply skiko-disable-instantiate.patch | tee -a "$BUILD_LOG"

Kotlin-compose/build/compose-benchmarks-benchmarks-wasm-js.wasm

@@ -377,7 +377,7 @@ export async function instantiate(imports={}, runInitializer=true) {
       throw "Supported JS engine not detected";
     }
 
-    const wasmFilePath = './compose-benchmarks-benchmarks-wasm-js.wasm';
+    const wasmFilePath = './compose-benchmarks-benchmarks.wasm';
     const importObject = {
         js_code,
         intrinsics: {
@@ -414,7 +414,7 @@ export async function instantiate(imports={}, runInitializer=true) {
       }
 
       if (isBrowser) {
-        wasmInstance = (await WebAssembly.instantiateStreaming(fetch(new URL('./compose-benchmarks-benchmarks-wasm-js.wasm',import.meta.url).href), importObject)).instance;
+        wasmInstance = (await WebAssembly.instantiateStreaming(fetch(new URL('./compose-benchmarks-benchmarks.wasm',import.meta.url).href), importObject)).instance;
       }
     } catch (e) {
       if (e instanceof WebAssembly.CompileError) {

Kotlin-compose/build/compose-benchmarks-benchmarks-wasm-js.uninstantiated.mjs renamed to Kotlin-compose/build/compose-benchmarks-benchmarks.uninstantiated.mjs

@@ -1,7 +1,7 @@
-diff --git a/Kotlin-compose/build/compose-benchmarks-benchmarks-wasm-js.uninstantiated.mjs b/Kotlin-compose/build/compose-benchmarks-benchmarks-wasm-js.uninstantiated.mjs
+diff --git a/Kotlin-compose/build/compose-benchmarks-benchmarks.uninstantiated.mjs b/Kotlin-compose/build/compose-benchmarks-benchmarks.uninstantiated.mjs
 index f92d6ec..54cc4cf 100644
---- a/Kotlin-compose/build/compose-benchmarks-benchmarks-wasm-js.uninstantiated.mjs
-+++ b/Kotlin-compose/build/compose-benchmarks-benchmarks-wasm-js.uninstantiated.mjs
+--- a/Kotlin-compose/build/compose-benchmarks-benchmarks.uninstantiated.mjs
++++ b/Kotlin-compose/build/compose-benchmarks-benchmarks.uninstantiated.mjs
 @@ -111,8 +111,8 @@ export async function instantiate(imports={}, runInitializer=true) {
               },
          'kotlin.js.__convertKotlinClosureToJsClosure_(()->Unit)' : (f) => getCachedJsObject(f, () => wasmExports['__callFunction_(()->Unit)'](f, )),