From ca843507e9712fcb490a5aab52f50a586f589049 Mon Sep 17 00:00:00 2001 From: chrg6 Date: Tue, 10 Nov 2026 10:03:54 -0500 Subject: [PATCH] A diagnostic says how long before its first draw the game made each program (NX2NAVI_PROG_LEAD=1). Shaders are looked up and pipelines built when a draw first needs them. The time between nvnProgramSetShaders and a program's first draw is the head start a build begun at the program's creation would have; the line gives it as counts under 17 ms, 100 ms, 1 s, 5 s, 30 s and over, mesh programs apart (vk_exec_draw.c prog_lead, nvn_api_obj.c nvn_prog_made_ns). Off unless asked for. Co-Authored-By: Claude Fable 5.2 --- runtime/cfg.c | 2 +- runtime/nvn_api.h | 1 + runtime/nvn_api_obj.c | 16 ++++++++++++++++ runtime/vk_exec_draw.c | 29 +++++++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 1 deletion(-) diff --git a/runtime/cfg.c b/runtime/cfg.c index e18ed1ce..711c5bc1 100644 --- a/runtime/cfg.c +++ b/runtime/cfg.c @@ -43,7 +43,7 @@ static const char *const known[] = { "DESC_TEMPLATE", "DEVICE_PROFILE", "DISCORD_APP_ID", "DISCORD_IMAGE", "DISCORD_RPC", "DLAA", "DLAA_CAM_KEEP", "DLSS_IDLE_FREE", "DLAA_JITTER", "DLAA_MV", "DLAA_MASKDEBUG", "DLAA_MVDEBUG", "DLAA_OBJMV", "DLAA_SURVEY", "DLAA_TIMES", "DLSS", "DLSS_CHAR_MASK", "DLSS_PRESET", "DLSS_REACTIVE", "DUMP", "DUMP_BUF", "DUMP_DIR", "DUMP_LOG", "DUMP_RAW", "DUMP_SHADERS", "DUMP_FILE", "DS3", "LOG_CS_BINDS", "LOG_TEX_FLAGS", "LOG_MESH", "MESH", "POOL", "NATIVE_TENSOR", "LOG_RCOND", "LOG_RT_SIZES", "DUMP_WHITE", "DUMP_AFTER", "DUMP_MOVIE", "SUBMIT_FINISH", "ACQUIRE_WAIT", "CRASH_FILTER_GUARD", "CS_FALLBACK", "EXEFS", "FEEDBACK", "FIX_C0", "FIX_ZERO", "FLIGHT", "FLIGHT_AT", "FLIGHT_DIR", "FLIGHT_FRAMES", "FLIGHT_SPIKE_MS", "FLIGHT_THUMBS", "FLIGHT_EVERY", "FLUSH_SPAN", "FLUSH_UPLOAD", "FOG_CULL", "FOLIAGE_SHADOW_CULL", "FOLIAGE_SHADOW_VRS", "FOV", "FOV_PATCH", "FG_HUDLESS_SHOW", "FG_MULT", "FPS60", "FPS_LIMIT", "FRAMEGEN", "FRAMEGEN_MULTIPLIER", "FREEZE_IDLE", "FREE_CORES", - "FULLSCREEN", "FXAA", "GAME_ASPECT", "GAME_RES", "GPA", "GPA_EMPTY", "GPA_TWIN", "GPA_TWIN_MAX_KB", "GPL", "GPL_DRAW_BUILD", "GPL_FEEDBACK", "PIPE_AHEAD", "PIPE_FAST_WORKERS", "PIPE_LINK_DRAW_MS", "GPU", "GPU_INDEX", "GPU_PASSES", "GPU_NAME", "HDR", "HDR_BLOWOUT", "HDR_CONTRAST", + "FULLSCREEN", "FXAA", "GAME_ASPECT", "GAME_RES", "GPA", "GPA_EMPTY", "GPA_TWIN", "GPA_TWIN_MAX_KB", "GPL", "GPL_DRAW_BUILD", "GPL_FEEDBACK", "PIPE_AHEAD", "PIPE_FAST_WORKERS", "PIPE_LINK_DRAW_MS", "PROG_LEAD", "GPU", "GPU_INDEX", "GPU_PASSES", "GPU_NAME", "HDR", "HDR_BLOWOUT", "HDR_CONTRAST", "HDR_EXPOSURE", "HDR_FLARE", "HDR_GAMMA", "HDR_GAME_NITS", "HDR_GRADE", "HDR_HIGHLIGHT_SAT", "HDR_HIGHLIGHTS", "HDR_HUE", "HDR_LIVE", "HDR_PEAK_NITS", "HDR_SATURATION", "HDR_SHADOWS", "HDR_TONEMAP", "HDR_UI_NITS", "HIGHFPS_FIX", "INPUT", "INPUT_RECORD", "INPUT_SCRIPT", "LANG", "LIB_PREBUILD", diff --git a/runtime/nvn_api.h b/runtime/nvn_api.h index 6438ee92..d08194e2 100644 --- a/runtime/nvn_api.h +++ b/runtime/nvn_api.h @@ -42,6 +42,7 @@ typedef struct { // NVNmappingRequest _Static_assert(sizeof(nvn_mapping_t) == 0x28, "NVNmappingRequest stride"); const pool_t *nvn_pool_find(uint64_t addr, uint64_t len); // GPU-visible pool holding [addr, addr+len], NULL if none +uint64_t nvn_prog_made_ns(uint64_t serial); // NX2NAVI_PROG_LEAD: when the program was made, 0 unknown uint64_t nvn_new_serial(void); // next tex_t / prog_t serial, from 1 uint64_t nvn_fence_last(void); // fence value of the newest submit (0 before the first) int nvn_depth_minus_w(void); // 1 after DeviceSetDepthMode(NEAR_IS_MINUS_W), else 0 diff --git a/runtime/nvn_api_obj.c b/runtime/nvn_api_obj.c index 87f40703..55758efe 100644 --- a/runtime/nvn_api_obj.c +++ b/runtime/nvn_api_obj.c @@ -443,6 +443,15 @@ NVN_API(nvnProgramFinalize) { prog_release(o); o->magic = 0; } +// NX2NAVI_PROG_LEAD=1 (diagnostics): when each program was made, by serial (direct-mapped; a serial that lost its +// slot reads 0). vk_exec_draw.c prog_lead compares it with the program's first draw. +#define PROG_MADE_N 16384 +static uint64_t prog_made_serial[PROG_MADE_N], prog_made_at[PROG_MADE_N]; +uint64_t nvn_prog_made_ns(uint64_t serial) { + uint32_t i = (uint32_t)serial & (PROG_MADE_N - 1); + return __atomic_load_n(&prog_made_serial[i], __ATOMIC_RELAXED) == serial ? __atomic_load_n(&prog_made_at[i], __ATOMIC_RELAXED) : 0; +} + static int prog_set_shaders(prog_t *o, int n, const NVNshaderData *sd) { if (n < 0 || n > 6 || (n && !sd)) { rt_log("nvn: ProgramSetShaders with %d stages at %p", n, (const void *)sd); @@ -452,6 +461,13 @@ static int prog_set_shaders(prog_t *o, int n, const NVNshaderData *sd) { o->nstage = (uint32_t)n; if (n) memcpy(o->sd, sd, (size_t)n * sizeof *sd); o->serial = nvn_new_serial(); + static int lead = -1; + if (lead < 0) lead = cfg_get("NX2NAVI_PROG_LEAD") != NULL && strcmp(cfg_get("NX2NAVI_PROG_LEAD"), "0") != 0; + if (lead) { + uint32_t i = (uint32_t)o->serial & (PROG_MADE_N - 1); + __atomic_store_n(&prog_made_at[i], plat_now_ns(), __ATOMIC_RELAXED); + __atomic_store_n(&prog_made_serial[i], o->serial, __ATOMIC_RELAXED); + } NVN_LOG("ProgramSetShaders %p n=%d data0=%#llx", (void *)o, n, n ? (unsigned long long)sd[0].data : 0ull); return 1; } diff --git a/runtime/vk_exec_draw.c b/runtime/vk_exec_draw.c index 4c9d8786..af97b0b8 100644 --- a/runtime/vk_exec_draw.c +++ b/runtime/vk_exec_draw.c @@ -3475,6 +3475,33 @@ static int skip_prog_wanted(uint64_t serial) { return 0; } +// NX2NAVI_PROG_LEAD=1 (diagnostics): how long before its first draw the game made each program +// (nvnProgramSetShaders, nvn_api_obj.c nvn_prog_made_ns): the head start a build begun at that moment would have over +// one begun at the draw, which is where shaders are looked up and pipelines built today. One line with the draw +// statistics (draw_stats_tick's period), mesh programs apart. +#define PROG_LEAD_N 16384 +static struct { int on; uint64_t seen[PROG_LEAD_N]; uint64_t n[2][6], logged; } PLD = {-1}; + +static void prog_lead(const prog_t *p, int mesh) { + uint32_t i = (uint32_t)p->serial & (PROG_LEAD_N - 1); + if (PLD.seen[i] == p->serial) return; + PLD.seen[i] = p->serial; + uint64_t made = nvn_prog_made_ns(p->serial); + if (!made) return; + double ms = (double)(plat_now_ns() - made) / 1e6; + PLD.n[mesh][ms < 17 ? 0 : ms < 100 ? 1 : ms < 1000 ? 2 : ms < 5000 ? 3 : ms < 30000 ? 4 : 5]++; + uint64_t tot = 0; + for (int m = 0; m < 2; m++) + for (int k = 0; k < 6; k++) tot += PLD.n[m][k]; + if (tot - PLD.logged < 200) return; + PLD.logged = tot; + for (int m = 0; m < 2; m++) + rt_log("vk: %s programs were made before their first draw by: under 17 ms %llu, 17-100 ms %llu, 0.1-1 s %llu, 1-5 s " + "%llu, 5-30 s %llu, longer %llu (NX2NAVI_PROG_LEAD)", m ? "mesh" : "vertex", (unsigned long long)PLD.n[m][0], + (unsigned long long)PLD.n[m][1], (unsigned long long)PLD.n[m][2], (unsigned long long)PLD.n[m][3], + (unsigned long long)PLD.n[m][4], (unsigned long long)PLD.n[m][5]); +} + // mesh: a mesh draw (op_draw_mesh): the program's mesh and task stages stand in for the vertex stage, and nothing // vertex-related (vertex buffers, motion vector bookkeeping of vertex shaders) is bound or noted. static int prepare_draw_ex(VkExec *ex, int prim, int32_t count, int restart, int mesh) { @@ -3492,6 +3519,8 @@ static int prepare_draw_ex(VkExec *ex, int prim, int32_t count, int restart, int VkRect2D sc = vk_exec_scissor(ex); if (!sc.extent.width || !sc.extent.height) return draw_skipped(ex, mesh, SK_SCISSOR); if (!ex->prog) return draw_skipped(ex, mesh, SK_NO_PROGRAM); + if (PLD.on < 0) PLD.on = cfg_get("NX2NAVI_PROG_LEAD") != NULL && strcmp(cfg_get("NX2NAVI_PROG_LEAD"), "0") != 0; + if (PLD.on) prog_lead(ex->prog, mesh); if (n_skip_prog && skip_prog_wanted(ex->prog->serial)) return draw_skipped(ex, mesh, SK_DISABLED); // -1 until read int has_vs, has_fs, vs_wait = 0, fs_wait = 0, memo = mesh ? 0 : shader_memo_on(); int has_ts = 0, ts_wait = 0, vst = mesh ? NVN_STAGE_MESH : NVN_STAGE_VS;