-
Notifications
You must be signed in to change notification settings - Fork 15.1k
[AMDGPU] Delete redundant s_or_b32 #165261
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 3 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
d9321dd
Delete redundant s_or_b32
LU-JOHN 8f79d82
Fix mnemonic
LU-JOHN a276310
Fix arguments
LU-JOHN f261b26
Fix comment
LU-JOHN b4f3449
Don't copy MachineOperand
LU-JOHN b3db724
Make comment clear
LU-JOHN 57d9edd
Ensure hi/lo halves are or-ed. Add mir tests.
LU-JOHN 919962b
Add undef testcase
LU-JOHN 7dbdbe4
Fix handling of undef
LU-JOHN 92f73c6
Use getVRegDef
LU-JOHN 3f8d209
Use correct instruction for scan start point
LU-JOHN d815e12
Ensure scan points have same parent
LU-JOHN 8889e21
Add negative test for intervening scc def
LU-JOHN f2e16ad
Fix grammar
LU-JOHN 9cea63d
remove braces
LU-JOHN File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10160,7 +10160,7 @@ static bool followSubRegDef(MachineInstr &MI, | |
| } | ||
|
|
||
| MachineInstr *llvm::getVRegSubRegDef(const TargetInstrInfo::RegSubRegPair &P, | ||
| MachineRegisterInfo &MRI) { | ||
| const MachineRegisterInfo &MRI) { | ||
| assert(MRI.isSSA()); | ||
| if (!P.Reg.isVirtual()) | ||
| return nullptr; | ||
|
|
@@ -10689,6 +10689,25 @@ bool SIInstrInfo::optimizeCompareInstr(MachineInstr &CmpInstr, Register SrcReg, | |
| if (!optimizeSCC(Def, &CmpInstr, RI)) | ||
| return false; | ||
|
|
||
| // If s_or_b32 result is unused (i.e. it is effectively a 64-bit s_cmp_lg of | ||
| // a register pair) and the input is a 64-bit foldableSelect then transform: | ||
| // | ||
| // (s_or_b32 (S_CSELECT_B64 (non-zero imm), 0), 0 => (S_CSELECT_B64 | ||
| // (non-zero | ||
| // imm), 0) | ||
| if (Def->getOpcode() == AMDGPU::S_OR_B32 && | ||
| MRI->use_nodbg_empty(Def->getOperand(0).getReg())) { | ||
| MachineOperand OrOpnd1 = Def->getOperand(1); | ||
| MachineOperand OrOpnd2 = Def->getOperand(2); | ||
LU-JOHN marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| if (OrOpnd1.isReg() && OrOpnd2.isReg() && | ||
| OrOpnd1.getReg() != OrOpnd2.getReg()) { | ||
| auto *Def1 = getVRegSubRegDef(getRegSubRegPair(OrOpnd1), *MRI); | ||
| auto *Def2 = getVRegSubRegDef(getRegSubRegPair(OrOpnd2), *MRI); | ||
|
||
| if (Def1 == Def2 && foldableSelect(*Def1)) | ||
| optimizeSCC(Def1, Def, RI); | ||
| } | ||
| } | ||
| return true; | ||
| }; | ||
|
|
||
|
|
||
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The example is malformed, the or can't directly consume the s_cselect_b64). It's also mixing different capitalizations
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated comment.