sync from abhijitramesh/webgpu-bench@f3ee9fc069

build/asyncify/bench.wasm

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:50895b262f9b0da117509d04075ca06f3b30d3482c130d22c827e53e20d8a650
-size 5233188
+oid sha256:1ba4381b1a8c3a34d003bae0837e684515174b8c1e24b470b7013eedafc359e4
+size 5235854

build/asyncify/build-info.json

@@ -2,5 +2,5 @@
   "llamaCppCommit": "f22c8021d213567942a3d0134692e70f02f28f3a",
   "llamaCppDescribe": "b8981-3-gf22c8021d",
   "dawnTag": "v20260317.182325",
-  "builtAt": "2026-04-29T23:41:53Z"
+  "builtAt": "2026-05-01T08:36:58Z"
 }

build/jspi/bench.wasm

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:92ef71c59da832ad869cbc002665fd3bb3505c7e515a7cefc5d7f7901224ea40
-size 3612135
+oid sha256:39eea46a9d02b044c9d143cf8243c3e05f8bf89d94bb5bcd804b6e43755b958d
+size 3614207

build/jspi/build-info.json

@@ -2,5 +2,5 @@
   "llamaCppCommit": "f22c8021d213567942a3d0134692e70f02f28f3a",
   "llamaCppDescribe": "b8981-3-gf22c8021d",
   "dawnTag": "v20260317.182325",
-  "builtAt": "2026-04-29T23:37:54Z"
+  "builtAt": "2026-05-01T08:33:19Z"
 }

css/style.css

@@ -1723,6 +1723,50 @@ a:hover { color: var(--info); }
 .run-device-row-value { color: var(--foreground); font-weight: 600; }
 .run-device-note { font-size: 11px; color: var(--foreground-muted); margin-top: 2px; }
 
+/* User-reported machine card — appears between the auto-detected device
+   stats and the filter bar. <details>/<summary> so it can collapse once
+   the user has filled it in. */
+.run-machine-card { margin-bottom: 24px; }
+.run-machine-card > summary { cursor: pointer; }
+.run-machine-card > summary > strong { font-weight: 600; }
+.run-machine-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
+  gap: 12px;
+  margin-top: 12px;
+}
+.run-machine-field { display: flex; flex-direction: column; gap: 6px; }
+.run-machine-label {
+  font-size: 12px;
+  color: var(--foreground-muted);
+  font-weight: 500;
+}
+.run-machine-req { color: var(--danger, #d04545); font-weight: 700; }
+.run-machine-opt { color: var(--foreground-muted); font-weight: 400; }
+.run-machine-input {
+  height: 34px;
+  padding: 0 10px;
+  background: var(--surface-1);
+  border: 1px solid var(--border);
+  border-radius: var(--radius-md);
+  color: var(--foreground);
+  font-family: var(--font-mono);
+  font-size: 13px;
+}
+.run-machine-input:focus {
+  outline: none;
+  border-color: var(--brand, #2b6df0);
+}
+.run-machine-input.is-missing {
+  border-color: var(--danger, #d04545);
+}
+.run-machine-hint {
+  margin-top: 10px;
+  font-size: 11px;
+  color: var(--foreground-muted);
+}
+.run-machine-hint.is-warn { color: var(--danger, #d04545); }
+
 /* Hide filters + iterations + action buttons — stacks with .filter-bar tokens. */
 .run-filters { align-items: center; }
 .run-filters-checks {

js/run/bench-worker.js

@@ -340,6 +340,22 @@ async function runOne({ params, opfsPath }) {
   if (loadResult !== 0) throw new Error(`bench_load failed: ${loadResult}`);
   log('Model loaded');
 
+  // ─── Memory snapshot from llama.cpp ───
+  // Captured immediately after bench_load so model_size reflects the loaded
+  // model and per-device free counters reflect post-allocation state. Wrapped
+  // in try/catch — if the C side or a backend errors, the run can still
+  // produce perf numbers, just without memoryInfo on the record.
+  try {
+    const raw = await Module.ccall('bench_memory_info', 'string', [], [], { async: true });
+    result.memoryInfo = parseBenchResult('bench_memory_info', raw);
+    const dev = (result.memoryInfo.devices || [])
+      .map(d => `${d.name}(${d.type}) free=${(d.free / (1024 * 1024)).toFixed(0)}MB total=${(d.total / (1024 * 1024)).toFixed(0)}MB`)
+      .join(' | ') || 'none';
+    log(`Memory: model=${(result.memoryInfo.model_size / (1024 * 1024)).toFixed(0)}MB state=${(result.memoryInfo.state_size / (1024 * 1024)).toFixed(0)}MB | ${dev}`);
+  } catch (err) {
+    log(`bench_memory_info failed: ${err.message} — continuing without memoryInfo`);
+  }
+
   // ─── Consistency phase ───
   // Soft-fail: a failure here logs and falls through to the perf phase
   // rather than aborting the whole run. Some devices/models can't survive

js/run/controller.js

@@ -12,6 +12,7 @@ import {
 import { isHubConfigured, HF_DATASET_REPO, CONSISTENCY_PROMPT } from './config.js';
 
 const RUN_INTENT_STORAGE_KEY = 'webgpu-bench:runIntent';
+const USER_REPORTED_STORAGE_KEY = 'webgpu-bench:userReported';
 const CRASH_STALE_MS = 10_000;
 
 const DEFAULT_N_PREDICT = 128;
@@ -62,8 +63,33 @@ const state = {
   // versions. JSPI and Asyncify variants are built from the same source
   // tree, so a single fetch is enough; both files would be identical.
   buildInfo: null,
+  // User-reported machine identity (Machine Name / GPU Name / Browser /
+  // OS). Filled by the "Your machine" form on the Run page, persisted to
+  // localStorage between visits, and stamped onto every result record so
+  // the leaderboard can attribute submissions even when UA / WebGPU
+  // adapter info is missing or wrong. machineName/browser/os are required
+  // before submission; gpuName is optional.
+  userReported: { machineName: '', gpuName: '', browser: '', os: '' },
 };
 
+const USER_REPORTED_REQUIRED = ['machineName', 'browser', 'os'];
+
+function loadUserReported() {
+  try {
+    const raw = localStorage.getItem(USER_REPORTED_STORAGE_KEY);
+    if (!raw) return null;
+    const parsed = JSON.parse(raw);
+    if (parsed && typeof parsed === 'object') return parsed;
+  } catch { /* corrupt storage */ }
+  return null;
+}
+
+function saveUserReported() {
+  try {
+    localStorage.setItem(USER_REPORTED_STORAGE_KEY, JSON.stringify(state.userReported));
+  } catch { /* quota / disabled */ }
+}
+
 // Register an abort callback for an in-flight async op (worker terminate,
 // fetch signal abort, etc.). Returns an unregister fn the caller MUST
 // invoke when the op settles, so we don't accumulate stale handlers across
@@ -943,6 +969,91 @@ function slugify(s) {
   return String(s).toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '') || 'unknown';
 }
 
+// ──────────────── user-reported submission fields ────────────────
+
+// Best-effort default for the four user-reported inputs, derived from the
+// auto-detected device + browser data. The user is expected to edit these
+// before running — defaults exist only so the form isn't empty on first
+// visit. Returns { machineName, gpuName, browser, os }.
+function autoDetectedUserReported() {
+  const d = state.device || {};
+  const gpu = d.gpu || {};
+  const gpuStr = [gpu.vendor, gpu.architecture, gpu.device, gpu.description]
+    .filter(Boolean).join(' ').trim();
+  const memGB = state.budget?.memGB;
+  const browser = formatBrowser(d);
+  const os = formatPlatform(d);
+  // machineName default: "<gpu> · <memGB> GB" if both known, else either,
+  // else the OS string. The user is encouraged to replace with a friendly
+  // label like "MacBook Pro M3 16GB".
+  let machineName = '';
+  if (gpuStr && memGB) machineName = `${gpuStr} · ${memGB} GB`;
+  else if (gpuStr) machineName = gpuStr;
+  else if (memGB) machineName = `${memGB} GB device`;
+  else machineName = os;
+  return { machineName, gpuName: gpuStr, browser, os };
+}
+
+function readUserReportedFromInputs() {
+  return {
+    machineName: ($('ur-machine-name')?.value ?? '').trim(),
+    gpuName:     ($('ur-gpu-name')?.value     ?? '').trim(),
+    browser:     ($('ur-browser')?.value      ?? '').trim(),
+    os:          ($('ur-os')?.value           ?? '').trim(),
+  };
+}
+
+function refreshUserReportedValidation() {
+  const hint = $('ur-hint');
+  const missing = USER_REPORTED_REQUIRED.filter(k => !state.userReported[k]);
+  for (const k of USER_REPORTED_REQUIRED) {
+    const id = { machineName: 'ur-machine-name', browser: 'ur-browser', os: 'ur-os' }[k];
+    const el = $(id);
+    if (el) el.classList.toggle('is-missing', !state.userReported[k]);
+  }
+  if (hint) {
+    if (missing.length === 0) {
+      hint.textContent = 'Looks good — these labels will be attached to every result you submit.';
+      hint.classList.remove('is-warn');
+    } else {
+      hint.textContent = `Required: ${missing.join(', ')}. We'll still let you run, but submissions need these filled in.`;
+      hint.classList.add('is-warn');
+    }
+  }
+}
+
+function wireUserReported() {
+  // Pre-fill: stored values win, fall back to auto-detected defaults so
+  // first-time users see something rather than an empty form.
+  const stored = loadUserReported();
+  const auto = autoDetectedUserReported();
+  state.userReported = {
+    machineName: stored?.machineName?.trim() || auto.machineName,
+    gpuName:     stored?.gpuName?.trim()     || auto.gpuName,
+    browser:     stored?.browser?.trim()     || auto.browser,
+    os:          stored?.os?.trim()          || auto.os,
+  };
+  for (const [id, key] of [
+    ['ur-machine-name', 'machineName'],
+    ['ur-gpu-name',     'gpuName'],
+    ['ur-browser',      'browser'],
+    ['ur-os',           'os'],
+  ]) {
+    const el = $(id);
+    if (!el) continue;
+    el.value = state.userReported[key] || '';
+    el.addEventListener('input', () => {
+      state.userReported = readUserReportedFromInputs();
+      saveUserReported();
+      refreshUserReportedValidation();
+    });
+  }
+  // Persist whatever the auto-detect filled in so the user doesn't lose
+  // it on reload before they touch anything.
+  saveUserReported();
+  refreshUserReportedValidation();
+}
+
 async function machineInfo() {
   const ua = navigator.userAgent;
   const platform = /Mac/.test(ua) ? 'darwin'
@@ -1511,6 +1622,15 @@ function makeRecord(v, vr, machine, browser, wallTimeMs) {
     cpu_baseline: cpuBaseline,
     output: gpu?.output || '',
     machine,
+    // Memory snapshot llama.cpp captured immediately after bench_load —
+    // model_size, state_size, and per-device {free,total} from every ggml
+    // backend. Useful for spotting memory-pressured runs and for sanity-
+    // checking GPU memory headroom across machines.
+    memoryInfo: gpu?.memoryInfo ?? null,
+    // User-typed labels that override (or supplement) the auto-detected
+    // machine/browser fields. Auto-detection is unreliable across UA-string
+    // anonymization, deviceMemory rounding, and missing WebGPU adapter info.
+    userReported: { ...state.userReported },
     source: `webgpu-bench/site (${state.surface})`,
   };
 }
@@ -1754,6 +1874,17 @@ function wireHubHandlers() {
       if (!state.hfSession) return;
       const eligible = submittableResults();
       if (eligible.length === 0) return;
+      // Required user-reported fields gate the submission so the leaderboard
+      // doesn't accumulate anonymous rows. The Run buttons stay enabled
+      // even when these are blank — we only block at submit time.
+      const missing = USER_REPORTED_REQUIRED.filter(k => !state.userReported[k]);
+      if (missing.length > 0) {
+        const card = $('user-reported-card');
+        if (card) { card.open = true; card.scrollIntoView({ behavior: 'smooth', block: 'center' }); }
+        refreshUserReportedValidation();
+        logLine(`Submit blocked: fill in ${missing.join(', ')} in "Your machine".`);
+        return;
+      }
       submitBtn.disabled = true;
       const original = submitBtn.textContent;
       submitBtn.textContent = 'Submitting…';
@@ -1845,6 +1976,7 @@ export async function mountRunSection() {
   wirePurgeHandler();
   wireHubHandlers();
   wireOutputHandlers();
+  wireUserReported();
   // Restore the last completed run from localStorage so it survives a page
   // reload — including the OAuth redirect taking the user to HF and back.
   // Must run before updateButtons/renderOutput/hideProgress so they pick up

run.html

@@ -166,6 +166,37 @@
           </div>
         </div>
 
+        <!-- User-reported machine identity. The auto-detected values in the
+             cards above are unreliable (UA strings lie, deviceMemory is
+             coarse, GPU adapter info is often empty). We ship these
+             user-typed fields alongside the auto-detected ones so the
+             leaderboard can attribute submissions correctly. Persisted to
+             localStorage between visits. -->
+        <details class="card run-machine-card" id="user-reported-card" open>
+          <summary>
+            <strong>Your machine</strong> — labels the auto-detected device data on submission. Saved between visits.
+          </summary>
+          <div class="run-machine-grid">
+            <label class="run-machine-field">
+              <span class="run-machine-label">Machine name <span class="run-machine-req" aria-hidden="true">*</span></span>
+              <input type="text" id="ur-machine-name" class="run-machine-input" placeholder="e.g. MacBook Pro M3 16GB" autocomplete="off" spellcheck="false">
+            </label>
+            <label class="run-machine-field">
+              <span class="run-machine-label">GPU name <span class="run-machine-opt">(optional)</span></span>
+              <input type="text" id="ur-gpu-name" class="run-machine-input" placeholder="e.g. Apple M3 Pro" autocomplete="off" spellcheck="false">
+            </label>
+            <label class="run-machine-field">
+              <span class="run-machine-label">Browser <span class="run-machine-req" aria-hidden="true">*</span></span>
+              <input type="text" id="ur-browser" class="run-machine-input" placeholder="e.g. Chrome 138 dev" autocomplete="off" spellcheck="false">
+            </label>
+            <label class="run-machine-field">
+              <span class="run-machine-label">Operating system <span class="run-machine-req" aria-hidden="true">*</span></span>
+              <input type="text" id="ur-os" class="run-machine-input" placeholder="e.g. macOS 15.4" autocomplete="off" spellcheck="false">
+            </label>
+          </div>
+          <p class="run-machine-hint" id="ur-hint">Required fields marked <span class="run-machine-req">*</span>. Defaults are filled in from your browser; edit anything that's wrong before running.</p>
+        </details>
+
         <!-- Hide filters, iterations, actions -->
         <div class="filter-bar run-controls">
           <div class="filter-bar-inner run-filters">