diff --git a/tests/test_perf_bench.py b/tests/test_perf_bench.py index 4729c5e20..ea074442e 100644 --- a/tests/test_perf_bench.py +++ b/tests/test_perf_bench.py @@ -50,7 +50,7 @@ if __name__ == "__main__": class WaitLoadedTests(unittest.TestCase): """wait_loaded on a scripted game with a fake clock: one status per 50 ms poll.""" - def run_script(self, statuses): + def run_script(self, statuses, min_chunks=0): import tools.perf_bench as pb clock = [0.0] it = iter(statuses) @@ -62,7 +62,7 @@ class WaitLoadedTests(unittest.TestCase): pb.time.time = lambda: clock[0] pb.time.sleep = lambda s: clock.__setitem__(0, clock[0] + s) try: - return pb.wait_loaded(control, lambda p: True, 60) + return pb.wait_loaded(control, lambda p: True, 60, min_chunks) finally: pb.time.time, pb.time.sleep = real_time, real_sleep @@ -86,3 +86,15 @@ class WaitLoadedTests(unittest.TestCase): busy = [self.status(901, 1000 * i) for i in range(20)] quiet = [self.status(901, 20000 + i) for i in range(40)] self.assertAlmostEqual(self.run_script(busy + quiet), 1.0, places=6) + + def test_a_quiet_start_is_not_a_load(self): + # Right after a teleport Horizon reports steady counts and nothing queued for 1.5 s before it loads: + # with a target the clock runs on until the chunks are there and the meshing has gone quiet. + idle = [self.status(3, 0, stages=0) for _ in range(30)] + loading = [self.status(30 * (i + 1), 500 * i, stages=500) for i in range(20)] + tail = [self.status(600, 10000, stages=0) for _ in range(60)] + took = self.run_script(idle + loading + tail, min_chunks=500) + self.assertGreater(took, 2.4) + self.assertLess(took, 4.0) + # Without one (the old call), the quiet start ends the wait at once. + self.assertLess(self.run_script(idle + loading + tail), 1.6) diff --git a/tools/perf_bench.py b/tools/perf_bench.py index c60533aa8..9dedc4d01 100644 --- a/tools/perf_bench.py +++ b/tools/perf_bench.py @@ -307,7 +307,12 @@ def poll(control, check, limit, interval=0.05): QUIET_MESHES_PER_S = 100 -def wait_loaded(control, near, limit): +def view_chunks(distance): + """80% of the view circle (pi x RD^2): Horizon keeps 637 columns at RD 12 and 3725 at RD 32.""" + return int(0.8 * math.pi * distance ** 2) + + +def wait_loaded(control, near, limit, min_chunks=0): """Waits until the player is spawned (near(position)), nothing is queued, the resident and generated chunk counts have not changed for a second, as the vanilla driver does, and the last sections are drawn; returns when the last @@ -320,6 +325,10 @@ def wait_loaded(control, near, limit): already taken, and sections waiting for their neighbours' light.)""" deadline = time.time() + limit last, changed, previous, meshing = None, time.time(), None, time.time() + # Right after a teleport (and at spawn) Horizon reports nothing queued and steady counts for over a second + # before it starts loading: the counts must change once, or stay full for 5 s, and the resident chunks reach + # min_chunks, before "steady" means loaded. + first, moved, began = None, False, time.time() while time.time() < deadline: try: s = control("status", timeout=10) @@ -331,6 +340,12 @@ def wait_loaded(control, near, limit): last, changed, previous, meshing = None, now, None, now else: counts = (s["chunks"], s["generated_chunks"]) + first = first or counts + moved = moved or counts != first or (s["chunks"] >= min_chunks > 0 and now - began > 5) + if min_chunks and (not moved or s["chunks"] < min_chunks): + last, changed, previous, meshing = None, now, None, now + time.sleep(0.05) + continue if counts != last: last, changed = counts, now stages = s.get("streaming") @@ -393,7 +408,7 @@ def run_horizon(args, distance): result["renderer"] = title["renderer"] result["startup"] = {"title_s": at - started} control(f"open {WORLD} {SEED} creative") - result["startup"]["world_s"] = wait_loaded(control, lambda p: True, args.timeout) - started + result["startup"]["world_s"] = wait_loaded(control, lambda p: True, args.timeout, view_chunks(distance)) - started for name, start, end, pitch in scene_list(args): control("time 6000") meshed = control("status")["meshed_sections"] @@ -403,7 +418,7 @@ def run_horizon(args, distance): control("fly {0} {1} {2} {0} {1} {2} 0.1 {3}".format(*start, pitch)) control(f"look {yaw(start, end):.3f} {pitch}") near = lambda p: sum((a - b) ** 2 for a, b in zip(p, start)) < 4.0 - scene = {"load_s": wait_loaded(control, near, args.timeout) - tp} + scene = {"load_s": wait_loaded(control, near, args.timeout, view_chunks(distance)) - tp} # Section meshes built while loading and while flying (Horizon only). loaded_meshes = control("status")["meshed_sections"] scene["meshes_load"] = loaded_meshes - meshed