Skip to content

Revert #5089: agc_driver_waterfall_images fails SPIR-V validation on main - #5824

Merged
adriadam10 merged 1 commit into
boykopovar:mainfrom
adriadam10:revert/5089-waterfall
Oct 14, 2026
Merged

adriadam10 merged 1 commit into
boykopovar:mainfrom
adriadam10:revert/5089-waterfall

Conversation

@adriadam10

@adriadam10 adriadam10 commented Oct 14, 2026 •

Copy link
Copy Markdown
Collaborator

What

Reverts #5089. Since its merge (fd438f6) every main build fails agc_driver_waterfall_images on Linux:

[VUID-StandaloneSpirv-DerivativeGroupQuadsKHR-10151] Local Size execution mode dimensions is (X = 8, Y = 1) but Entry Point id 39 also has an DerivativeGroupQuadsKHR execution mode, so both dimensions must be

The test's compute shader does an LOD query with a local size of 8x1, and SpirvModuleSetup.cpp declares DerivativeGroupQuadsKHR for every compute shader with derivatives. CI's -DANYPS5_ENABLE_SPIRV_TOOLS=ON validation rejects it. Main runs: 38560929488, 38562879025, 38563969869.

The PR can come back with the derivative group chosen from the local size (or the test on an even 2D size).

Tested

Full Build dispatched with linux=true on this branch; the last green main build (968d326) was right before #5089.

Checklist

  • Based on current main; no other open PR implements the same functions
  • One topic per PR; follow-ups go in a new PR
  • No comments in code except technical debt
  • Unimplemented paths throw (NotImplemented_nid_no_patch); silent stubs are listed in TechnicalDebt
  • No notes, investigation .md files or images added to the repository
  • New third-party code is a submodule built from source
  • Generic behaviour, not specific to one title
  • Depends on: none
  • AI-assisted: yes

…piler-waterfall-descriptors"

agc_driver_waterfall_images fails on main since fd438f6: its compute shader
runs an LOD query with a local size of 8x1, and the module gets
DerivativeGroupQuadsKHR, which SPIR-V validation rejects unless both
dimensions are even (VUID-StandaloneSpirv-DerivativeGroupQuadsKHR-10151).

This reverts commit fd438f6, reversing changes made to 5103174.

Co-Authored-By: Claude <noreply@anthropic.com>
@adriadam10
adriadam10 merged commit e2eebdb into boykopovar:main Oct 14, 2026
8 of 10 checks passed
fdfawef324 added a commit to fdfawef324/AnyPS5 that referenced this pull request Oct 19, 2026
… tables

A waterfall loop over a T# that each lane loaded with IDXEN buffer loads
(s_ff1/v_readfirstlane, v_readlane of the eight dwords, v_cmpx_eq against
the lane's VGPRs, the image instruction) stopped planning with
"GetImageResource dword 0 is not a valid runtime value". Bring back the
fold of boykopovar#5089 (reverted by boykopovar#5824 for a derivative-group validation error
that boykopovar#5829 fixed) on the image table model of boykopovar#757: the T# dwords are the
lane's own VGPRs under the loop's EXEC, and the access reads an image table
column keyed by the lane's buffer index, with the V#'s stride and
NUM_RECORDS addressing of the recompiler's buffer loads, a record count in
the table header, NonUniform slots, and whole-table faults for V# layouts
and for mixed image modes under implicit derivatives.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Codex <noreply@openai.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant