Fix MergeBlock error: a merge block for another header #3280
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
MrSidims
requested review from
YixingZhang007,
YuriPlyakhin,
maarquitos14 and
vmaksimo
| DominatorTree DomTree(*Fun); | ||
| LoopInfo LI(DomTree); | ||
| for (const auto *LoopObj : LI.getLoopsInPreorder()) { | ||
| // Find the innermost loop that contains the current basic block |
There was a problem hiding this comment.
Suggested change
| // Find the innermost loop that contains the current basic block | |
| // Find the innermost loop that contains the current basic block. |
| ; This test verifies that OpLoopMerge instructions properly assign unique merge blocks | ||
| ; and don't create conflicts where the same block is used as a merge block for multiple loops. | ||
|
|
||
| ; RUN: llvm-spirv %S/mergeBlock.bc -o %t.spv |
There was a problem hiding this comment.
Please, add the test contents in plain text in this file and call llvm-as from here.
There was a problem hiding this comment.
I think these binary file should be removed from the PR.
There was a problem hiding this comment.
and the same for the other .bc file.
|
|
||
| ; RUN: llvm-spirv --to-text %t.spv -o - | FileCheck %s --check-prefix=CHECK-SPIRV-TEXT | ||
| ; CHECK-SPIRV-TEXT: LoopMerge | ||
| ; CHECK-SPIRV-TEXT: BranchConditional No newline at end of file |
There was a problem hiding this comment.
Please, add newline at end of file.
|
|
||
| ; RUN: llvm-spirv --to-text %t.spv -o - | FileCheck %s --check-prefix=CHECK-SPIRV-TEXT | ||
| ; CHECK-SPIRV-TEXT: LoopMerge | ||
| ; CHECK-SPIRV-TEXT: BranchConditional No newline at end of file |
There was a problem hiding this comment.
should we add NEXT to verify that LoopMerge is immediately preceding?
Suggested change
| ; CHECK-SPIRV-TEXT: BranchConditional | |
| ; CHECK-SPIRV-TEXT-NEXT: BranchConditional |
|
|
||
| ; RUN: llvm-spirv --to-text %t.spv -o - | FileCheck %s --check-prefix=CHECK-SPIRV-TEXT | ||
| ; CHECK-SPIRV-TEXT: LoopMerge | ||
| ; CHECK-SPIRV-TEXT: BranchConditional No newline at end of file |
There was a problem hiding this comment.
Please, add newline at end of file.
There was a problem hiding this comment.
and the same for the other .bc file.
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.
Code was assigning the same merge block to multiple headers. Added a fails as follows before the fix:
#3277 should be merged first as this test will trigger that error before hitting merge block error.