test(vk): the replay write-order fixture cuts main's payload_short with payload (#231) #937
No reviewers
Labels
No labels
area/accessibility
area/audio
area/input
area/install
area/menu
area/renderer
area/saves
area/tooling
area/upscaling
beanstalk: approved
beanstalk: failed
beanstalk: needs approval
beanstalk: running
beanstalk: tested
ci: approved
good first issue
gpu/amd
gpu/igpu
gpu/intel
gpu/nvidia
help wanted
kind
bug
kind
chore
kind
docs
kind
feature
kind
performance
kind
question
needs measurements
platform/linux
platform/macos
platform/steam-deck
platform/windows
preview
priority
critical
priority
high
priority
low
regression
risk
high
risk
low
risk
medium
status
blocked
status
confirmed
status
duplicate
status
invalid
status
needs-info
status
wontfix
ci: approved
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set
Reference
MagicBeanDev/Longshot!937
Loading…
Reference in a new issue
No description provided.
Delete branch "mooki/Longshot:fix/replay-write-order-payload-short"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Type: test · Risk: low · Tested on: macOS 26.7.1, Apple M4 Max (game-free checks only, arm64 and x86_64) · Needs: none
Why
tests/test_replay_write_order.py, the check #440 added, fails on main before any of its cases runs: its fixture no longer builds. So #440's fix (the replay's own buffer writes kept in command order) has no working game-free check on any platform, andpython -I -B tests/run_all.pyfails on it for everyone.The cause is the merge order. #440 (
9e100854, merged 2026-11-15 14:41 CST) merged at a head based onaa95d35f, from before #231 (3d880bf6, merged 12:27 CST). #231 makespayload<T>()ingpu/vk/vk_replay.cppcopy a payload shorter than its type throughpayload_short, a function of its own. The test cutspayload<T>()out of the replay's source and builds it against its stand-ins, but notpayload_short, so the build stops at "use of undeclared identifier 'payload_short'". The issue tracker (searched 2026-11-15 15:10 CST for the test's name,payload_shortand "write order") has nothing that fits.What changed
The test's fixture cuts
payload_shortout ofvk_replay.cpptogether withpayload<T>(), where the source has it, so the check builds and runs again. No assertion, product code or other test changes.main()intests/test_replay_write_order.pyfills the@@PAYLOAD@@stand-in with the[[gnu::noinline, gnu::cold]] void payload_short(block and thenpayload<T>()when the replay haspayload_short(main's), and withpayload<T>()alone when it does not (a source from before #231, given with--source). 7 lines added, 1 changed.payload_shortis #231's intended out-of-line copy of a short payload, and #440's fix works with it unchanged; only the fixture, written on a base without it, is stale. This is the rebase sweep's commit for the same break on its rebased copy of #440 (9a1d4d92), cherry-picked without a conflict.Measurements
Verdict: nothing to measure: a test fixture only; the game, its build and its timing are unchanged.
Flags and settings
None
Testing
Tested: game-free, on macOS 26.7.1, Apple M4 Max, Apple clang 21, arm64 and x86_64 (Rosetta: the fixture built with
clang++ -arch x86_64and run translated):python -I -B tests/test_replay_write_order.py --headers <Vulkan-Headers/include>fails on mainceccd963, and again on25e7d10f, on both architectures, before any case:t.cpp:273:9: error: use of undeclared identifier 'payload_short', then "FAIL: the cut-out write and clear did not build against the stand-ins". On this PR all 18 cases pass on both: first atd6f6ff82, then at head3b17461e, the same patch rebased onto25e7d10f.--sourcepointing at main'sgpu/from just before #440 (adbdd4fc, which already has #231'spayload_short), the same 10 cases fail on both architectures ("FAIL: 10 case(s): the replay's own writes do not all keep command order"), and the other 8 pass.3b17461e(python -I -B tests/run_all.py --jobs 6, in a fresh HOME): 573 passed, 41 failed, 17 skipped. By name against main7bacf846's run on this Mac (558 passed, 34 failed, 17 skipped; main has 47 commits since), the one status this PR changes istest_replay_write_order: pass here, FAIL on main (above). Every other difference is main's own since7bacf846:test_crt_options(its fixture looks forconstexpr int kVramBudgets =in the menu's source, which main's no longer has) andtest_nonuniform_image_arrays("create_device: no 'ci.pNext = &f;' before vkCreateDevice") fail. 3 it removed with #915:test_forge_pr,test_forge_session_lock,test_team_chat.7bacf846fail:test_fsr_uniform_ownershipandtest_parallel_init_order(their fixtures don't know #928'sFpsRtWait),test_bug_reportandtest_hardware_report(since #915 they need MagicBeanDev/Tooling beside the checkout),test_gpu_hang_watch(its 2 s limit ended the process at 3.7 s, load average 21-27).25e7d10f, run by name on this Mac (the hang watch at 3.4 s, load average 32).7bacf846on this Mac, by name:test_appimage_package_retry,test_appimage_player_build,test_collect_wide,test_control,test_crash_dialog,test_crash_record,test_env_on,test_game_layout,test_lift_cleanup_error,test_linux_preflight,test_longshot_ctl,test_low_memory_notice,test_make_game_cache,test_mem_gate,test_mem_gate_children,test_mirror_trim,test_missing_nup,test_oot_state_tap,test_options_budget_once,test_options_path,test_pcache_header_read,test_pipeline_cache_file,test_pipeline_cache_save,test_pipeline_play_cache,test_pipeline_tour,test_prof_symbols,test_program_cache_cleanup,test_program_cache_one_variant,test_readback_late,test_report_run,test_split_giants,test_vk_occlusion_queries,test_vk_pgo,test_walk_key.recorder_sync_test.exe-2026-11-15-155719.ips, fromtest_recorder_sync, which passed.Not tested: Linux and Windows. On main the fixture calls a function it never cut out, so every compiler refuses it the same way [inference: not run there]. The change is Python that assembles the fixture's source; the C++ it adds is main's own
payload_short, whichvk_replay.cppalready builds with on every platform. The game: nothing in the game changes.Must be tested: None: a test-only fix (a game-free fixture, no product code), so it needs no test request. macOS arm64 and x86_64 are covered under Tested; a run on Linux or Windows would confirm the "fails on main" side there.
Risks
What could break: test-only. If a later change renames or moves
payload_short, the fixture no longer finds it and the check fails to build again, loudly, as on main now; it cannot pass without the replay's code.Turning it off: revert the commit: that brings back main's build failure in this check.
Compatibility: Nothing changes: a test fixture only.
Issues
See #440 and #231.
Checklist
Everyone
type(scope): description) of the status line's type.main(25e7d10f, head3b17461e). Main has since moved to79b1fd8f(9 commits, none touching the test or the four sources it reads): this head merges onto it without a conflict, and the test passes on that merge, all 18 cases, on both architectures.python -I -B tests/run_all.pypasses (any failure that also fails onmainis named). On macOS at3b17461e: 573 passed, 17 skipped, and 41 failures that also fail on main on this Mac (34 on7bacf846, the other 7 on25e7d10f), named under Testing.third_party/untouched (a new folder with aPROVENANCE.mdinstead).When it applies
Assisted-by:/Co-Authored-By:trailers.tests/that reads changed source updated in this PR, not weakened.WIP: test(vk): the replay write-order fixture cuts main's payload_short with payload (#231)to test(vk): the replay write-order fixture cuts main's payload_short with payload (#231)View command line instructions
Checkout
From your project repository, check out a new branch and test the changes.