Merge remote-tracking branch 'danleh/main' into kotlin

Author: danleh

8bitbench/benchmark.js

@@ -1,4 +1,5 @@
 // Copyright 2025 the V8 project authors. All rights reserved.
+// Copyright 2025 Apple Inc. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -34,14 +35,20 @@ function dumpFrame(vec) {
 
 class Benchmark {
   isInstantiated = false;
+  romBinary;
+
+  async init() {
+    Module.wasmBinary = await getBinary(wasmBinary);
+    this.romBinary = await getBinary(romBinary);
+  }
 
   async runIteration() {
     if (!this.isInstantiated) {
       await wasm_bindgen(Module.wasmBinary);
       this.isInstantiated = true;
     }
 
-    wasm_bindgen.loadRom(Module.romBinary);
+    wasm_bindgen.loadRom(this.romBinary);
 
     const frameCount = 2 * 60;
     for (let i = 0; i < frameCount; ++i) {

ARES-6/Air/util.js

@@ -168,12 +168,3 @@ function bubbleSort(array, lessThan)
         end--;
     }
 }
-
-let currentTime;
-if (this.performance && performance.now)
-    currentTime = function() { return performance.now() };
-else if (this.preciseTime)
-    currentTime = function() { return preciseTime() * 1000; };
-else
-    currentTime = function() { return +new Date(); };
-

ARES-6/Babylon/benchmark.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
+ * Copyright (C) 2017-2025 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -26,34 +26,18 @@
 "use strict";
 
 class Benchmark {
-    constructor(verbose = 0)
-    {
+    async init(verbose = 0) {
         let sources = [];
 
         const files = [
-              [isInBrowser ? airBlob : "./ARES-6/Babylon/air-blob.js", {}]
-            , [isInBrowser ? basicBlob : "./ARES-6/Babylon/basic-blob.js", {}]
-            , [isInBrowser ? inspectorBlob : "./ARES-6/Babylon/inspector-blob.js", {}]
-            , [isInBrowser ? babylonBlob : "./ARES-6/Babylon/babylon-blob.js", {sourceType: "module"}]
+              [airBlob, {}]
+            , [basicBlob, {}]
+            , [inspectorBlob, {}]
+            , [babylonBlob, {sourceType: "module"}]
         ];
 
-        for (let [file, options] of files) {
-            function appendSource(s) {
-                sources.push([file, s, options]);
-            }
-
-            let s;
-            if (isInBrowser) {
-                let request = new XMLHttpRequest();
-                request.open('GET', file, false);
-                request.send(null);
-                if (!request.responseText.length)
-                    throw new Error("Expect non-empty sources");
-                appendSource(request.responseText);
-            } else {
-                appendSource(read(file));
-            }
-        }
+        for (let [file, options] of files)
+            sources.push([file, await getString(file), options]);
 
         this.sources = sources;
     }

ARES-6/Basic/util.js

@@ -261,25 +261,9 @@ class Benchmark {
   async init() {
     // 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.)
-    // TODO: Support ES6 modules in the driver instead of this one-off solution.
-    // This probably requires a new `Benchmark` field called `modules` that
-    // is a map from module variable name (which will hold the resulting module
-    // namespace object) to relative module URL, which is resolved in the
-    // `preRunnerCode`, similar to this code here.
-    if (isInBrowser) {
-      // In browsers, relative imports don't work since we are not in a module.
-      // (`import.meta.url` is not defined.)
-      const pathname = location.pathname.match(/^(.*\/)(?:[^.]+(?:\.(?:[^\/]+))+)?$/)[1];
-      this.dart2wasmJsModule = await import(location.origin + pathname + "./Dart/build/flute.dart2wasm.mjs");
-    } else {
-      // In shells, relative imports require different paths, so try with and
-      // without the "./" prefix (e.g., JSC requires it).
-      try {
-        this.dart2wasmJsModule = await import("Dart/build/flute.dart2wasm.mjs");
-      } catch {
-        this.dart2wasmJsModule = await import("./Dart/build/flute.dart2wasm.mjs");
-      }
-    }
+
+    Module.wasmBinary = await getBinary(wasmBinary);
+    this.dart2wasmJsModule = await dynamicImport(jsModule);
   }
 
   async runIteration() {

Dart/benchmark.js

@@ -224,7 +224,6 @@ a.button {
     color: transparent;
     background-image: linear-gradient(132deg, #96E5FF 0%, #96E5FF 2%, #86D9FF 42%, #8BDAFF 84%, #96E5FF 98%, #96E5FF 100%);
     -webkit-background-clip: text;
-    background-size: 1200px 100%;
     background-repeat: no-repeat;
     -webkit-touch-callout: none;
     -webkit-user-select: none;