[llvm] ce66b56 - [LV][VPlan] Remove any-of reduction from precomputeCost. NFC (#117109)
via llvm-commits
llvm-commits at lists.llvm.org
Thu Nov 21 18:48:15 PST 2024
Author: Elvis Wang
Date: 2024-11-22T10:48:11+08:00
New Revision: ce66b56865426fc1760b5a090ca2748c046094f5
URL: https://github.com/llvm/llvm-project/commit/ce66b56865426fc1760b5a090ca2748c046094f5
DIFF: https://github.com/llvm/llvm-project/commit/ce66b56865426fc1760b5a090ca2748c046094f5.diff
LOG: [LV][VPlan] Remove any-of reduction from precomputeCost. NFC (#117109)
The any-of reduction contains phi and select instructions.
The select instruction might be optimized and removed in the vplan which
may cause VF difference between legacy and VPlan-based model. But if the
select instruction be removed, `planContainsAdditionalSimplifications()`
will catch it and disable the assertion.
Therefore, we can just remove the ayn-of reduction calculation in the
precomputeCost().
Added:
Modified:
llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
index d13770a35c108f..5b556058cc762c 100644
--- a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
+++ b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
@@ -7303,34 +7303,14 @@ LoopVectorizationPlanner::precomputeCosts(VPlan &Plan, ElementCount VF,
// The legacy cost model has special logic to compute the cost of in-loop
// reductions, which may be smaller than the sum of all instructions involved
- // in the reduction. For AnyOf reductions, VPlan codegen may remove the select
- // which the legacy cost model uses to assign cost. Pre-compute their costs
- // for now.
+ // in the reduction.
// TODO: Switch to costing based on VPlan once the logic has been ported.
for (const auto &[RedPhi, RdxDesc] : Legal->getReductionVars()) {
if (ForceTargetInstructionCost.getNumOccurrences())
continue;
- if (!CM.isInLoopReduction(RedPhi) &&
- !RecurrenceDescriptor::isAnyOfRecurrenceKind(
- RdxDesc.getRecurrenceKind()))
- continue;
-
- // AnyOf reduction codegen may remove the select. To match the legacy cost
- // model, pre-compute the cost for AnyOf reductions here.
- if (RecurrenceDescriptor::isAnyOfRecurrenceKind(
- RdxDesc.getRecurrenceKind())) {
- auto *Select = cast<SelectInst>(*find_if(
- RedPhi->users(), [](User *U) { return isa<SelectInst>(U); }));
- assert(!CostCtx.SkipCostComputation.contains(Select) &&
- "reduction op visited multiple times");
- CostCtx.SkipCostComputation.insert(Select);
- auto ReductionCost = CostCtx.getLegacyCost(Select, VF);
- LLVM_DEBUG(dbgs() << "Cost of " << ReductionCost << " for VF " << VF
- << ":\n any-of reduction " << *Select << "\n");
- Cost += ReductionCost;
+ if (!CM.isInLoopReduction(RedPhi))
continue;
- }
const auto &ChainOps = RdxDesc.getReductionOpChain(RedPhi, OrigLoop);
SetVector<Instruction *> ChainOpsAndOperands(ChainOps.begin(),
More information about the llvm-commits
mailing list