[llvm] 9333b97 - [VPlan] Replace AlsoPack field with shouldPack() method (NFC).
Florian Hahn via llvm-commits
llvm-commits at lists.llvm.org
Mon Feb 20 02:29:10 PST 2023
Author: Florian Hahn
Date: 2023-02-20T10:28:26Z
New Revision: 9333b977638475d6b068cd005f8ea39406634c57
URL: https://github.com/llvm/llvm-project/commit/9333b977638475d6b068cd005f8ea39406634c57
DIFF: https://github.com/llvm/llvm-project/commit/9333b977638475d6b068cd005f8ea39406634c57.diff
LOG: [VPlan] Replace AlsoPack field with shouldPack() method (NFC).
There is no need to update the AlsoPack field when creating
VPReplicateRecipes. It can be easily computed based on the VP def-use
chains when it is needed.
Reviewed By: Ayal
Differential Revision: https://reviews.llvm.org/D143864
Added:
Modified:
llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
llvm/lib/Transforms/Vectorize/VPRecipeBuilder.h
llvm/lib/Transforms/Vectorize/VPlan.h
llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
index 8eb488d8de190..7f4f907d89226 100644
--- a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
+++ b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
@@ -8583,21 +8583,6 @@ VPBasicBlock *VPRecipeBuilder::handleReplication(Instruction *I, VFRange &Range,
auto *Recipe = new VPReplicateRecipe(I, Plan.mapToVPValues(I->operands()),
IsUniform, IsPredicated);
- // Find if I uses a predicated instruction. If so, it will use its scalar
- // value. Avoid hoisting the insert-element which packs the scalar value into
- // a vector value, as that happens iff all users use the vector value.
- for (VPValue *Op : Recipe->operands()) {
- auto *PredR =
- dyn_cast_or_null<VPPredInstPHIRecipe>(Op->getDefiningRecipe());
- if (!PredR)
- continue;
- auto *RepR = cast<VPReplicateRecipe>(
- PredR->getOperand(0)->getDefiningRecipe());
- assert(RepR->isPredicated() &&
- "expected Replicate recipe to be predicated");
- RepR->setAlsoPack(false);
- }
-
// Finalize the recipe for Instr, first if it is not predicated.
if (!IsPredicated) {
LLVM_DEBUG(dbgs() << "LV: Scalarizing:" << *I << "\n");
@@ -9585,7 +9570,7 @@ void VPReplicateRecipe::execute(VPTransformState &State) {
State.ILV->scalarizeInstruction(UI, this, *State.Instance,
IsPredicated, State);
// Insert scalar instance packing it into a vector.
- if (AlsoPack && State.VF.isVector()) {
+ if (State.VF.isVector() && shouldPack()) {
// If we're constructing lane 0, initialize to start from poison.
if (State.Instance->Lane.isFirstLane()) {
assert(!State.VF.isScalable() && "VF is assumed to be non scalable.");
diff --git a/llvm/lib/Transforms/Vectorize/VPRecipeBuilder.h b/llvm/lib/Transforms/Vectorize/VPRecipeBuilder.h
index 929c882b80297..1d2a96f1ad375 100644
--- a/llvm/lib/Transforms/Vectorize/VPRecipeBuilder.h
+++ b/llvm/lib/Transforms/Vectorize/VPRecipeBuilder.h
@@ -166,9 +166,8 @@ class VPRecipeBuilder {
/// Build a VPReplicationRecipe for \p I and enclose it within a Region if it
/// is predicated. \return \p VPBB augmented with this new recipe if \p I is
/// not predicated, otherwise \return a new VPBasicBlock that succeeds the new
- /// Region. Update the packing decision of predicated instructions if they
- /// feed \p I. Range.End may be decreased to ensure same recipe behavior from
- /// \p Range.Start to \p Range.End.
+ /// Region. Range.End may be decreased to ensure same recipe behavior from \p
+ /// Range.Start to \p Range.End.
VPBasicBlock *handleReplication(Instruction *I, VFRange &Range,
VPBasicBlock *VPBB, VPlan &Plan);
diff --git a/llvm/lib/Transforms/Vectorize/VPlan.h b/llvm/lib/Transforms/Vectorize/VPlan.h
index 98fa690c46b59..e1364fc0e2a93 100644
--- a/llvm/lib/Transforms/Vectorize/VPlan.h
+++ b/llvm/lib/Transforms/Vectorize/VPlan.h
@@ -1503,22 +1503,12 @@ class VPReplicateRecipe : public VPRecipeBase, public VPValue {
/// Indicator if the replicas are also predicated.
bool IsPredicated;
- /// Indicator if the scalar values should also be packed into a vector.
- bool AlsoPack;
-
public:
template <typename IterT>
VPReplicateRecipe(Instruction *I, iterator_range<IterT> Operands,
bool IsUniform, bool IsPredicated = false)
: VPRecipeBase(VPDef::VPReplicateSC, Operands), VPValue(this, I),
- IsUniform(IsUniform), IsPredicated(IsPredicated) {
- // Retain the previous behavior of predicateInstructions(), where an
- // insert-element of a predicated instruction got hoisted into the
- // predicated basic block iff it was its only user. This is achieved by
- // having predicated instructions also pack their values into a vector by
- // default unless they have a replicated user which uses their scalar value.
- AlsoPack = IsPredicated && !I->use_empty();
- }
+ IsUniform(IsUniform), IsPredicated(IsPredicated) {}
~VPReplicateRecipe() override = default;
@@ -1529,8 +1519,6 @@ class VPReplicateRecipe : public VPRecipeBase, public VPValue {
/// the \p State.
void execute(VPTransformState &State) override;
- void setAlsoPack(bool Pack) { AlsoPack = Pack; }
-
#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
/// Print the recipe.
void print(raw_ostream &O, const Twine &Indent,
@@ -1539,8 +1527,6 @@ class VPReplicateRecipe : public VPRecipeBase, public VPValue {
bool isUniform() const { return IsUniform; }
- bool isPacked() const { return AlsoPack; }
-
bool isPredicated() const { return IsPredicated; }
/// Returns true if the recipe only uses the first lane of operand \p Op.
@@ -1556,6 +1542,11 @@ class VPReplicateRecipe : public VPRecipeBase, public VPValue {
"Op must be an operand of the recipe");
return true;
}
+
+ /// Returns true if the recipe is used by a widened recipe via an intervening
+ /// VPPredInstPHIRecipe. In this case, the scalar values should also be packed
+ /// in a vector.
+ bool shouldPack() const;
};
/// A recipe for generating conditional branches on the bits of a mask.
diff --git a/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp b/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
index deacfc88ed75e..eb79a3ef1cc80 100644
--- a/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
+++ b/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
@@ -920,6 +920,16 @@ void VPReductionRecipe::print(raw_ostream &O, const Twine &Indent,
"outside of loop)";
}
+bool VPReplicateRecipe::shouldPack() const {
+ // Find if the recipe is used by a widened recipe via an intervening
+ // VPPredInstPHIRecipe. In this case, also pack the scalar values in a vector.
+ return any_of(users(), [](const VPUser *U) {
+ if (auto *PredR = dyn_cast<VPPredInstPHIRecipe>(U))
+ return any_of(PredR->users(),
+ [](const VPUser *U) { return !isa<VPReplicateRecipe>(U); });
+ return false;
+ });
+}
void VPReplicateRecipe::print(raw_ostream &O, const Twine &Indent,
VPSlotTracker &SlotTracker) const {
O << Indent << (IsUniform ? "CLONE " : "REPLICATE ");
@@ -940,7 +950,7 @@ void VPReplicateRecipe::print(raw_ostream &O, const Twine &Indent,
printOperands(O, SlotTracker);
}
- if (AlsoPack)
+ if (shouldPack())
O << " (S->V)";
}
#endif
More information about the llvm-commits
mailing list