Merge in upstream changes & apply fixes for Windows/MSVC

.github/workflows/ci.yml

@@ -68,12 +68,12 @@ jobs:
           fetch-depth: 0
           sparse-checkout-cone-mode: false
           # Git for Windows refuses to materialize paths with reserved DOS
-          # device names. The benchmark-only aux/ tree is not needed by the
+          # device names. The benchmark-only auxiliary/ tree is not needed by the
           # native Windows platform build/run smoke, so exclude it at checkout
           # while keeping the rest of the source tree complete.
           sparse-checkout: |
             /*
-            !/aux/
+            !/auxiliary/
       - uses: msys2/setup-msys2@v2
         with:
           msystem: UCRT64

bench/closure-upvalue-diagnosis-2026-09-04/filtered-runs.json

@@ -12,7 +12,7 @@
       "-jon",
       "-e",
       "io.stdout:setvbuf(\"line\")",
-      "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/aux/bench/bench.lua",
+      "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/auxiliary/bench/bench.lua",
       "closures_upval"
     ],
     "environment": {
@@ -44,7 +44,7 @@
       "-jon",
       "-e",
       "io.stdout:setvbuf(\"line\")",
-      "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/aux/bench/bench.lua",
+      "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/auxiliary/bench/bench.lua",
       "closures_upval"
     ],
     "environment": {
@@ -76,7 +76,7 @@
       "-jon",
       "-e",
       "io.stdout:setvbuf(\"line\")",
-      "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/aux/bench/bench.lua",
+      "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/auxiliary/bench/bench.lua",
       "closures_upval"
     ],
     "environment": {
@@ -108,7 +108,7 @@
       "-jon",
       "-e",
       "io.stdout:setvbuf(\"line\")",
-      "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/aux/bench/bench.lua",
+      "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/auxiliary/bench/bench.lua",
       "closures_upval"
     ],
     "environment": {
@@ -140,7 +140,7 @@
       "-jon",
       "-e",
       "io.stdout:setvbuf(\"line\")",
-      "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/aux/bench/bench.lua",
+      "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/auxiliary/bench/bench.lua",
       "closures_upval"
     ],
     "environment": {
@@ -172,7 +172,7 @@
       "-jon",
       "-e",
       "io.stdout:setvbuf(\"line\")",
-      "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/aux/bench/bench.lua",
+      "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/auxiliary/bench/bench.lua",
       "closures_upval"
     ],
     "environment": {

bench/closure-upvalue-diagnosis-2026-09-04/filtered-scale1-runs.json

@@ -11,7 +11,7 @@
       "-jon",
       "-e",
       "io.stdout:setvbuf(\"line\")",
-      "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/aux/bench/bench.lua",
+      "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/auxiliary/bench/bench.lua",
       "closures_upval"
     ],
     "environment": {
@@ -42,7 +42,7 @@
       "-jon",
       "-e",
       "io.stdout:setvbuf(\"line\")",
-      "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/aux/bench/bench.lua",
+      "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/auxiliary/bench/bench.lua",
       "closures_upval"
     ],
     "environment": {

bench/closure-upvalue-diagnosis-2026-09-04/metadata.json

@@ -14,7 +14,7 @@
       "readelf_notes": "\nDisplaying notes found in: .note.gnu.property\n  Owner                Data size \tDescription\n  GNU                  0x00000010\tNT_GNU_PROPERTY_TYPE_0\n      Properties: x86 ISA needed: x86-64-baseline\n\nDisplaying notes found in: .note.gnu.build-id\n  Owner                Data size \tDescription\n  GNU                  0x00000014\tNT_GNU_BUILD_ID (unique build ID bitstring)\n    Build ID: 7ee48eb30ddc2bb66518fe3133b14860908c163c\n\nDisplaying notes found in: .note.ABI-tag\n  Owner                Data size \tDescription\n  GNU                  0x00000010\tNT_GNU_ABI_TAG (ABI version tag)\n    OS: Linux, ABI: 3.2.0\n"
     }
   },
-  "harness": "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/aux/bench/bench.lua",
+  "harness": "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/auxiliary/bench/bench.lua",
   "isolation": "CPU affinity only, shared machine; other agents have functional work, use CPUs0-15 where practical",
   "harness_sha256": "ebd0b8d53b6e7a340c90c45ad33d9bdd47acbd5418890d593d6aae127ef926a9",
   "cpu_metadata": {

bench/closure-upvalue-diagnosis-2026-09-04/run-filtered.py

@@ -7,7 +7,7 @@
   "leaf": "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/src/luajit",
   "stock": "/tmp/lj-runtime-performance-review-2026-09-04/stock/src/luajit",
 }
-harness="/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/aux/bench/bench.lua"
+harness="/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/auxiliary/bench/bench.lua"
 records=[]
 for sample in range(3):
   for kind in (["stock","leaf"] if sample%2==0 else ["leaf","stock"]):

bench/closure-upvalue-diagnosis-2026-09-04/sequence-harness.patch

@@ -1,4 +1,4 @@
---- frozen/plan/aux/bench/bench.lua
+--- frozen/plan/auxiliary/bench/bench.lua
 +++ diagnosis/sequence.lua
 @@ -11,7 +11,8 @@
  local scale = tonumber(getenv("BENCH_SCALE")) or 1

bench/ffi-clib-cache-authority-2026-09-05/benchmark.py

@@ -14,7 +14,7 @@
             if workload=='direct_clib': fixture=p/'direct-cost.lua';args=[str(fixture),'clib']
             elif workload=='shared':
                 fixture=p/'shared-cost.lua';args=[str(fixture),'2000000','helper' if variant=='candidate' else 'baseline']
-            elif workload=='ffi_struct': fixture=repo/'aux/bench/bench.lua';args=[str(fixture),'ffi_struct']
+            elif workload=='ffi_struct': fixture=repo/'auxiliary/bench/bench.lua';args=[str(fixture),'ffi_struct']
             else: fixture=p/'cost.lua';args=[str(fixture),workload]
             cmd=['taskset','-c','31',str(tree/'src/luajit'),'-jon']+args
             start=time.monotonic()

bench/ffi-clib-cache-authority-2026-09-05/cost-results.json

@@ -1059,7 +1059,7 @@
       "31",
       "/tmp/lj-udata-pure-receiver-combined-20260905-sn9vd57b/candidate/src/luajit",
       "-jon",
-      "/workspaces/lj-lockless/aux/bench/bench.lua",
+      "/workspaces/lj-lockless/auxiliary/bench/bench.lua",
       "ffi_struct"
     ],
     "cwd": "/workspaces/lj-lockless",
@@ -1084,7 +1084,7 @@
       "31",
       "/tmp/lj-clib-cache-root-20260905-i59mqoic/v2/candidate/src/luajit",
       "-jon",
-      "/workspaces/lj-lockless/aux/bench/bench.lua",
+      "/workspaces/lj-lockless/auxiliary/bench/bench.lua",
       "ffi_struct"
     ],
     "cwd": "/workspaces/lj-lockless",
@@ -1109,7 +1109,7 @@
       "31",
       "/tmp/lj-clib-cache-root-20260905-i59mqoic/v2/candidate/src/luajit",
       "-jon",
-      "/workspaces/lj-lockless/aux/bench/bench.lua",
+      "/workspaces/lj-lockless/auxiliary/bench/bench.lua",
       "ffi_struct"
     ],
     "cwd": "/workspaces/lj-lockless",
@@ -1134,7 +1134,7 @@
       "31",
       "/tmp/lj-udata-pure-receiver-combined-20260905-sn9vd57b/candidate/src/luajit",
       "-jon",
-      "/workspaces/lj-lockless/aux/bench/bench.lua",
+      "/workspaces/lj-lockless/auxiliary/bench/bench.lua",
       "ffi_struct"
     ],
     "cwd": "/workspaces/lj-lockless",
@@ -1159,7 +1159,7 @@
       "31",
       "/tmp/lj-udata-pure-receiver-combined-20260905-sn9vd57b/candidate/src/luajit",
       "-jon",
-      "/workspaces/lj-lockless/aux/bench/bench.lua",
+      "/workspaces/lj-lockless/auxiliary/bench/bench.lua",
       "ffi_struct"
     ],
     "cwd": "/workspaces/lj-lockless",
@@ -1184,7 +1184,7 @@
       "31",
       "/tmp/lj-clib-cache-root-20260905-i59mqoic/v2/candidate/src/luajit",
       "-jon",
-      "/workspaces/lj-lockless/aux/bench/bench.lua",
+      "/workspaces/lj-lockless/auxiliary/bench/bench.lua",
       "ffi_struct"
     ],
     "cwd": "/workspaces/lj-lockless",
@@ -1209,7 +1209,7 @@
       "31",
       "/tmp/lj-clib-cache-root-20260905-i59mqoic/v2/candidate/src/luajit",
       "-jon",
-      "/workspaces/lj-lockless/aux/bench/bench.lua",
+      "/workspaces/lj-lockless/auxiliary/bench/bench.lua",
       "ffi_struct"
     ],
     "cwd": "/workspaces/lj-lockless",
@@ -1234,7 +1234,7 @@
       "31",
       "/tmp/lj-udata-pure-receiver-combined-20260905-sn9vd57b/candidate/src/luajit",
       "-jon",
-      "/workspaces/lj-lockless/aux/bench/bench.lua",
+      "/workspaces/lj-lockless/auxiliary/bench/bench.lua",
       "ffi_struct"
     ],
     "cwd": "/workspaces/lj-lockless",
@@ -1259,7 +1259,7 @@
       "31",
       "/tmp/lj-udata-pure-receiver-combined-20260905-sn9vd57b/candidate/src/luajit",
       "-jon",
-      "/workspaces/lj-lockless/aux/bench/bench.lua",
+      "/workspaces/lj-lockless/auxiliary/bench/bench.lua",
       "ffi_struct"
     ],
     "cwd": "/workspaces/lj-lockless",
@@ -1284,7 +1284,7 @@
       "31",
       "/tmp/lj-clib-cache-root-20260905-i59mqoic/v2/candidate/src/luajit",
       "-jon",
-      "/workspaces/lj-lockless/aux/bench/bench.lua",
+      "/workspaces/lj-lockless/auxiliary/bench/bench.lua",
       "ffi_struct"
     ],
     "cwd": "/workspaces/lj-lockless",
@@ -1309,7 +1309,7 @@
       "31",
       "/tmp/lj-clib-cache-root-20260905-i59mqoic/v2/candidate/src/luajit",
       "-jon",
-      "/workspaces/lj-lockless/aux/bench/bench.lua",
+      "/workspaces/lj-lockless/auxiliary/bench/bench.lua",
       "ffi_struct"
     ],
     "cwd": "/workspaces/lj-lockless",
@@ -1334,7 +1334,7 @@
       "31",
       "/tmp/lj-udata-pure-receiver-combined-20260905-sn9vd57b/candidate/src/luajit",
       "-jon",
-      "/workspaces/lj-lockless/aux/bench/bench.lua",
+      "/workspaces/lj-lockless/auxiliary/bench/bench.lua",
       "ffi_struct"
     ],
     "cwd": "/workspaces/lj-lockless",
@@ -1359,7 +1359,7 @@
       "31",
       "/tmp/lj-udata-pure-receiver-combined-20260905-sn9vd57b/candidate/src/luajit",
       "-jon",
-      "/workspaces/lj-lockless/aux/bench/bench.lua",
+      "/workspaces/lj-lockless/auxiliary/bench/bench.lua",
       "ffi_struct"
     ],
     "cwd": "/workspaces/lj-lockless",
@@ -1384,7 +1384,7 @@
       "31",
       "/tmp/lj-clib-cache-root-20260905-i59mqoic/v2/candidate/src/luajit",
       "-jon",
-      "/workspaces/lj-lockless/aux/bench/bench.lua",
+      "/workspaces/lj-lockless/auxiliary/bench/bench.lua",
       "ffi_struct"
     ],
     "cwd": "/workspaces/lj-lockless",

bench/ffi-interpreter-lifetime-cost-2026-09-05/extended-interpreter/result.json

@@ -8,7 +8,7 @@
     "-eL",
     "/tmp/lj-rooted-positive-hit-20260905-34e9qs5t/normal/src/luajit",
     "-joff",
-    "/tmp/lj-rooted-positive-hit-20260905-34e9qs5t/normal/plan/aux/bench/bench.lua"
+    "/tmp/lj-rooted-positive-hit-20260905-34e9qs5t/normal/plan/auxiliary/bench/bench.lua"
   ],
   "seconds": 727.4270960239992,
   "status": "complete",

bench/ffi-interpreter-lifetime-cost-2026-09-05/extended-interpreter/running-metadata.json

@@ -8,7 +8,7 @@
     "-eL",
     "/tmp/lj-rooted-positive-hit-20260905-34e9qs5t/normal/src/luajit",
     "-joff",
-    "/tmp/lj-rooted-positive-hit-20260905-34e9qs5t/normal/plan/aux/bench/bench.lua"
+    "/tmp/lj-rooted-positive-hit-20260905-34e9qs5t/normal/plan/auxiliary/bench/bench.lua"
   ],
   "environment": {
     "BENCH_SCALE": "1",

bench/ffi-interpreter-lifetime-cost-2026-09-05/metadata.json

@@ -4,7 +4,7 @@
     "control": "/tmp/lj-linux-integrated-stability-20260905-st7b2_hh/normal",
     "stock": "/tmp/lj-runtime-performance-review-2026-09-04/stock"
   },
-  "source_harness": "/tmp/lj-rooted-positive-hit-20260905-34e9qs5t/normal/plan/aux/bench/bench.lua",
+  "source_harness": "/tmp/lj-rooted-positive-hit-20260905-34e9qs5t/normal/plan/auxiliary/bench/bench.lua",
   "harness_sha256": "ebd0b8d53b6e7a340c90c45ad33d9bdd47acbd5418890d593d6aae127ef926a9",
   "binary_sha256": {
     "candidate": "cfd0a47e14be6de5f1a3fde057abb88752ee7aeb516990b2884ae77acf01db17",

bench/gc-coalescing-pilot-2026-09-05/README.md

@@ -11,7 +11,7 @@ revision, harness hash, and measurement limits. Apply `measured-runtime.patch`
 with `git apply --unidiff-zero` to its runtime base to reconstruct the four
 production source overlays. Zero context keeps patch syntax compatible with
 the repository whitespace check. The
-benchmark harness is the unchanged `plan/aux/bench/bench.lua` in that tree;
+benchmark harness is the unchanged `plan/auxiliary/bench/bench.lua` in that tree;
 `benchmark.py` records original temporary paths and commands. `build.py` is the
 original build driver; only its normal build was measured.
 

bench/gc-coalescing-pilot-2026-09-05/benchmark.py

@@ -2,7 +2,7 @@
 import subprocess,json,time,os,signal,hashlib,math,csv
 p=Path(__file__).parent;out=p/'performance';out.mkdir(exist_ok=True)
 roots={'stock':Path('/tmp/lj-runtime-performance-review-2026-09-04/stock'),'fork':p/'normal'}
-harness=p/'normal/plan/aux/bench/bench.lua'
+harness=p/'normal/plan/auxiliary/bench/bench.lua'
 rows_expected=['arith_loop','fib30','tab_hash_write','tab_store_existing','tab_insert_newkey','tab_hash_read','tab_read_existing','tab_array','alloc_tables','string_intern','closures_upval','upval_hot','ffi_struct','coroutine_switch','sbuf_format']
 meta={'runtime_metadata':json.loads((p/'metadata.json').read_text()),'build':json.loads((p/'build-normal.json').read_text()),'harness_sha256':hashlib.sha256(harness.read_bytes()).hexdigest(),'stock_ref':'b925b3e3fc6771171602323b45fbe9fb8fc90369','binary_sha256':{name:hashlib.sha256((root/'src/luajit').read_bytes()).hexdigest() for name,root in roots.items()},'protocol':'Fresh stock JIT, fork JIT, stock interpreter, fork interpreter; BENCH_SCALE=1, GC mode unset, unmodified full harness, 180s per process. Each row is minimum of five in-process rounds, not independent process repetitions. CPU 30; other functional work on CPUs 0-15; no full host/frequency isolation.'}
 (out/'metadata.json').write_text(json.dumps(meta,indent=2)+'\n');results=[]

bench/gc-coalescing-pilot-2026-09-05/runs.json

@@ -11,7 +11,7 @@
       "-eL",
       "/tmp/lj-runtime-performance-review-2026-09-04/stock/src/luajit",
       "-jon",
-      "/tmp/lj-gc-jit-combined-20260905-6cxpl6mp/normal/plan/aux/bench/bench.lua"
+      "/tmp/lj-gc-jit-combined-20260905-6cxpl6mp/normal/plan/auxiliary/bench/bench.lua"
     ],
     "environment": {
       "BENCH_SCALE": "1",
@@ -98,7 +98,7 @@
       "-eL",
       "/tmp/lj-gc-jit-combined-20260905-6cxpl6mp/normal/src/luajit",
       "-jon",
-      "/tmp/lj-gc-jit-combined-20260905-6cxpl6mp/normal/plan/aux/bench/bench.lua"
+      "/tmp/lj-gc-jit-combined-20260905-6cxpl6mp/normal/plan/auxiliary/bench/bench.lua"
     ],
     "environment": {
       "BENCH_SCALE": "1",
@@ -185,7 +185,7 @@
       "-eL",
       "/tmp/lj-runtime-performance-review-2026-09-04/stock/src/luajit",
       "-joff",
-      "/tmp/lj-gc-jit-combined-20260905-6cxpl6mp/normal/plan/aux/bench/bench.lua"
+      "/tmp/lj-gc-jit-combined-20260905-6cxpl6mp/normal/plan/auxiliary/bench/bench.lua"
     ],
     "environment": {
       "BENCH_SCALE": "1",
@@ -272,7 +272,7 @@
       "-eL",
       "/tmp/lj-gc-jit-combined-20260905-6cxpl6mp/normal/src/luajit",
       "-joff",
-      "/tmp/lj-gc-jit-combined-20260905-6cxpl6mp/normal/plan/aux/bench/bench.lua"
+      "/tmp/lj-gc-jit-combined-20260905-6cxpl6mp/normal/plan/auxiliary/bench/bench.lua"
     ],
     "environment": {
       "BENCH_SCALE": "1",

bench/gc-sweep-edge-admission-2026-09-04/insertion-timeout.json

@@ -7,7 +7,7 @@
     "30",
     "/tmp/lj-gc-sweep-lease-20260904-2p5yleu8/control/src/luajit",
     "-joff",
-    "/tmp/lj-gc-sweep-lease-20260904-2p5yleu8/control/plan/aux/bench/bench.lua",
+    "/tmp/lj-gc-sweep-lease-20260904-2p5yleu8/control/plan/auxiliary/bench/bench.lua",
     "tab_insert_newkey"
   ],
   "env": {
@@ -40,14 +40,14 @@
       "src/lj_ctype.c": "63990b7796d93a7c4c8659e61c2f0ec43dd766a2972ed679f8f46a4237b2171b",
       "src/lj_ctype.h": "8ee89b4adca50452d429e57ae528568ee9a2ac185eb15922f88e4007d0fd5e7d",
       "src/lj_trace.c": "0e9b47d38d52d60b82f05f6ab79aa32f1ac05e14317213e41971ecf371ca2200",
-      "plan/aux/bench/bench.lua": "ebd0b8d53b6e7a340c90c45ad33d9bdd47acbd5418890d593d6aae127ef926a9"
+      "plan/auxiliary/bench/bench.lua": "ebd0b8d53b6e7a340c90c45ad33d9bdd47acbd5418890d593d6aae127ef926a9"
     },
     "after": {
       "src/lj_gc2.c": "03642a1d466a127af219e9654bfc4e2a4ab63fe9119722a7685528df1d5a84f9",
       "src/lj_ctype.c": "63990b7796d93a7c4c8659e61c2f0ec43dd766a2972ed679f8f46a4237b2171b",
       "src/lj_ctype.h": "8ee89b4adca50452d429e57ae528568ee9a2ac185eb15922f88e4007d0fd5e7d",
       "src/lj_trace.c": "0e9b47d38d52d60b82f05f6ab79aa32f1ac05e14317213e41971ecf371ca2200",
-      "plan/aux/bench/bench.lua": "ebd0b8d53b6e7a340c90c45ad33d9bdd47acbd5418890d593d6aae127ef926a9"
+      "plan/auxiliary/bench/bench.lua": "ebd0b8d53b6e7a340c90c45ad33d9bdd47acbd5418890d593d6aae127ef926a9"
     }
   },
   "committed_symbolized_report_command": [

bench/gc-sweep-leaf-performance-2026-09-04/full-runs.json

@@ -10,7 +10,7 @@
       "-jon",
       "-e",
       "io.stdout:setvbuf(\"line\")",
-      "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/aux/bench/bench.lua"
+      "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/auxiliary/bench/bench.lua"
     ],
     "environment": {
       "BENCH_SCALE": "1",
@@ -58,7 +58,7 @@
       "-jon",
       "-e",
       "io.stdout:setvbuf(\"line\")",
-      "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/aux/bench/bench.lua"
+      "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/auxiliary/bench/bench.lua"
     ],
     "environment": {
       "BENCH_SCALE": "1",
@@ -106,7 +106,7 @@
       "-joff",
       "-e",
       "io.stdout:setvbuf(\"line\")",
-      "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/aux/bench/bench.lua"
+      "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/auxiliary/bench/bench.lua"
     ],
     "environment": {
       "BENCH_SCALE": "1",
@@ -154,7 +154,7 @@
       "-joff",
       "-e",
       "io.stdout:setvbuf(\"line\")",
-      "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/aux/bench/bench.lua"
+      "/tmp/lj-sweep-coalesce-review-20260904-2cpu_bml/tree-leaf/plan/auxiliary/bench/bench.lua"
     ],
     "environment": {
       "BENCH_SCALE": "1",