[llvm] [VPlan][NFC] Add cost for `VPWidenMemoryRecipe`. (PR #105614)
Elvis Wang via llvm-commits
llvm-commits at lists.llvm.org
Mon Aug 26 06:12:48 PDT 2024
https://github.com/ElvisWang123 updated https://github.com/llvm/llvm-project/pull/105614
>From c0adb649fd9a1a41b09548c013259a5da382b38f Mon Sep 17 00:00:00 2001
From: Elvis Wang <elvis.wang at sifive.com>
Date: Wed, 21 Aug 2024 20:39:31 -0700
Subject: [PATCH 1/2] [VPlan] Add cost for `VPWidenMemoryRecipe`
In this patch, we add the `computeCost()` function for `VPWidenMemoryRecipe`.
---
llvm/lib/Transforms/Vectorize/VPlan.h | 7 +++++
.../lib/Transforms/Vectorize/VPlanRecipes.cpp | 31 +++++++++++++++++++
2 files changed, 38 insertions(+)
diff --git a/llvm/lib/Transforms/Vectorize/VPlan.h b/llvm/lib/Transforms/Vectorize/VPlan.h
index a99f3882092c2c..1f6de54822ebcf 100644
--- a/llvm/lib/Transforms/Vectorize/VPlan.h
+++ b/llvm/lib/Transforms/Vectorize/VPlan.h
@@ -2529,6 +2529,13 @@ class VPWidenMemoryRecipe : public VPRecipeBase {
llvm_unreachable("VPWidenMemoryRecipe should not be instantiated.");
}
+ /// Get element Type
+ Type *getElementType() const { return getLoadStoreType(&Ingredient); }
+
+ /// Return the cost of this VPWidenMemoryRecipe.
+ InstructionCost computeCost(ElementCount VF,
+ VPCostContext &Ctx) const override;
+
Instruction &getIngredient() const { return Ingredient; }
};
diff --git a/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp b/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
index c9d603612aecea..d3b36b145d470e 100644
--- a/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
+++ b/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
@@ -2084,6 +2084,37 @@ void VPPredInstPHIRecipe::print(raw_ostream &O, const Twine &Indent,
}
#endif
+InstructionCost VPWidenMemoryRecipe::computeCost(ElementCount VF,
+ VPCostContext &Ctx) const {
+ Instruction *I = getInstructionForCost(this);
+ Type *Ty = ToVectorTy(getElementType(), VF);
+ const Align Alignment = getLoadStoreAlignment(const_cast<Instruction *>(I));
+ const Value *Ptr = getLoadStorePointerOperand(I);
+ unsigned AS = getLoadStoreAddressSpace(const_cast<Instruction *>(I));
+ TTI::TargetCostKind CostKind = TTI::TCK_RecipThroughput;
+
+ if (Consecutive) {
+ InstructionCost Cost = 0;
+ if (IsMasked) {
+ Cost += Ctx.TTI.getMaskedMemoryOpCost(I->getOpcode(), Ty, Alignment, AS,
+ CostKind);
+ } else {
+ TTI::OperandValueInfo OpInfo = Ctx.TTI.getOperandInfo(I->getOperand(0));
+ Cost += Ctx.TTI.getMemoryOpCost(I->getOpcode(), Ty, Alignment, AS,
+ CostKind, OpInfo, I);
+ }
+ if (Reverse)
+ Cost += Ctx.TTI.getShuffleCost(TargetTransformInfo::SK_Reverse,
+ cast<VectorType>(Ty), std::nullopt,
+ CostKind, 0);
+
+ return Cost;
+ }
+ return Ctx.TTI.getAddressComputationCost(Ty) +
+ Ctx.TTI.getGatherScatterOpCost(I->getOpcode(), Ty, Ptr, IsMasked,
+ Alignment, CostKind, I);
+}
+
void VPWidenLoadRecipe::execute(VPTransformState &State) {
auto *LI = cast<LoadInst>(&Ingredient);
>From d11c5703781180689bb3ec0ef57d7dc7408a9b5f Mon Sep 17 00:00:00 2001
From: Elvis Wang <elvis.wang at sifive.com>
Date: Mon, 26 Aug 2024 06:10:41 -0700
Subject: [PATCH 2/2] Address comments
---
llvm/lib/Transforms/Vectorize/VPlan.h | 3 -
.../lib/Transforms/Vectorize/VPlanRecipes.cpp | 57 ++++++++++---------
2 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/llvm/lib/Transforms/Vectorize/VPlan.h b/llvm/lib/Transforms/Vectorize/VPlan.h
index 1f6de54822ebcf..7fa48ca78b97b1 100644
--- a/llvm/lib/Transforms/Vectorize/VPlan.h
+++ b/llvm/lib/Transforms/Vectorize/VPlan.h
@@ -2529,9 +2529,6 @@ class VPWidenMemoryRecipe : public VPRecipeBase {
llvm_unreachable("VPWidenMemoryRecipe should not be instantiated.");
}
- /// Get element Type
- Type *getElementType() const { return getLoadStoreType(&Ingredient); }
-
/// Return the cost of this VPWidenMemoryRecipe.
InstructionCost computeCost(ElementCount VF,
VPCostContext &Ctx) const override;
diff --git a/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp b/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
index d3b36b145d470e..a1f6efa458694c 100644
--- a/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
+++ b/llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
@@ -277,8 +277,6 @@ static Instruction *getInstructionForCost(const VPRecipeBase *R) {
return dyn_cast_or_null<Instruction>(S->getUnderlyingValue());
if (auto *IG = dyn_cast<VPInterleaveRecipe>(R))
return IG->getInsertPos();
- if (auto *WidenMem = dyn_cast<VPWidenMemoryRecipe>(R))
- return &WidenMem->getIngredient();
return nullptr;
}
@@ -2086,33 +2084,40 @@ void VPPredInstPHIRecipe::print(raw_ostream &O, const Twine &Indent,
InstructionCost VPWidenMemoryRecipe::computeCost(ElementCount VF,
VPCostContext &Ctx) const {
- Instruction *I = getInstructionForCost(this);
- Type *Ty = ToVectorTy(getElementType(), VF);
- const Align Alignment = getLoadStoreAlignment(const_cast<Instruction *>(I));
- const Value *Ptr = getLoadStorePointerOperand(I);
- unsigned AS = getLoadStoreAddressSpace(const_cast<Instruction *>(I));
+ Type *Ty = ToVectorTy(getLoadStoreType(&Ingredient), VF);
+ const Align Alignment =
+ getLoadStoreAlignment(const_cast<Instruction *>(&Ingredient));
+ unsigned AS =
+ getLoadStoreAddressSpace(const_cast<Instruction *>(&Ingredient));
TTI::TargetCostKind CostKind = TTI::TCK_RecipThroughput;
- if (Consecutive) {
- InstructionCost Cost = 0;
- if (IsMasked) {
- Cost += Ctx.TTI.getMaskedMemoryOpCost(I->getOpcode(), Ty, Alignment, AS,
- CostKind);
- } else {
- TTI::OperandValueInfo OpInfo = Ctx.TTI.getOperandInfo(I->getOperand(0));
- Cost += Ctx.TTI.getMemoryOpCost(I->getOpcode(), Ty, Alignment, AS,
- CostKind, OpInfo, I);
- }
- if (Reverse)
- Cost += Ctx.TTI.getShuffleCost(TargetTransformInfo::SK_Reverse,
- cast<VectorType>(Ty), std::nullopt,
- CostKind, 0);
-
- return Cost;
+ if (!Consecutive) {
+ // TODO: Using the original IR may not be accurate.
+ // Currently, ARM will use the underlying IR to calculate gather/scatter
+ // instruction cost.
+ const Value *Ptr = getLoadStorePointerOperand(&Ingredient);
+ return Ctx.TTI.getAddressComputationCost(Ty) +
+ Ctx.TTI.getGatherScatterOpCost(Ingredient.getOpcode(), Ty, Ptr,
+ IsMasked, Alignment, CostKind,
+ &Ingredient);
+ }
+
+ InstructionCost Cost = 0;
+ if (IsMasked) {
+ Cost += Ctx.TTI.getMaskedMemoryOpCost(Ingredient.getOpcode(), Ty, Alignment,
+ AS, CostKind);
+ } else {
+ TTI::OperandValueInfo OpInfo =
+ Ctx.TTI.getOperandInfo(Ingredient.getOperand(0));
+ Cost += Ctx.TTI.getMemoryOpCost(Ingredient.getOpcode(), Ty, Alignment, AS,
+ CostKind, OpInfo, &Ingredient);
}
- return Ctx.TTI.getAddressComputationCost(Ty) +
- Ctx.TTI.getGatherScatterOpCost(I->getOpcode(), Ty, Ptr, IsMasked,
- Alignment, CostKind, I);
+ if (Reverse)
+ Cost +=
+ Ctx.TTI.getShuffleCost(TargetTransformInfo::SK_Reverse,
+ cast<VectorType>(Ty), std::nullopt, CostKind, 0);
+
+ return Cost;
}
void VPWidenLoadRecipe::execute(VPTransformState &State) {
More information about the llvm-commits
mailing list