-
Notifications
You must be signed in to change notification settings - Fork 14.3k
[RISCV][TTI] Add shuffle costing for masked slide lowering #128537
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 all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
8b64212
[RISCV][TTI] Add costing for masked slide lowering
preames 01e60ff
Clang-format
preames 8621324
Address review comments
preames 81d57fc
Use std::array
preames 210ca02
Update llvm/include/llvm/Analysis/VectorUtils.h
preames 0c0a09a
lambda naming
preames d504717
Add an explicit guard for length changing shuffles
preames 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
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
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 | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -413,6 +413,36 @@ bool llvm::getShuffleDemandedElts(int SrcWidth, ArrayRef<int> Mask, | |||||||||||
return true; | ||||||||||||
} | ||||||||||||
|
||||||||||||
bool llvm::isMaskedSlidePair(ArrayRef<int> Mask, int NumElts, | ||||||||||||
std::array<std::pair<int, int>, 2> &SrcInfo) { | ||||||||||||
const int SignalValue = NumElts * 2; | ||||||||||||
SrcInfo[0] = {-1, SignalValue}; | ||||||||||||
SrcInfo[1] = {-1, SignalValue}; | ||||||||||||
lukel97 marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||||||||
for (auto [i, M] : enumerate(Mask)) { | ||||||||||||
if (M < 0) | ||||||||||||
continue; | ||||||||||||
int Src = M >= (int)NumElts; | ||||||||||||
int Diff = (int)i - (M % NumElts); | ||||||||||||
bool Match = false; | ||||||||||||
for (int j = 0; j < 2; j++) { | ||||||||||||
preames marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||||||||
auto &[SrcE, DiffE] = SrcInfo[j]; | ||||||||||||
if (SrcE == -1) { | ||||||||||||
assert(DiffE == SignalValue); | ||||||||||||
SrcE = Src; | ||||||||||||
DiffE = Diff; | ||||||||||||
} | ||||||||||||
Comment on lines
+432
to
+433
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Again, that would be incorrect. You need to fall into the match clause to consider this a successful match. |
||||||||||||
if (SrcE == Src && DiffE == Diff) { | ||||||||||||
Match = true; | ||||||||||||
break; | ||||||||||||
} | ||||||||||||
} | ||||||||||||
if (!Match) | ||||||||||||
return false; | ||||||||||||
} | ||||||||||||
assert(SrcInfo[0].first != -1 && "Must find one slide"); | ||||||||||||
return true; | ||||||||||||
} | ||||||||||||
|
||||||||||||
void llvm::narrowShuffleMaskElts(int Scale, ArrayRef<int> Mask, | ||||||||||||
SmallVectorImpl<int> &ScaledMask) { | ||||||||||||
assert(Scale > 0 && "Unexpected scaling factor"); | ||||||||||||
|
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
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
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
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
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.
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.
Why did this need to move up to VectorUtils? Couldn't it stay in the RISCV backend?
Uh oh!
There was an error while loading. Please reload this page.
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.
I didn't see an obvious spot to put it. If you have a suggestion, happy to move it back.
p.s. I'd meant to explicitly pose this question when posting the review, but apparently didn't. Oops.