mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-19 04:19:57 -04:00
Merge the stability pass's fixes for the points its review found.
Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com> # Conflicts: # runtime/cfg.c
This commit is contained in:
@@ -56,6 +56,26 @@ int main(void) {
|
||||
snprintf(text, sizeof text, "%s 2x\n", key);
|
||||
CHECK(boot_warm_decide(text, key, 0, &tries) == BOOT_WARM_NO, "a count with a tail owes a warm");
|
||||
|
||||
// ---- a marker left by a start that ended while the boot built pipelines
|
||||
int quiet = -1;
|
||||
// A crash the handler saw: the prebuild is skipped at once, whatever the count.
|
||||
snprintf(text, sizeof text, "%s 0\n", key);
|
||||
CHECK(boot_end_decide(text, key, 1, &quiet) == BOOT_END_SKIP, "a reported crash does not skip the prebuild");
|
||||
// No note: the start was closed or stopped. It counts, and the builds are made again, until BOOT_QUIET_ENDS in a row.
|
||||
for (int n = 0; n < BOOT_QUIET_ENDS; n++) {
|
||||
snprintf(text, sizeof text, "%s %d\n", key, n);
|
||||
int want = n + 1 >= BOOT_QUIET_ENDS ? BOOT_END_SKIP : BOOT_END_COUNTED;
|
||||
CHECK(boot_end_decide(text, key, 0, &quiet) == want && quiet == n + 1, "a stopped start after %d before it", n);
|
||||
}
|
||||
// A marker of 0.9.2 holds the GPU and driver alone: the first of its row.
|
||||
CHECK(boot_end_decide(key, key, 0, &quiet) == BOOT_END_COUNTED && quiet == 1, "an old marker skips the prebuild");
|
||||
CHECK(boot_end_decide(key, key, 1, &quiet) == BOOT_END_SKIP, "an old marker with a crash note does not skip");
|
||||
// Another driver's marker says nothing about this one, crash note or not.
|
||||
snprintf(text, sizeof text, "%s 2\n", other);
|
||||
CHECK(boot_end_decide(text, key, 0, &quiet) == BOOT_END_OTHER && quiet == 0, "another driver's marker counted");
|
||||
CHECK(boot_end_decide(text, key, 1, &quiet) == BOOT_END_OTHER, "another driver's crash blamed on this one");
|
||||
CHECK(boot_end_decide("", key, 0, &quiet) == BOOT_END_OTHER, "an empty marker counted");
|
||||
|
||||
printf("boot_warm_check: %s\n", fails ? "FAILED" : "passed");
|
||||
return fails ? 1 : 0;
|
||||
}
|
||||
|
||||
@@ -49,6 +49,10 @@ VkResult vmaCreateBuffer(VmaAllocator a, const VkBufferCreateInfo *bi, const Vma
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
void vmaDestroyBuffer(VmaAllocator a, VkBuffer buf, VmaAllocation alloc) { (void)a, (void)buf; free(alloc); }
|
||||
VkResult vmaInvalidateAllocation(VmaAllocator a, VmaAllocation alloc, VkDeviceSize off, VkDeviceSize n) {
|
||||
(void)a, (void)alloc, (void)off, (void)n;
|
||||
return VK_SUCCESS;
|
||||
}
|
||||
|
||||
// A buffer's device address: its handle far above the GPU addresses the tests map.
|
||||
static uint64_t dev_of(VkBuffer b) { return (uint64_t)(uintptr_t)b << 28; }
|
||||
@@ -73,6 +77,22 @@ static void gpu_done(void) { // the submission being recorded is issued and fi
|
||||
nqueue = k;
|
||||
}
|
||||
|
||||
// A store the GPU runs in queue order (vk_gpa_flip_cmd): kept until gpu_runs_stores, as a command buffer keeps it
|
||||
// until the GPU reaches it.
|
||||
static struct { VkDeviceSize off, n; uint8_t data[32]; } stores[8];
|
||||
static int nstores;
|
||||
void vkCmdUpdateBuffer(VkCommandBuffer cb, VkBuffer b, VkDeviceSize off, VkDeviceSize n, const void *data) {
|
||||
(void)cb, (void)b;
|
||||
if (nstores == 8 || n > sizeof stores[0].data || (off | n) & 3) { printf("FAIL: a store the stand-in cannot hold\n"); exit(1); }
|
||||
stores[nstores].off = off, stores[nstores].n = n;
|
||||
memcpy(stores[nstores].data, data, (size_t)n);
|
||||
nstores++;
|
||||
}
|
||||
static void gpu_runs_stores(void) {
|
||||
for (int i = 0; i < nstores; i++) memcpy((uint8_t *)(uintptr_t)table + stores[i].off, stores[i].data, (size_t)stores[i].n);
|
||||
nstores = 0;
|
||||
}
|
||||
|
||||
// ---- the table as a shader reads it (the layout at the top of vk_gpa.c)
|
||||
enum { L1_WORD = 16, L1_N = 65536, L2_WORD = L1_WORD + L1_N, L2_N = 4096, BLOCKS = 1024 };
|
||||
static uint32_t block_of(uint64_t addr) { return table[L1_WORD + (addr >> 24)]; }
|
||||
@@ -125,27 +145,35 @@ int main(void) {
|
||||
CHECK(read_through(a0 + 4096, 1) == dev_of(b0) + 4096, "a plain page is its own twin");
|
||||
gpu_done();
|
||||
|
||||
// a new mirror takes the writes first and the reads once its first copy has run (vk_memory.c mirror_create,
|
||||
// gpa_switch): until then the pages read the imported buffer and the mirror is their twin
|
||||
// a new mirror takes the pool's record over by a store the GPU runs after the mirror's first copy (vk_memory.c
|
||||
// mirror_create, vk_mem_mirror_prologue): what is queued before the store reads and writes the imported buffer
|
||||
// alone, what comes after it reads the mirror and writes both
|
||||
VkBuffer m1 = new_buf();
|
||||
uint32_t w0 = vk_gpa_remap_writes(a0, a1, r0, m1, a0);
|
||||
CHECK(w0 && w0 != r0, "a new mirror gets a record for the writes");
|
||||
expect(a0, a1, b0, a0, "a new mirror before its first copy: reads stay on the imported buffer");
|
||||
CHECK(read_through(a0 + 4096, 1) == dev_of(m1) + 4096 && read_through(a1 - 4096, 1) == dev_of(m1) + (a1 - 4096 - a0),
|
||||
"a new mirror before its first copy is the twin, which takes the writes");
|
||||
CHECK(vk_gpa_flip_cmd(VK_NULL_HANDLE, r0, m1, a0, 1), "a new mirror's store is recorded");
|
||||
expect(a0, a1, b0, a0, "before the GPU reaches the store: reads stay on the imported buffer");
|
||||
CHECK(read_through(a0 + 4096, 1) == dev_of(b0) + 4096 && read_through(a1 - 4096, 1) == dev_of(b0) + (a1 - 4096 - a0),
|
||||
"before the GPU reaches the store nothing is written into the mirror");
|
||||
gpu_runs_stores();
|
||||
expect(a0, a1, m1, a0, "after the store: reads are on the mirror");
|
||||
CHECK(read_through(a0 + 4096, 1) == dev_of(b0) + 4096 && read_through(a1 - 4096, 1) == dev_of(b0) + (a1 - 4096 - a0),
|
||||
"after the store the imported buffer is the twin");
|
||||
gpu_done();
|
||||
r0 = vk_gpa_remap(a0, a1, w0, m1, a0);
|
||||
expect(a0, a1, m1, a0, "a new mirror after its first copy: reads move to it");
|
||||
CHECK(read_through(a0 + 4096, 1) == dev_of(b0) + 4096, "and the imported buffer is the twin again");
|
||||
// evicted while it still waits for its first copy: the pages go back to the imported buffer alone
|
||||
// evicted: the pages go back to the imported buffer alone, on a record of their own
|
||||
uint32_t was = r0;
|
||||
r0 = vk_gpa_remap_plain(a0, a1, r0, b0, a0);
|
||||
gpu_done();
|
||||
VkBuffer m2 = new_buf();
|
||||
w0 = vk_gpa_remap_writes(a0, a1, r0, m2, a0);
|
||||
r0 = vk_gpa_remap_plain(a0, a1, w0, b0, a0);
|
||||
expect(a0, a1, b0, a0, "a mirror gone before its first copy");
|
||||
CHECK(r0 && r0 != was, "an evicted mirror's pages take a new record");
|
||||
expect(a0, a1, b0, a0, "an evicted mirror");
|
||||
CHECK(read_through(a0 + 4096, 1) == dev_of(b0) + 4096, "leaves the imported buffer as its own twin");
|
||||
CHECK(!vk_gpa_remap_writes(a0, a1, 0, m2, a0), "a pool without a record gets none for a mirror's writes");
|
||||
gpu_done();
|
||||
// a mirror without a twin: the store names it twice
|
||||
VkBuffer m2 = new_buf();
|
||||
CHECK(vk_gpa_flip_cmd(VK_NULL_HANDLE, r0, m2, a0, 0), "an untwinned mirror's store is recorded");
|
||||
gpu_runs_stores();
|
||||
expect(a0, a1, m2, a0, "an untwinned mirror");
|
||||
CHECK(read_through(a0 + 4096, 1) == dev_of(m2) + 4096, "is its own twin");
|
||||
r0 = vk_gpa_remap_plain(a0, a1, r0, b0, a0);
|
||||
expect(a0, a1, b0, a0, "and goes back to the imported buffer");
|
||||
CHECK(!vk_gpa_flip_cmd(VK_NULL_HANDLE, 0, m2, a0, 1) && !nstores, "a pool without a record gets no store");
|
||||
gpu_done();
|
||||
|
||||
// an unmapped range reads the zero buffer at once, and its blocks serve no other range while the GPU may still read
|
||||
|
||||
Reference in New Issue
Block a user