Merge branch 'main' into 2025-10-14_simpler_startup

Author: camillobruni

.github/workflows/test.yml

@@ -10,8 +10,8 @@ on:
     workflow_dispatch:
 
 jobs:
-    build:
-        name: Build
+    test:
+        name: Test
         runs-on: macos-latest
         env:
             GITHUB_ACTIONS_OUTPUT: ""
@@ -49,3 +49,30 @@ jobs:
               run: |
                   echo "Running in $BROWSER"
                   npm run test:${{ matrix.browser }}
+
+    build:
+        name: Build
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout Branch
+              uses: actions/checkout@v4
+              with:
+                fetch-depth: ${{ github.event_name == 'pull_request' && 2 || 0 }}
+
+            - name: Setup Node
+              uses: actions/setup-node@v4
+              with:
+                  node-version-file: package.json
+                  cache: npm
+
+            - name: Install Node Packages
+              run: npm ci
+
+            - name: Run Build
+              run: |
+                  if ${{ github.event_name == 'pull_request' }}; then
+                    npm run test:build -- --diff="HEAD^...HEAD"
+                  else
+                    npm run test:build -- --diff="${{ github.event.before }}...${{ github.event.after }}"
+                  fi
+

JetStream.css

@@ -69,6 +69,64 @@ body {
     height: 100%;
 }
 
+table {
+    border-spacing: 0;
+}
+
+body.nonDefaultParams {
+    filter: hue-rotate(152deg);
+}
+
+.nonDefaultParams .summary {
+    display: none;
+}
+
+#non-default-params {
+    display: none;
+    text-align: center;
+
+    & h2 {
+        text-align: center;
+    } 
+
+    & p {
+        text-align: center;
+    }
+}
+
+.nonDefaultParams #non-default-params {
+    display: block;
+}
+
+#non-standard-params-table {
+    border-collapse: collapse;
+    text-align: left;
+    display: inline-block;
+    margin-top: var(--gap);
+}
+
+#non-standard-params-table tr {
+    padding: 2px;
+}
+
+#non-standard-params-table thead th {
+    border-bottom: 1px solid var(--foreground);
+}
+
+#non-standard-params-table tbody td {
+    font-weight: normal;
+    text-align: left;
+}
+
+#non-standard-params-table thead th,
+#non-standard-params-table tbody td {
+    padding: 0.1em 0.3em;
+}
+#non-standard-params-table tbody td:nth-child(2) {
+    color: var(--highlight);
+}
+
+
 .overflow-scroll {
     overflow-y: auto;
 }

JetStreamDriver.js

@@ -302,11 +302,11 @@ class Driver {
             }
         }
 
-        const totalScore = geomeanScore(allScores);
-        console.assert(totalScore > 0, `Invalid total score: ${totalScore}`);
+        const overallScore = geomeanScore(allScores);
+        console.assert(overallScore > 0, `Invalid total score: ${overallScore}`);
 
         if (isInBrowser) {
-            let summaryHtml = `<div class="score">${uiFriendlyScore(totalScore)}</div>
+            let summaryHtml = `<div class="score">${uiFriendlyScore(overallScore)}</div>
                     <label>Score</label>`;
             summaryHtml += `<div class="benchmark benchmark-done">`;
             for (let [category, scores] of categoryScores) {
@@ -328,20 +328,20 @@ class Driver {
             summaryElement.onclick = displayCategoryScores;
             statusElement.innerHTML = "";
         } else if (!JetStreamParams.dumpJSONResults) {
-            console.log("Total:");
+            console.log("Overall:");
             for (let [category, scores] of categoryScores) {
                 console.log(
-                    shellFriendlyLabel(`Total ${category}-Score`),
+                    shellFriendlyLabel(`Overall ${category}-Score`),
                     shellFriendlyScore(geomeanScore(scores)));
             }
             for (let [category, times] of categoryTimes) {
                 console.log(
-                    shellFriendlyLabel(`Total ${category}-Time`),
+                    shellFriendlyLabel(`Overall ${category}-Time`),
                     shellFriendlyDuration(geomeanScore(times)));
             }
             console.log("");
-            console.log(shellFriendlyLabel("Total Score"), shellFriendlyScore(totalScore));
-            console.log(shellFriendlyLabel("Total Time"), shellFriendlyDuration(totalTime));
+            console.log(shellFriendlyLabel("Overall Score"), shellFriendlyScore(overallScore));
+            console.log(shellFriendlyLabel("Overall Wall-Time"), shellFriendlyDuration(totalTime));
             console.log("");
         }
 
@@ -833,8 +833,8 @@ class Benchmark {
 
     allTimes() {
         const allTimes = this.subTimes();
-        allTimes["Wall"] = this.wallTime;
         allTimes["Total"] = this.totalTime;
+        allTimes["Wall"] = this.wallTime;
         return allTimes;
     }
 

cli.js

@@ -41,7 +41,7 @@ const CLI_PARAMS = {
     param: "dumpJSONResults",
   },
   "dump-test-list": {
-    help: "Print test list instead of running.",
+    help: "Print the selected test list instead of running.",
     param: "dumpTestList",
   },
   ramification: {

index.html

@@ -36,7 +36,9 @@
     const isInBrowser = true;
     const isD8 = false;
     const isSpiderMonkey = false;
-    globalThis.JetStreamParamsSource = new URLSearchParams(globalThis?.location?.search);
+    if (globalThis?.location?.search) {
+        globalThis.JetStreamParamsSource = new URLSearchParams(globalThis?.location?.search);
+    }
     globalThis.allIsGood = true;
     window.onerror = function(e) {
         if (e == "Script error.") {
@@ -53,6 +55,9 @@
         if (JetStreamParams.startDelay !== undefined) {
             bodyClassList.remove("animate");
         }
+        if (!JetStreamParams.isDefault) {
+            showNonDefaultParams();
+        }
         if (globalThis.allIsGood) {
             try {
                 await JetStream.initialize();
@@ -72,6 +77,17 @@
         }
     }
 
+    function showNonDefaultParams() {
+        document.body.classList.add("nonDefaultParams"); 
+        const body = document.querySelector("#non-standard-params-table tbody");
+        for (const [key, value] of  Object.entries(JetStreamParams.nonDefaultParams)) {
+            const defaultValue = DefaultJetStreamParams[key]
+            const row = body.insertRow();
+            row.insertCell().textContent = key;
+            row.insertCell().textContent = JSON.stringify(value);
+            row.insertCell().textContent = JSON.stringify(defaultValue);
+        }
+    }
     </script>
 
     <script src="params.js"></script>
@@ -87,6 +103,23 @@ <h1 class="logo">
 
 <main>
     <p class="summary">JetStream 3 is a JavaScript and WebAssembly benchmark suite focused on the most advanced web applications. It rewards browsers that start up quickly, execute code quickly, and run smoothly. For more information, read the <a href="in-depth.html">in-depth analysis</a>. Bigger scores are better.</p>
+    <div id="non-default-params">
+        <h2>Non-standard Parameters</h2>
+        <p>
+            JetStream ran with non-standard parameters.<br />
+            The results are likely not comparable to default runs.
+        </p>
+        <table id="non-standard-params-table">
+            <thead>
+                <tr>
+                    <th>Param</th>
+                    <th>Value</th>
+                    <th>Default</th>
+                </tr>
+            </thead>
+            <tbody></tbody>
+        </table>
+    </div>
     <p class="summary" id="mode-description"></p>
 
     <div id="result-summary"></div>

package.json

@@ -31,7 +31,8 @@
         "test:shell": "npm run test:prepare && npm run test:v8 && npm run test:jsc && npm run test:spidermonkey",
         "test:v8": "npm run test:prepare && node tests/run-shell.mjs --shell v8",
         "test:jsc": "npm run test:prepare && node tests/run-shell.mjs --shell jsc",
-        "test:spidermonkey": "npm run test:prepare && node tests/run-shell.mjs --shell spidermonkey"
+        "test:spidermonkey": "npm run test:prepare && node tests/run-shell.mjs --shell spidermonkey",
+        "test:build": "npm run test:prepare && node tests/run-build.mjs"
     },
     "devDependencies": {
         "@actions/core": "^1.11.1",

params.js

@@ -140,8 +140,9 @@ class Params {
     _parseBooleanParam(sourceParams, paramKey) {
         if (!sourceParams.has(paramKey))
             return DefaultJetStreamParams[paramKey];
-        const value = sourceParams.get(paramKey).toLowerCase();
+        const rawValue = sourceParams.get(paramKey);;
         sourceParams.delete(paramKey);
+        const value = rawValue.toLowerCase();
         return !(value === "false" || value === "0");
     }
 
@@ -170,9 +171,10 @@ class Params {
     get nonDefaultParams() {
         const diff = Object.create(null);
         for (const [key, value] of Object.entries(this)) {
-            if (value !== DefaultJetStreamParams[key]) {
-                diff[key] = value;
-            }
+            const defaultValue = DefaultJetStreamParams[key]
+            if (value == defaultValue) continue;
+            if (value?.length == 0 && defaultValue?.length == 0) continue;
+            diff[key] = value;
         }
         return diff;
     }
@@ -183,6 +185,10 @@ let maybeCustomParams = DefaultJetStreamParams;
 if (globalThis?.JetStreamParamsSource) {
     try {
         maybeCustomParams = new Params(globalThis?.JetStreamParamsSource);
+        // We might have parsed the same values again, do a poor-mans deep-equals:
+        if (JSON.stringify(maybeCustomParams) === JSON.stringify(DefaultJetStreamParams)) {
+           maybeCustomParams = DefaultJetStreamParams 
+        }
     } catch (e) {
         console.error("Invalid Params", e, "\nUsing defaults as fallback:", maybeCustomParams);
     }

tests/helper.mjs

@@ -21,11 +21,12 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 // THE POSSIBILITY OF SUCH DAMAGE.
 
-import { styleText } from "node:util";
 import core from "@actions/core";
+import { spawn } from "child_process";
 import commandLineUsage from "command-line-usage";
+import { styleText } from "node:util";
 
-export const GITHUB_ACTIONS_OUTPUT = "GITHUB_ACTIONS_OUTPUT" in process.env;
+export const GITHUB_ACTIONS_OUTPUT = ("GITHUB_ACTIONS_OUTPUT" in process.env) || ("GITHUB_EVENT_PATH" in process.env);
 
 export function logInfo(...args) {
   const text = args.join(" ")
@@ -53,6 +54,16 @@ export function logError(...args) {
   }
 }
 
+export function logCommand(...args) {
+  const cmd = args.join(" ");
+  if (GITHUB_ACTIONS_OUTPUT) {
+    core.notice(styleText("blue", cmd));
+  } else {
+    console.log(styleText("blue", cmd));
+  }
+}
+
+
 export async function logGroup(name, body) {
   if (GITHUB_ACTIONS_OUTPUT) {
     core.startGroup(name);
@@ -103,3 +114,49 @@ export async function runTest(label, testFunction) {
     }
     return true;
 }
+
+
+export async function sh(binary, ...args) {
+  const cmd = `${binary} ${args.join(" ")}`;
+  if (GITHUB_ACTIONS_OUTPUT)
+    core.startGroup(binary);
+  logCommand(cmd);
+  try {
+    return await spawnCaptureStdout(binary, args);
+  } catch(e) {
+    logError(e.stdoutString);
+    throw e;
+  } finally {
+    if (GITHUB_ACTIONS_OUTPUT)
+      core.endGroup();
+  }
+}
+
+const SPAWN_OPTIONS =  Object.freeze({ 
+  stdio: ["inherit", "pipe", "inherit"]
+});
+
+async function spawnCaptureStdout(binary, args, options={}) {
+  options = Object.assign(options, SPAWN_OPTIONS);
+  const childProcess = spawn(binary, args, options);
+  childProcess.stdout.pipe(process.stdout);
+  return new Promise((resolve, reject) => {
+    childProcess.stdoutString = "";
+    childProcess.stdio[1].on("data", (data) => {
+      childProcess.stdoutString += data.toString();
+    });
+    childProcess.on("close", (code) => {
+      if (code === 0) {
+        resolve(childProcess);
+      } else {
+        // Reject the Promise with an Error on failure
+        const error = new Error(`Command failed with exit code ${code}: ${binary} ${args.join(" ")}`);
+        error.process = childProcess;
+        error.stdout = childProcess.stdoutString;
+        error.exitCode = code;
+        reject(error);
+      }
+    });
+    childProcess.on("error", reject);
+  })
+}