[SLP] Replace most uses of for_each with range-for loops. NFC #136146
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
This removes a bit of complexity from the code, where it doesn't seem to be justified.
|
@llvm/pr-subscribers-llvm-transforms Author: Alexander Kornienko (alexfh) ChangesThis removes a bit of complexity from the code, where it doesn't seem to be justified. Full diff: https://github.com/llvm/llvm-project/pull/136146.diff 1 Files Affected:
diff --git a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
index fd23fb6c81c2c..4d2968ace17c6 100644
--- a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
+++ b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
@@ -14584,13 +14584,13 @@ InstructionCost BoUpSLP::getTreeCost(ArrayRef<Value *> VectorizedVals,
};
if (!ValueToExtUses) {
ValueToExtUses.emplace();
- for_each(enumerate(ExternalUses), [&](const auto &P) {
+ for (const auto &P : enumerate(ExternalUses)) {
// Ignore phis in loops.
if (IsPhiInLoop(P.value()))
- return;
+ continue;
ValueToExtUses->try_emplace(P.value().Scalar, P.index());
- });
+ }
}
// Can use original instruction, if no operands vectorized or they are
// marked as externally used already.
@@ -14668,13 +14668,13 @@ InstructionCost BoUpSLP::getTreeCost(ArrayRef<Value *> VectorizedVals,
}
if (KeepScalar) {
ExternalUsesAsOriginalScalar.insert(EU.Scalar);
- for_each(Inst->operands(), [&](Value *V) {
+ for (Value *V : Inst->operands()) {
auto It = ValueToExtUses->find(V);
if (It != ValueToExtUses->end()) {
// Replace all uses to avoid compiler crash.
ExternalUses[It->second].User = nullptr;
}
- });
+ }
ExtraCost = ScalarCost;
if (!IsPhiInLoop(EU))
ExtractsCount[Entry].insert(Inst);
@@ -14683,13 +14683,13 @@ InstructionCost BoUpSLP::getTreeCost(ArrayRef<Value *> VectorizedVals,
// Update the users of the operands of the cast operand to avoid
// compiler crash.
if (auto *IOp = dyn_cast<Instruction>(Inst->getOperand(0))) {
- for_each(IOp->operands(), [&](Value *V) {
+ for (Value *V : IOp->operands()) {
auto It = ValueToExtUses->find(V);
if (It != ValueToExtUses->end()) {
// Replace all uses to avoid compiler crash.
ExternalUses[It->second].User = nullptr;
}
- });
+ }
}
}
}
@@ -15325,7 +15325,9 @@ BoUpSLP::isGatherShuffledSingleRegisterEntry(
// tree.
Entries.push_back(FirstEntries.front());
// Update mapping between values and corresponding tree entries.
- for_each(UsedValuesEntry, [&](auto &P) { P.second = 0; });
+ for (auto &P : UsedValuesEntry) {
+ P.second = 0;
+ }
VF = FirstEntries.front()->getVectorFactor();
} else {
// Try to find nodes with the same vector factor.
@@ -15375,13 +15377,13 @@ BoUpSLP::isGatherShuffledSingleRegisterEntry(
ValuesToEntries.emplace_back().insert(E->Scalars.begin(),
E->Scalars.end());
// Update mapping between values and corresponding tree entries.
- for_each(UsedValuesEntry, [&](auto &P) {
+ for (auto &P : UsedValuesEntry) {
for (unsigned Idx : seq<unsigned>(ValuesToEntries.size()))
if (ValuesToEntries[Idx].contains(P.first)) {
P.second = Idx;
break;
}
- });
+ }
}
bool IsSplatOrUndefs = isSplat(VL) || all_of(VL, IsaPred<UndefValue>);
@@ -15527,12 +15529,12 @@ BoUpSLP::isGatherShuffledSingleRegisterEntry(
(MaxElement % VF) -
(MinElement % VF) + 1));
if (NewVF < VF) {
- for_each(SubMask, [&](int &Idx) {
+ for (int &Idx : SubMask) {
if (Idx == PoisonMaskElem)
- return;
+ continue;
Idx = ((Idx % VF) - (((MinElement % VF) / NewVF) * NewVF)) % NewVF +
(Idx >= static_cast<int>(VF) ? NewVF : 0);
- });
+ }
} else {
NewVF = VF;
}
@@ -19304,8 +19306,11 @@ BoUpSLP::BlockScheduling::tryScheduleBundle(ArrayRef<Value *> VL, BoUpSLP *SLP,
// whole bundle might not be ready.
ReadyInsts.remove(BundleMember);
if (ArrayRef<ScheduleBundle *> Bundles = getScheduleBundles(V);
- !Bundles.empty())
- for_each(Bundles, [&](ScheduleBundle *B) { ReadyInsts.remove(B); });
+ !Bundles.empty()) {
+ for (ScheduleBundle *B : Bundles) {
+ ReadyInsts.remove(B);
+ }
+ }
if (!BundleMember->isScheduled())
continue;
@@ -19630,23 +19635,23 @@ void BoUpSLP::BlockScheduling::calculateDependencies(ScheduleBundle &Bundle,
}
continue;
}
- for_each(Bundles, [&](ScheduleBundle *Bundle) {
+ for (ScheduleBundle *Bundle : Bundles) {
if (!Visited.insert(Bundle).second || Bundle->hasValidDependencies())
- return;
+ continue;
assert(isInSchedulingRegion(*Bundle) &&
"ScheduleData not in scheduling region");
for_each(Bundle->getBundle(), ProcessNode);
- });
+ }
if (InsertInReadyList && SD->isReady()) {
- for_each(Bundles, [&](ScheduleBundle *Bundle) {
+ for (ScheduleBundle *Bundle : Bundles) {
assert(isInSchedulingRegion(*Bundle) &&
"ScheduleData not in scheduling region");
if (!Bundle->isReady())
- return;
+ continue;
ReadyInsts.insert(Bundle);
LLVM_DEBUG(dbgs() << "SLP: gets ready on update: " << *Bundle
<< "\n");
- });
+ }
}
}
}
@@ -20030,8 +20035,9 @@ bool BoUpSLP::collectValuesToDemote(
if (Operands.empty()) {
if (!IsTruncRoot)
MaxDepthLevel = 1;
- (void)for_each(E.Scalars, std::bind(IsPotentiallyTruncated, _1,
- std::ref(BitWidth)));
+ for (Value *V : E.Scalars) {
+ (void)IsPotentiallyTruncated(V, BitWidth);
+ }
} else {
// Several vectorized uses? Check if we can truncate it, otherwise -
// exit.
@@ -21032,17 +21038,17 @@ bool SLPVectorizerPass::vectorizeStores(
unsigned Sz = 1 + Log2_32(MaxVF) - Log2_32(MinVF);
SmallVector<unsigned> CandidateVFs(Sz + (NonPowerOf2VF > 0 ? 1 : 0));
unsigned Size = MinVF;
- for_each(reverse(CandidateVFs), [&](unsigned &VF) {
+ for (unsigned &VF : reverse(CandidateVFs)) {
VF = Size > MaxVF ? NonPowerOf2VF : Size;
Size *= 2;
- });
+ }
unsigned End = Operands.size();
unsigned Repeat = 0;
constexpr unsigned MaxAttempts = 4;
OwningArrayRef<std::pair<unsigned, unsigned>> RangeSizes(Operands.size());
- for_each(RangeSizes, [](std::pair<unsigned, unsigned> &P) {
+ for (std::pair<unsigned, unsigned> &P : RangeSizes) {
P.first = P.second = 1;
- });
+ }
DenseMap<Value *, std::pair<unsigned, unsigned>> NonSchedulable;
auto IsNotVectorized = [](bool First,
const std::pair<unsigned, unsigned> &P) {
@@ -21118,22 +21124,22 @@ bool SLPVectorizerPass::vectorizeStores(
AnyProfitableGraph = RepeatChanged = Changed = true;
// If we vectorized initial block, no need to try to vectorize
// it again.
- for_each(RangeSizes.slice(Cnt, Size),
- [](std::pair<unsigned, unsigned> &P) {
- P.first = P.second = 0;
- });
+ for (std::pair<unsigned, unsigned> &P :
+ RangeSizes.slice(Cnt, Size)) {
+ P.first = P.second = 0;
+ }
if (Cnt < StartIdx + MinVF) {
- for_each(RangeSizes.slice(StartIdx, Cnt - StartIdx),
- [](std::pair<unsigned, unsigned> &P) {
- P.first = P.second = 0;
- });
+ for (std::pair<unsigned, unsigned> &P :
+ RangeSizes.slice(StartIdx, Cnt - StartIdx)) {
+ P.first = P.second = 0;
+ }
StartIdx = Cnt + Size;
}
if (Cnt > Sz - Size - MinVF) {
- for_each(RangeSizes.slice(Cnt + Size, Sz - (Cnt + Size)),
- [](std::pair<unsigned, unsigned> &P) {
- P.first = P.second = 0;
- });
+ for (std::pair<unsigned, unsigned> &P :
+ RangeSizes.slice(Cnt + Size, Sz - (Cnt + Size))) {
+ P.first = P.second = 0;
+ }
if (Sz == End)
End = Cnt;
Sz = Cnt;
@@ -21159,13 +21165,13 @@ bool SLPVectorizerPass::vectorizeStores(
continue;
}
if (TreeSize > 1)
- for_each(RangeSizes.slice(Cnt, Size),
- [&](std::pair<unsigned, unsigned> &P) {
- if (Size >= MaxRegVF)
- P.second = std::max(P.second, TreeSize);
- else
- P.first = std::max(P.first, TreeSize);
- });
+ for (std::pair<unsigned, unsigned> &P :
+ RangeSizes.slice(Cnt, Size)) {
+ if (Size >= MaxRegVF)
+ P.second = std::max(P.second, TreeSize);
+ else
+ P.first = std::max(P.first, TreeSize);
+ }
++Cnt;
AnyProfitableGraph = true;
}
@@ -21207,10 +21213,10 @@ bool SLPVectorizerPass::vectorizeStores(
CandidateVFs.push_back(Limit);
if (VF > MaxTotalNum || VF >= StoresLimit)
break;
- for_each(RangeSizes, [&](std::pair<unsigned, unsigned> &P) {
+ for (std::pair<unsigned, unsigned> &P : RangeSizes) {
if (P.first != 0)
P.first = std::max(P.second, P.first);
- });
+ }
// Last attempt to vectorize max number of elements, if all previous
// attempts were unsuccessful because of the cost issues.
CandidateVFs.push_back(VF);
|
|
@llvm/pr-subscribers-vectorizers Author: Alexander Kornienko (alexfh) ChangesThis removes a bit of complexity from the code, where it doesn't seem to be justified. Full diff: https://github.com/llvm/llvm-project/pull/136146.diff 1 Files Affected:
diff --git a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
index fd23fb6c81c2c..4d2968ace17c6 100644
--- a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
+++ b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
@@ -14584,13 +14584,13 @@ InstructionCost BoUpSLP::getTreeCost(ArrayRef<Value *> VectorizedVals,
};
if (!ValueToExtUses) {
ValueToExtUses.emplace();
- for_each(enumerate(ExternalUses), [&](const auto &P) {
+ for (const auto &P : enumerate(ExternalUses)) {
// Ignore phis in loops.
if (IsPhiInLoop(P.value()))
- return;
+ continue;
ValueToExtUses->try_emplace(P.value().Scalar, P.index());
- });
+ }
}
// Can use original instruction, if no operands vectorized or they are
// marked as externally used already.
@@ -14668,13 +14668,13 @@ InstructionCost BoUpSLP::getTreeCost(ArrayRef<Value *> VectorizedVals,
}
if (KeepScalar) {
ExternalUsesAsOriginalScalar.insert(EU.Scalar);
- for_each(Inst->operands(), [&](Value *V) {
+ for (Value *V : Inst->operands()) {
auto It = ValueToExtUses->find(V);
if (It != ValueToExtUses->end()) {
// Replace all uses to avoid compiler crash.
ExternalUses[It->second].User = nullptr;
}
- });
+ }
ExtraCost = ScalarCost;
if (!IsPhiInLoop(EU))
ExtractsCount[Entry].insert(Inst);
@@ -14683,13 +14683,13 @@ InstructionCost BoUpSLP::getTreeCost(ArrayRef<Value *> VectorizedVals,
// Update the users of the operands of the cast operand to avoid
// compiler crash.
if (auto *IOp = dyn_cast<Instruction>(Inst->getOperand(0))) {
- for_each(IOp->operands(), [&](Value *V) {
+ for (Value *V : IOp->operands()) {
auto It = ValueToExtUses->find(V);
if (It != ValueToExtUses->end()) {
// Replace all uses to avoid compiler crash.
ExternalUses[It->second].User = nullptr;
}
- });
+ }
}
}
}
@@ -15325,7 +15325,9 @@ BoUpSLP::isGatherShuffledSingleRegisterEntry(
// tree.
Entries.push_back(FirstEntries.front());
// Update mapping between values and corresponding tree entries.
- for_each(UsedValuesEntry, [&](auto &P) { P.second = 0; });
+ for (auto &P : UsedValuesEntry) {
+ P.second = 0;
+ }
VF = FirstEntries.front()->getVectorFactor();
} else {
// Try to find nodes with the same vector factor.
@@ -15375,13 +15377,13 @@ BoUpSLP::isGatherShuffledSingleRegisterEntry(
ValuesToEntries.emplace_back().insert(E->Scalars.begin(),
E->Scalars.end());
// Update mapping between values and corresponding tree entries.
- for_each(UsedValuesEntry, [&](auto &P) {
+ for (auto &P : UsedValuesEntry) {
for (unsigned Idx : seq<unsigned>(ValuesToEntries.size()))
if (ValuesToEntries[Idx].contains(P.first)) {
P.second = Idx;
break;
}
- });
+ }
}
bool IsSplatOrUndefs = isSplat(VL) || all_of(VL, IsaPred<UndefValue>);
@@ -15527,12 +15529,12 @@ BoUpSLP::isGatherShuffledSingleRegisterEntry(
(MaxElement % VF) -
(MinElement % VF) + 1));
if (NewVF < VF) {
- for_each(SubMask, [&](int &Idx) {
+ for (int &Idx : SubMask) {
if (Idx == PoisonMaskElem)
- return;
+ continue;
Idx = ((Idx % VF) - (((MinElement % VF) / NewVF) * NewVF)) % NewVF +
(Idx >= static_cast<int>(VF) ? NewVF : 0);
- });
+ }
} else {
NewVF = VF;
}
@@ -19304,8 +19306,11 @@ BoUpSLP::BlockScheduling::tryScheduleBundle(ArrayRef<Value *> VL, BoUpSLP *SLP,
// whole bundle might not be ready.
ReadyInsts.remove(BundleMember);
if (ArrayRef<ScheduleBundle *> Bundles = getScheduleBundles(V);
- !Bundles.empty())
- for_each(Bundles, [&](ScheduleBundle *B) { ReadyInsts.remove(B); });
+ !Bundles.empty()) {
+ for (ScheduleBundle *B : Bundles) {
+ ReadyInsts.remove(B);
+ }
+ }
if (!BundleMember->isScheduled())
continue;
@@ -19630,23 +19635,23 @@ void BoUpSLP::BlockScheduling::calculateDependencies(ScheduleBundle &Bundle,
}
continue;
}
- for_each(Bundles, [&](ScheduleBundle *Bundle) {
+ for (ScheduleBundle *Bundle : Bundles) {
if (!Visited.insert(Bundle).second || Bundle->hasValidDependencies())
- return;
+ continue;
assert(isInSchedulingRegion(*Bundle) &&
"ScheduleData not in scheduling region");
for_each(Bundle->getBundle(), ProcessNode);
- });
+ }
if (InsertInReadyList && SD->isReady()) {
- for_each(Bundles, [&](ScheduleBundle *Bundle) {
+ for (ScheduleBundle *Bundle : Bundles) {
assert(isInSchedulingRegion(*Bundle) &&
"ScheduleData not in scheduling region");
if (!Bundle->isReady())
- return;
+ continue;
ReadyInsts.insert(Bundle);
LLVM_DEBUG(dbgs() << "SLP: gets ready on update: " << *Bundle
<< "\n");
- });
+ }
}
}
}
@@ -20030,8 +20035,9 @@ bool BoUpSLP::collectValuesToDemote(
if (Operands.empty()) {
if (!IsTruncRoot)
MaxDepthLevel = 1;
- (void)for_each(E.Scalars, std::bind(IsPotentiallyTruncated, _1,
- std::ref(BitWidth)));
+ for (Value *V : E.Scalars) {
+ (void)IsPotentiallyTruncated(V, BitWidth);
+ }
} else {
// Several vectorized uses? Check if we can truncate it, otherwise -
// exit.
@@ -21032,17 +21038,17 @@ bool SLPVectorizerPass::vectorizeStores(
unsigned Sz = 1 + Log2_32(MaxVF) - Log2_32(MinVF);
SmallVector<unsigned> CandidateVFs(Sz + (NonPowerOf2VF > 0 ? 1 : 0));
unsigned Size = MinVF;
- for_each(reverse(CandidateVFs), [&](unsigned &VF) {
+ for (unsigned &VF : reverse(CandidateVFs)) {
VF = Size > MaxVF ? NonPowerOf2VF : Size;
Size *= 2;
- });
+ }
unsigned End = Operands.size();
unsigned Repeat = 0;
constexpr unsigned MaxAttempts = 4;
OwningArrayRef<std::pair<unsigned, unsigned>> RangeSizes(Operands.size());
- for_each(RangeSizes, [](std::pair<unsigned, unsigned> &P) {
+ for (std::pair<unsigned, unsigned> &P : RangeSizes) {
P.first = P.second = 1;
- });
+ }
DenseMap<Value *, std::pair<unsigned, unsigned>> NonSchedulable;
auto IsNotVectorized = [](bool First,
const std::pair<unsigned, unsigned> &P) {
@@ -21118,22 +21124,22 @@ bool SLPVectorizerPass::vectorizeStores(
AnyProfitableGraph = RepeatChanged = Changed = true;
// If we vectorized initial block, no need to try to vectorize
// it again.
- for_each(RangeSizes.slice(Cnt, Size),
- [](std::pair<unsigned, unsigned> &P) {
- P.first = P.second = 0;
- });
+ for (std::pair<unsigned, unsigned> &P :
+ RangeSizes.slice(Cnt, Size)) {
+ P.first = P.second = 0;
+ }
if (Cnt < StartIdx + MinVF) {
- for_each(RangeSizes.slice(StartIdx, Cnt - StartIdx),
- [](std::pair<unsigned, unsigned> &P) {
- P.first = P.second = 0;
- });
+ for (std::pair<unsigned, unsigned> &P :
+ RangeSizes.slice(StartIdx, Cnt - StartIdx)) {
+ P.first = P.second = 0;
+ }
StartIdx = Cnt + Size;
}
if (Cnt > Sz - Size - MinVF) {
- for_each(RangeSizes.slice(Cnt + Size, Sz - (Cnt + Size)),
- [](std::pair<unsigned, unsigned> &P) {
- P.first = P.second = 0;
- });
+ for (std::pair<unsigned, unsigned> &P :
+ RangeSizes.slice(Cnt + Size, Sz - (Cnt + Size))) {
+ P.first = P.second = 0;
+ }
if (Sz == End)
End = Cnt;
Sz = Cnt;
@@ -21159,13 +21165,13 @@ bool SLPVectorizerPass::vectorizeStores(
continue;
}
if (TreeSize > 1)
- for_each(RangeSizes.slice(Cnt, Size),
- [&](std::pair<unsigned, unsigned> &P) {
- if (Size >= MaxRegVF)
- P.second = std::max(P.second, TreeSize);
- else
- P.first = std::max(P.first, TreeSize);
- });
+ for (std::pair<unsigned, unsigned> &P :
+ RangeSizes.slice(Cnt, Size)) {
+ if (Size >= MaxRegVF)
+ P.second = std::max(P.second, TreeSize);
+ else
+ P.first = std::max(P.first, TreeSize);
+ }
++Cnt;
AnyProfitableGraph = true;
}
@@ -21207,10 +21213,10 @@ bool SLPVectorizerPass::vectorizeStores(
CandidateVFs.push_back(Limit);
if (VF > MaxTotalNum || VF >= StoresLimit)
break;
- for_each(RangeSizes, [&](std::pair<unsigned, unsigned> &P) {
+ for (std::pair<unsigned, unsigned> &P : RangeSizes) {
if (P.first != 0)
P.first = std::max(P.second, P.first);
- });
+ }
// Last attempt to vectorize max number of elements, if all previous
// attempts were unsuccessful because of the cost issues.
CandidateVFs.push_back(VF);
|
alexey-bataev
approved these changes
Apr 17, 2025
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 2025
…36146) This removes a bit of complexity from the code, where it doesn't seem to be justified.
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 2025
…36146) This removes a bit of complexity from the code, where it doesn't seem to be justified.
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.
This removes a bit of complexity from the code, where it doesn't seem to be justified.