From bac4d6cf91ec7d082245ddb21568f2f0c7725538 Mon Sep 17 00:00:00 2001 From: Valiantsin Dzerakh Date: Tue, 27 Oct 2026 15:54:00 +0300 Subject: [PATCH] The shader memo skips its 1 KiB handle compare while no texture or image was bound memo_match compared the vertex and fragment stages' 64 texture and 64 image handles on every draw. Every OP_BIND_TEX and now every OP_BIND_IMG bumps tex_serial; a key whose serial is current has the same handles, and a key that matched by the compare takes the current serial. memo_match went from 0.95% to 0.27% of the fight replay. Co-Authored-By: Claude Opus 5.5 --- runtime/vk_exec.h | 2 +- runtime/vk_exec_draw.c | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/runtime/vk_exec.h b/runtime/vk_exec.h index 48cbea79..a274cfb3 100644 --- a/runtime/vk_exec.h +++ b/runtime/vk_exec.h @@ -101,7 +101,7 @@ typedef struct VkExec { // or the last in-pass barrier const void *fb_fs; // feedback_scan's memo: fragment shader, texture bind serial, pass serial uint32_t fb_serial, fb_pass, fb_sampled; - uint32_t tex_serial, pass_serial; // bumped by every texture bind and pass begin + uint32_t tex_serial, pass_serial; // bumped by every texture or image bind and pass begin } VkExec; // Begins dynamic rendering with the current targets unless a pass is open (a full memory barrier precedes it). Call diff --git a/runtime/vk_exec_draw.c b/runtime/vk_exec_draw.c index e5570efa..fcc14669 100644 --- a/runtime/vk_exec_draw.c +++ b/runtime/vk_exec_draw.c @@ -1764,27 +1764,33 @@ static int pipe_skip_mode(void) { // nothing else, so shader_for would return the same shaders. About 65% of field draws repeat them // (TOTK_BIND_STATS). TOTK_SHADER_MEMO=0 turns it off; =check looks the shaders up on every hit too, and every slot's // texture type in answers_for, and stops on a difference. +// tex_serial (bumped by every texture and image bind) equal to the key's means the handles were not rebound since +// they were compared, so the 1 KiB compare is skipped; a rebind to the same handles still matches by the compare. typedef struct { const prog_t *prog; uint64_t serial; - uint32_t gen; + uint32_t gen, tex_serial; uint64_t tex[2][32], img[2][32]; VkPipeState pipe; } MemoKey; static struct { int on, valid, has_fs; MemoKey k; const GfxShader *vs, *fs; } SM = {-1}; static void memo_key(const VkExec *ex, uint32_t gen, MemoKey *k) { - k->prog = ex->prog, k->serial = ex->prog->serial, k->gen = gen; + k->prog = ex->prog, k->serial = ex->prog->serial, k->gen = gen, k->tex_serial = ex->tex_serial; memcpy(k->tex[0], ex->tex[NVN_STAGE_VS], sizeof k->tex[0]), memcpy(k->tex[1], ex->tex[NVN_STAGE_FS], sizeof k->tex[1]); memcpy(k->img[0], ex->img[NVN_STAGE_VS], sizeof k->img[0]), memcpy(k->img[1], ex->img[NVN_STAGE_FS], sizeof k->img[1]); memcpy(&k->pipe, &ex->pipe, sizeof k->pipe); } -static int memo_match(const VkExec *ex, uint32_t gen, const MemoKey *k) { - return k->prog == ex->prog && k->serial == ex->prog->serial && k->gen == gen && - !memcmp(k->tex[0], ex->tex[NVN_STAGE_VS], sizeof k->tex[0]) && !memcmp(k->tex[1], ex->tex[NVN_STAGE_FS], sizeof k->tex[1]) && - !memcmp(k->img[0], ex->img[NVN_STAGE_VS], sizeof k->img[0]) && !memcmp(k->img[1], ex->img[NVN_STAGE_FS], sizeof k->img[1]) && - !memcmp(&k->pipe, &ex->pipe, sizeof k->pipe); +static int memo_match(const VkExec *ex, uint32_t gen, MemoKey *k) { + if (k->prog != ex->prog || k->serial != ex->prog->serial || k->gen != gen || memcmp(&k->pipe, &ex->pipe, sizeof k->pipe)) + return 0; + if (k->tex_serial == ex->tex_serial) return 1; + if (memcmp(k->tex[0], ex->tex[NVN_STAGE_VS], sizeof k->tex[0]) || memcmp(k->tex[1], ex->tex[NVN_STAGE_FS], sizeof k->tex[1]) || + memcmp(k->img[0], ex->img[NVN_STAGE_VS], sizeof k->img[0]) || memcmp(k->img[1], ex->img[NVN_STAGE_FS], sizeof k->img[1])) + return 0; + k->tex_serial = ex->tex_serial; + return 1; } static int shader_memo_on(void) { @@ -2204,6 +2210,7 @@ void vk_exec_op_draw(VkExec *ex, uint32_t op, const void *payload) { case OP_BIND_IMG: { const p_bind_handles *b = payload; bind_handles(b->stage >= 0 && b->stage < 6 ? ex->img[b->stage] : NULL, 32, b); + ex->tex_serial++; // the shader memo's handle check (feedback_scan reads only textures: a rescan at most) bind_gen++; break; }