Fix LoopMerge Instruction Placement#3277
Merged
MrSidims merged 2 commits intoKhronosGroup:mainfrom Jan 6, 2026
Merged
Conversation
Contributor
|
Restarting CI with the new HEAD |
MrSidims
reviewed
Jul 28, 2025
lib/SPIRV/libSPIRV/SPIRVModule.cpp
Outdated
Comment on lines
1867
to
1873
| } else { | ||
| // If there's no proper terminator, add at the end | ||
| return addInstruction( | ||
| new SPIRVLoopMerge(MergeBlock, ContinueTarget, LoopControl, | ||
| LoopControlParameters, BB), | ||
| BB); | ||
| } |
Contributor
There was a problem hiding this comment.
Probably clang-tidy will recommend to remove else as previous if terminates with return.
MrSidims
requested review from
YixingZhang007,
YuriPlyakhin,
maarquitos14 and
vmaksimo
pvelesko
force-pushed
the
LoopMerge
branch
2 times, most recently
from
da5d2bf to
27b6c29
Compare
Contributor
Author
|
Any ETA on fixing the CI? |
Contributor
|
Restarting out-of-tree build with new HEAD |
MrSidims
approved these changes
Jan 6, 2026
Contributor
Is expected, it requires yet another package update in apt.llvm.org. Unrelated to this project and not gating this PR |
YuriPlyakhin
approved these changes
Jan 6, 2026
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
4 participants
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.
The SPIR-V specification requires that OpLoopMerge instructions must be placed as the second-to-last instruction in their basic block, immediately preceding the branch instruction (OpBranch or OpBranchConditional). The original implementation was not ensuring this correct placement, which could lead to SPIR-V validation failures.