[TTI][RISCV] Remove deduplicate type-based VP costing of VPReduction.NFC #117708
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
|
@llvm/pr-subscribers-backend-risc-v Author: LiqinWeng (LiqinWeng) ChangesRefered to: #115983 Full diff: https://github.com/llvm/llvm-project/pull/117708.diff 2 Files Affected:
diff --git a/llvm/include/llvm/CodeGen/BasicTTIImpl.h b/llvm/include/llvm/CodeGen/BasicTTIImpl.h
index 98cbb4886642bf..21c1f98c78fe7c 100644
--- a/llvm/include/llvm/CodeGen/BasicTTIImpl.h
+++ b/llvm/include/llvm/CodeGen/BasicTTIImpl.h
@@ -1647,6 +1647,38 @@ class BasicTTIImplBase : public TargetTransformInfoImplCRTPBase<T> {
UI->getPredicate(), CostKind);
}
}
+ if (VPReductionIntrinsic::isVPReduction(ICA.getID())) {
+ std::optional<Intrinsic::ID> RedID =
+ VPIntrinsic::getFunctionalIntrinsicIDForVP(ICA.getID());
+ assert(RedID.has_value());
+ switch (ICA.getID()) {
+ case Intrinsic::vp_reduce_add:
+ case Intrinsic::vp_reduce_fadd:
+ case Intrinsic::vp_reduce_mul:
+ case Intrinsic::vp_reduce_fmul:
+ case Intrinsic::vp_reduce_and:
+ case Intrinsic::vp_reduce_or:
+ case Intrinsic::vp_reduce_xor: {
+ unsigned RedOp = getArithmeticReductionInstruction(*RedID);
+ return thisT()->getArithmeticReductionCost(
+ RedOp, cast<VectorType>(ICA.getArgTypes()[1]), ICA.getFlags(),
+ CostKind);
+ }
+ case Intrinsic::vp_reduce_smax:
+ case Intrinsic::vp_reduce_smin:
+ case Intrinsic::vp_reduce_umax:
+ case Intrinsic::vp_reduce_umin:
+ case Intrinsic::vp_reduce_fmax:
+ case Intrinsic::vp_reduce_fmaximum:
+ case Intrinsic::vp_reduce_fmin:
+ case Intrinsic::vp_reduce_fminimum: {
+ Intrinsic::ID MinMaxID = getMinMaxReductionIntrinsicOp(*RedID);
+ return thisT()->getMinMaxReductionCost(
+ MinMaxID, cast<VectorType>(ICA.getArgTypes()[1]),
+ ICA.getFlags(), CostKind);
+ }
+ }
+ }
}
std::optional<Intrinsic::ID> FID =
diff --git a/llvm/lib/Target/RISCV/RISCVTargetTransformInfo.cpp b/llvm/lib/Target/RISCV/RISCVTargetTransformInfo.cpp
index 8f0ef69258b165..bbded57bb92ab0 100644
--- a/llvm/lib/Target/RISCV/RISCVTargetTransformInfo.cpp
+++ b/llvm/lib/Target/RISCV/RISCVTargetTransformInfo.cpp
@@ -1144,37 +1144,6 @@ RISCVTTIImpl::getIntrinsicInstrCost(const IntrinsicCostAttributes &ICA,
: RISCV::VMV_V_X,
LT.second, CostKind);
}
- case Intrinsic::vp_reduce_add:
- case Intrinsic::vp_reduce_fadd:
- case Intrinsic::vp_reduce_mul:
- case Intrinsic::vp_reduce_fmul:
- case Intrinsic::vp_reduce_and:
- case Intrinsic::vp_reduce_or:
- case Intrinsic::vp_reduce_xor: {
- std::optional<Intrinsic::ID> RedID =
- VPIntrinsic::getFunctionalIntrinsicIDForVP(ICA.getID());
- assert(RedID.has_value());
- unsigned RedOp = getArithmeticReductionInstruction(*RedID);
- return getArithmeticReductionCost(RedOp,
- cast<VectorType>(ICA.getArgTypes()[1]),
- ICA.getFlags(), CostKind);
- }
- case Intrinsic::vp_reduce_smax:
- case Intrinsic::vp_reduce_smin:
- case Intrinsic::vp_reduce_umax:
- case Intrinsic::vp_reduce_umin:
- case Intrinsic::vp_reduce_fmax:
- case Intrinsic::vp_reduce_fmaximum:
- case Intrinsic::vp_reduce_fmin:
- case Intrinsic::vp_reduce_fminimum: {
- std::optional<Intrinsic::ID> RedID =
- VPIntrinsic::getFunctionalIntrinsicIDForVP(ICA.getID());
- assert(RedID.has_value());
- Intrinsic::ID MinMaxID = getMinMaxReductionIntrinsicOp(*RedID);
- return getMinMaxReductionCost(MinMaxID,
- cast<VectorType>(ICA.getArgTypes()[1]),
- ICA.getFlags(), CostKind);
- }
}
if (ST->hasVInstructions() && RetTy->isVectorTy()) {
|
LiqinWeng
changed the title
| case Intrinsic::vp_reduce_xor: { | ||
| unsigned RedOp = getArithmeticReductionInstruction(*RedID); | ||
| return thisT()->getArithmeticReductionCost( | ||
| RedOp, cast<VectorType>(ICA.getArgTypes()[1]), ICA.getFlags(), |
LiqinWeng
force-pushed
the
vp-reduction
branch
from
08a6201 to
bb33f53
Compare
LiqinWeng
changed the title
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/30/builds/11230 Here is the relevant piece of the build log for the reference |
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.
Refered to: #115983