Skip to content

[SLPVectorizer] minor tweaks around lambdas for compatibilty with older compilers #122348

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.

Sign up for GitHub

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 2 commits into from
Jan 10, 2025
Merged

[SLPVectorizer] minor tweaks around lambdas for compatibilty with older compilers #122348

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ef3e24
[SLPVectorizer] minor tweaks around lambdas for compatibilty with som…
AlexMaclean Dec 22, 2024
07c41f2
address comments
AlexMaclean Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6923,8 +6923,8 @@ void BoUpSLP::tryToVectorizeGatheredLoads(
Loads.size());
Align Alignment = computeCommonAlignment<LoadInst>(Values);
auto *Ty = getWidenedType(Loads.front()->getType(), Loads.size());
return TTI->isLegalMaskedGather(Ty, Alignment) &&
!TTI->forceScalarizeMaskedGather(Ty, Alignment);
return this->TTI->isLegalMaskedGather(Ty, Alignment) &&
Copy link
Member

@alexey-bataev alexey-bataev Jan 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest something like this instead:

auto IsMaskedGatherSupported = [&, TTI=TTI](ArrayRef<LoadInst *> Loads) {

Copy link
Member Author

@AlexMaclean AlexMaclean Jan 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good, fixed

!this->TTI->forceScalarizeMaskedGather(Ty, Alignment);
};

auto GetVectorizedRanges = [this](ArrayRef<LoadInst *> Loads,
Expand Down Expand Up @@ -7085,9 +7085,10 @@ void BoUpSLP::tryToVectorizeGatheredLoads(
}
SmallVector<std::pair<LoadInst *, int>> LocalLoadsDists(LoadsDists);
SmallVector<LoadInst *> OriginalLoads(LocalLoadsDists.size());
transform(
LoadsDists, OriginalLoads.begin(),
[](const std::pair<LoadInst *, int> &L) { return L.first; });
transform(LoadsDists, OriginalLoads.begin(),
[](const std::pair<LoadInst *, int> &L) -> LoadInst * {
return L.first;
});
stable_sort(LocalLoadsDists, LoadSorter);
SmallVector<LoadInst *> Loads;
unsigned MaxConsecutiveDistance = 0;
Expand Down Expand Up @@ -7314,7 +7315,8 @@ void BoUpSLP::tryToVectorizeGatheredLoads(
if (!Ref.empty() && !NonVectorized.empty() &&
std::accumulate(
Ref.begin(), Ref.end(), 0u,
[](unsigned S, ArrayRef<std::pair<LoadInst *, int>> LoadsDists) {
[](unsigned S,
ArrayRef<std::pair<LoadInst *, int>> LoadsDists) -> unsigned {
return S + LoadsDists.size();
}) != NonVectorized.size() &&
IsMaskedGatherSupported(NonVectorized)) {
Expand Down Expand Up @@ -17003,8 +17005,8 @@ void BoUpSLP::optimizeGatherSequence() {
// Check if the last undefs actually change the final number of used vector
// registers.
return SM1.size() - LastUndefsCnt > 1 &&
TTI->getNumberOfParts(SI1->getType()) ==
TTI->getNumberOfParts(
this->TTI->getNumberOfParts(SI1->getType()) ==
this->TTI->getNumberOfParts(
getWidenedType(SI1->getType()->getElementType(),
SM1.size() - LastUndefsCnt));
};
Expand Down Expand Up @@ -17784,8 +17786,8 @@ bool BoUpSLP::collectValuesToDemote(
const unsigned VF = E.Scalars.size();
Type *OrigScalarTy = E.Scalars.front()->getType();
if (UniqueBases.size() <= 2 ||
TTI->getNumberOfParts(getWidenedType(OrigScalarTy, VF)) ==
TTI->getNumberOfParts(getWidenedType(
this->TTI->getNumberOfParts(getWidenedType(OrigScalarTy, VF)) ==
this->TTI->getNumberOfParts(getWidenedType(
IntegerType::get(OrigScalarTy->getContext(), BitWidth), VF)))
ToDemote.push_back(E.Idx);
}
Expand Down
Loading