Fix LoopMerge Instruction Placement #3277
Open
Conversation
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
|
Restarting CI with the new HEAD |
MrSidims
reviewed
Jul 28, 2025
| ; This test verifies that OpLoopMerge instructions are properly placed as the second-to-last | ||
| ; instruction in their basic block, immediately preceding the branch instruction. | ||
|
|
||
| ; RUN: llvm-spirv %S/loopMerge.bc -o %t.spv |
There was a problem hiding this comment.
Please move .bc file content to the text and call llvm-as in the test before the translation.
Comment on lines
+9
to
+10
| ; CHECK-SPIRV-TEXT: LoopMerge | ||
| ; CHECK-SPIRV-TEXT: BranchConditional |
There was a problem hiding this comment.
Suggested change
| ; CHECK-SPIRV-TEXT: LoopMerge | |
| ; CHECK-SPIRV-TEXT: BranchConditional | |
| ; CHECK-SPIRV-TEXT: LoopMerge | |
| ; CHECK-SPIRV-TEXT-NEXT: BranchConditional |
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); | ||
| } |
There was a problem hiding this comment.
Probably clang-tidy will recommend to remove else as previous if terminates with return.
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.
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.