Skip to content

Commit d2532f8

Browse files
committed
[VPlan] Handle live-in extend operands in partial reduction ::computeCost
In some cases, extend operands can be live-ins. Use dyn_cast_if_present, to handle this case without crashing. Fixes #162902.
1 parent 2ba960c commit d2532f8

File tree

2 files changed

+62
-2
lines changed

2 files changed

+62
-2
lines changed

llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,8 @@ VPPartialReductionRecipe::computeCost(ElementCount VF,
330330
auto HandleWiden = [&](VPWidenRecipe *Widen) {
331331
if (match(Widen, m_Sub(m_ZeroInt(), m_VPValue(Op)))) {
332332
Widen = dyn_cast<VPWidenRecipe>(Op->getDefiningRecipe());
333+
if (!Widen)
334+
return;
333335
}
334336
Opcode = Widen->getOpcode();
335337
VPRecipeBase *ExtAR = Widen->getOperand(0)->getDefiningRecipe();
@@ -355,10 +357,10 @@ VPPartialReductionRecipe::computeCost(ElementCount VF,
355357
ExtAType = GetExtendKind(OpR);
356358
} else if (isa<VPReductionPHIRecipe>(OpR)) {
357359
auto RedPhiOp1R = getOperand(1)->getDefiningRecipe();
358-
if (isa<VPWidenCastRecipe>(RedPhiOp1R)) {
360+
if (isa_and_nonnull<VPWidenCastRecipe>(RedPhiOp1R)) {
359361
InputTypeA = Ctx.Types.inferScalarType(RedPhiOp1R->getOperand(0));
360362
ExtAType = GetExtendKind(RedPhiOp1R);
361-
} else if (auto Widen = dyn_cast<VPWidenRecipe>(RedPhiOp1R))
363+
} else if (auto Widen = dyn_cast_if_present<VPWidenRecipe>(RedPhiOp1R))
362364
HandleWiden(Widen);
363365
} else if (auto Widen = dyn_cast<VPWidenRecipe>(OpR)) {
364366
HandleWiden(Widen);

llvm/test/Transforms/LoopVectorize/AArch64/partial-reduce-constant-ops.ll

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,3 +467,61 @@ loop:
467467
exit:
468468
ret i32 %red.next
469469
}
470+
471+
; Test case for https://github.com/llvm/llvm-project/issues/162902.
472+
define void @partial_reduction_zext_const(i64 %arg, ptr %ptr) {
473+
; CHECK-LABEL: define void @partial_reduction_zext_const(
474+
; CHECK-SAME: i64 [[ARG:%.*]], ptr [[PTR:%.*]]) #[[ATTR0]] {
475+
; CHECK-NEXT: [[ENTRY:.*]]:
476+
; CHECK-NEXT: [[TMP0:%.*]] = sub i64 100, [[ARG]]
477+
; CHECK-NEXT: [[MIN_ITERS_CHECK:%.*]] = icmp ult i64 [[TMP0]], 4
478+
; CHECK-NEXT: br i1 [[MIN_ITERS_CHECK]], label %[[SCALAR_PH:.*]], label %[[VECTOR_PH:.*]]
479+
; CHECK: [[VECTOR_PH]]:
480+
; CHECK-NEXT: [[N_MOD_VF:%.*]] = urem i64 [[TMP0]], 4
481+
; CHECK-NEXT: [[N_VEC:%.*]] = sub i64 [[TMP0]], [[N_MOD_VF]]
482+
; CHECK-NEXT: [[TMP1:%.*]] = add i64 [[ARG]], [[N_VEC]]
483+
; CHECK-NEXT: br label %[[VECTOR_BODY:.*]]
484+
; CHECK: [[VECTOR_BODY]]:
485+
; CHECK-NEXT: [[INDEX:%.*]] = phi i64 [ 0, %[[VECTOR_PH]] ], [ [[INDEX_NEXT:%.*]], %[[VECTOR_BODY]] ]
486+
; CHECK-NEXT: [[VEC_PHI:%.*]] = phi <4 x i8> [ zeroinitializer, %[[VECTOR_PH]] ], [ [[TMP2:%.*]], %[[VECTOR_BODY]] ]
487+
; CHECK-NEXT: [[TMP2]] = add <4 x i8> [[VEC_PHI]], splat (i8 2)
488+
; CHECK-NEXT: [[INDEX_NEXT]] = add nuw i64 [[INDEX]], 4
489+
; CHECK-NEXT: [[TMP3:%.*]] = icmp eq i64 [[INDEX_NEXT]], [[N_VEC]]
490+
; CHECK-NEXT: br i1 [[TMP3]], label %[[MIDDLE_BLOCK:.*]], label %[[VECTOR_BODY]], !llvm.loop [[LOOP16:![0-9]+]]
491+
; CHECK: [[MIDDLE_BLOCK]]:
492+
; CHECK-NEXT: [[TMP4:%.*]] = call i8 @llvm.vector.reduce.add.v4i8(<4 x i8> [[TMP2]])
493+
; CHECK-NEXT: store i8 [[TMP4]], ptr [[PTR]], align 1
494+
; CHECK-NEXT: [[CMP_N:%.*]] = icmp eq i64 [[TMP0]], [[N_VEC]]
495+
; CHECK-NEXT: br i1 [[CMP_N]], label %[[EXIT:.*]], label %[[SCALAR_PH]]
496+
; CHECK: [[SCALAR_PH]]:
497+
; CHECK-NEXT: [[BC_RESUME_VAL:%.*]] = phi i64 [ [[TMP1]], %[[MIDDLE_BLOCK]] ], [ [[ARG]], %[[ENTRY]] ]
498+
; CHECK-NEXT: [[BC_MERGE_RDX:%.*]] = phi i8 [ [[TMP4]], %[[MIDDLE_BLOCK]] ], [ 0, %[[ENTRY]] ]
499+
; CHECK-NEXT: br label %[[LOOP:.*]]
500+
; CHECK: [[LOOP]]:
501+
; CHECK-NEXT: [[IV:%.*]] = phi i64 [ [[BC_RESUME_VAL]], %[[SCALAR_PH]] ], [ [[IV_NEXT:%.*]], %[[LOOP]] ]
502+
; CHECK-NEXT: [[PARTIAL:%.*]] = phi i8 [ [[BC_MERGE_RDX]], %[[SCALAR_PH]] ], [ [[PARTIAL_NEXT:%.*]], %[[LOOP]] ]
503+
; CHECK-NEXT: [[ZERO_EXT:%.*]] = zext i2 -2 to i8
504+
; CHECK-NEXT: [[PARTIAL_NEXT]] = add i8 [[PARTIAL]], [[ZERO_EXT]]
505+
; CHECK-NEXT: store i8 [[PARTIAL_NEXT]], ptr [[PTR]], align 1
506+
; CHECK-NEXT: [[IV_NEXT]] = add i64 [[IV]], 1
507+
; CHECK-NEXT: [[EC:%.*]] = icmp eq i64 [[IV_NEXT]], 100
508+
; CHECK-NEXT: br i1 [[EC]], label %[[EXIT]], label %[[LOOP]], !llvm.loop [[LOOP17:![0-9]+]]
509+
; CHECK: [[EXIT]]:
510+
; CHECK-NEXT: ret void
511+
;
512+
entry:
513+
br label %loop
514+
515+
loop:
516+
%iv = phi i64 [ %arg, %entry ], [ %iv.next, %loop ]
517+
%partial = phi i8 [ 0, %entry ], [ %partial.next, %loop ]
518+
%zero.ext = zext i2 2 to i8
519+
%partial.next = add i8 %partial, %zero.ext
520+
store i8 %partial.next, ptr %ptr, align 1
521+
%iv.next = add i64 %iv, 1
522+
%ec = icmp eq i64 %iv.next, 100
523+
br i1 %ec, label %exit, label %loop
524+
525+
exit:
526+
ret void
527+
}

0 commit comments

Comments
 (0)