mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-18 00:29:58 -04:00
Keep the freezes of idle regions back after slow ones and around area loads.
After a slow freeze the passes wait 250 ms, doubled for each further slow one, but the first fast freeze after a hold started the doubling over, so in the seconds after a load a 4-5 ms freeze came every 250 ms (Kakariko, 2026-11-13: five in a row, 16 frames apart), and freezes of 4-10 ms pushed frames of 25-52 ms over the stutter line. The doubling now starts over only after freeze_quiet_ms (default 5000; 0: the old rule) without a slow freeze. No pass runs while the texture pool makes an area's textures, when the frames are held anyway and one freeze took 32.4 ms, nor for freeze_load_hold_ms (default 3000; 0: off) after that or after an area's load. The regions that go idle meanwhile stay queued and are frozen later; their write-watch queries go on until then. A region is now queued once instead of again every freeze_idle submissions while the passes are held. The rules are in runtime/freeze_hold.h, checked by tests/freeze_hold_check.py. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
68
tests/freeze_hold_check.c
Normal file
68
tests/freeze_hold_check.c
Normal file
@@ -0,0 +1,68 @@
|
||||
// runtime/freeze_hold.h: when the freezing of idle guest regions waits. Built and run by tests/freeze_hold_check.py;
|
||||
// prints each failed check and exits 1 on any failure.
|
||||
//
|
||||
// The backoff after slow freezes keeps doubling while slow ones come within the quiet time, fast freezes between them
|
||||
// included, and starts over after the quiet time; with quiet 0 a fast freeze starts it over (the rule of 0.10.1). An
|
||||
// area load holds the passes while the texture pool loads and for the hold after it or after the area's load.
|
||||
#include <stdio.h>
|
||||
|
||||
#include "freeze_hold.h"
|
||||
|
||||
static int fails;
|
||||
#define CHECK(c, ...) do { if (!(c)) { fails++; printf("FAIL line %d: ", __LINE__); printf(__VA_ARGS__); printf("\n"); } } while (0)
|
||||
|
||||
#define MS 1000000ull
|
||||
#define S 1000000000ull
|
||||
|
||||
int main(void) {
|
||||
// slow freezes 300 ms apart with fast ones between, as after a load in Kakariko: the holds double up to 2 s
|
||||
{
|
||||
FrzHold h = {0};
|
||||
uint64_t t = 10 * S;
|
||||
frz_freeze_done(&h, t, 5 * MS, 5 * S);
|
||||
CHECK(h.backoff == 250 * MS && h.hold_until == t + 250 * MS, "first slow: %llu", (unsigned long long)h.backoff);
|
||||
frz_freeze_done(&h, t + 260 * MS, 100000, 5 * S); // a fast one after the hold
|
||||
CHECK(h.backoff == 250 * MS, "a fast freeze keeps the backoff: %llu", (unsigned long long)h.backoff);
|
||||
frz_freeze_done(&h, t + 300 * MS, 4 * MS, 5 * S);
|
||||
CHECK(h.backoff == 500 * MS, "second slow doubles: %llu", (unsigned long long)h.backoff);
|
||||
frz_freeze_done(&h, t + 900 * MS, 4 * MS, 5 * S);
|
||||
frz_freeze_done(&h, t + 2 * S, 4 * MS, 5 * S);
|
||||
frz_freeze_done(&h, t + 4 * S, 4 * MS, 5 * S);
|
||||
CHECK(h.backoff == FRZ_BACKOFF_MAX_NS, "capped at 2 s: %llu", (unsigned long long)h.backoff);
|
||||
frz_freeze_done(&h, t + 10 * S, 3 * MS, 5 * S); // 6 s after the last slow one: starts over
|
||||
CHECK(h.backoff == 250 * MS, "after the quiet time it starts over: %llu", (unsigned long long)h.backoff);
|
||||
}
|
||||
// quiet 0: the rule of 0.10.1, a fast freeze starts the doubling over
|
||||
{
|
||||
FrzHold h = {0};
|
||||
frz_freeze_done(&h, 1 * S, 5 * MS, 0);
|
||||
frz_freeze_done(&h, 1 * S + 260 * MS, 100000, 0);
|
||||
frz_freeze_done(&h, 1 * S + 300 * MS, 5 * MS, 0);
|
||||
CHECK(h.backoff == 250 * MS, "quiet 0: a fast freeze between restarts it: %llu", (unsigned long long)h.backoff);
|
||||
}
|
||||
// the backoff holds the passes until hold_until
|
||||
{
|
||||
FrzHold h = {0};
|
||||
frz_freeze_done(&h, 1 * S, 5 * MS, 5 * S);
|
||||
CHECK(!frz_may_run(&h, 1 * S + 100 * MS, 3 * S, 0, 0), "held by the backoff");
|
||||
CHECK(frz_may_run(&h, 1 * S + 250 * MS, 3 * S, 0, 0), "runs after the backoff");
|
||||
}
|
||||
// area loads: the pool's load holds the passes, and the hold lasts after it ends
|
||||
{
|
||||
FrzHold h = {0};
|
||||
CHECK(frz_may_run(&h, 100 * S, 3 * S, 0, 0), "no load: runs");
|
||||
CHECK(!frz_may_run(&h, 100 * S, 3 * S, 1, 0), "the pool loads: held");
|
||||
CHECK(!frz_may_run(&h, 101 * S, 3 * S, 1, 0), "still loading: held");
|
||||
CHECK(!frz_may_run(&h, 103 * S, 3 * S, 0, 0), "2 s after the load ended: held");
|
||||
CHECK(frz_may_run(&h, 104 * S + 1, 3 * S, 0, 0), "3 s after: runs");
|
||||
// an area's load (perf_scene) 1 s ago holds; one 4 s ago does not
|
||||
CHECK(!frz_may_run(&h, 200 * S, 3 * S, 0, 199 * S), "area loaded 1 s ago: held");
|
||||
CHECK(frz_may_run(&h, 204 * S, 3 * S, 0, 200 * S), "area loaded 4 s ago: runs");
|
||||
// a hold of 0 never holds for loads
|
||||
FrzHold z = {0};
|
||||
CHECK(frz_may_run(&z, 300 * S, 0, 1, 299 * S), "load hold 0: runs while loading");
|
||||
}
|
||||
if (fails) return 1;
|
||||
printf("freeze_hold_check: all checks passed\n");
|
||||
return 0;
|
||||
}
|
||||
40
tests/freeze_hold_check.py
Normal file
40
tests/freeze_hold_check.py
Normal file
@@ -0,0 +1,40 @@
|
||||
"""Build and run tests/freeze_hold_check.c: runtime/freeze_hold.h, which says when the freezing of idle guest regions
|
||||
waits (the backoff after slow freezes and its quiet time, and the hold around area loads).
|
||||
|
||||
No GPU, no game files, any Python.
|
||||
|
||||
Usage: freeze_hold_check.py
|
||||
"""
|
||||
import os
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
MSYS_BIN = Path(r'C:\msys64\ucrt64\bin')
|
||||
|
||||
|
||||
def compiler():
|
||||
"""$CC, else MSYS2 UCRT64's clang, else clang on PATH (as tests/diff/common.py picks it, without its Unicorn)."""
|
||||
if os.environ.get('CC'):
|
||||
return os.environ['CC']
|
||||
if os.name == 'nt' and (MSYS_BIN / 'clang.exe').exists():
|
||||
return str(MSYS_BIN / 'clang.exe')
|
||||
return shutil.which('clang') or 'clang'
|
||||
|
||||
|
||||
def main():
|
||||
work = ROOT / 'build' / 'test' / 'freeze_hold'
|
||||
work.mkdir(parents=True, exist_ok=True)
|
||||
exe = work / ('freeze_hold_check.exe' if os.name == 'nt' else 'freeze_hold_check')
|
||||
env = dict(os.environ)
|
||||
if os.name == 'nt' and MSYS_BIN.exists():
|
||||
env['PATH'] = str(MSYS_BIN) + os.pathsep + env.get('PATH', '')
|
||||
subprocess.check_call([compiler(), '-std=gnu11', '-O1', '-Wall', '-Werror', '-I', str(ROOT / 'runtime'),
|
||||
str(ROOT / 'tests' / 'freeze_hold_check.c'), '-o', str(exe)], env=env)
|
||||
return subprocess.run([str(exe)], env=env).returncode
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
sys.exit(main())
|
||||
Reference in New Issue
Block a user