mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-19 23:49:56 -04:00
Cap the memory released textures keep for reuse, and free old ones when the system commit runs low.
After an hour at 2160p the 2048 released entries held 5-7 GiB of render targets and decoded textures, charged to Windows' commit as well. NX2NAVI_TEX_RELEASED_MB caps them by size (default 1/16 of RAM, 1-4 GiB), and with less commit free than NX2NAVI_TEX_COMMIT_FREE_MB they are dropped to 256 MiB. Only entries released 120 frames ago or more go, at most 32 a check, oldest first. On Linux the commit check applies only with vm.overcommit_memory = 2 (plat_commit_enforced). From a tester's fixes. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -58,7 +58,7 @@ static const char *const known[] = {
|
|||||||
"SHADER_MEMO", "SHADOW_COMPARE", "SHADOW_RANGE", "SHADOW_RES", "SHADOW_SCALE", "SHARED_FONTS", "SHARPNESS", "SHOTS", "SHOTS_DIR",
|
"SHADER_MEMO", "SHADOW_COMPARE", "SHADOW_RANGE", "SHADOW_RES", "SHADOW_SCALE", "SHARED_FONTS", "SHARPNESS", "SHOTS", "SHOTS_DIR",
|
||||||
"SHOTS_FULL", "SPEED_PROBE", "SPIN", "SPIN_HANDOFF_US", "SPLIT_DRAWS", "SPLIT_US", "SPV_OVERRIDE", "STICK_DEADZONE", "STICK_SENS",
|
"SHOTS_FULL", "SPEED_PROBE", "SPIN", "SPIN_HANDOFF_US", "SPLIT_DRAWS", "SPLIT_US", "SPV_OVERRIDE", "STICK_DEADZONE", "STICK_SENS",
|
||||||
"SWKBD_ANSWER",
|
"SWKBD_ANSWER",
|
||||||
"SWKBD_TEST", "TAA", "TEST_PAD", "TEST_PAD_AT", "TEST_PREPARE_SHADERS", "TEX_ALIAS", "TEX_MEMO", "TEX_VRAM_PRESSURE", "TIMER_1MS", "TRACE", "TXD_TRANSPOSE", "UBO_SNAPSHOT", "UPSCALER", "VK_DYN_A2C", "VK_DYN_VERTEX", "VK_NOOPT", "VK_NO_FLOAT64",
|
"SWKBD_TEST", "TAA", "TEST_PAD", "TEST_PAD_AT", "TEST_PREPARE_SHADERS", "TEX_ALIAS", "TEX_MEMO", "TEX_VRAM_PRESSURE", "TEX_RELEASED_MB", "TEX_COMMIT_FREE_MB", "TIMER_1MS", "TRACE", "TXD_TRANSPOSE", "UBO_SNAPSHOT", "UPSCALER", "VK_DYN_A2C", "VK_DYN_VERTEX", "VK_NOOPT", "VK_NO_FLOAT64",
|
||||||
"VK_PRESENT", "VK_RECORDER", "VK_SSBO_ALIGN", "VK_SUBGROUP", "VK_SUBGROUP_PIN", "VK_VALIDATION", "VOLUME", "VRAM_HEADROOM", "VS_OUTS",
|
"VK_PRESENT", "VK_RECORDER", "VK_SSBO_ALIGN", "VK_SUBGROUP", "VK_SUBGROUP_PIN", "VK_VALIDATION", "VOLUME", "VRAM_HEADROOM", "VS_OUTS",
|
||||||
"WALK_KEY", "WALK_SCALE", "WB_EXACT", "WB_FENCE_LIMIT", "WB_MERGE", "WINDOW_SIZE", "XLATE", "XLATE_ID", "XLATE_KEEP", "XLATE_PROCS",
|
"WALK_KEY", "WALK_SCALE", "WB_EXACT", "WB_FENCE_LIMIT", "WB_MERGE", "WINDOW_SIZE", "XLATE", "XLATE_ID", "XLATE_KEEP", "XLATE_PROCS",
|
||||||
"ZSTD_CHECK", "ZSTD_NATIVE",
|
"ZSTD_CHECK", "ZSTD_NATIVE",
|
||||||
|
|||||||
@@ -1666,6 +1666,20 @@ void plat_commit_info(double *proc_mb, double *used_mb, double *limit_mb) {
|
|||||||
if (private_bytes) *proc_mb = (double)(private_bytes >> 20);
|
if (private_bytes) *proc_mb = (double)(private_bytes >> 20);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int plat_commit_enforced(void) {
|
||||||
|
static int v = -1; // read once
|
||||||
|
if (v < 0) {
|
||||||
|
int mode = 0;
|
||||||
|
FILE *f = fopen("/proc/sys/vm/overcommit_memory", "r");
|
||||||
|
if (f) {
|
||||||
|
if (fscanf(f, "%d", &mode) != 1) mode = 0;
|
||||||
|
fclose(f);
|
||||||
|
}
|
||||||
|
v = mode == 2;
|
||||||
|
}
|
||||||
|
return v;
|
||||||
|
}
|
||||||
|
|
||||||
// ---- child processes
|
// ---- child processes
|
||||||
|
|
||||||
struct PlatChild {
|
struct PlatChild {
|
||||||
|
|||||||
@@ -420,6 +420,8 @@ void plat_mem_info(float *used_mb, float *total_mb, float *proc_mb);
|
|||||||
// Commit charge in MB: this process's private bytes, the system's commit in use and its limit (RAM plus page files).
|
// Commit charge in MB: this process's private bytes, the system's commit in use and its limit (RAM plus page files).
|
||||||
// An allocation fails when the system's reaches the limit, however much physical memory is free. -1 when unknown.
|
// An allocation fails when the system's reaches the limit, however much physical memory is free. -1 when unknown.
|
||||||
void plat_commit_info(double *proc_mb, double *used_mb, double *limit_mb);
|
void plat_commit_info(double *proc_mb, double *used_mb, double *limit_mb);
|
||||||
|
// Whether an allocation fails at that limit: always on Windows; on Linux only with vm.overcommit_memory = 2.
|
||||||
|
int plat_commit_enforced(void);
|
||||||
// This process's memory in bytes: resident (the working set) and private (Windows: committed private bytes; Linux: the
|
// This process's memory in bytes: resident (the working set) and private (Windows: committed private bytes; Linux: the
|
||||||
// resident anonymous pages). 0 when unknown.
|
// resident anonymous pages). 0 when unknown.
|
||||||
void plat_process_memory(uint64_t *resident, uint64_t *private_bytes);
|
void plat_process_memory(uint64_t *resident, uint64_t *private_bytes);
|
||||||
|
|||||||
@@ -1721,6 +1721,8 @@ void plat_commit_info(double *proc_mb, double *used_mb, double *limit_mb) {
|
|||||||
*proc_mb = (double)(pmc.PrivateUsage >> 20);
|
*proc_mb = (double)(pmc.PrivateUsage >> 20);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int plat_commit_enforced(void) { return 1; }
|
||||||
|
|
||||||
void plat_process_memory(uint64_t *resident, uint64_t *private_bytes) {
|
void plat_process_memory(uint64_t *resident, uint64_t *private_bytes) {
|
||||||
PROCESS_MEMORY_COUNTERS_EX pm = {.cb = sizeof pm};
|
PROCESS_MEMORY_COUNTERS_EX pm = {.cb = sizeof pm};
|
||||||
*resident = *private_bytes = 0;
|
*resident = *private_bytes = 0;
|
||||||
|
|||||||
@@ -39,11 +39,13 @@ typedef struct Tex {
|
|||||||
tex_t t; // the newest texture object seen with this key
|
tex_t t; // the newest texture object seen with this key
|
||||||
TexVkFormat f;
|
TexVkFormat f;
|
||||||
VmaAllocation alloc; // own memory; NULL when bound into pool memory
|
VmaAllocation alloc; // own memory; NULL when bound into pool memory
|
||||||
|
uint64_t bytes; // the size of alloc (0 without own memory), for the released entries' total
|
||||||
VmaAllocation bound_to; // the pool memory it is bound into
|
VmaAllocation bound_to; // the pool memory it is bound into
|
||||||
uint32_t wgen; // page generation of the last upload check
|
uint32_t wgen; // page generation of the last upload check
|
||||||
uint32_t checked; // submit_epoch of the last check from a draw binding
|
uint32_t checked; // submit_epoch of the last check from a draw binding
|
||||||
int uploaded, released;
|
int uploaded, released;
|
||||||
uint32_t rel_serial; // reg_serial when it was released: slots registered before then are stale (slot_resolve)
|
uint32_t rel_serial; // reg_serial when it was released: slots registered before then are stale (slot_resolve)
|
||||||
|
uint64_t rel_frame; // gfx_counters.frames when it was released (drop_stale)
|
||||||
uint32_t n_up; // uploads of this entry (vk_texture_debug)
|
uint32_t n_up; // uploads of this entry (vk_texture_debug)
|
||||||
int last_ch; // last vk_mem_changed result of make_fresh: 1 written, 0 clean, -1 not tracked
|
int last_ch; // last vk_mem_changed result of make_fresh: 1 written, 0 clean, -1 not tracked
|
||||||
struct Tex *next_at; // other entries at the same storage address
|
struct Tex *next_at; // other entries at the same storage address
|
||||||
@@ -535,6 +537,11 @@ static Tex *create_tex(const tex_t *t, const TexKey *k, int defer_init) {
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (e->alloc) {
|
||||||
|
VmaAllocationInfo own;
|
||||||
|
vmaGetAllocationInfo(c->vma, e->alloc, &own);
|
||||||
|
e->bytes = own.size;
|
||||||
|
}
|
||||||
VkTexImage *p = &e->pub;
|
VkTexImage *p = &e->pub;
|
||||||
p->image = img;
|
p->image = img;
|
||||||
p->format = f.vk;
|
p->format = f.vk;
|
||||||
@@ -607,15 +614,19 @@ static void own_remove(Tex *e) {
|
|||||||
plat_mutex_unlock(&owned_lock);
|
plat_mutex_unlock(&owned_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static uint64_t rel_bytes; // own memory of the released entries (Tex.bytes)
|
||||||
|
|
||||||
static void rel_append(Tex *e) {
|
static void rel_append(Tex *e) {
|
||||||
e->rel_next = NULL;
|
e->rel_next = NULL;
|
||||||
e->rel_prev = rel_tail;
|
e->rel_prev = rel_tail;
|
||||||
if (rel_tail) rel_tail->rel_next = e;
|
if (rel_tail) rel_tail->rel_next = e;
|
||||||
else rel_head = e;
|
else rel_head = e;
|
||||||
rel_tail = e;
|
rel_tail = e;
|
||||||
|
rel_bytes += e->bytes;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void rel_unlink(Tex *e) {
|
static void rel_unlink(Tex *e) {
|
||||||
|
rel_bytes -= e->bytes;
|
||||||
if (e->rel_prev) e->rel_prev->rel_next = e->rel_next;
|
if (e->rel_prev) e->rel_prev->rel_next = e->rel_next;
|
||||||
else rel_head = e->rel_next;
|
else rel_head = e->rel_next;
|
||||||
if (e->rel_next) e->rel_next->rel_prev = e->rel_prev;
|
if (e->rel_next) e->rel_next->rel_prev = e->rel_prev;
|
||||||
@@ -663,6 +674,80 @@ static void sweep_released(void) {
|
|||||||
static int vram_pressure = -1;
|
static int vram_pressure = -1;
|
||||||
static uint64_t n_pressure_drops;
|
static uint64_t n_pressure_drops;
|
||||||
|
|
||||||
|
static int comes_back_intact(const Tex *e) { return e->pub.mirrored && !e->pub.gpu_owned && !e->gpu_dirty; }
|
||||||
|
|
||||||
|
// NX2NAVI_TEX_RELEASED_MB (default a sixteenth of the installed memory, 1 to 4 GiB; 0 = no limit) bounds the own memory
|
||||||
|
// of the released entries: RELEASED_MAX alone kept 5-7 GiB of released render targets and decoded textures after an
|
||||||
|
// hour of play at a 2160p game resolution, device memory the driver also charges to the system's commit (the process's
|
||||||
|
// private bytes reached 31 GiB). NX2NAVI_TEX_COMMIT_FREE_MB (default the larger of 4 GiB and a tenth of the commit
|
||||||
|
// limit; 0 = off) lowers that bound to COMMIT_LOW_KEEP while less of the system's commit is free: an allocation that
|
||||||
|
// fails there ends the game. Both drop only stale entries (drop_stale), a few per check like the VRAM pressure.
|
||||||
|
#define COMMIT_LOW_KEEP ((uint64_t)256 << 20)
|
||||||
|
static uint64_t released_cap; // bytes; 0 = not read yet, UINT64_MAX = no limit
|
||||||
|
static long long commit_free_mb = -2; // -2: not read yet, -1: the default
|
||||||
|
static int commit_low, commit_logs;
|
||||||
|
static uint64_t n_cap_drops, n_commit_drops;
|
||||||
|
|
||||||
|
static uint64_t released_cap_bytes(void) {
|
||||||
|
if (!released_cap) {
|
||||||
|
const char *s = cfg_get("NX2NAVI_TEX_RELEASED_MB");
|
||||||
|
long long mb;
|
||||||
|
if (s && *s) mb = atoll(s);
|
||||||
|
else {
|
||||||
|
float used, total, proc;
|
||||||
|
plat_mem_info(&used, &total, &proc);
|
||||||
|
mb = total > 0 ? (long long)(total / 16) : 2048;
|
||||||
|
mb = mb < 1024 ? 1024 : mb > 4096 ? 4096 : mb;
|
||||||
|
}
|
||||||
|
released_cap = mb > 0 ? (uint64_t)mb << 20 : UINT64_MAX;
|
||||||
|
if (mb > 0) rt_log("vk: released textures keep at most %lld MiB of their own memory", mb);
|
||||||
|
else rt_log("vk: released textures: no size limit");
|
||||||
|
}
|
||||||
|
return released_cap;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int commit_is_low(void) {
|
||||||
|
if (commit_free_mb == -2) {
|
||||||
|
const char *s = cfg_get("NX2NAVI_TEX_COMMIT_FREE_MB");
|
||||||
|
commit_free_mb = s && *s ? atoll(s) : -1;
|
||||||
|
if (commit_free_mb < -1) commit_free_mb = -1;
|
||||||
|
if (!plat_commit_enforced()) commit_free_mb = 0; // a limit no allocation fails at
|
||||||
|
}
|
||||||
|
if (!commit_free_mb) return 0;
|
||||||
|
double proc, used, limit;
|
||||||
|
plat_commit_info(&proc, &used, &limit);
|
||||||
|
if (used < 0 || limit <= 0) return 0;
|
||||||
|
double want = commit_free_mb > 0 ? (double)commit_free_mb : limit / 10 > 4096 ? limit / 10 : 4096;
|
||||||
|
int low = limit - used < want;
|
||||||
|
if (low != commit_low && commit_logs < 40) { // a few lines, however often it flips
|
||||||
|
commit_logs++;
|
||||||
|
rt_log("vk: system commit %s: %.0f of %.0f MB in use (this process %.0f MB); released textures kept %d, %.0f MiB "
|
||||||
|
"of own memory%s", low ? "low" : "no longer low", used, limit, proc, nreleased, rel_bytes / 1048576.0,
|
||||||
|
low ? ": dropping the stale ones" : "");
|
||||||
|
}
|
||||||
|
return commit_low = low;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Drops up to PRESSURE_STEP released entries that own memory and were released STALE_FRAMES presents ago or earlier,
|
||||||
|
// oldest first and the intact ones before the others, while the released entries own more than keep. A transient
|
||||||
|
// texture is taken back within frames, so dropping it frees nothing: the game initializes it again and it is created
|
||||||
|
// again, empty if it is a render target. Under commit pressure that a system-managed page file never relieves, dropping
|
||||||
|
// young ones destroyed 2160p render targets about every frame for whole sessions. Frame generation also reads a frame's
|
||||||
|
// depth target at the host present (vk_dlssg.c vk_dlssg_frame tags it), after the blit deferred destruction waits for.
|
||||||
|
#define STALE_FRAMES 120
|
||||||
|
static void drop_stale(uint64_t keep, uint64_t *count) {
|
||||||
|
uint64_t now = __atomic_load_n(&gfx_counters.frames, __ATOMIC_RELAXED);
|
||||||
|
int dropped = 0;
|
||||||
|
for (int any = 0; any < 2; any++)
|
||||||
|
for (Tex *e = rel_head, *next; e && now - e->rel_frame >= STALE_FRAMES; e = next) { // in release order
|
||||||
|
if (dropped == PRESSURE_STEP || rel_bytes <= keep) return;
|
||||||
|
next = e->rel_next;
|
||||||
|
if (!e->bytes || (!any && !comes_back_intact(e))) continue;
|
||||||
|
destroy_tex(e);
|
||||||
|
dropped++, (*count)++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void sweep_pressure(void) { // tex_lock held
|
static void sweep_pressure(void) { // tex_lock held
|
||||||
if (vram_pressure < 0) {
|
if (vram_pressure < 0) {
|
||||||
const char *s = cfg_get("NX2NAVI_TEX_VRAM_PRESSURE");
|
const char *s = cfg_get("NX2NAVI_TEX_VRAM_PRESSURE");
|
||||||
@@ -670,17 +755,19 @@ static void sweep_pressure(void) { // tex_lock held
|
|||||||
if (vram_pressure < 0 || vram_pressure > 100) vram_pressure = 90;
|
if (vram_pressure < 0 || vram_pressure > 100) vram_pressure = 90;
|
||||||
rt_log("vk: released textures under VRAM pressure: %s%d%%", vram_pressure ? "dropped above " : "off", vram_pressure);
|
rt_log("vk: released textures under VRAM pressure: %s%d%%", vram_pressure ? "dropped above " : "off", vram_pressure);
|
||||||
}
|
}
|
||||||
if (!vram_pressure || !rel_head || submit_epoch & 7) return; // the budget query every 8 submits
|
if (!rel_head || submit_epoch & 7) return; // the budget and commit queries every 8 submits
|
||||||
uint64_t used, budget;
|
uint64_t used, budget;
|
||||||
int exact;
|
int exact, dropped = 0;
|
||||||
if (!vk_mem_vram(&used, &budget, &exact) || used <= budget / 100 * (uint64_t)vram_pressure) return;
|
if (vram_pressure && vk_mem_vram(&used, &budget, &exact) && used > budget / 100 * (uint64_t)vram_pressure)
|
||||||
int dropped = 0;
|
for (Tex *e = rel_head, *next; e && dropped < PRESSURE_STEP; e = next) {
|
||||||
for (Tex *e = rel_head, *next; e && dropped < PRESSURE_STEP; e = next) {
|
next = e->rel_next;
|
||||||
next = e->rel_next;
|
if (!comes_back_intact(e)) continue;
|
||||||
if (!e->pub.mirrored || e->pub.gpu_owned || e->gpu_dirty) continue;
|
destroy_tex(e);
|
||||||
destroy_tex(e);
|
dropped++, n_pressure_drops++;
|
||||||
dropped++, n_pressure_drops++;
|
}
|
||||||
}
|
uint64_t cap = released_cap_bytes();
|
||||||
|
if (rel_bytes > cap) drop_stale(cap, &n_cap_drops);
|
||||||
|
if (rel_bytes > COMMIT_LOW_KEEP && commit_is_low()) drop_stale(COMMIT_LOW_KEEP, &n_commit_drops);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------- uploads
|
// ---------------------------------------------------------------- uploads
|
||||||
@@ -1253,6 +1340,7 @@ void vk_texture_release(const tex_t *t) {
|
|||||||
if (e && !e->released) {
|
if (e && !e->released) {
|
||||||
e->released = 1;
|
e->released = 1;
|
||||||
e->rel_serial = reg_serial;
|
e->rel_serial = reg_serial;
|
||||||
|
e->rel_frame = __atomic_load_n(&gfx_counters.frames, __ATOMIC_RELAXED);
|
||||||
nreleased++;
|
nreleased++;
|
||||||
rel_append(e);
|
rel_append(e);
|
||||||
n_site[3]++;
|
n_site[3]++;
|
||||||
@@ -1528,9 +1616,11 @@ void vk_texture_new_submit(void) {
|
|||||||
(unsigned long long)f * 60, (unsigned long long)ck, (unsigned long long)n_checks, (unsigned long long)calls,
|
(unsigned long long)f * 60, (unsigned long long)ck, (unsigned long long)n_checks, (unsigned long long)calls,
|
||||||
(unsigned long long)untr);
|
(unsigned long long)untr);
|
||||||
n_checks = 0;
|
n_checks = 0;
|
||||||
rt_log("perf: frame %llu: released textures kept %d, dropped under VRAM pressure %llu", (unsigned long long)f * 60,
|
rt_log("perf: frame %llu: released textures kept %d (%.0f MiB of own memory), dropped past the size limit %llu, "
|
||||||
nreleased, (unsigned long long)n_pressure_drops);
|
"under VRAM pressure %llu, under commit pressure %llu", (unsigned long long)f * 60, nreleased,
|
||||||
n_pressure_drops = 0;
|
rel_bytes / 1048576.0, (unsigned long long)n_cap_drops, (unsigned long long)n_pressure_drops,
|
||||||
|
(unsigned long long)n_commit_drops);
|
||||||
|
n_cap_drops = n_pressure_drops = n_commit_drops = 0;
|
||||||
}
|
}
|
||||||
unlock();
|
unlock();
|
||||||
}
|
}
|
||||||
@@ -2277,7 +2367,7 @@ void vk_texture_shutdown(void) {
|
|||||||
samplers = (nvn_hmap){.klen = sizeof(samp_par)};
|
samplers = (nvn_hmap){.klen = sizeof(samp_par)};
|
||||||
free(tslots), free(sslots);
|
free(tslots), free(sslots);
|
||||||
tslots = NULL, sslots = NULL, ntslots = nsslots = 0, nreleased = 0;
|
tslots = NULL, sslots = NULL, ntslots = nsslots = 0, nreleased = 0;
|
||||||
rel_head = rel_tail = NULL;
|
rel_head = rel_tail = NULL, rel_bytes = 0;
|
||||||
if (sinfo) memset(sinfo, 0, sizeof *sinfo << 20); // no slot is registered: tokens 0
|
if (sinfo) memset(sinfo, 0, sizeof *sinfo << 20); // no slot is registered: tokens 0
|
||||||
unlock();
|
unlock();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user