[llvm] d853b3f - [VPlan] Remove unneeded Plan arg from getVPValueOrAddLiveIn (NFC).
Florian Hahn via llvm-commits
llvm-commits at lists.llvm.org
Sun Aug 25 12:00:42 PDT 2024
Author: Florian Hahn
Date: 2024-08-25T20:00:30+01:00
New Revision: d853b3f4b621ef01ffa08024f3e9daaa38415804
URL: https://github.com/llvm/llvm-project/commit/d853b3f4b621ef01ffa08024f3e9daaa38415804
DIFF: https://github.com/llvm/llvm-project/commit/d853b3f4b621ef01ffa08024f3e9daaa38415804.diff
LOG: [VPlan] Remove unneeded Plan arg from getVPValueOrAddLiveIn (NFC).
The helper can simply use VPRecipeBuilder::Plan.
Added:
Modified:
llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
llvm/lib/Transforms/Vectorize/VPRecipeBuilder.h
Removed:
################################################################################
diff --git a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
index cc73a90d9d9f61..6850b502939f58 100644
--- a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
+++ b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
@@ -7904,7 +7904,7 @@ void EpilogueVectorizerEpilogueLoop::printDebugTracesAtEnd() {
iterator_range<mapped_iterator<Use *, std::function<VPValue *(Value *)>>>
VPRecipeBuilder::mapToVPValues(User::op_range Operands) {
std::function<VPValue *(Value *)> Fn = [this](Value *Op) {
- return getVPValueOrAddLiveIn(Op, Plan);
+ return getVPValueOrAddLiveIn(Op);
};
return map_range(Operands, Fn);
}
@@ -7920,7 +7920,7 @@ void VPRecipeBuilder::createSwitchEdgeMasks(SwitchInst *SI) {
// Create masks where the terminator in Src is a switch. We create mask for
// all edges at the same time. This is more efficient, as we can create and
// collect compares for all cases once.
- VPValue *Cond = getVPValueOrAddLiveIn(SI->getCondition(), Plan);
+ VPValue *Cond = getVPValueOrAddLiveIn(SI->getCondition());
BasicBlock *DefaultDst = SI->getDefaultDest();
MapVector<BasicBlock *, SmallVector<VPValue *>> Dst2Compares;
for (auto &C : SI->cases()) {
@@ -7931,7 +7931,7 @@ void VPRecipeBuilder::createSwitchEdgeMasks(SwitchInst *SI) {
if (Dst == DefaultDst)
continue;
auto I = Dst2Compares.insert({Dst, {}});
- VPValue *V = getVPValueOrAddLiveIn(C.getCaseValue(), Plan);
+ VPValue *V = getVPValueOrAddLiveIn(C.getCaseValue());
I.first->second.push_back(Builder.createICmp(CmpInst::ICMP_EQ, Cond, V));
}
@@ -7994,7 +7994,7 @@ VPValue *VPRecipeBuilder::createEdgeMask(BasicBlock *Src, BasicBlock *Dst) {
if (OrigLoop->isLoopExiting(Src))
return EdgeMaskCache[Edge] = SrcMask;
- VPValue *EdgeMask = getVPValueOrAddLiveIn(BI->getCondition(), Plan);
+ VPValue *EdgeMask = getVPValueOrAddLiveIn(BI->getCondition());
assert(EdgeMask && "No Edge Mask found for condition");
if (BI->getSuccessor(0) != Dst)
@@ -8605,7 +8605,7 @@ static MapVector<PHINode *, VPValue *> collectUsersInExitBlock(
for (PHINode &ExitPhi : ExitBB->phis()) {
Value *IncomingValue =
ExitPhi.getIncomingValueForBlock(ExitingBB);
- VPValue *V = Builder.getVPValueOrAddLiveIn(IncomingValue, Plan);
+ VPValue *V = Builder.getVPValueOrAddLiveIn(IncomingValue);
// Exit values for inductions are computed and updated outside of VPlan and
// independent of induction recipes.
// TODO: Compute induction exit values in VPlan, use VPLiveOuts to update
diff --git a/llvm/lib/Transforms/Vectorize/VPRecipeBuilder.h b/llvm/lib/Transforms/Vectorize/VPRecipeBuilder.h
index 544000059f8954..0b27933925d8a4 100644
--- a/llvm/lib/Transforms/Vectorize/VPRecipeBuilder.h
+++ b/llvm/lib/Transforms/Vectorize/VPRecipeBuilder.h
@@ -168,7 +168,7 @@ class VPRecipeBuilder {
iterator_range<mapped_iterator<Use *, std::function<VPValue *(Value *)>>>
mapToVPValues(User::op_range Operands);
- VPValue *getVPValueOrAddLiveIn(Value *V, VPlan &Plan) {
+ VPValue *getVPValueOrAddLiveIn(Value *V) {
if (auto *I = dyn_cast<Instruction>(V)) {
if (auto *R = Ingredient2Recipe.lookup(I))
return R->getVPSingleValue();
More information about the llvm-commits
mailing list