mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-19 15:09:58 -04:00
Sync the device address table's shadows once per guest submission that binds the table, and take out the port of pull request #353.
The author of pull request #353 closed it on 2026-11-11 with the words that they give no permission to use its code. Its port (3134f524) goes: the mark of a pipeline that declares the table (VkPipeInfo.gpa, vk_pipeline.c pipe_add) and of the part that draws with it (vk_mem_gpa_use in vk_exec_draw.c bind_resources and mo_emit), the sync of the table's pools in every such part's prologue (vk_mem_gpa_sync), the submission with a callback in the replay's place as it stood (vk_sync_probe_submit), and --probe-vkmem's read through the table with its shader (test_gpa_read, runtime/shaders/gpa_read.spvasm).
In its place, after pull request #551, which was written without that code: a shadow pool goes into the table and onto a list of the table's shadows (vk_memory.c shadow_table_add); the record of a binding of the table notes the guest submission (vk_exec_draw.c ssbo_info, vk_mem_shadow_table_read); and vk_mem_shadow_sync brings the CPU's writes into every shadow on the list once for that guest submission, before the part is submitted. Once is enough, because the copy-ins read the guest submission's write-watch snapshots, which a second sync would find unchanged. Measured by #551's author on Linux (RTX 4090, Kokiri Forest): 113 and 76 frames over 25 ms in 75 s against 217 and 429 with the port, 43 against 41 fps, the picture complete in both.
What this line had built on the port stays, on the new sync: the test that passes over a pool with nothing written (shadow_pool_clean), the upload of the same pages into a table pool's VRAM mirror, the write-back of stores through the table (NX2NAVI_SHADOW_TABLE_STORES, table_wb_cb, now asked once per guest submission that binds the table) and the counts of NX2NAVI_SHADOW_CHECK. The probes that record their own commands (the lost-device probe, --probe-vkmem's table parts) call vk_sync_submit_own, written anew. vk_mem_shadow_storage stays: one line that returns the mode. Finalized pools in the table were already kept for vk_mem_shutdown here.
--probe-vkmem has a check of its own for the sync (test_table_sync): the shadow of a pool that is never bound keeps its old word through a CPU write and a guest submission that does not bind the table, and holds the new one after a guest submission that does. It passes with NX2NAVI_SHADOW=1 on Windows (RTX 5090), as do the store check with NX2NAVI_SHADOW_TABLE_STORES=1 and the probe without shadow storage; --probe-devlost ends as before. Not run: the game, with or without shadow storage, and anything on Linux.
Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
@@ -286,10 +286,11 @@ well: the shadow copies are chosen for the measured cost above, not for a missin
|
||||
|
||||
The device address table (`runtime/vk_gpa.c`) names a pool's shadow copy as it names an import, so shaders follow guest
|
||||
pointers into either. A shader that reads through the table resolves nothing, so the pool it reaches is not queued for
|
||||
the copy-in: a part whose pipelines declare the table is marked at its draws and dispatches, and its prologue brings
|
||||
the shadow of every pool in the table up to date with the pages the CPU wrote and queues the same pages for those
|
||||
pools' VRAM mirrors (`vk_memory.c` `vk_mem_gpa_sync`). That copies the written pages of every CPU-visible pool in
|
||||
each such part, which the cost above does not include. What a shader stores through the table lands in the shadow copy
|
||||
the copy-in: a guest submission whose record binds the table (`vk_exec_draw.c` `ssbo_info`) brings the shadow of
|
||||
every pool in the table up to date with the pages the CPU wrote, once, before the first part recorded after the
|
||||
binding is submitted, and queues the same pages for those pools' VRAM mirrors (`vk_memory.c` `vk_mem_shadow_sync`).
|
||||
That copies the written pages of every CPU-visible pool once in each such guest submission, which the cost above does
|
||||
not include. What a shader stores through the table lands in the shadow copy
|
||||
and in the pool's VRAM mirror, and no binding names it, so nothing notes it as a GPU write: it does not come back to
|
||||
guest memory, and the next whole copy-in of its page (the CPU rewrites other words of the same records) puts guest
|
||||
memory's stale bytes back over it in both copies. In the runs measured so far that copy-in always came before the
|
||||
@@ -299,8 +300,9 @@ then on like a page with a noted GPU write, and has its stores written back to g
|
||||
submission that uses the table. It is off by default (`runtime/vk_memory.c`, "Pages a shader stores into", says why).
|
||||
`NX2NAVI_SHADOW_CHECK=1` logs every 60 frames how often a copy-in overwrote such a store and for which pools, how many
|
||||
write-backs landed on pages the CPU had written since their copy-in, and what the copy-ins cost and where they went.
|
||||
`--probe-vkmem` checks the read: a shader follows the table to a word of a pool that is never bound, and must read
|
||||
`0x13579BDF` and, after a plain CPU write, `0x2468ACE0`; and with `NX2NAVI_SHADOW_TABLE_STORES=1` the store: a GPU
|
||||
`--probe-vkmem` checks the sync: the shadow of a pool that is never bound must hold `0x13579BDF`, keep it through a
|
||||
plain CPU write and a guest submission that does not bind the table, and hold the written `0x2468ACE0` after one that
|
||||
does; and with `NX2NAVI_SHADOW_TABLE_STORES=1` the store: a GPU
|
||||
write into a shadow page that nothing notes must survive the CPU's writes of that page and reach guest memory. On
|
||||
Linux, run it for each backing:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user