Skip to content

Commit 26b61e1

Browse files
authored
[LoopVectorizer] Propagate underlying instruction to the cloned instances of VPPartialReductionRecipes (#123638)
1 parent 1f0964f commit 26b61e1

File tree

2 files changed

+68
-3
lines changed

2 files changed

+68
-3
lines changed

llvm/lib/Transforms/Vectorize/VPlan.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2467,7 +2467,8 @@ class VPPartialReductionRecipe : public VPSingleDefRecipe {
24672467
~VPPartialReductionRecipe() override = default;
24682468

24692469
VPPartialReductionRecipe *clone() override {
2470-
return new VPPartialReductionRecipe(Opcode, getOperand(0), getOperand(1));
2470+
return new VPPartialReductionRecipe(Opcode, getOperand(0), getOperand(1),
2471+
getUnderlyingInstr());
24712472
}
24722473

24732474
VP_CLASSOF_IMPL(VPDef::VPPartialReductionSC)

llvm/test/Transforms/LoopVectorize/AArch64/vplan-printing.ll

Lines changed: 66 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
; REQUIRES: asserts
2-
; RUN: opt -mattr=+neon,+dotprod -passes=loop-vectorize -debug-only=loop-vectorize -force-vector-interleave=1 -disable-output %s 2>&1 | FileCheck %s
2+
; RUN: opt -mattr=+neon,+dotprod -passes=loop-vectorize -debug-only=loop-vectorize -force-vector-interleave=1 -enable-epilogue-vectorization -epilogue-vectorization-force-VF=2 -disable-output %s 2>&1 | FileCheck %s
33

44
target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
55
target triple = "aarch64-none-unknown-elf"
@@ -70,7 +70,71 @@ define i32 @print_partial_reduction(ptr %a, ptr %b) {
7070
; CHECK-NEXT: IR %add.lcssa = phi i32 [ %add, %for.body ] (extra operand: vp<[[EXTRACT]]> from middle.block)
7171
; CHECK-NEXT: No successors
7272
; CHECK-NEXT: }
73-
;
73+
; CHECK: VPlan 'Final VPlan for VF={8,16},UF={1}' {
74+
; CHECK-NEXT: Live-in ir<[[EP_VFxUF:.+]]> = VF * UF
75+
; CHECK-NEXT: Live-in ir<[[EP_VEC_TC:.+]]> = vector-trip-count
76+
; CHECK-NEXT: Live-in ir<1024> = original trip-count
77+
; CHECK-EMPTY:
78+
; CHECK-NEXT: ir-bb<entry>:
79+
; CHECK-NEXT: Successor(s): ir-bb<scalar.ph>, ir-bb<vector.main.loop.iter.check>
80+
; CHECK-EMPTY:
81+
; CHECK-NEXT: ir-bb<vector.main.loop.iter.check>:
82+
; CHECK-NEXT: Successor(s): ir-bb<scalar.ph>, ir-bb<vector.ph>
83+
; CHECK-EMPTY:
84+
; CHECK-NEXT: ir-bb<vector.ph>:
85+
; CHECK-NEXT: Successor(s): vector loop
86+
; CHECK-EMPTY:
87+
; CHECK-NEXT: <x1> vector loop: {
88+
; CHECK-NEXT: vector.body:
89+
; CHECK-NEXT: SCALAR-PHI vp<[[EP_IV:%.+]]> = phi ir<0>, vp<%index.next>
90+
; CHECK-NEXT: WIDEN-REDUCTION-PHI ir<%accum> = phi ir<0>, ir<%add> (VF scaled by 1/4)
91+
; CHECK-NEXT: vp<[[STEPS:%.+]]> = SCALAR-STEPS vp<[[EP_IV]]>, ir<1>
92+
; CHECK-NEXT: CLONE ir<%gep.a> = getelementptr ir<%a>, vp<[[STEPS]]>
93+
; CHECK-NEXT: vp<[[PTR_A:%.+]]> = vector-pointer ir<%gep.a>
94+
; CHECK-NEXT: WIDEN ir<%load.a> = load vp<[[PTR_A]]>
95+
; CHECK-NEXT: WIDEN-CAST ir<%ext.a> = zext ir<%load.a> to i32
96+
; CHECK-NEXT: CLONE ir<%gep.b> = getelementptr ir<%b>, vp<[[STEPS]]>
97+
; CHECK-NEXT: vp<[[PTR_B:%.+]]> = vector-pointer ir<%gep.b>
98+
; CHECK-NEXT: WIDEN ir<%load.b> = load vp<[[PTR_B]]>
99+
; CHECK-NEXT: WIDEN-CAST ir<%ext.b> = zext ir<%load.b> to i32
100+
; CHECK-NEXT: WIDEN ir<%mul> = mul ir<%ext.b>, ir<%ext.a>
101+
; CHECK-NEXT: PARTIAL-REDUCE ir<%add> = add ir<%mul>, ir<%accum>
102+
; CHECK-NEXT: EMIT vp<[[EP_IV_NEXT:%.+]]> = add nuw vp<[[EP_IV]]>, ir<16>
103+
; CHECK-NEXT: EMIT branch-on-count vp<[[EP_IV_NEXT]]>, ir<1024>
104+
; CHECK-NEXT: No successors
105+
; CHECK-NEXT: }
106+
; CHECK-NEXT: Successor(s): ir-bb<middle.block>
107+
; CHECK-EMPTY:
108+
; CHECK-NEXT: ir-bb<middle.block>:
109+
; CHECK-NEXT: EMIT vp<[[RED_RESULT:%.+]]> = compute-reduction-result ir<%accum>, ir<%add>
110+
; CHECK-NEXT: EMIT vp<[[EXTRACT:%.+]]> = extract-from-end vp<[[RED_RESULT]]>, ir<1>
111+
; CHECK-NEXT: EMIT vp<[[CMP:%.+]]> = icmp eq ir<1024>, ir<1024>
112+
; CHECK-NEXT: EMIT branch-on-cond vp<[[CMP]]>
113+
; CHECK-NEXT: Successor(s): ir-bb<exit>, ir-bb<scalar.ph>
114+
; CHECK-EMPTY:
115+
; CHECK-NEXT: ir-bb<exit>:
116+
; CHECK-NEXT: IR %add.lcssa = phi i32 [ %add, %for.body ] (extra operand: vp<[[EXTRACT]]> from ir-bb<middle.block>)
117+
; CHECK-NEXT: No successors
118+
; CHECK-EMPTY:
119+
; CHECK-NEXT: ir-bb<scalar.ph>:
120+
; CHECK-NEXT: EMIT vp<[[EP_RESUME:%.+]]> = resume-phi ir<1024>, ir<0>
121+
; CHECK-NEXT: EMIT vp<[[EP_MERGE:%.+]]> = resume-phi vp<[[RED_RESULT]]>, ir<0>
122+
; CHECK-NEXT: Successor(s): ir-bb<for.body>
123+
; CHECK-EMPTY:
124+
; CHECK-NEXT: ir-bb<for.body>:
125+
; CHECK-NEXT: IR %accum = phi i32 [ 0, %scalar.ph ], [ %add, %for.body ] (extra operand: vp<[[EP_MERGE]]> from ir-bb<scalar.ph>)
126+
; CHECK-NEXT: IR %gep.a = getelementptr i8, ptr %a, i64 %iv
127+
; CHECK-NEXT: IR %load.a = load i8, ptr %gep.a, align 1
128+
; CHECK-NEXT: IR %ext.a = zext i8 %load.a to i32
129+
; CHECK-NEXT: IR %gep.b = getelementptr i8, ptr %b, i64 %iv
130+
; CHECK-NEXT: IR %load.b = load i8, ptr %gep.b, align 1
131+
; CHECK-NEXT: IR %ext.b = zext i8 %load.b to i32
132+
; CHECK-NEXT: IR %mul = mul i32 %ext.b, %ext.a
133+
; CHECK-NEXT: IR %add = add i32 %mul, %accum
134+
; CHECK-NEXT: IR %iv.next = add i64 %iv, 1
135+
; CHECK-NEXT: IR %exitcond.not = icmp eq i64 %iv.next, 1024
136+
; CHECK-NEXT: No successors
137+
; CHECK-NEXT: }
74138
entry:
75139
br label %for.body
76140

0 commit comments

Comments
 (0)