WIP: fix(macos): Rosetta host imports at whole hardware pages, and a refused import asked again only when its backing changes #686

Closed

mooki wants to merge 48 commits from mooki/Longshot:mac/rosetta-import into main

pull from: mooki/Longshot:mac/rosetta-import

merge into: MagicBeanDev:main

MagicBeanDev:main

Conversation 1 Commits 48 Files changed 83 +11696 -357

mooki commented 2026-11-15 04:33:59 +00:00

Member

• Copy link
• Copy Markdown

Type: fix · Risk: medium · Tested on: macOS 26.7.1, Apple M4 Max (MoltenVK 1.4.2), game-free at this head on arm64 and x86_64 (Rosetta); GPU probe RI-01 on both routes (history) · Needs: Windows, Linux, macOS x86_64 game run

Why

On a Mac running the x86_64 build under Rosetta, the renderer left about 1,640 draws a frame out once the first scene loaded
(start #29): host-memory imports of guest memory failed ([mvk-error] … VK_ERROR_OUT_OF_DEVICE_MEMORY … Could not allocate a host-coherent or exportable VkDeviceMemory; the kernel refused the client buffers 6,665 times,
IOGPUSysMemory::memoryDescriptorWithClientBuffer … failed). Under Rosetta the process's page is 4 KiB but the GPU maps the
hardware's 16 KiB pages. A guest free replaced the freed range's 4 KiB pages with fresh memory, which left 16 KiB pages split
between two memory objects, and IOGPU refuses any import over such a page. Every refused range was then asked of the driver
again every 2 s, and every draw over it was counted and logged as an import (about 22 million asks, 86,833 log lines filling
the runner's 16 MiB log). arm64 never meets it: there both pages are 16 KiB. This PR keeps frees and imports at the hardware's
page and asks a refused import again only when its backing changes. It is part of the macOS port. See #420.

How to reproduce

Seen on: macOS 26.7.1, Apple M4 Max, MoltenVK 1.4.2, the x86_64 build under Rosetta (start #29); not on arm64
Settings and switches: defaults
Steps: start the x86_64 build, load a save and play into the first scene load; or, game-free, the probe RI-01 (reserve as
darwin_mem_map does, replace 4 KiB inside a 16 KiB page as darwin_mem_discard did, import the chunk under arch -x86_64),
or python -I -B tests/test_darwin_guest_memory.py --cc clang --arch x86_64 with this PR's test on the base
Expected: every import of guest memory succeeds, and no draw is left out
Actual: on the base, under Rosetta, the import of any chunk holding a split page fails with VK_ERROR_OUT_OF_DEVICE_MEMORY
at vkAllocateMemory and stays refused (RI-01: refused 3 of 3 when asked again unchanged); the game leaves the draws over it
out, about 1,640 a frame (vk: skips a frame by vk_draw.cpp line)

What changed

macOS only; Windows and Linux keep their code paths (their compiled text changes only in comments, an unused type and an
empty report function, see Reviewer notes).

• host, host/posix/darwin_mem.{c,h}: darwin_mem_hardware_page() = the larger of getpagesize() and
  vm_kernel_page_size; darwin_mem_whole_pages(). darwin_mem_discard replaces only the whole hardware pages inside a free
  and zeroes the rest in place: the same bytes (zero), and no 16 KiB page ever split between memory objects. Natively the
  hardware page is the process's, so nothing changes on arm64.
• host, host/posix/darwin_guest_mem.c: the guest layer's native page is the hardware's (hos_posix_guest_reserve), so guest
  protections, watches and pins round to 16 KiB under Rosetta as on arm64 (RI-01: a 16 KiB page with one 4 KiB part read-only
  is refused for import too). New hos_posix_guest_backing_generation(lo, hi): a counter per 2 MiB cell of the guest window
  that a discard's remap or a protection change moves.
• ABI, gpu/vk/vk_api.h, host/rx_backend.c, host/hos.h: the backing generation is a new host callback,
  guest_backing_generation, appended after #491's import pins: Apple host API version 25 (#491's pins are 24), offset
  392, size 400.
• renderer, gpu/vk/darwin_import.h, gpu/vk/vk_memory.cpp: memory_init aligns imports to the hardware page too
  (darwin_import::alignment(minImportedHostPointerAlignment, page, vm_kernel_page_size): 16 KiB under Rosetta, as on
  arm64), and the start line says so when the process's page is smaller.
• renderer, gpu/vk/import_hold.h, vk_memory.cpp: on macOS a refused import is remembered in ImportRefusals with its
  VkResult and the call that refused it (import_step), and asked of the driver again only when the host's backing
  generation for its range changes or, for a refusal for lack of memory, after an import was given back. No time-out, no cap.
  An ask answered from memory is no longer counted or logged as an import; the every-256th line says refused when the
  driver refused; the refusal line names the call (vk: pool … not imported (VkResult -2 at vkAllocateMemory over the host pages; asked again once its backing changes)).
• renderer, gpu/vk/vk_replay.cpp, vk_internal.h: with the frame statistics (every 120 presents) vk: imports refused: N ranges remembered (M MB); since the last report R refused, A asked again after their backing changed; a frame: X ranges held, Y bindings answered from memory, each range once a frame; nothing while no range is refused.
• docs: docs/development.md, the macOS guest-memory paragraph.
• tests: tests/test_rosetta_import_geometry.py (new, with rosetta_import_geometry_test.cpp: the alignment and free
  arithmetic under a simulated 4 KiB process page); ImportRefusals cases in import_hold_test.cpp; refusals_remembered
  and the Rosetta route in darwin_import_lifetime_test.cpp; hardware_page_discard in darwin_guest_memory_test.c (real
  VM, both routes); the API-25 layout in test_vk_darwin_admission.py and darwin_renderer_startup_test.cpp; the wiring
  filter in test_darwin_renderer.py; nx2/test_import_windows.py knows import_step.

Measurements

Verdict: fixes the cause on the GPU (history: RI-01 on both routes, every replacement inside a 16 KiB page refused under
Rosetta and the fix's whole-page discard imported); game-free at this head, the free and import geometry is 16 KiB on both
routes and a refused range is not asked of the driver again while its backing is unchanged. Not yet measured in the game (the next
x86_64 start decides; see Testing).

Hardware: macOS 26.7.1, Apple M4 Max, 64 GB, Apple clang 21
Scene: none (game-free tests; RI-01 is a standalone probe of the same mapping and import calls, no game data)
Method: the tests below at this head, arm64 and x86_64 (Rosetta), and on the base with this PR's test files, which must fail.
RI-01 (reports/RosettaImport-files/ri01/, packet b61fed81…), one admission per route, run by the parent at 21:34 CST.
Exact checks: one run per route.
How to reproduce: python -I -B tests/test_darwin_guest_memory.py --cc clang --arch arm64 --arch x86_64;
python -I -B tests/test_rosetta_import_geometry.py; python -I -B tests/test_import_hold.py
Baseline: the "before" column is this PR's base, #658 (11d09b9a), whose import admission this PR changes (main has neither
#658's admission nor #491's pins).

	Before: base (#658) @ 11d09b9a	After: this PR @ b7b509f8
RI-01, x86_64 under Rosetta (history, MoltenVK 1.4.2): a 4 KiB or 12 KiB replacement inside a 16 KiB page, the chunk and the page imported	refused (VK_ERROR_OUT_OF_DEVICE_MEMORY), 11 kernel refusals for 11 imports; asked again unchanged: refused 3 of 3	the fix's discard (whole 16 KiB pages replaced, edges zeroed): imported on both routes; every import read back byte for byte
test_darwin_guest_memory, arm64 and x86_64	fails with this PR's test (no darwin_mem_hardware_page)	passes: HARDWARE_PAGE process=4096 hardware=16384 frees=4 entries=5 edges_on_hardware_pages=1 bytes_exact=1 backing_moved=1 under Rosetta
test_rosetta_import_geometry	fails (no darwin_mem_whole_pages)	18 checks, 0 failures, arm64 and x86_64
test_import_hold	fails (no ImportRefusals)	passes: a range refused once and then asked by 1,640 draws a frame for 600 frames reaches the driver once, counted once a frame; asked again on a backing change
test_darwin_renderer, both routes	fails (no ImportRefusals in the lifetime fixture)	2,248 import-owner checks, 133,263 startup/ABI checks, Apple25 wiring
test_vk_darwin_admission	fails (Apple host API version is 25)	passes, arm64 and x86_64

this PR @ b7b509f8:
HARDWARE_PAGE process=4096 hardware=16384 frees=4 entries=5 edges_on_hardware_pages=1 bytes_exact=1 backing_moved=1   (x86_64)
PASS: Darwin guest memory: arm64, x86_64
rosetta import geometry: 18 checks, 0 failures   (x86_64 under Rosetta; arm64 the same)
PASS: 352 exact startup allocation failures, Apple25 typed host callback wiring, serial/parallel resources and rollback; no Vulkan driver
PASS: fixed non-Apple ABI: version 22, size 360, all 45 named offsets; Apple version 25, size 400, typed callbacks at 360/368/376/384/392
base 11d09b9a with this PR's tests: error: unknown type name 'ImportRefusals'; FAIL: Apple host API version is 25

Flags and settings

None: the geometry follows the page sizes and the refusals follow the backing, with no switch. The diff against main also
shows the switches of the PRs it stacks on, theirs to list: HOS_KEEP_FREED_PAGES, HOS_ZERO_ALL_PAGES,
RX_NVN_WATCH_AFTER, RX_NVN_WATCH_ALL, RX_NVN_WATCH_TEXELS_SRC (#480), RX_VK_LIBRARY (#438), RX_VK_DLSS_ACTORS,
RX_VK_GPU_DUMP, RX_VK_MESH_IND_COUNT_WORD and RX_VK_NO_UPSCALE_STUB (#658).

Testing

Tested: on macOS 26.7.1, Apple M4 Max, at this head (main 6c9edffe, #658's stack, this PR), game-free, every run under the
shared check slot with a fresh HOME and TMPDIR:

• tests/test_darwin_guest_memory.py --arch arm64 --arch x86_64: exit 0 (real VM; the Rosetta route's frees replace whole
  16 KiB pages and move the backing generation). On the base with this PR's test: fails to compile.
• tests/test_rosetta_import_geometry.py: exit 0; its fixture also built with -arch x86_64 and run under Rosetta: 18 checks,
  0 failures. On the base with this PR's test: fails.
• tests/test_import_hold.py: exit 0; on the base with this PR's test: fails.
• tests/test_darwin_renderer.py --arch arm64 --arch x86_64, tests/test_vk_darwin_admission.py (arm64, x86_64),
  tests/test_import_buffer_binding.py (arm64, x86_64: 37 cases, the Windows/Linux import routes unchanged),
  nx2/test_import_windows.py: exit 0. On the base with this PR's tests the first two fail.
• The pick alone (00d0305c, before the API end commit): test_vk_darwin_admission and test_darwin_renderer fail on the
  layout (sizeof(AppleHost) == 392, not at exact API24 layout), as its end commit says.
• Objects: vk_memory.cpp and vk_replay.cpp compiled whole with main 6c9edffe's renderer flags for arm64 and x86_64 (4 of 4,
  scratch tree with #476, #492 and #490); host darwin_guest_mem.c, darwin_mem.c and rx_backend.c compiled whole with
  #479's macOS host flags for arm64 and x86_64 (6 of 6, scratch tree of this head with #490 and #479; the three files are this
  head's byte for byte).
• The wave's merge (this PR + the control-flow bound PR, 38d42adf): link check 0 of 621 declared names without an external
  definition, 66 of 66 objects, 1,218 name/arch checks, closure 566 symbols a route, 0 undefined; the suite in the run_all box.
• History (RosettaImport's report): RI-01 on both routes as in Measurements; the topic's full suite with only its base's own
  failure. Every changed line is the topic's except the API number (24 there, 25 here) and the docs paragraph, rewritten on
  #491's text.
• Logs: reports/PubWave-files/PubNext/ (proof-ri-01/, proof-ri-02/, compile/rosetta-import/, compile/host-rosetta/,
  offapple-rosetta.txt, wave3/).

Not tested: the game at this head on either route (the next x86_64 start on a build carrying this commit decides: see
below); no GPU run at this head (RI-01 is a standalone probe of the mechanism and of the fix's discard, not LS's code).
Windows and Linux: not built there (6 changed files differ from the base's off Apple, in comments, an unused type and an empty
function); its test request covers it.

Must be tested:

• macOS, x86_64 under Rosetta: start the x86_64 build with the same save and inputs as start #29, expecting vk: guest memory imported in place (alignment 16384, the hardware's page: this process's pages are smaller (Rosetta)), 0 [mvk-error] VK_ERROR_OUT_OF_DEVICE_MEMORY … host-coherent or exportable, 0 vk: pool … not imported, no vk: imports refused: line, 0
  IOGPU memoryDescriptorWithClientBuffer … failed in a live log stream, 0 skipped draws in play (about arm64's 1,910 draws a
  frame), and the log well under the runner's 16 MiB (by hand: the owner, the log's vk: and [mvk-error] lines)
• macOS, arm64: the same start as before, expecting the start line unchanged (alignment 16384) and no other difference (by
  hand: the owner)
• Windows and Linux, any GPU: build this PR (head b7b509f8, it carries #658 with the PRs it stacks on) and main 6c9edffe the
  same way and start each into play, expecting this PR's changed renderer files to compile (vk_memory.cpp, vk_replay.cpp,
  import_hold.h, vk_internal.h) and every line to match main's, a failed import still held for 2 s and logged as before
  (by hand: test request T-NQ85)

Risks

What could break: on macOS, a free now zeroes the edges of a range in place instead of replacing them (the same bytes);
under Rosetta guest protections and watches cover 16 KiB, as on arm64. A refused import is asked again only when its backing
changes or memory is given back: a refusal for another reason that would have cleared by itself stays refused until then
(counted with the frame statistics, so it is visible). Windows and Linux: unchanged.

Turning it off: revert the PR (no switch).

Compatibility: the Apple host ABI moves to version 25 (size 400): the macOS executable and its renderer library must be
built together, as with every ABI step (on a mismatch rx_backend.c does not take the Vulkan renderer: rx: mkwvk_init version mismatch). Windows and Linux keep version 22, size 360.
The translator stamp is unchanged (ebbf160ce9626041: no stamped file changes). Nothing changes in saves or
longshot_options.ini.

Reviewer notes

• Review 11d09b9a..b7b509f8, two commits: the topic -x from macos/rosetta-import, then the API end commit. Read
  darwin_mem_discard and hos_posix_guest_reserve first, then ImportRefusals and import_pool's macOS branch.
• Depends on #658 (this branch is its head 11d09b9a): the logging it changes is #658's import_planned, beside its alias
  isolation and segments; and through #658 on #491 (the import pins at API 24, darwin_import.h) with the PRs #491 carries.
• The pick's conflicts: docs/development.md (the guest-memory paragraph rewritten on #491's text, with this topic's facts),
  vk_replay.cpp (only this topic's report line, after draw_skip_report) and test_vk_darwin_admission.py (#491's layout
  kept in the pick); the end commit appends the generation at version 25.
• ABI: #491 took version 24 for the pins; this PR appends the generation as 25. Any other PR that appends to the Apple host
  table renumbers after whichever lands first.
• Conflicts with sibling PRs: #677, #679 and #680 in vk_replay.cpp's log_frame_stats (each adds a report block where this
  adds its line): keep both, this PR's line after #680's block, as macos/integrated 187387eb. The conflicts with #490
  (win32_posix.c, test_collect_wide.py) and with #667 and #669 (vk_draw.cpp) are #658's own.
• Off Apple: Windows and Linux compile changed text (comments, ImportRefusals defined and unused, and an empty
  memory_import_refusal_report called once every 120 presents); behaviour unchanged. The same storm exists there in a
  smaller form (a failed import asked again every 2 s, every 256th ask logged as imported even when it failed or was held);
  changing it for every platform is the owner's decision, not prepared here.
• Code comments cite reports/2026-11-14-*.md (the port's design notes), which are not in this repository.

Issues

See #420

Checklist

Everyone

• One topic.
• The title is a Conventional Commit (type(scope): description) of the status line's type.
• Why gives the reason plainly and links the issues that fit (the tracker searched).
• Measurements has a verdict, or one line saying why there is nothing to measure.
• Testing names what was tested, what wasn't, and what must still be tested, where and how. (Test requests not open yet.)
• Rebased on current main (main e090cc48).
• python -I -B tests/run_all.py passes (any failure that also fails on main is named). (On the wave's merge 38d42adf (the control-flow bound PR, whose stack carries #658, + this PR): 559 passed, 31 failed, 18 skipped against main 6c9edffe's 531/32/17 on this Mac; the 31 failures are main's own and nothing that passes on main fails; test_collect_wide now passes; 27 new tests pass, test_rosetta_import_geometry, test_darwin_guest_memory, test_darwin_renderer and test_vk_darwin_admission among them; test_darwin_audio_service, Darwin-only, is skipped by the runner; reports/PubWave-files/PubNext/wave3/full-38d42adf/.)
• No game files, dumps, build output or generated files.
• third_party/ untouched (a new folder with a PROVENANCE.md instead).
• The license is OK: GPL-3.0-or-later, nothing incompatible and nothing decompiled.

When it applies

• AI assistance recorded with Assisted-by: / Co-Authored-By: trailers.
• A game-free test added for the fix, failing on main and passing here. (They fail on this PR's base, #658, with this PR's
  test files; on main too, which has neither the guest layer's discard nor #491's import pins.)
• A check under tests/ that reads changed source updated in this PR, not weakened.
• Docs updated.
• MKWVK_API_VERSION bumped (gpu/vk/vk_api.h's MkwVkHost or MkwVkRenderer changed). (Apple 24 → 25 for the new
  host callback; non-Apple unchanged at 22.)

**Type:** fix · **Risk:** medium · **Tested on:** macOS 26.7.1, Apple M4 Max (MoltenVK 1.4.2), game-free at this head on arm64 and x86_64 (Rosetta); GPU probe RI-01 on both routes (history) · **Needs:** Windows, Linux, macOS x86_64 game run ## Why On a Mac running the x86_64 build under Rosetta, the renderer left about 1,640 draws a frame out once the first scene loaded (start #29): host-memory imports of guest memory failed (`[mvk-error] … VK_ERROR_OUT_OF_DEVICE_MEMORY … Could not allocate a host-coherent or exportable VkDeviceMemory`; the kernel refused the client buffers 6,665 times, `IOGPUSysMemory::memoryDescriptorWithClientBuffer … failed`). Under Rosetta the process's page is 4 KiB but the GPU maps the hardware's 16 KiB pages. A guest free replaced the freed range's 4 KiB pages with fresh memory, which left 16 KiB pages split between two memory objects, and IOGPU refuses any import over such a page. Every refused range was then asked of the driver again every 2 s, and every draw over it was counted and logged as an import (about 22 million asks, 86,833 log lines filling the runner's 16 MiB log). arm64 never meets it: there both pages are 16 KiB. This PR keeps frees and imports at the hardware's page and asks a refused import again only when its backing changes. It is part of the macOS port. See #420. ## How to reproduce **Seen on:** macOS 26.7.1, Apple M4 Max, MoltenVK 1.4.2, the x86_64 build under Rosetta (start #29); not on arm64 **Settings and switches:** defaults **Steps:** start the x86_64 build, load a save and play into the first scene load; or, game-free, the probe RI-01 (reserve as `darwin_mem_map` does, replace 4 KiB inside a 16 KiB page as `darwin_mem_discard` did, import the chunk under `arch -x86_64`), or `python -I -B tests/test_darwin_guest_memory.py --cc clang --arch x86_64` with this PR's test on the base **Expected:** every import of guest memory succeeds, and no draw is left out **Actual:** on the base, under Rosetta, the import of any chunk holding a split page fails with `VK_ERROR_OUT_OF_DEVICE_MEMORY` at `vkAllocateMemory` and stays refused (RI-01: refused 3 of 3 when asked again unchanged); the game leaves the draws over it out, about 1,640 a frame (`vk: skips a frame by vk_draw.cpp line`) ## What changed macOS only; Windows and Linux keep their code paths (their compiled text changes only in comments, an unused type and an empty report function, see Reviewer notes). - host, `host/posix/darwin_mem.{c,h}`: `darwin_mem_hardware_page()` = the larger of `getpagesize()` and `vm_kernel_page_size`; `darwin_mem_whole_pages()`. `darwin_mem_discard` replaces only the whole hardware pages inside a free and zeroes the rest in place: the same bytes (zero), and no 16 KiB page ever split between memory objects. Natively the hardware page is the process's, so nothing changes on arm64. - host, `host/posix/darwin_guest_mem.c`: the guest layer's native page is the hardware's (`hos_posix_guest_reserve`), so guest protections, watches and pins round to 16 KiB under Rosetta as on arm64 (RI-01: a 16 KiB page with one 4 KiB part read-only is refused for import too). New `hos_posix_guest_backing_generation(lo, hi)`: a counter per 2 MiB cell of the guest window that a discard's remap or a protection change moves. - ABI, `gpu/vk/vk_api.h`, `host/rx_backend.c`, `host/hos.h`: the backing generation is a new host callback, `guest_backing_generation`, appended after #491's import pins: Apple host API version **25** (#491's pins are 24), offset 392, size 400. - renderer, `gpu/vk/darwin_import.h`, `gpu/vk/vk_memory.cpp`: `memory_init` aligns imports to the hardware page too (`darwin_import::alignment(minImportedHostPointerAlignment, page, vm_kernel_page_size)`: 16 KiB under Rosetta, as on arm64), and the start line says so when the process's page is smaller. - renderer, `gpu/vk/import_hold.h`, `vk_memory.cpp`: on macOS a refused import is remembered in `ImportRefusals` with its VkResult and the call that refused it (`import_step`), and asked of the driver again only when the host's backing generation for its range changes or, for a refusal for lack of memory, after an import was given back. No time-out, no cap. An ask answered from memory is no longer counted or logged as an import; the every-256th line says `refused` when the driver refused; the refusal line names the call (`vk: pool … not imported (VkResult -2 at vkAllocateMemory over the host pages; asked again once its backing changes)`). - renderer, `gpu/vk/vk_replay.cpp`, `vk_internal.h`: with the frame statistics (every 120 presents) `vk: imports refused: N ranges remembered (M MB); since the last report R refused, A asked again after their backing changed; a frame: X ranges held, Y bindings answered from memory`, each range once a frame; nothing while no range is refused. - docs: `docs/development.md`, the macOS guest-memory paragraph. - tests: `tests/test_rosetta_import_geometry.py` (new, with `rosetta_import_geometry_test.cpp`: the alignment and free arithmetic under a simulated 4 KiB process page); `ImportRefusals` cases in `import_hold_test.cpp`; `refusals_remembered` and the Rosetta route in `darwin_import_lifetime_test.cpp`; `hardware_page_discard` in `darwin_guest_memory_test.c` (real VM, both routes); the API-25 layout in `test_vk_darwin_admission.py` and `darwin_renderer_startup_test.cpp`; the wiring filter in `test_darwin_renderer.py`; `nx2/test_import_windows.py` knows `import_step`. ## Measurements **Verdict:** fixes the cause on the GPU (history: RI-01 on both routes, every replacement inside a 16 KiB page refused under Rosetta and the fix's whole-page discard imported); game-free at this head, the free and import geometry is 16 KiB on both routes and a refused range is not asked of the driver again while its backing is unchanged. Not yet measured in the game (the next x86_64 start decides; see Testing). Hardware: macOS 26.7.1, Apple M4 Max, 64 GB, Apple clang 21 Scene: none (game-free tests; RI-01 is a standalone probe of the same mapping and import calls, no game data) Method: the tests below at this head, arm64 and x86_64 (Rosetta), and on the base with this PR's test files, which must fail. RI-01 (`reports/RosettaImport-files/ri01/`, packet `b61fed81…`), one admission per route, run by the parent at 21:34 CST. Exact checks: one run per route. How to reproduce: `python -I -B tests/test_darwin_guest_memory.py --cc clang --arch arm64 --arch x86_64`; `python -I -B tests/test_rosetta_import_geometry.py`; `python -I -B tests/test_import_hold.py` Baseline: the "before" column is this PR's base, #658 (`11d09b9a`), whose import admission this PR changes (main has neither #658's admission nor #491's pins). | | Before: base (#658) @ 11d09b9a | After: this PR @ b7b509f8 | |---|---|---| | RI-01, x86_64 under Rosetta (history, MoltenVK 1.4.2): a 4 KiB or 12 KiB replacement inside a 16 KiB page, the chunk and the page imported | refused (`VK_ERROR_OUT_OF_DEVICE_MEMORY`), 11 kernel refusals for 11 imports; asked again unchanged: refused 3 of 3 | the fix's discard (whole 16 KiB pages replaced, edges zeroed): imported on both routes; every import read back byte for byte | | `test_darwin_guest_memory`, arm64 and x86_64 | fails with this PR's test (no `darwin_mem_hardware_page`) | passes: `HARDWARE_PAGE process=4096 hardware=16384 frees=4 entries=5 edges_on_hardware_pages=1 bytes_exact=1 backing_moved=1` under Rosetta | | `test_rosetta_import_geometry` | fails (no `darwin_mem_whole_pages`) | 18 checks, 0 failures, arm64 and x86_64 | | `test_import_hold` | fails (no `ImportRefusals`) | passes: a range refused once and then asked by 1,640 draws a frame for 600 frames reaches the driver once, counted once a frame; asked again on a backing change | | `test_darwin_renderer`, both routes | fails (no `ImportRefusals` in the lifetime fixture) | 2,248 import-owner checks, 133,263 startup/ABI checks, Apple25 wiring | | `test_vk_darwin_admission` | fails (`Apple host API version is 25`) | passes, arm64 and x86_64 | ``` this PR @ b7b509f8: HARDWARE_PAGE process=4096 hardware=16384 frees=4 entries=5 edges_on_hardware_pages=1 bytes_exact=1 backing_moved=1 (x86_64) PASS: Darwin guest memory: arm64, x86_64 rosetta import geometry: 18 checks, 0 failures (x86_64 under Rosetta; arm64 the same) PASS: 352 exact startup allocation failures, Apple25 typed host callback wiring, serial/parallel resources and rollback; no Vulkan driver PASS: fixed non-Apple ABI: version 22, size 360, all 45 named offsets; Apple version 25, size 400, typed callbacks at 360/368/376/384/392 base 11d09b9a with this PR's tests: error: unknown type name 'ImportRefusals'; FAIL: Apple host API version is 25 ``` ### Flags and settings None: the geometry follows the page sizes and the refusals follow the backing, with no switch. The diff against main also shows the switches of the PRs it stacks on, theirs to list: `HOS_KEEP_FREED_PAGES`, `HOS_ZERO_ALL_PAGES`, `RX_NVN_WATCH_AFTER`, `RX_NVN_WATCH_ALL`, `RX_NVN_WATCH_TEXELS_SRC` (#480), `RX_VK_LIBRARY` (#438), `RX_VK_DLSS_ACTORS`, `RX_VK_GPU_DUMP`, `RX_VK_MESH_IND_COUNT_WORD` and `RX_VK_NO_UPSCALE_STUB` (#658). ## Testing **Tested:** on macOS 26.7.1, Apple M4 Max, at this head (main 6c9edffe, #658's stack, this PR), game-free, every run under the shared check slot with a fresh HOME and TMPDIR: - `tests/test_darwin_guest_memory.py --arch arm64 --arch x86_64`: exit 0 (real VM; the Rosetta route's frees replace whole 16 KiB pages and move the backing generation). On the base with this PR's test: fails to compile. - `tests/test_rosetta_import_geometry.py`: exit 0; its fixture also built with `-arch x86_64` and run under Rosetta: 18 checks, 0 failures. On the base with this PR's test: fails. - `tests/test_import_hold.py`: exit 0; on the base with this PR's test: fails. - `tests/test_darwin_renderer.py --arch arm64 --arch x86_64`, `tests/test_vk_darwin_admission.py` (arm64, x86_64), `tests/test_import_buffer_binding.py` (arm64, x86_64: 37 cases, the Windows/Linux import routes unchanged), `nx2/test_import_windows.py`: exit 0. On the base with this PR's tests the first two fail. - The pick alone (`00d0305c`, before the API end commit): `test_vk_darwin_admission` and `test_darwin_renderer` fail on the layout (`sizeof(AppleHost) == 392`, `not at exact API24 layout`), as its end commit says. - Objects: `vk_memory.cpp` and `vk_replay.cpp` compiled whole with main 6c9edffe's renderer flags for arm64 and x86_64 (4 of 4, scratch tree with #476, #492 and #490); host `darwin_guest_mem.c`, `darwin_mem.c` and `rx_backend.c` compiled whole with #479's macOS host flags for arm64 and x86_64 (6 of 6, scratch tree of this head with #490 and #479; the three files are this head's byte for byte). - The wave's merge (this PR + the control-flow bound PR, `38d42adf`): link check 0 of 621 declared names without an external definition, 66 of 66 objects, 1,218 name/arch checks, closure 566 symbols a route, 0 undefined; the suite in the run_all box. - History (RosettaImport's report): RI-01 on both routes as in Measurements; the topic's full suite with only its base's own failure. Every changed line is the topic's except the API number (24 there, 25 here) and the docs paragraph, rewritten on #491's text. - Logs: `reports/PubWave-files/PubNext/` (`proof-ri-01/`, `proof-ri-02/`, `compile/rosetta-import/`, `compile/host-rosetta/`, `offapple-rosetta.txt`, `wave3/`). **Not tested:** the game at this head on either route (the next x86_64 start on a build carrying this commit decides: see below); no GPU run at this head (RI-01 is a standalone probe of the mechanism and of the fix's discard, not LS's code). Windows and Linux: not built there (6 changed files differ from the base's off Apple, in comments, an unused type and an empty function); its test request covers it. **Must be tested:** - macOS, x86_64 under Rosetta: start the x86_64 build with the same save and inputs as start #29, expecting `vk: guest memory imported in place (alignment 16384, the hardware's page: this process's pages are smaller (Rosetta))`, 0 `[mvk-error] VK_ERROR_OUT_OF_DEVICE_MEMORY … host-coherent or exportable`, 0 `vk: pool … not imported`, no `vk: imports refused:` line, 0 IOGPU `memoryDescriptorWithClientBuffer … failed` in a live `log stream`, 0 skipped draws in play (about arm64's 1,910 draws a frame), and the log well under the runner's 16 MiB (by hand: the owner, the log's `vk:` and `[mvk-error]` lines) - macOS, arm64: the same start as before, expecting the start line unchanged (`alignment 16384`) and no other difference (by hand: the owner) - Windows and Linux, any GPU: build this PR (head b7b509f8, it carries #658 with the PRs it stacks on) and main 6c9edffe the same way and start each into play, expecting this PR's changed renderer files to compile (`vk_memory.cpp`, `vk_replay.cpp`, `import_hold.h`, `vk_internal.h`) and every line to match main's, a failed import still held for 2 s and logged as before (by hand: test request T-NQ85) ## Risks **What could break:** on macOS, a free now zeroes the edges of a range in place instead of replacing them (the same bytes); under Rosetta guest protections and watches cover 16 KiB, as on arm64. A refused import is asked again only when its backing changes or memory is given back: a refusal for another reason that would have cleared by itself stays refused until then (counted with the frame statistics, so it is visible). Windows and Linux: unchanged. **Turning it off:** revert the PR (no switch). **Compatibility:** the Apple host ABI moves to version 25 (size 400): the macOS executable and its renderer library must be built together, as with every ABI step (on a mismatch `rx_backend.c` does not take the Vulkan renderer: `rx: mkwvk_init version mismatch`). Windows and Linux keep version 22, size 360. The translator stamp is unchanged (`ebbf160ce9626041`: no stamped file changes). Nothing changes in saves or `longshot_options.ini`. ## Reviewer notes - Review `11d09b9a..b7b509f8`, two commits: the topic `-x` from `macos/rosetta-import`, then the API end commit. Read `darwin_mem_discard` and `hos_posix_guest_reserve` first, then `ImportRefusals` and `import_pool`'s macOS branch. - Depends on #658 (this branch is its head `11d09b9a`): the logging it changes is #658's `import_planned`, beside its alias isolation and segments; and through #658 on #491 (the import pins at API 24, `darwin_import.h`) with the PRs #491 carries. - The pick's conflicts: `docs/development.md` (the guest-memory paragraph rewritten on #491's text, with this topic's facts), `vk_replay.cpp` (only this topic's report line, after `draw_skip_report`) and `test_vk_darwin_admission.py` (#491's layout kept in the pick); the end commit appends the generation at version 25. - ABI: #491 took version 24 for the pins; this PR appends the generation as 25. Any other PR that appends to the Apple host table renumbers after whichever lands first. - Conflicts with sibling PRs: #677, #679 and #680 in `vk_replay.cpp`'s `log_frame_stats` (each adds a report block where this adds its line): keep both, this PR's line after #680's block, as `macos/integrated` `187387eb`. The conflicts with #490 (`win32_posix.c`, `test_collect_wide.py`) and with #667 and #669 (`vk_draw.cpp`) are #658's own. - Off Apple: Windows and Linux compile changed text (comments, `ImportRefusals` defined and unused, and an empty `memory_import_refusal_report` called once every 120 presents); behaviour unchanged. The same storm exists there in a smaller form (a failed import asked again every 2 s, every 256th ask logged as `imported` even when it failed or was held); changing it for every platform is the owner's decision, not prepared here. - Code comments cite `reports/2026-11-14-*.md` (the port's design notes), which are not in this repository. ## Issues See #420 ## Checklist ### Everyone - [x] One topic. - [x] The title is a Conventional Commit (`type(scope): description`) of the status line's type. - [x] Why gives the reason plainly and links the issues that fit (the tracker searched). - [x] Measurements has a verdict, or one line saying why there is nothing to measure. - [ ] Testing names what was tested, what wasn't, and what must still be tested, where and how. (Test requests not open yet.) - [x] Rebased on current `main` (main e090cc48). - [x] `python -I -B tests/run_all.py` passes (any failure that also fails on `main` is named). (On the wave's merge `38d42adf` (the control-flow bound PR, whose stack carries #658, + this PR): 559 passed, 31 failed, 18 skipped against main 6c9edffe's 531/32/17 on this Mac; the 31 failures are main's own and nothing that passes on main fails; `test_collect_wide` now passes; 27 new tests pass, `test_rosetta_import_geometry`, `test_darwin_guest_memory`, `test_darwin_renderer` and `test_vk_darwin_admission` among them; `test_darwin_audio_service`, Darwin-only, is skipped by the runner; `reports/PubWave-files/PubNext/wave3/full-38d42adf/`.) - [x] No game files, dumps, build output or generated files. - [x] `third_party/` untouched (a new folder with a `PROVENANCE.md` instead). - [x] The license is OK: GPL-3.0-or-later, nothing incompatible and nothing decompiled. ### When it applies - [x] AI assistance recorded with `Assisted-by:` / `Co-Authored-By:` trailers. - [x] A game-free test added for the fix, failing on `main` and passing here. (They fail on this PR's base, #658, with this PR's test files; on `main` too, which has neither the guest layer's discard nor #491's import pins.) - [x] A check under `tests/` that reads changed source updated in this PR, not weakened. - [x] Docs updated. - [x] `MKWVK_API_VERSION` bumped (`gpu/vk/vk_api.h`'s `MkwVkHost` or `MkwVkRenderer` changed). (Apple 24 → 25 for the new host callback; non-Apple unchanged at 22.)

mooki added 47 commits 2026-11-15 04:34:00 +00:00

fix(vk): scan the import table as far back as its largest live import ... 07501d533b

Every scan down vk_memory.cpp's import table by start (pool_lookup's
covering import and merge plan, bg_drain, prefetch_chunks,
import_in_background, memory_note_gpu_write and memory_guest_imported)
stopped once an import ended more than 1 GiB below its address, on the
belief that no import is larger than that. pool_lookup's own merge escape
leaves an import above 1 GiB over the smaller ones inside it ("left
overlapping"), and the device allows imports up to max_import_size: a scan
stopped at a small import inside a large one, missed the large one, and
the same bytes were imported again, two memories over the same bytes.

import_reach.h counts the live imports by span class; its bound is above
every live span, within twice the largest. imported_add and imported_take,
now the table's only ways in and out, keep the count. A scan stops only
where no import further down can reach its address, so it also stops
sooner than before when the imports are small. The covering-import checks
in pool_lookup and import_in_background look past the last import at or
below the range for the same reason.

Tests: test_import_reach.py runs the actual scans with a 4 GiB import over
a 16 MiB chunk, left by the merge escape (imports are recorded ranges: no
payload, no Vulkan, no game). Its lookup, query, note, drain, background
and prefetch cases fail on main 5e072fc8 and pass here, and a source check
keeps every change to the table in the two helpers. test_import_windows
runs pool_lookup with the helpers; test_mirror_gpu_only names the new
publication point.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

test(vk): the readback refresh fixture runs memory_note_gpu_write with the import table's helpers ... 693acd941b

test_parallel_rb_refresh cuts memory_note_gpu_write out of vk_memory.cpp,
whose scan now stops at the live imports' reach: the fixture includes
import_reach.h, cuts live_reach, imported_add and imported_take beside it,
and puts its pool in the table through imported_add. It failed to build
at 11e9ee44 ("use of undeclared identifier 'import_reach'").

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

fix(runtime): preserve guest pages when discarding on macOS ... 937fe5bcb8

Reserve the fixed guest window with a non-overwriting Mach mapping. Reclaim
complete owned host pages with fresh anonymous mappings and zero only the
partial-page edges, preserving adjacent 4 KiB guest pages on 16 KiB hosts.
Use the actual host granule for non-guest allocation/protection and report
macOS discard failures instead of returning success.

Add game-free source-linked arm64/Rosetta tests covering collisions, repeated
free/recommit, unaligned ranges, failure paths and resident-memory reduction.
Keep Linux and Windows paths unchanged. Build-list integration is separate.

Assisted-by: GPT-6 Astra
Co-Authored-By: GPT-6 Astra <[email protected]>
Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

fix(runtime): retain guest-page rounding in Darwin memory wrappers ... 041ac3da77

Keep the POSIX layer's outward 4 KiB MEM_DECOMMIT and inward 4 KiB MEM_RESET
contracts above the byte-exact Darwin helper. Check arithmetic before rounding,
and keep separate real-memory assertions for helper and wrapper ranges.

Default the Darwin regression test to the native architecture. Both CPU routes
remain explicitly selectable for acceptance without requiring Rosetta or arm64
execution from every ordinary macOS suite run.

Assisted-by: GPT-6 Astra
Co-Authored-By: GPT-6 Astra <[email protected]>
Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

test(runtime): cut main's int hos_commit in the Darwin guest-memory test ... aafb7498e3

Main's #324 (a4c77174) made hos_commit in host/mkw_glue.c return whether
the range was committed, so its definition now starts "int hos_commit(".
The Darwin guest-memory test cut the function by its old "void" head and
stopped with a ValueError on main's source, on this branch and on main alike,
before compiling anything. Cut it by the new head.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

fix(runtime): translate macOS fault contexts on both CPU routes ... f2778f7517

Decode Darwin signal contexts and access faults for arm64 and x86_64,
copy supported context edits back on signal return, and prevent recursive
callback dispatch when a fault handler itself faults. Keep the non-Apple
bridge text and the x64-shaped CONTEXT layout unchanged.

Add source-linked, game-free owned-memory fault tests for both targets,
including page repair, PC redirection, prior handlers and an inaccessible
handler stack. Document the native PC/SP contract and remaining limits.

Assisted-by: GPT-6 Astra
Co-Authored-By: GPT-6 Astra <[email protected]>
Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

test(runtime): keep Darwin fault checks native by default ... 7b50aa7ccf

Do not make the ordinary Apple Silicon suite depend on Rosetta. Default
to the running Python process's architecture and retain explicit repeated
--arch options for dual-route qualification. Document that command and
count only files when reporting crash-report directory changes.

Assisted-by: GPT-6 Astra
Co-Authored-By: GPT-6 Astra <[email protected]>
Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

test(runtime): classify the fault bridge's fatal _exit in main's exit inventory ... 861d9aba6f

Main's crash records (#75) added an exhaustive inventory of host process
exits to test_crash_record.py, which scans every host/**/*.c on every
platform. darwin_fault.c's nested-fault _exit(128 + sig) is fatal, so it
is listed as one and exempt from the clean-end mark, like hos_thread.c's
ExitProcess(3). Without it the inventory fails on Windows and Linux too.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

feat(vk): add macOS Vulkan loader and device admission ... b73888eb6f

Select a local Vulkan loader or MoltenVK with RX_VK_LIBRARY and keep SDL and
renderer startup on that same library. Capture SDL's instance extensions on
the window thread, enable advertised portability extensions, and name missing
admission requirements and VkResults without changing Windows or Linux paths.

Keep the non-Apple host API at 21 for existing prebuilt renderers; append the
two macOS callbacks only in Apple's version 22. Cover pure decisions, legacy
platform expectations, ABI layout, and the SDL2/SDL3 bridge without a GPU.

Assisted-by: GPT-6 Astra
Co-Authored-By: GPT-6 Astra <[email protected]>
Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

test(vk): use semantic admission contracts ... 1f4abf7d2d

Remove the SDL source-string wiring and source-index ordering assertions while
keeping the sixteen compiled behavioral cases and surface adapter compile.
Replace the comment-sensitive API header hash with fixed baseline field names,
byte offsets, versions and sizes, retaining typed Apple callback checks and
both platforms' actual admission decisions and negative controls.

Production code is unchanged. Prior full-suite and device receipts remain
bound to 818e33b1; only the affected game-free tests were rerun.

Assisted-by: GPT-6 Astra
Co-Authored-By: GPT-6 Astra <[email protected]>
Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

test(vk): follow main's LoadLibraryA and float-add choice in the admission fixture ... 1ac24df96f

The fixture cuts LoadLibraryA and create_device out of main's source. Since
#34, LoadLibraryA keeps dlerror()'s text in load_error, and since #191
native_fadd_wanted also takes the device ID and driver version, so the cut
code no longer compiled against the fixture's stand-ins on this base. Give
it load_error and a dlerror stand-in, and the four-argument stand-in. No
expectation changed.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

test(vk): pin the admission ABI at main's version 22 and macOS 23 ... 0f2262a378

Main's custom output size (#51) took MKWVK_API_VERSION 22 on every
platform and appended take_text at offset 352. The macOS loader
callbacks now follow it: the rebased header says 23 on Apple and 22
elsewhere. The fixed contract follows: non-Apple version 22, size 360
and 45 named offsets (take_text added); Apple version 23, size 376,
vulkan_library and vulkan_extensions at 360 and 368.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

test(runtime): follow main's HLE call counts in the Darwin guest-memory fixture ... cd383fcbbf

Main's HOS_HLE_STATS (#153) made HLE() a counting wrapper: a static
HleCount named by its first field, hos_hle_stats and hos_hle_counted. The
fixture's cut of hos_mem.c now gets those two (off: each body runs
directly) and main's -Wno-missing-field-initializers, as main's other
C fixtures pass. The guest-memory checks are unchanged.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

Merge mac/fault-contexts (#436) into mac/guest-16k ... fe9299ffe7

This PR needs the macOS fault-context PR (#436); its commits are kept as they are.
The one conflict, host/posix/win32_posix.c's Apple include block, keeps both
darwin_mem.h (the guest-memory PR's) and darwin_fault.h (#436's).

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

fix(macos): serialize guest backing and native-page watch lifetimes ... d10a961bea

Keep address-region and page frees owned until discard or in-place zeroing
finishes. Route guest mutations from each image to one executable-owned
registry, and pin complete imported backing through duplicate and overlapping
GPU memory lifetimes without querying the renderer under ownership locks.

Use real Mach query ranges and protections, preserve byte-exact 4 KiB guest
ownership and 64 KiB commit semantics, and handle all native watch subpages
with checked fault recovery and conservative dirty coverage. Replace racy
bulk dirty-byte reads with same-granule atomics.

Add game-free native arm64/Rosetta fixtures for two-image dispatch, actual
faults, aliases, failures, and deterministic free/reallocate/import races.
Carry prior RSS evidence rather than repeat unchanged experiments.

Assisted-by: GPT-6 Astra
Co-Authored-By: GPT-6 Astra <[email protected]>
Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

fix(macos): retain pending watch faults across protection changes ... 1f69fa8366

Keep a cancelled-writable watch state so an already pending diagnostic fault
is acknowledged without rearming or changing permissions. Check the real
mapping before acknowledgement; intentional read-only/no-access stays closed.

Freeze affected watch pages once, preflight the complete native range against
Mach maximum permissions, and issue one protection operation. Preserve prior
watch states when either preflight or the native operation fails.

Exercise the real Win32 vectored dispatcher, signal-handler retention and the
next genuine watch fault. Cover permission failures both before preflight and
after a deterministic barrier, with real Mach maximum-protection changes and
no manufactured VM results, on native arm64 and Rosetta.

Assisted-by: GPT-6 Astra
Co-Authored-By: GPT-6 Astra <[email protected]>
Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

fix(macos): make the guest-memory changes Apple-only; Windows and Linux keep main's code ... d092e30e2b

The two commits before this one also changed Windows and Linux: the
dirty-page scan read its marks with byte atomics, the renderer's zeroed
guest memory was marked written, an empty range consumed no mark,
allocation failures in the scan and in the address-region bookkeeping
were fatal, hos_region_alloc refused a bad size or alignment,
hos_mark_written clamped its length, and VirtualQuery checked its
pointer and set last_error. Nobody has timed the scan there, so each of
these is now inside #if defined(__APPLE__), with main's code in the
#else. unifdef -U__APPLE__ of every host/ file this branch changes
equals main's byte for byte, and so do their preprocessed Linux and
Windows token streams. Issue #432 is the version for every platform.

test_collect_wide's fixture compiles the scan the platform builds: byte
atomics, and an empty range consuming nothing, on macOS; main's word
loads elsewhere.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

docs(macos): describe the guest window's one owner, import pins and native-page watches ... afa7490c0f

The guest-memory section still described the groundwork alone: it said
the write watch and VirtualQuery were separate work and that the
region allocator's unlock-before-discard race remained. Describe the
executable's single owner and how each image reaches it, frees that
keep their range until the bytes are gone, import pins, the real
VirtualQuery and VirtualProtect, the native-page watch and the atomic
dirty scan, that all of it is macOS only (issue #432), and the test's
two narrower modes.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

Merge mac/vk-admission (#438) into mac/renderer-correctness ... 4975b01a13

Carries the vk-admission pull request's commits, which this one needs
(MkwVkHost's Apple callbacks, darwin_vulkan.h), on top of guest-16k.
host/posix/win32_posix.c: its Apple include block keeps darwin_mem.h,
darwin_fault.h and darwin_vulkan.h.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

fix(macos): pin renderer imports through final resource ownership ... 7d168a5e06

Append Apple23 full-backing import lifetime callbacks while preserving the
non-Apple21 layout. Keep buffer views move-only, release buffers before the
last memory owner unpins backing, and preserve completion-gated retirement.
Unpublished failures unwind; published roots retain process lifetime rather
than calling Vulkan from unsafe static teardown.

Check and unwind post-device startup allocations. Resolve the shared audio
shim through the executable-owned SDL service on Darwin without unresolved
weak imports or linker relaxation. Retain the existing loader/SDL behavior.

Add game-free owner, ABI, source-topology and strict-link consumers, including
both native arm64 and x86_64 routes. This slice does not claim to fix separate
host-import alias visibility or implement the final alias admission planner.

Assisted-by: GPT-6 Astra
Co-Authored-By: GPT-6 Astra <[email protected]>
Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

test(macos): cut the non-Apple Pool and import route in three more fixtures ... 1e5388270c

044635ea gave vk_memory.cpp's Pool an Apple-only DarwinImportView member and
import_pool an Apple route (darwin_import_pool) right after its guards. It
moved test_import_buffer_binding and test_texel_buffer_ownership onto the
Windows/Linux layout (#if defined(__APPLE__) -> #if 0: the Apple owner has
its own darwin_import_lifetime_test), but three more fixtures cut the same
code and stopped compiling on macOS. Each passes at 58c5c5aa (044635ea's
parent) and fails at 044635ea:

- test_direct_buffer_writes and test_parallel_rb_refresh: their cut of
  struct Pool named DarwinImportView. They now cut Pool's Windows/Linux
  layout, the same one they compiled before.
- nx2/test_import_windows: its cut of import_pool's guards, which ends at
  the import, took in the unterminated Apple #if. It now ends at the Apple
  route, which must stay one #if just before the import; the fixture's own
  continuation models the Windows/Linux import as before.

No assertion, case or check is removed or loosened. test_parallel_rb_refresh
and test_import_windows also need the renderer-core extractions (next).

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

fix(vk): drain the recorder before startup rollback destroys the allocator ... 3bdfb9296b

044635ea added vma_startup_rollback (vk_vma.cpp, run after a failed
replay_start), which calls vmaDestroyAllocator. vk_vma.cpp includes
vk_work.h last so that RX_VK_RECORDER=defer/thread drains before its
destructions, and every such boundary call in a vk_work.h file must be in
RX_REC_BOUNDARIES with a drain-first macro. This one was not, and
test_recorder_sync caught it ("vk_vma.cpp calls ['vmaDestroyAllocator'],
which vk_work.h does not drain before"): it passes at 58c5c5aa (044635ea's
parent) and fails at 044635ea.

Add it to the list and to vk_work.h, next to vmaDestroyBuffer and
vmaDestroyImage. With the recorder off (the default) boundary() is a
relaxed load and a branch. Rollback runs before any image or buffer exists,
so nothing should be held there today, but the allocator is no longer
destroyed while a recorder could still hold packets. The test is unchanged
(sources: 42 boundaries drained, was 41).

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

test(macos): follow main's #324 and #250 in the Darwin renderer fixture ... 2764a8a6c6

tests/test_darwin_renderer.py cuts vk_memory.cpp's code into
darwin_import_lifetime_test.cpp. Two of main's changes since this
branch's first base broke that cut on the rebase, before any check ran:

- #324 reworded the comment after imports_give_back's drain of the
  evicted pools ("(longshot) Off by default on Windows ..." is now
  "(longshot) Default by OS and vendor ..."). The cut ends at that
  comment, so it now looks for the new words. The cut code is the same
  drain loop as before.
- #250 (sparse mirrors) made retire_pool erase a retired pool from
  sparse_wanted. The fixture's stand-ins gain an empty sparse_wanted,
  beside mirror_wanted, as main declares it (std::vector<Pool*>).

No assertion, case or expected output changes.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

test(vk): follow the moved Pool in test_mirror_gpu_only's cut ... f78ae3edcb

107fda29 moves the new pool into the import table
(imported.emplace(p.lo, std::move(p))) instead of copying it.
tests/test_mirror_gpu_only.py ends its cut of pool_lookup's merge at
"imported.emplace(p.lo, p)", so it stopped with "substring not found"
(full-suite receipt full-91f9a58d: the only check that passes on main
and fails here). It now ends at the moved form. The check is the same:
the merged pool must take in the gpu_only and gpu_written marks of the
pools it absorbs before it goes into the table.

On the macOS integration branch this was hidden: renderer-core's
53b8914d rewrote the same line for its imported_add. When that pull
request rebases onto this one, its line replaces this one.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

fix(macos): the import pin callbacks are macOS host API version 24 ... 0f54963d80

Main's custom output size (#51) took MKWVK_API_VERSION 22 everywhere, so
the macOS loader callbacks (#438) became version 23 after take_text, and
this branch's guest_import_pin and guest_import_unpin, appended after
them, become version 24. The Apple table is now 392 bytes with the four
callbacks at 360, 368, 376 and 384; the admission contract and the
renderer startup fixture pin exactly that. Windows and Linux stay at 22.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

feat(vk): plan where an oversize guest span is cut into import segments ... 411e2885ca

A connected guest span that the views of one operation need can be larger than
one device allocation (41,747,087,360 bytes on MoltenVK 1.4.2, M4 Max). It is
then imported as disjoint, adjacent segments of at most the cap.
gpu/vk/span_segments.h (rules only, no Vulkan) chooses the cuts: multiples of
the import granularity, the fewest segments, the least cost of the views a cut
splits (gathers by their bytes, then uniform, texel and storage buffers), a
cost for moving a previous cut, and the lowest addresses on ties. It maps any
guest range onto the segments, and splits a texel view at cuts and at
maxTexelBufferElements, reporting 12-byte seams. Invalid input gets an
explicit refusal. Nothing uses it yet: vk_memory.cpp takes it later.

tests/test_span_segments.py checks it against brute force at caps of 48 KiB,
64 KiB, 96 KiB and 1 MiB with 16 KiB granularity, plus the 48 GiB example, the
512 GiB guest window and the top of the u64 range (--arch arm64 / x86_64 on
macOS).

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>
(cherry picked from commit 11e53b66ffbdddd0cfeaa7a043361a337299d855)

feat(vk): let the segment planner add segments that pay for themselves ... 6fd02124bc

With the fewest segments, a large gathered view can be cut on every draw
although one more segment would keep it whole: a 32 GiB index extent at
[8, 40) GiB in a 48 GiB domain at the 41,747,087,360-byte cap is split by
every two-segment cut list. plan() now weighs any number of segments, each
one beyond the fewest at Weights::segment (2^32 bytes-equivalent, above a
move), and returns the least cost, then the fewest segments, then the lowest
cuts. Every cut of that plan is a mark (the first multiple of g at or above a
demand's end, or a previous cut) or ceil(next cut - cap), so the search runs
over those candidates and is exact over [k_min, k_min + min(marks,
C0 / segment)]; a least plan over 4096 segments is refused. Plan::extra
reports the added segments.

The test brute-forces the same range of segment counts, checks a DP over
every count, and adds the 32 GiB extent (three segments, nothing gathered).

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>
(cherry picked from commit 189d0636cb5e90e0d98de397d0b9676a5f8354c2)

fix(macos): vk_memory.cpp compiles on macOS: #324's evicted_pools declaration is not Apple's ... 7bf1589934

Main's #324 (a4c77174) declares `extern std::deque<…> evicted_pools;` above
memory_guest_imported, which reads it on Windows and Linux. This branch
defines evicted_pools on macOS as a process-owned reference
(`auto& evicted_pools = *new std::deque<…>;`), so after the rebase onto
6c9edffe vk_memory.cpp did not compile for macOS ("redefinition of
'evicted_pools' with a different type"). The game-free fixtures cut the
functions out and never compile the whole file, so they did not see it.

The declaration is now for Windows and Linux only: on macOS
memory_guest_imported answers through darwin_guest_imported, which comes after
the definition. Windows and Linux compile the same text as before.

First made on mac/renderer-core, where this branch is merged.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>
(cherry picked from commit 444e05c119a261b36c7c762abf9d26194b0ee417)

Merge mac/renderer-correctness (#491) into mac/renderer-core c70e444462

Merge fix/import-lookback (#431) into mac/renderer-core ... 7628abcc5d

# Conflicts:
#	gpu/vk/vk_memory.cpp
#	tests/test_mirror_gpu_only.py
#	tests/test_parallel_rb_refresh.py

fix(vk): join #431's import table helpers with #491's macOS Pool ... 0030e14a5e

#431 (fix/import-lookback) makes imported_add and imported_take the import
table's only ways in and out. #491 (mac/renderer-correctness) gives the
macOS Pool an import view (DarwinImportView) that owns the imported memory
and cannot be copied, defines the table on macOS as a process-owned map,
and releases imports through destroy_import. Merged, they do not build or
test on macOS:

- imported_add took a const Pool& and copied it. It now takes Pool&& and
  moves it into the table (the macOS stack's form, 53b8914d). Its callers
  already move (the merge kept #491's moves); the fixtures that call it with
  a local pool move it, or a copy where they read the pool afterwards
  (nx2/test_import_windows.py). Windows and Linux insert the same Pool at
  the same key: a move in place of a copy.
- test_import_reach.py cut the Pool and the scans with their Apple guards,
  so on macOS the fixture met DarwinImportView. It now resolves the Apple
  guards to the other side (test_vk_darwin_admission.py's select, as
  test_darwin_renderer.py does; the macOS route is that test's), cuts
  destroy_import where the source has it, and its source check does not
  count macOS's definition of the table as a change to it.
- test_darwin_renderer.py's Darwin fixture cuts live_reach, imported_add and
  imported_take (darwin_import_lifetime_test.cpp includes import_reach.h),
  and its queue-slot order check finds imported_take where the source has it.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

fix(macos): import NOACCESS guest pages and name a missing audio service ... 5717d3974c

RendererSliceReview findings on 044635ea, forwarded by the parent.

darwin_import_commit refused a whole import when any page in its range was
committed but NOACCESS. Darwin's VirtualQuery reports the demand-paged guest
window committed with each page's own protection, so an explicit NOACCESS or
a diagnostic watch page dropped every binding in that range to zeros, where
the pre-pin path tried the import and let the driver's VkResult decide. The
CPU protection of a committed page is CPU-side state: such pages are now left
exactly as they are and the import proceeds; only an unmapped page or a failed
query refuses. Whether MoltenVK/Metal imports a NOACCESS host range is left to
its own result; a GPU arm for the parent-released probe settles it.

waveOutOpen on macOS returned MMSYSERR_ERROR without a word when the
executable provides no hos_posix_audio_open. The lookup now names the missing
service once, on stderr; nothing else changes.

Tests: darwin_import_lifetime_test.cpp imports a range with a committed
NOACCESS page (no commit, no reprotection); test_darwin_audio_service.py
counts the line: once with the provider missing, never with it present. Both
fail on an archived 73f90266.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>
(cherry picked from commit 9e3832639a33e22dc8672e80a64354eb729c4c48)

feat(vk): admit an operation's guest buffers before it binds them (alias isolation, macOS) ... 6e765c8d5c

Two host imports of the same bytes read stale data within one submission on MoltenVK. Under alias
isolation (set in memory_init on Apple only) every operation's guest buffers are admitted before it
binds the first, and no import is replaced while recorded work may still reach it:

- Seam: memory_admit / replay_admit on the replay thread (replay_mu, no parallel worker): draw()
  (mesh records, then its buffers once the pipeline is known), dispatch() (the upscale stand-in, then
  its buffers), the replay's signal, buffer copy, fill and uniform update, the textures of every
  copy and clear, and copy_b2t's buffer side once its texture is resolved.
- Resolver: one side-effect-free description of what each binding path binds, from the binders' own
  helpers (uniform_bind_size, storage_binding, texel_buffer_extent, buffer_extent, the *_bytes
  helpers), including the GPU unswizzle's source (texture_unswizzle_source), the temporal
  upscaler's actor motion (temporal_actor_demands) and the diagnostic readers' copies
  (RX_VK_DRAW_STATS, RX_VK_DUMP). tests/test_resolver_coverage.py holds every gpu_buffer_bind /
  gpu_buffer call site of the renderer to its resolver demand and its seam.
- Covering reuse: a range a live import holds needs nothing; on Apple a range inside a live import's
  backing becomes a new view on that memory. Backing extents count for alias conflicts.
- Handoff: end the pass, flush the uniform updates before this place, device-to-host barrier,
  submit, wait, then import (old memories retired and kept to completion, page-table changes
  deferred), host-to-device barrier.
- Cohorts: different operations whose union passes the cap get one memory each, with a handoff.
- Under batch admission the dry pass's view-making marks are skipped (its command buffer is then
  recorded in order); RX_VK_POOL_END_IMPORTED is ignored under alias isolation (it imported to
  answer a resolver's question).

Off alias isolation (Windows, Linux) nothing of this runs and every binding path is unchanged.

Tests: test_alias_admission, test_admission_handoff, test_resolver_coverage (new); the Apple
spare-backing reuse and backing-overlap cases in darwin_import_lifetime_test; extractions of
test_import_chunk_default, test_fallback_depth_hold, test_vulkan_copy_span(_gpu_compile),
test_draw_side_effects and test_vk_occlusion_queries follow the moved code, every assertion kept
(the last two also check the admission seam). test_import_reach.py's main() call is restored: the
53b8914d copy ran nothing.

Published on main 6c9edffe with #491 and #431 below it (mac/renderer-core):
- actor_reads binds main's index bytes (count << itype) for every index
  type, as main's actor_motion does. The macOS stack's copy bound nothing
  for an index type outside 0..2, which would change Windows and Linux too;
  such a draw does not reach actor_motion (bones_used refuses it when the
  draw is noted) unless its model key matches a draw of another index type,
  so that guard is left out of this macOS PR.
- vk_temporal.cpp: #59 (actor motion pairs copies by place) copies a pose
  read at its draw from the stage; the copy from the game's memory, its
  else branch, binds through actor_reads.
- vk_memory.cpp imports_give_back keeps #324's retire grace beside alias_ref.
- test_import_reach.py keeps #431's source check and prefetch case and takes
  the admission excerpts and --arch. Its main() call needed no restoring:
  #431's copy has it.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>
(cherry picked from commit ae1d7812c12f3e64941da0c34bb3541eb695f6db)

feat(vk): import a span past one device allocation as segments (SegMem, alias isolation) ... e125114077

A connected guest span one operation needs that is larger than max_import_size (41,747,087,360 bytes
on MoltenVK 1.4.2, M4 Max) was left unplanned (admit_over_cap): its bindings came back empty. It is
now a segmented domain (reports/2026-11-14-full-range-design.md 2.1, 2.3, 5.3-5.5), in place of
that branch:

- memory_admit plans it as disjoint, adjacent segments where span_segments::plan cuts them (the
  operation's views and classes as demands, the domain's previous cuts kept unless moving one pays,
  priced extra segments), each an ordinary Pool of at most the cap: one import, its own page-table
  entries, mirror, write-backs and retirement. Only segments holding a demand are imported; every
  live import over their bytes is retired, after a handoff when recorded work may reach it.
- A view across a cut is never one memory: pool_lookup refuses it (counted, logged), not owed to an
  admission. gpu_span_bind (vk_internal.h SpanRef) gives its pieces, one per segment, for the
  consumers' failure branches; gpu_span_pieces and gpu_span_layout describe them binding nothing.
- Domains change only at an admission, never while parallel workers run (debug-checked with the
  design's invariants, seg_invariants); a batch past the cap is admitted as segments instead of
  being recorded in order. memory_admit loses its batch flag and AdmissionStats its splits.
- span_unused_piece: the hook the NullDesc design fills (MoltenVK has no nullDescriptor: an unused
  piece slot of a storage table cannot be null).
- import_planned retires a taken-in import only while it is still over the plan's bytes (two
  segment plans of one admission may name the same old import).

Off alias isolation nothing of this runs.

Tests: test_segmented_domains (the 48 GiB A/B case at the real cap, the priced extra segment,
injected small caps, growth with the cuts kept, a moved cut after a handoff, frozen under workers,
a refused domain reported, nothing off alias isolation; fails on the planner commit and on the
archived base); test_resolver_coverage lists gpu_span_bind's bindings and holds future callers to
a failure branch.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>
(cherry picked from commit 9fb9b3b4a60af49e54031d9c7707cdaf71fa5117)

test(vk): follow the renderer-core merge's moved code in three extractions ... 05b032fb59

The renderer-core merge (f216d287) moved code three fixtures cut out of the
sources. ae1d7812 updated the extractions it listed; these three it missed
(its named set held no nx2/ tests, and the other two already failed on its
base for the reason the previous commit fixes). The code moved; what it does
did not change, so each fixture follows it and keeps every assertion and case:

- nx2/test_cbuf_table_extent: ae1d7812 moved uniform_range's `used` lines,
  unchanged, into uniform_used(), which the resolver shares, and
  uniform_range calls it. The test searched for those lines after
  uniform_range( (ValueError). It now cuts uniform_used's body, from the
  same `uint32_t used = index < Shader::Info::MAX_CBUFS` line, and
  uniform_range's own `used` up to the driver banks, and runs both as
  uniform_range does.
- tests/test_parallel_rb_refresh: ae1d7812 moved build_descriptors'
  bare-entry guess and binding range into storage_binding() (b.addr, b.size,
  b.bare, ...). The fixture now cuts storage_binding's guess and range and
  build_descriptors' binding from them, through memory_note_gpu_write, the
  lines it cut before. 53b8914d made memory_note_gpu_write's scan stop by
  import_reach.h's live_reach, so the fixture includes the header, cuts
  live_reach and imported_add, and adds its pool through imported_add.
- nx2/test_import_windows: pool_lookup and the code above it now read
  53b8914d's import_reach (live_reach, imported_add, imported_take) and
  ae1d7812's admission state and alias isolation globals. The fixture cuts
  them (DemandClass and AdmissionStats from vk_internal.h), with isolation
  off as on Windows and Linux and alias_conflict false (as
  tests/import_reach_test.cpp does). Its retire_pool spy and its two seeded
  imports use imported_take/imported_add, the table's only ways in and out.

The three print what they printed at 58c5c5aa.

Published on main 6c9edffe (mac/renderer-core): #431 below this branch
already cuts live_reach, imported_add and imported_take into
nx2/test_import_windows and test_parallel_rb_refresh (its rb_table.inc), so
those two keep #431's cuts and add only what follows ae1d7812: the alias
isolation globals, DemandClass and AdmissionStats, and alias_conflict's
stub; storage_binding's cut.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>
(cherry picked from commit 64a84e4dbc10017f44cd16fc0fbd7440135ee498)

fix(vk, macos): admit a parallel batch's uniform updates in order, and keep its own updates out of its handoff ... a575aba447

Two findings from the renderer-core review (reports/2026-11-14-renderer-core-review.md), both in vk_replay.cpp's
parallel-batch admission. Neither path is reachable off Apple: admit_fallback and batch_admit are set only where
memory_admission_on() is true.

P2.5: a parallel replay's batch its dry pass could not know is recorded on the replay thread in order (Mode::Worker,
admit_fallback), each operation admitted as the serial replay admits it, except NOP_UPDATE_UB, whose worker branch broke out
before op_admit. Its destination is bound at the recording's end (flush_ub_updates -> gpu_write); one that needed a growth over
reached memory was refused by the guard and written on the CPU out of GPU order. The worker branch now admits it under
admit_fallback, before the update counts as passed, so a handoff there writes only the updates before it.

P3.1: a batch admitted at once whose admission hands off called admission_handoff() with rmode Serial, which wrote every listed
uniform update into the recording that ends, including the ones the batch's own dry pass had listed (from ub0). admission_handoff
takes the end of the updates to write (ub_end, default all: unchanged for every other caller), and the batch passes ub0.

Tests: tests/test_batch_admission.py (new) runs the NOP_UPDATE_UB case, op_admit, replay_admit, admission_handoff and the batch's
handoff statement cut out of the source; on bacb7c59 both of its cases fail for those reasons. tests/test_admission_handoff.py
cuts admission_handoff out by its name only (its signature gained the parameter).

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>
(cherry picked from commit 39542f89f4443e14b70fb1e46bdaa3e0e330f2ea)

fix(vk, macos): keep every byte the page table reached mapped when an admission retires imports ... 64fb40e1ba

Findings P1 and P2.2 of the renderer-core review (reports/2026-11-14-renderer-core-review.md). Both are in vk_memory.cpp's
admission planner, which runs only under alias isolation (memory_admit returns at once elsewhere: macOS only).

P1, the page-table holes. A plan retires every live import it overlaps (retire_pool zeroes the import's whole range), but two plans
did not cover what they retired:
- the cohort (plan_cohort) retired the imports it overlaps and does not need without growing over them;
- a segment (seg_plan) retired an import that reaches into a segment no demand needs.
Shaders that follow the guest page table then miss on those bytes. The fix, by the rule that no byte reachable before an admission
is left without memory after it (design 5.5):
- admit_rest: the bytes of each retired import that no plan holds are planned with the first plan that retires it, imported
  exactly, before that plan's import (one that fails leaves everything as it was, as mirrors_trim does), and published after it;
  they keep the import's marks (gpu_only, gpu_written, trims, last_value) and count in the handoff's conflict test;
- seg_plan: a segment that replaces live imports makes every segment over those imports needed, to a fixpoint;
- the SegMem span takes in every live import over it, so a segment retires only imports its domain holds whole;
- the cohort's threshold is the device's import cap (max_import_size) under the admission, not kMergeMax: a merge up to the cap is
  one import (pool_lookup keeps kMergeMax: plan_import's merge_max defaults to it);
- admit_apply: a plan that is not made keeps the imports it would retire, and no later plan of the admission retires them.

P2.2, covered demands across a domain's boundary or cut. A range a live import already holds was left out of the domain: across the
domain's edge, the segment's plan retired its import and the guard then refused its binding; across a cut, one live import bound
it whole while gpu_span_pieces reported its pieces. The span's live-import take-in covers the first. For the second, a covered
range that straddles a cut seeds its domain's span (its segments are planned, the crossing import retired with the handoff the
conflict test asks for).

Tests: tests/test_admission_coverage.py with tests/admission_coverage_test.cpp (new; the admission cut out of the source, recorded
imports and page table, injected caps), cases merge-table, cohort-table, segment-table, domain-edge, covered-straddle. Each fails on
bacb7c59 for the reviewed reason (reports/CoreFix-files/repro-base-bacb7c59) and passes here on arm64 and x86_64.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>
(cherry picked from commit f29396c79600467b11fbb935a529a4c2511cf533)

fix(vk, macos): one view per byte of an Apple spare backing, and no endless retry of a failed view ... cd889d2136

Findings P2.1 and P3.3 of the renderer-core review (reports/2026-11-14-renderer-core-review.md). The code is Apple-only
(#if defined(__APPLE__) in vk_memory.cpp's admission planner).

P2.1: covering_backing returns the owner's backing for a demand across the end of the owner's view, and the view plan was
[max(want_lo, b->lo), min(want_hi, b->hi)): (a) at the owner's own key, imported_add kept the owner, the new view was destroyed,
memory_admit returned Ready and the guard refused the binding at every admission; (b) at another key, the view overlapped the
owner (eviction of either zeroed page-table entries the other served; seg_invariants broke inside a domain). A failed
darwin_import_view looped the same way. Now:
- view_plan grows the view over every live view on the same backing it overlaps; those are retired when it is made (the same
  memory: alias_conflict excludes it, no handoff; retired views are kept until their work is done) and their gpu_only and
  gpu_written marks carried. A live import of another memory over it means no view: the range is planned as pool_lookup imports it.
- admit_apply makes the view first, then retires what it takes in, then inserts it, and checks the insertion.
- A view that fails is logged, its backing is remembered (weak_ptr) as one that takes no view, and its range is imported on its own
  (the binding, or the guard's debt and the next admission's handoff), never as a view on it again.
P3.3: admit_st.reused counts only a view that went into the table.

Tests: tests/darwin_import_lifetime_test.cpp (the real Apple import code, test_darwin_renderer.py, both arches) gains spare-cross
(a range across a one-chunk owner's end), spare-reuse-count, spare-overlap (a two-chunk owner) and spare-view-failure (the driver
refuses a second buffer on a memory). Each fails on bacb7c59 for the reviewed reason (reports/CoreFix-files/repro-base-bacb7c59)
and passes here; the fixture takes --case NAME to run one alone (the driver's --process-exit is unchanged).

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>
(cherry picked from commit 0c1d2aea03e17a3a10b0c1aa6ef69461d8d405d9)

fix(vk, macos): bg_drain publishes no background import over this epoch's retired memory or across a domain ... 04e170465f

Finding P2.4 of the renderer-core review (reports/2026-11-14-renderer-core-review.md). Under alias isolation (macOS) bg_drain
dropped a background import only when it overlapped a live import or one sat at its start; it never asked alias_conflict, so an
import over bytes a memory retired, evicted or queued dead in the current handoff epoch still held (alias_ref) was published:
two memories over the same bytes in one epoch, the stale read alias isolation prevents. It could also publish a chunk across a
segmented domain's cut. Reachable only with the opt-in background imports (RX_VK_PREFETCH_CHUNKS, RX_VK_ASYNC_IMPORT,
RX_VK_BG_IMPORT).

Under alias isolation bg_drain now also drops (counted in st_prefetch_dropped) an import when alias_conflict holds over its
memory's bytes (on Apple its whole backing), or when it is over a segmented domain (seg_overlaps). The new branch runs only when
alias_isolation is set: off Apple the condition is unchanged. alias_conflict's and seg_overlaps' declarations move up beside the
alias isolation globals, and seg_overlaps' definition into SegMem's state block (above pool_lookup), so bg_drain (and every
fixture that cuts it out with them) sees both.

Tests: tests/admission_coverage_test.cpp gains bg-epoch (an import given back after work reached it, a background import of its
bytes), bg-domain (a background chunk across a cut after the segments were given back) and bg-elsewhere (off alias isolation,
published as before); tests/darwin_import_lifetime_test.cpp gains apple-bg-epoch (Apple's alias_conflict, real import code). The
first two and apple-bg-epoch fail on bacb7c59 for the reviewed reason (reports/CoreFix-files/repro-base-bacb7c59); all pass here
on arm64 and x86_64.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>
(cherry picked from commit 755ac7e8757fdd30d4809ae1142e51232fae2a9e)

fix(vk, macos): admission merges no import past 1 GiB again, so mirror_make can still mirror it ... 74ee40cbf1

Finding N1 of the core-fix review (reports/2026-11-14-core-fix-review.md). f29396c7 let the admission merge imports up to the
device's import cap (plan_import(..., max_import_size), and the plans' merge at max_import_size). mirror_make refuses a VRAM mirror
for any pool over 1 GiB, and mirrors are on by default for a discrete, non-GCN GPU (an Intel Mac with an RDNA Radeon, which alias
isolation also covers) and with RX_VK_MIRROR=1: such a merged pool lost its mirror, every binding in it reading host memory.

The cap was never needed for correctness once admit_rest keeps a cohort's leftover bytes mapped, so the admission's threshold is
kMergeMax again (cohort plus leftovers past it). plan_import loses the merge_max parameter that only the admission used; it, its
comment and pool_lookup's calls are as on bacb7c59. No correctness reason to keep the cap was found: a cohort and its leftovers
import the same bytes a merge would, each piece no larger than the import it came from.

Off Apple: unchanged (admit_plan runs only under alias isolation; plan_import is textually bacb7c59's again).

Tests: tests/admission_coverage_test.cpp gains merge-mirror (the seam of two live 768 MiB imports at the real cap: no import the
admission makes is larger than mirror_make's limit, which the driver reads from mirror_make itself, and every byte stays mapped).
It fails on 755ac7e8 for that reason (reports/CoreFix-files/repro2-base-755ac7e8) and passes here on arm64 and x86_64;
merge-table (the same seam: every byte mapped, one handoff) passes on both.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>
(cherry picked from commit 9ccc7c19864991be11d4437211eecf3e430b2a7d)

fix(vk, macos): a segment keeps a crossing import's bytes as leftovers clipped at the cuts, not as whole segments ... 7a51f4a59c

Finding N2 of the core-fix review (reports/2026-11-14-core-fix-review.md). f29396c7's closure in seg_plan marked every segment over
an import a needed segment retires as needed, and each such segment was then imported whole (up to the device's cap, 41.7 GB of
guest address space on an M4 Max) only to keep that import's few bytes in it mapped; and when such a forced segment's import failed
after the needed one's, the crossing import was already retired.

The closure is gone: seg_plan plans only the segments the operation's ranges need. The retired imports' bytes in segments no range
needs are leftovers, as a cohort's are: admit_rest now takes segment plans too and cuts every piece that lies in a domain planned in
this admission at that domain's cuts, so each piece lies in one segment, crosses no cut and overlaps nothing (invariant 1 holds),
and costs no more than the import it came from. They are made before the segment's own import and published after it retires the
import (admit_apply, unchanged), so a failure leaves everything as it was.

Off Apple: unreachable (seg_plan and admit_rest run only from the admission, under alias isolation).

Tests: tests/admission_coverage_test.cpp gains segment-rest (a chunk across the cut into a 100 MiB segment nobody needs, retired by
the segment the operation needs: its 4 MiB there stay one import clipped at the cut, nothing else of that segment is imported, every
byte stays mapped, no import crosses a cut). It fails on 755ac7e8 for that reason (reports/CoreFix-files/repro2-base-755ac7e8) and
passes here on arm64 and x86_64; segment-table, domain-edge and covered-straddle (the other segment cases) pass on both.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>
(cherry picked from commit 596f0ff4063da99505e7d5df789580fb4cde89f7)

fix(vk, macos): each new import over a retired import's bytes inherits its share of that import's VRAM mirror ... 53a6829900

Open item 1 of the core-fix review (reports/2026-11-14-core-fix-review.md), more reachable after N1 (9ccc7c19): with mirrors on
(a discrete, non-GCN GPU such as an Intel Mac's RDNA Radeon, or RX_VK_MIRROR=1), an import an admission retires whose bytes go to
several new imports (a cohort and that import's leftovers, or two segments over an import across their cut) handed what the GPU
wrote into its mirror and nowhere else to the first of them whose mirror was made only: mirror_make ends a retired pool's wait unless
it is trimmed, so the others' mirrors were filled from guest memory without it.

admit_apply now does what mirrors_trim does for a trim's parts:
- it counts, per import the plans retire, the new pools its bytes go to (the plans over it and its leftovers);
- a retired import with more than one, whose mirror was on (inherit_pending, set by retire_pool), is marked trimmed and counted in
  trims_waiting once the plan that retires it is made, so each new pool takes its share when its mirror is made, and trims_settle
  lets it go once every live pool over its range has its own (or after kIdleEpochs, as before);
- a leftover of an import whose mirror was on wants a mirror at once (MIRROR_WANTED, in mirror_wanted), as a trim's parts do.
trims_waiting is declared ahead of the admission region (its definition, with mirrors_trim, is unchanged).

Mirrors off (Apple Silicon's default): no pool is ever MIRROR_ON, so retire_pool sets no inherit_pending, nothing is marked and no
mirror is wanted: unchanged (the counting runs, without effect). Off Apple: unreachable (admit_apply runs only under alias isolation).

Tests: tests/admission_coverage_test.cpp gains mirror-cohort (the seam's cohort retires a mirrored import: the cohort and the leftover
both inherit, the leftover wants a mirror, trims_settle, cut out of the source, lets the old one go) and mirror-segments (two needed
segments over a mirrored import across their cut); mirror_made models mirror_make's inheritance, whose two tests the driver checks
are in mirror_make verbatim. Both fail on 596f0ff4 for the reviewed reason (reports/CoreFix-files/repro3-base-596f0ff4) and pass here
on arm64 and x86_64; mirror-off (mirrors off: nothing marked, nothing wanted) passes on both. alias_admission_test.cpp,
segmented_domains_test.cpp and darwin_import_lifetime_test.cpp get a trims_waiting stub only (no assertion changed).

Published on main 6c9edffe (mac/renderer-core): darwin_import_lifetime_test's
trims_waiting stub sits beside #491's sparse_wanted stub (main's #250).

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>
(cherry picked from commit 6aa7c2af0fb4e9d0dc57d6eeb8018aaac07ed234)

test(vk): the admission fixtures follow main's #250 sparse mirrors ... e9098f0c81

Main's #250 (sparse mirrors) makes retire_pool drop a retired pool from
sparse_wanted, the pools a binding found a sparse block with no memory in.
test_alias_admission, test_segmented_domains and test_admission_coverage cut
retire_pool out of vk_memory.cpp with the admission, so their fixtures did
not compile on main 6c9edffe ("use of undeclared identifier
'sparse_wanted'"). Each gets the stub darwin_import_lifetime_test already has
(#491). No assertion changes.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

fix(vk, macos): the actor motion's resolver follows #59: a pose read at its draw is not copied ... 508fcb4192

Main's #59 (actor motion pairs a model's copies by place) takes a skinned
draw's pose as the draw read it (temporal_note_skinned_draw, ub_read), through
a host-visible stage, and copies the bones and origin from the game's memory
only for a draw whose pose was not read, or with no stage. actor_reads and
temporal_actor_demands (alias isolation's resolver for the upscaler's actor
motion) still demanded the bones and origin of every skinned draw: a
superset, so admissions on macOS could import or hand off for bytes nothing
binds.

pose_read_at_draw(s, k, staged) is now the one test, actor_motion's (with its
stage) and the resolver's (with the stage actor_motion takes next): the
resolver demands a draw's bones and origin only where actor_motion copies
them, and its vertices and indices always. With no stage made yet the
resolver demands the bones and origin too, since actor_motion's making of the
stage may fail. test_resolver_coverage holds both to that test.

Off alias isolation (Windows, Linux) the resolver does not run, and
actor_motion's test is the same expression as before.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

test(vk): test_split_ub_flush follows flush_ub_updates' end parameter ... 11d09b9abb

Main's #189 check reads flush_ub_updates by its signature. The admission (6e765c8d) gives it an end, the first update not
written, for a handoff in a dry-passed command buffer, defaulting to SIZE_MAX, so the check's anchor was not found and it
stopped with a ValueError. It now reads the new signature and still requires what it guarded: the writes start at
ub_first_of_recording and, with the default end every caller in maybe_split and finish_recording uses, reach the last
update (end = std::min(end, ub_updates.size())).

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

fix(macos): Rosetta host imports: whole hardware pages, refused imports asked again only when their backing changes ... 00d0305c3d

Under Rosetta 2 the process's page is 4 KiB (getpagesize, vm_page_size, MoltenVK's minImportedHostPointerAlignment)
but the GPU maps the hardware's 16 KiB pages (vm_kernel_page_size). darwin_mem_discard replaced freed guest memory in
4 KiB pieces, which left 16 KiB pages in two memory objects; IOGPU then refused every host-memory import over them
(memoryDescriptorWithClientBuffer failed, MoltenVK VK_ERROR_OUT_OF_DEVICE_MEMORY) and x86_64 run #29 skipped about
1,640 draws a frame (vk_draw.cpp:9540). Natively both pages are 16 KiB, so arm64 never met it.

- darwin_mem_discard replaces only the whole hardware pages inside a free (darwin_mem_hardware_page,
  darwin_mem_whole_pages) and zeroes the rest in place: the same bytes, no split page. Natively unchanged.
- The guest layer's native page is the hardware's (hos_posix_guest_reserve): guest protections, watches and pins
  round to 16 KiB under Rosetta as on arm64. RI-01 showed a 16 KiB page with one 4 KiB part read-only is refused too.
- memory_init aligns imports to the hardware page too (darwin_import::alignment): 16 KiB under Rosetta, as on arm64.
- macOS: a refused import is remembered with its VkResult and the call that refused it (ImportRefusals) and asked
  again only when the host's backing generation for its range changes (new host API, macOS version 24:
  guest_backing_generation, moved by a discard's remap or a protection change) or, for lack of memory, after an
  import was given back. No time-out, no cap; asks answered from memory are no longer counted or logged as
  imports (run #29: about 22 million). Held ranges are reported with the frame statistics, once each a frame.
- Windows and Linux keep ImportHolds' 2 s holds unchanged.

Tests: rosetta_import_geometry_test (the alignment and free arithmetic under a simulated 4 KiB process page),
ImportRefusals cases in import_hold_test, refusals_remembered and the Rosetta route in darwin_import_lifetime_test,
hardware_page_discard in darwin_guest_memory_test (real VM, arm64 and x86_64 under Rosetta), the API-24 layout in
test_vk_darwin_admission and darwin_renderer_startup_test.

Report: reports/2026-11-14-rosetta-import.md (macOS work area).

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>
(cherry picked from commit f9a2386715a69ae8e289900010627ebe8fc5c792)

fix(macos): the backing generation is Apple host API version 25, after #491's import pins at 24 ... b7b509f85c

The topic was written on a base whose Apple host API was 23 and gave its new callback, guest_backing_generation,
version 24. On this stack #491 already took 24 for the typed import pin/unpin callbacks (offsets 376/384, size 392),
so the generation is appended after them as version 25: offset 392, size 400.

- gpu/vk/vk_api.h: MKWVK_API_VERSION 25 on Apple, the callback's comment says version 25.
- tests/test_vk_darwin_admission.py: the Apple layout requires the generation at 392, size 400, version 25 (the pick
  kept this base's layout where it conflicted).
- tests/darwin_renderer_startup_test.cpp: version 25, size 400.
- docs/development.md: the Apple renderer ABI is 25; non-Apple stays 22.

The pick before this commit alone does not pass these two ABI checks (its version still says 24 with five callbacks);
a squash merge hides that. Windows and Linux are unchanged: their ABI is still version 22, size 360.

Assisted-by: Claude Opus 5.5
Co-Authored-By: Claude Opus 5.5 <[email protected]>

mooki referenced this pull request 2026-11-15 05:05:20 +00:00

WIP: fix(vk): the MoltenVK nesting bound counts only the reads SPIRV-Cross certainly makes #692

mooki referenced this pull request 2026-11-15 05:05:32 +00:00

WIP: fix(vk): MoltenVK's vertex stages run the guest's warp operations as one-lane warps #694

mooki referenced this pull request 2026-11-15 05:05:39 +00:00

WIP: feat(vk): RX_VK_SPV_PROFILE, what the big SPIR-V modules are made of #695

mooki referenced this pull request 2026-11-15 05:05:47 +00:00

WIP: perf(vk): search storage buffer tables in loops in every global memory fallback on MoltenVK and KosmicKrisp #696

mooki referenced this pull request 2026-11-15 05:05:54 +00:00

WIP: perf(vk): zero local memory at computed offsets by a loop on MoltenVK, not a written-out initializer #697

mooki referenced this pull request 2026-11-15 05:05:59 +00:00

WIP: fix(macos): keep storage image reads in program order on KosmicKrisp too #698

mooki referenced this pull request 2026-11-15 06:11:07 +00:00

Idea: a native macOS build (Apple silicon, x86-64 under Rosetta) with Vulkan on Metal through MoltenVK #420

mooki force-pushed mac/rosetta-import from b7b509f85c to a0027de2ac 2026-11-15 07:54:20 +00:00 Compare

mooki referenced this pull request 2026-11-15 11:55:57 +00:00

WIP: perf(macos): batch the mesh fallback's draws of a pass on MoltenVK #783

mooki referenced this pull request 2026-11-15 11:56:12 +00:00

WIP: fix(macos): Metal's shader cache folder asked at the host's start, before SDL's window #786

mooki added the

area/renderer

kind

bug

platform/macos

priority

high

labels 2026-11-15 13:58:10 +00:00

mooki force-pushed mac/rosetta-import from a0027de2ac to 6ec9629e59 2026-11-15 15:04:41 +00:00 Compare

mooki referenced this pull request 2026-11-15 17:39:50 +00:00

WIP: feat(vk): the SPIR-V back end on MoltenVK and guest spans past one device allocation #848

mooki commented 2026-11-15 18:08:05 +00:00

Author

Member

• Copy link
• Copy Markdown

Folded into #848 (feat(vk): the SPIR-V back end on MoltenVK and guest spans past one device allocation)

Folded into #848 (feat(vk): the SPIR-V back end on MoltenVK and guest spans past one device allocation)

mooki closed this pull request 2026-11-15 18:08:05 +00:00

Some checks failed

Hide checks

CI / Python source checks (ubuntu-24.04, part 1/2) (pull_request) Has been skipped

Details

CI / Python source checks (ubuntu-24.04, part 2/2) (pull_request) Has been skipped

Details

CI / SPIR-V fixtures (global narrow load/store, direct surface atomics, F2I immediate) (pull_request) Has been skipped

Details

Third-party parts / The same as upstream (pull_request) Has been skipped

Details

Website / Website on Cloudflare (pull_request) Has been skipped

Details

PR description / Description follows the template (pull_request_target) Successful in 6s

Details

CI / Conventional Commit title (pull_request) Successful in 4s

Details

CI / Workflow lint (actionlint) (pull_request) Successful in 5s

Details

Guide screenshots / Guide images and local UI source review (pull_request) Failing after 5s

Details

Third-party parts / As their notes say (pull_request) Successful in 9s

Details

Pull request closed

Please reopen this pull request to perform a merge.

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

area/accessibility

Barriers for people with disabilities

  

area/audio

Sound and music

  

area/input

Controllers, keyboard, mouse

  

area/install

Installing, updating, building from your game

  

area/menu

In-game menu and settings

  

area/renderer

Vulkan renderer, shaders, effects

  

area/saves

Save files

  

area/upscaling

DLSS, FSR, frame generation

  

beanstalk: approved @ 1697603

Set by Beanstalk for show; the farm's database is what counts

  

beanstalk: approved @ 2c5a62e

Set by Beanstalk for show; the farm's database is what counts

  

beanstalk: approved @ 4fd82b7

Set by Beanstalk for show; the farm's database is what counts

  

beanstalk: approved @ 64d6d09

Set by Beanstalk for show; the farm's database is what counts

  

beanstalk: approved @ 6f91fae

Set by Beanstalk for show; the farm's database is what counts

  

beanstalk: approved @ 70a78f9

Set by Beanstalk for show; the farm's database is what counts

  

beanstalk: approved @ 8d361dc

Set by Beanstalk for show; the farm's database is what counts

  

beanstalk: approved @ 9d8356e

Set by Beanstalk for show; the farm's database is what counts

  

beanstalk: approved @ abf2227

Set by Beanstalk for show; the farm's database is what counts

  

beanstalk: approved @ d82f202

Set by Beanstalk for show; the farm's database is what counts

  

beanstalk: approved @ e5f1e40

Set by Beanstalk for show; the farm's database is what counts

  

beanstalk: approved @ ee8ab5f

Set by Beanstalk for show; the farm's database is what counts

  

ci: approved

A maintainer approved CircleCI for this fork PR (sticky; removed after 14 quiet days)

  

good first issue

A good start for a new contributor

  

gpu/amd

AMD GPUs

  

gpu/igpu

Integrated GPUs

  

gpu/intel

Intel GPUs

  

gpu/nvidia

NVIDIA GPUs

  

help wanted

Extra hands or knowledge wanted

  

kind

bug

Something doesn't work as it should

  

kind

chore

Build, CI, dependencies, tidying

  

kind

docs

Documentation

  

kind

feature

A new feature or an improvement

  

kind

performance

Frame rate, frame time, loading, memory

  

kind

question

A question rather than a change

  

needs measurements

Waiting for before/after measurements

  

platform/linux

Affects Linux (a change for every system carries both Windows and Linux)

  

platform/macos

macOS (Apple silicon or Intel Macs)

  

platform/steam-deck

Steam Deck

  

platform/windows

Affects Windows (a change for every system carries both Windows and Linux)

  

preview

Maintainers: deploy a preview of this PR's website (read its changes first). Removed after the run.

  

priority

critical

Crashes, data loss, or blocks most players

  

priority

high

Important: next in line

  

priority

low

Nice to have

  

regression

Worked in an earlier build, broken in a newer one: highest priority, above other bugs

  

status

blocked

Waits on something else first

  

status

confirmed

Reproduced or agreed on

  

status

duplicate

Already reported or proposed

  

status

invalid

Not a problem in this project

  

status

needs-info

Waiting for more information from the reporter

  

status

wontfix

Will not be worked on

  

testing wanted

Wanted: a test on other hardware (posts a test request in #test-requests)

  

ci: approved

No labels

area/accessibility

area/audio

area/input

area/install

area/menu

area/renderer

area/saves

area/upscaling

beanstalk: approved @ 1697603

beanstalk: approved @ 2c5a62e

beanstalk: approved @ 4fd82b7

beanstalk: approved @ 64d6d09

beanstalk: approved @ 6f91fae

beanstalk: approved @ 70a78f9

beanstalk: approved @ 8d361dc

beanstalk: approved @ 9d8356e

beanstalk: approved @ abf2227

beanstalk: approved @ d82f202

beanstalk: approved @ e5f1e40

beanstalk: approved @ ee8ab5f

ci: approved

good first issue

gpu/amd

gpu/igpu

gpu/intel

gpu/nvidia

help wanted

kind

bug

kind

chore

kind

docs

kind

feature

kind

performance

kind

question

needs measurements

platform/linux

platform/macos

platform/steam-deck

platform/windows

preview

priority

critical

priority

high

priority

low

regression

status

blocked

status

confirmed

status

duplicate

status

invalid

status

needs-info

status

wontfix

testing wanted

ci: approved

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

MagicBeanDev/Longshot!686

No description provided.