Repository navigation
Stop test_mem_trim matching a bc_scratch_layout call that has moved on - #852
Closed
notquiteog wants to merge 1 commit into
Closed
notquiteog wants to merge 1 commit into
notquiteog wants to merge 1 commit into
Conversation
…ved on tests/test_mem_trim.py fails on main with "a BC3 upload uses a scratch it did not ask for". It is the test, not the renderer: the assertion counts the exact string "if (!bc_scratch_layout(cmd)) return false;", and the uneven BC levels work gave that guard a second argument. Both call sites still check the return (vk_texture.cpp:700 and :2196), so the property the check is about -- every user asks for the scratch first and stops when it cannot be made -- holds; only the literal changed. Matches the call with the argument list left open, so adding an argument does not break it again. Confirmed not vacuous: with the guard at :2196 reduced to a bare call the check still fails, and passes again when restored. Assisted-by: Claude Opus 5 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Owner
|
Thank you for the fix! #806 made the same repair to tests/test_mem_trim.py (checking both bc_scratch_layout call sites with their resize argument) and was merged a few minutes ago, so main's check passes again. Closing as a duplicate. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
tests/test_mem_trim.pyfails onmain:It is the test, not the renderer. The assertion counts an exact string:
The uneven-BC-levels work gave that guard a second argument, so both call sites now read
if (!bc_scratch_layout(cmd, tex.bc_resized)) return false;andif (!bc_scratch_layout(cmd, dst->bc_resized)) return false;(gpu/vk/vk_texture.cpp:700and:2196). The property the check is about — every user asks for the scratch first and stops when it cannot be made — still holds at both sites; only the literal changed.This matches the call with the argument list left open instead, so adding an argument does not break it again.
Checked that it is not now vacuous: with the guard at
:2196reduced to a barebc_scratch_layout(cmd, dst->bc_resized);the check still fails, and it passes again when restored.python -I -B tests/run_all.pygoes from 14 failures to 13 here. The rest are a missingclang++and pinned SPIR-V headers in my environment, not code.AI assistance: recorded in the commit trailers.