test(vk): the simulated-turf pools check asserts the stock floor #2174 set #2202

Open
dazemc wants to merge 2 commits from dazemc/Longshot:fix/sim-turf-floor-check into main
Contributor

Summary

tests/test_sim_turf_pools.py's wiring check still pinned the floor #2093 gave the adaptive simulated-turf lists: 0 records ("maximum, 0u"). #2174 changed that floor to the game's own size — 143360 blade records and 138240 pool records — because a list released to 0 in an area without turf (Market) came back to Hyrule Field empty and grew list by list, each growth's first write into the game's records a write-back that a capture waited 250 ms for. It added tests/test_sim_turf_floor.py, which plays that policy for both lists, but did not update this check, so test_sim_turf_pools.py has been red on main since #2174 with FAIL: adaptive buffers do not default to their measured minimum floor.

What changed: the assertion states the new contract — the constructor passes kSimTurfPoolCap for a pool and kSimTurfBladeCap for the blade list (whitespace removed before matching, so a re-indent does not fail it), and RX_VK_SIM_TURF_SUBSTOCK still may not exist. It is kept rather than deleted: test_sim_turf_floor.py plays the floor's behaviour for both lists, and this is the wiring's cheap text-level guard; deleting it would weaken a check to make a failure go away.

No product change: the branch differs from main only in tests/test_sim_turf_pools.py.

Testing

Tested: the full suite, --jobs 3 in an 8 GiB memory scope with the pinned headers: here 912 passed, 22 failed, 18 skipped in 626 s against main @ a2dc5385's 911 / 23 / 18. The only name in the baseline and not here is tests/test_sim_turf_pools.py, the check this change updates; no name fails here that does not fail on main. On main @ a2dc5385 the old check fails with FAIL: adaptive buffers do not default to their measured minimum floor (the main-red name); with this change it passes. The branch changes no source, so that pass is against the same gpu/vk/vk_draw.cpp main has, and tests/test_sim_turf_floor.py (#2174's behavioural check for both lists) still passes.

Still to test: None.

Measurements

Verdict: the stale assertion is gone and the floor stays guarded: the pools check is green again, test_sim_turf_floor.py still plays the policy, and nothing the game runs changes.

Before: main @ a2dc5385 After: this PR @ fcaa932f
test_sim_turf_pools.py FAIL: adaptive buffers do not default to their measured minimum floor pass
test_sim_turf_floor.py pass pass
full suite (passed / failed, 18 skipped) 911 / 23 912 / 22

Risks

A test-only change: nothing the game runs changes — no switch, setting, save or cache. If the constructor's floor moves again, this check fails with the line to read, and test_sim_turf_floor.py fails with the capacity it found. Reverting restores the red check.

Checklist

Ready for review

  • One topic, on current main; the title is a Conventional Commit.
  • Tested on my own PC, in the game for a change the game runs, as Testing says. (test-only: the game runs nothing new; the check ran on this PC)
  • mise run test passes (any failure that also fails on main is named). (912 / 22 / 18 here against main's 911 / 23 / 18; the only difference is tests/test_sim_turf_pools.py passing, and no name here is absent from main's list)
  • Measured against main, or Measurements says why there is nothing to measure.
  • No game files, build output or hand-edited generated files; third_party/ untouched; nothing GPL-incompatible.

When it applies

  • A check under tests/ that reads changed source is updated, not weakened. (the floor assertion states the contract #2174 set; test_sim_turf_floor.py still plays it)
  • AI assistance recorded with Assisted-by: / Co-Authored-By: trailers. The head adds
    Assisted-by: DeepSeek V4.1 Flash 1017 (opencode-go) in an empty commit (message-only: no file changed); its tree
    b79602aeac48f05cfce025af124fd6620032b83f is the same object as fcaa932f's, so the runs and checks above describe the head's tree.

Ready to merge

  • Everything in Still to test has run, its results in Tested. (Still to test is None; the check is in Tested — ticked at merge)
  • Tier 1 hardware it can affect is tested (docs/dev/standards.md, "Hardware tiers"). (a test-only change affects no hardware)
  • Approved in review, every comment answered. (no review yet)
  • CI passes on the head; on current main, measured again or a comment says why the numbers still hold. (CI has not run on this head)
## Summary `tests/test_sim_turf_pools.py`'s wiring check still pinned the floor #2093 gave the adaptive simulated-turf lists: 0 records (`"maximum, 0u"`). #2174 changed that floor to the game's own size — 143360 blade records and 138240 pool records — because a list released to 0 in an area without turf (Market) came back to Hyrule Field empty and grew list by list, each growth's first write into the game's records a write-back that a capture waited 250 ms for. It added `tests/test_sim_turf_floor.py`, which plays that policy for both lists, but did not update this check, so `test_sim_turf_pools.py` has been red on `main` since #2174 with `FAIL: adaptive buffers do not default to their measured minimum floor`. What changed: the assertion states the new contract — the constructor passes `kSimTurfPoolCap` for a pool and `kSimTurfBladeCap` for the blade list (whitespace removed before matching, so a re-indent does not fail it), and `RX_VK_SIM_TURF_SUBSTOCK` still may not exist. It is kept rather than deleted: `test_sim_turf_floor.py` plays the floor's behaviour for both lists, and this is the wiring's cheap text-level guard; deleting it would weaken a check to make a failure go away. No product change: the branch differs from `main` only in `tests/test_sim_turf_pools.py`. ## Testing **Tested:** the full suite, `--jobs 3` in an 8 GiB memory scope with the pinned headers: here **912 passed, 22 failed, 18 skipped in 626 s** against `main @ a2dc5385`'s **911 / 23 / 18**. The only name in the baseline and not here is `tests/test_sim_turf_pools.py`, the check this change updates; no name fails here that does not fail on main. On `main @ a2dc5385` the old check fails with `FAIL: adaptive buffers do not default to their measured minimum floor` (the main-red name); with this change it passes. The branch changes no source, so that pass is against the same `gpu/vk/vk_draw.cpp` `main` has, and `tests/test_sim_turf_floor.py` (#2174's behavioural check for both lists) still passes. **Still to test:** None. ## Measurements **Verdict:** the stale assertion is gone and the floor stays guarded: the pools check is green again, `test_sim_turf_floor.py` still plays the policy, and nothing the game runs changes. | | Before: main @ a2dc5385 | After: this PR @ fcaa932f | |---|---|---| | `test_sim_turf_pools.py` | FAIL: adaptive buffers do not default to their measured minimum floor | pass | | `test_sim_turf_floor.py` | pass | pass | | full suite (passed / failed, 18 skipped) | 911 / 23 | 912 / 22 | ## Risks A test-only change: nothing the game runs changes — no switch, setting, save or cache. If the constructor's floor moves again, this check fails with the line to read, and `test_sim_turf_floor.py` fails with the capacity it found. Reverting restores the red check. ## Checklist ### Ready for review - [x] One topic, on current `main`; the title is a Conventional Commit. - [x] Tested on my own PC, in the game for a change the game runs, as Testing says. (test-only: the game runs nothing new; the check ran on this PC) - [x] `mise run test` passes (any failure that also fails on `main` is named). (912 / 22 / 18 here against main's 911 / 23 / 18; the only difference is `tests/test_sim_turf_pools.py` passing, and no name here is absent from main's list) - [x] Measured against `main`, or Measurements says why there is nothing to measure. - [x] No game files, build output or hand-edited generated files; `third_party/` untouched; nothing GPL-incompatible. ### When it applies - [x] A check under `tests/` that reads changed source is updated, not weakened. (the floor assertion states the contract #2174 set; `test_sim_turf_floor.py` still plays it) - [x] AI assistance recorded with `Assisted-by:` / `Co-Authored-By:` trailers. The head adds `Assisted-by: DeepSeek V4.1 Flash 1017 (opencode-go)` in an empty commit (message-only: no file changed); its tree `b79602aeac48f05cfce025af124fd6620032b83f` is the same object as `fcaa932f`'s, so the runs and checks above describe the head's tree. ### Ready to merge - [ ] Everything in Still to test has run, its results in Tested. (Still to test is None; the check is in Tested — ticked at merge) - [ ] Tier 1 hardware it can affect is tested (docs/dev/standards.md, "Hardware tiers"). (a test-only change affects no hardware) - [ ] Approved in review, every comment answered. (no review yet) - [ ] CI passes on the head; on current `main`, measured again or a comment says why the numbers still hold. (CI has not run on this head)
test(vk): the simulated-turf pools check asserts the stock floor #2174 set
Some checks failed
PR description / Description follows the template (pull_request_target) Successful in 5s
Website / Website on Cloudflare (pull_request_target) Has been skipped
CI / Conventional Commit title (pull_request) Has been cancelled
CI / Python source checks (ubuntu-24.04, part 1/2) (pull_request) Has been cancelled
CI / Python source checks (ubuntu-24.04, part 2/2) (pull_request) Has been cancelled
CI / SPIR-V fixtures (global narrow load/store, direct surface atomics, F2I immediate) (pull_request) Has been cancelled
CI / Workflow lint (actionlint) (pull_request) Has been cancelled
CI / Website build and checks (pull_request) Has been cancelled
Guide screenshots / Guide images and local UI source review (pull_request) Has been cancelled
Third-party parts / As their notes say (pull_request) Has been cancelled
Third-party parts / The same as upstream (pull_request) Has been cancelled
fcaa932fd4
#2093's check pinned SimTurfPrivate's floor at 0 records ("maximum, 0u"). #2174 made the floor the
game's own size (143360 blade records, 138240 pool records) so a list is never empty when an area
without turf comes back, and added tests/test_sim_turf_floor.py, which plays that policy for both
lists. The pools check still asserted the old floor, so it has been red on main since #2174:
"FAIL: adaptive buffers do not default to their measured minimum floor".

It now asserts the new contract: the constructor passes kSimTurfPoolCap for a pool and
kSimTurfBladeCap for the blade list (whitespace removed before matching, so a re-indent does not
fail it), and RX_VK_SIM_TURF_SUBSTOCK still may not exist. The assertion stays rather than being
deleted: the floor check plays the behaviour, this is the wiring's cheap text-level guard, and
removing it would weaken a check to make a failure go away.

No product change: the branch differs from main only in this test.
dazemc left a comment

The When it applies section has no AI assistance recorded box, and the commit fcaa932f has no Assisted-by: trailer. Add the trailer and the box (and the A fix box if the updated check counts as the failing-on-main test).

The `When it applies` section has no `AI assistance recorded` box, and the commit `fcaa932f` has no `Assisted-by:` trailer. Add the trailer and the box (and the `A fix` box if the updated check counts as the failing-on-main test).
chore: record the Assisted-by trailer
Some checks are pending
CI / Python source checks (ubuntu-24.04, part 2/2) (pull_request) Blocked by required conditions
CI / SPIR-V fixtures (global narrow load/store, direct surface atomics, F2I immediate) (pull_request) Blocked by required conditions
CI / Conventional Commit title (pull_request) Blocked by required conditions
CI / Python source checks (ubuntu-24.04, part 1/2) (pull_request) Blocked by required conditions
CI / Workflow lint (actionlint) (pull_request) Blocked by required conditions
CI / Website build and checks (pull_request) Blocked by required conditions
Guide screenshots / Guide images and local UI source review (pull_request) Blocked by required conditions
Third-party parts / As their notes say (pull_request) Blocked by required conditions
Third-party parts / The same as upstream (pull_request) Blocked by required conditions
PR description / Description follows the template (pull_request_target) Successful in 5s
6c324a7ce5
Assisted-by: DeepSeek V4.1 Flash 1017 (opencode-go)
Author
Contributor

AI-assistance box added with real evidence: head 6c324a7c is an empty, message-only commit carrying Assisted-by: DeepSeek V4.1 Flash 1017 (opencode-go); its tree b79602aeac48f05cfce025af124fd6620032b83f is the same object as fcaa932f's, so the check's runs still describe the head's tree. Pushed fast-forward, no force.

AI-assistance box added with real evidence: head `6c324a7c` is an empty, message-only commit carrying `Assisted-by: DeepSeek V4.1 Flash 1017 (opencode-go)`; its tree `b79602aeac48f05cfce025af124fd6620032b83f` is the same object as `fcaa932f`'s, so the check's runs still describe the head's tree. Pushed fast-forward, no force.
Some checks are pending
CI / Python source checks (ubuntu-24.04, part 2/2) (pull_request) Blocked by required conditions
CI / SPIR-V fixtures (global narrow load/store, direct surface atomics, F2I immediate) (pull_request) Blocked by required conditions
CI / Conventional Commit title (pull_request) Blocked by required conditions
CI / Python source checks (ubuntu-24.04, part 1/2) (pull_request) Blocked by required conditions
CI / Workflow lint (actionlint) (pull_request) Blocked by required conditions
CI / Website build and checks (pull_request) Blocked by required conditions
Guide screenshots / Guide images and local UI source review (pull_request) Blocked by required conditions
Third-party parts / As their notes say (pull_request) Blocked by required conditions
Third-party parts / The same as upstream (pull_request) Blocked by required conditions
PR description / Description follows the template (pull_request_target) Successful in 5s
This pull request doesn't have enough approvals yet. 0 of 1 approvals granted.
Some workflows are waiting to be reviewed.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u 'fix/sim-turf-floor-check:dazemc-fix/sim-turf-floor-check'
git switch 'dazemc-fix/sim-turf-floor-check'
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
MagicBeanDev/Longshot!2202
No description provided.