Skip to content

[VPlan] Guard VPPartialReductionRecipe::computeCost() against ilist sentinel(#148389) #148555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[VPlan] Guard VPPartialReductionRecipe::computeCost() against ilist sentinel(#148389) #148555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,24 +296,32 @@ bool VPRecipeBase::isScalarCast() const {
InstructionCost
VPPartialReductionRecipe::computeCost(ElementCount VF,
VPCostContext &Ctx) const {
// -----------------------------------------------------------------------
// Helpers that treat an ilist *sentinel* exactly like `nullptr`.
// -----------------------------------------------------------------------
auto safe = [](VPRecipeBase *R) -> VPRecipeBase * {
return isa_and_present<VPRecipeBase>(R) ? R : nullptr;
};

std::optional<unsigned> Opcode;
VPValue *Op = getOperand(0);
VPRecipeBase *OpR = Op->getDefiningRecipe();
VPValue *Op = getOperand(0);
VPRecipeBase *OpR = safe(Op->getDefiningRecipe());

// If the partial reduction is predicated, a select will be operand 0
using namespace llvm::VPlanPatternMatch;
if (match(getOperand(1), m_Select(m_VPValue(), m_VPValue(Op), m_VPValue()))) {
OpR = Op->getDefiningRecipe();
OpR = safe(Op->getDefiningRecipe());
}

Type *InputTypeA = nullptr, *InputTypeB = nullptr;
TTI::PartialReductionExtendKind ExtAType = TTI::PR_None,
ExtBType = TTI::PR_None;

auto GetExtendKind = [](VPRecipeBase *R) {
auto GetExtendKind = [&](VPRecipeBase *R) {
R = safe(R);
if (!R)
return TTI::PR_None;
auto *WidenCastR = dyn_cast<VPWidenCastRecipe>(R);
auto *WidenCastR = dyn_cast_if_present<VPWidenCastRecipe>(R);
if (!WidenCastR)
return TTI::PR_None;
if (WidenCastR->getOpcode() == Instruction::CastOps::ZExt)
Expand All @@ -328,11 +336,11 @@ VPPartialReductionRecipe::computeCost(ElementCount VF,
auto HandleWiden = [&](VPWidenRecipe *Widen) {
if (match(Widen,
m_Binary<Instruction::Sub>(m_SpecificInt(0), m_VPValue(Op)))) {
Widen = dyn_cast<VPWidenRecipe>(Op->getDefiningRecipe());
Widen = dyn_cast_if_present<VPWidenRecipe>(safe(Op->getDefiningRecipe()));
}
Opcode = Widen->getOpcode();
VPRecipeBase *ExtAR = Widen->getOperand(0)->getDefiningRecipe();
VPRecipeBase *ExtBR = Widen->getOperand(1)->getDefiningRecipe();
VPRecipeBase *ExtAR = safe(Widen->getOperand(0)->getDefiningRecipe());
VPRecipeBase *ExtBR = safe(Widen->getOperand(1)->getDefiningRecipe());
InputTypeA = Ctx.Types.inferScalarType(ExtAR ? ExtAR->getOperand(0)
: Widen->getOperand(0));
InputTypeB = Ctx.Types.inferScalarType(ExtBR ? ExtBR->getOperand(0)
Expand All @@ -341,7 +349,7 @@ VPPartialReductionRecipe::computeCost(ElementCount VF,
ExtBType = GetExtendKind(ExtBR);
};

if (isa<VPWidenCastRecipe>(OpR)) {
if (isa_and_present<VPWidenCastRecipe>(OpR)) {
InputTypeA = Ctx.Types.inferScalarType(OpR->getOperand(0));
ExtAType = GetExtendKind(OpR);
} else if (isa<VPReductionPHIRecipe>(OpR)) {
Expand All @@ -351,9 +359,9 @@ VPPartialReductionRecipe::computeCost(ElementCount VF,
ExtAType = GetExtendKind(RedPhiOp1R);
} else if (auto Widen = dyn_cast<VPWidenRecipe>(RedPhiOp1R))
HandleWiden(Widen);
} else if (auto Widen = dyn_cast<VPWidenRecipe>(OpR)) {
} else if (auto Widen = dyn_cast_if_present<VPWidenRecipe>(OpR)) {
HandleWiden(Widen);
} else if (auto Reduction = dyn_cast<VPPartialReductionRecipe>(OpR)) {
} else if (auto Reduction = dyn_cast_if_present<VPReductionRecipe>(OpR)) {
return Reduction->computeCost(VF, Ctx);
}
auto *PhiType = Ctx.Types.inferScalarType(getOperand(1));
Expand Down
27 changes: 27 additions & 0 deletions llvm/test/Transforms/LoopVectorize/PR148389-sentinel.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
; RUN: opt -passes=loop-vectorize -mcpu=grace -S %s -o /dev/null
; REQUIRES: aarch64-registered-target

; Reduced from GitHub issue #148389.
; The test just needs to run – if the pass crashes the test will fail.

define void @h(ptr %e, ptr %f, i8 %d) {
entry:
br label %body
body:
%i = phi i16 [0, %entry], [%inc, %latch]
%idx = sext i16 %i to i64
%eelt = getelementptr [1 x i16], ptr %e, i64 %idx, i64 %idx
%eval = load i16, ptr %eelt
%felt = getelementptr [7 x i8], ptr %f, i64 %idx, i64 %idx
%fval = load i8, ptr %felt
%cmp = icmp eq i8 %d, 0
br i1 %cmp, label %update, label %latch
update:
br label %latch
latch:
%inc = add nuw nsw i16 %i, 1
%exit = icmp eq i16 %inc, 17
br i1 %exit, label %exit.block, label %body
exit.block:
ret void
}
Loading