Skip to content

Commit 24bd4e5

Browse files
fhahnfhahn
committed
[VPlan] Use regular phi printing for resume phis.
As discussed in #140405, remove custom printing for resume-phis and update tests.
1 parent 30d8aeb commit 24bd4e5

18 files changed

+80
-87
lines changed

‎llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,15 +1118,8 @@ void VPPhi::print(raw_ostream &O, const Twine &Indent,
11181118
VPSlotTracker &SlotTracker) const {
11191119
O << Indent << "EMIT" << (isSingleScalar() ? "-SCALAR" : "") << " ";
11201120
printAsOperand(O, SlotTracker);
1121-
const VPBasicBlock *Parent = getParent();
1122-
if (Parent == Parent->getPlan()->getScalarPreheader()) {
1123-
// TODO: Use regular printing for resume-phis as well
1124-
O << " = resume-phi ";
1125-
printOperands(O, SlotTracker);
1126-
} else {
1127-
O << " = phi ";
1128-
printPhiOperands(O, SlotTracker);
1129-
}
1121+
O << " = phi ";
1122+
printPhiOperands(O, SlotTracker);
11301123
}
11311124
#endif
11321125

‎llvm/test/Transforms/LoopVectorize/AArch64/sve2-histcnt-vplan.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ target triple = "aarch64-unknown-linux-gnu"
4949
; CHECK-NEXT: No successors
5050
; CHECK-EMPTY:
5151
; CHECK-NEXT: scalar.ph:
52-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = resume-phi [[VTC]], ir<0>
52+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = phi [ [[VTC]], middle.block ], [ ir<0>, ir-bb<entry> ]
5353
; CHECK-NEXT: Successor(s): ir-bb<for.body>
5454
; CHECK-EMPTY:
5555
; CHECK-NEXT: ir-bb<for.body>:
@@ -96,7 +96,7 @@ target triple = "aarch64-unknown-linux-gnu"
9696
; CHECK-NEXT: No successors
9797
; CHECK-EMPTY:
9898
; CHECK-NEXT: scalar.ph:
99-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = resume-phi [[VTC]], ir<0>
99+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = phi [ [[VTC]], middle.block ], [ ir<0>, ir-bb<entry> ]
100100
; CHECK-NEXT: Successor(s): ir-bb<for.body>
101101
; CHECK-EMPTY:
102102
; CHECK-NEXT: ir-bb<for.body>:

‎llvm/test/Transforms/LoopVectorize/AArch64/synthesize-mask-for-call.ll

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ target triple = "aarch64-unknown-linux-gnu"
4747
; CHECK-NEXT: No successors
4848
; CHECK-EMPTY:
4949
; CHECK-NEXT: scalar.ph:
50-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
50+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = phi [ vp<[[VTC]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
5151
; CHECK-NEXT: Successor(s): ir-bb<for.body>
5252
; CHECK-EMPTY:
5353
; CHECK-NEXT: ir-bb<for.body>:
@@ -94,7 +94,7 @@ target triple = "aarch64-unknown-linux-gnu"
9494
; CHECK-NEXT: No successors
9595
; CHECK-EMPTY:
9696
; CHECK-NEXT: scalar.ph:
97-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
97+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = phi [ vp<[[VTC]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
9898
; CHECK-NEXT: Successor(s): ir-bb<for.body>
9999
; CHECK-EMPTY:
100100
; CHECK-NEXT: ir-bb<for.body>:
@@ -146,7 +146,7 @@ target triple = "aarch64-unknown-linux-gnu"
146146
; CHECK-NEXT: No successors
147147
; CHECK-EMPTY:
148148
; CHECK-NEXT: scalar.ph:
149-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
149+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = phi [ vp<[[VTC]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
150150
; CHECK-NEXT: Successor(s): ir-bb<for.body>
151151
; CHECK-EMPTY:
152152
; CHECK-NEXT: ir-bb<for.body>:
@@ -193,7 +193,7 @@ target triple = "aarch64-unknown-linux-gnu"
193193
; CHECK-NEXT: No successors
194194
; CHECK-EMPTY:
195195
; CHECK-NEXT: scalar.ph:
196-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
196+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = phi [ vp<[[VTC]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
197197
; CHECK-NEXT: Successor(s): ir-bb<for.body>
198198
; CHECK-EMPTY:
199199
; CHECK-NEXT: ir-bb<for.body>:
@@ -244,7 +244,7 @@ target triple = "aarch64-unknown-linux-gnu"
244244
; CHECK-NEXT: No successors
245245
; CHECK-EMPTY:
246246
; CHECK-NEXT: scalar.ph:
247-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
247+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = phi [ vp<[[VTC]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
248248
; CHECK-NEXT: Successor(s): ir-bb<for.body>
249249
; CHECK-EMPTY:
250250
; CHECK-NEXT: ir-bb<for.body>:
@@ -291,7 +291,7 @@ target triple = "aarch64-unknown-linux-gnu"
291291
; CHECK-NEXT: No successors
292292
; CHECK-EMPTY:
293293
; CHECK-NEXT: scalar.ph:
294-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
294+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = phi [ vp<[[VTC]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
295295
; CHECK-NEXT: Successor(s): ir-bb<for.body>
296296
; CHECK-EMPTY:
297297
; CHECK-NEXT: ir-bb<for.body>:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ define i32 @print_partial_reduction(ptr %a, ptr %b) {
5252
; CHECK-NEXT: No successors
5353
; CHECK-EMPTY:
5454
; CHECK-NEXT: scalar.ph:
55-
; CHECK-NEXT: EMIT-SCALAR vp<%bc.resume.val> = resume-phi vp<[[VEC_TC]]>, ir<0>
56-
; CHECK-NEXT: EMIT-SCALAR vp<%bc.merge.rdx> = resume-phi vp<[[RED_RESULT]]>, ir<0>
55+
; CHECK-NEXT: EMIT-SCALAR vp<%bc.resume.val> = phi [ vp<[[VEC_TC]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
56+
; CHECK-NEXT: EMIT-SCALAR vp<%bc.merge.rdx> = phi [ vp<[[RED_RESULT]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
5757
; CHECK-NEXT: Successor(s): ir-bb<for.body>
5858
; CHECK-EMPTY:
5959
; CHECK-NEXT: ir-bb<for.body>:
@@ -114,8 +114,8 @@ define i32 @print_partial_reduction(ptr %a, ptr %b) {
114114
; CHECK-NEXT: No successors
115115
; CHECK-EMPTY:
116116
; CHECK-NEXT: ir-bb<scalar.ph>:
117-
; CHECK-NEXT: EMIT-SCALAR vp<[[EP_RESUME:%.+]]> = resume-phi ir<1024>, ir<0>
118-
; CHECK-NEXT: EMIT-SCALAR vp<[[EP_MERGE:%.+]]> = resume-phi vp<[[RED_RESULT]]>, ir<0>
117+
; CHECK-NEXT: EMIT-SCALAR vp<[[EP_RESUME:%.+]]> = phi [ ir<1024>, middle.block ], [ ir<0>, ir-bb<entry> ]
118+
; CHECK-NEXT: EMIT-SCALAR vp<[[EP_MERGE:%.+]]> = phi [ vp<[[RED_RESULT]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
119119
; CHECK-NEXT: Successor(s): ir-bb<for.body>
120120
; CHECK-EMPTY:
121121
; CHECK-NEXT: ir-bb<for.body>:

‎llvm/test/Transforms/LoopVectorize/AArch64/widen-call-with-intrinsic-or-libfunc.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ target triple = "arm64-apple-ios"
4545
; CHECK-NEXT: No successors
4646
; CHECK-EMPTY:
4747
; CHECK-NEXT: scalar.ph:
48-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
48+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = phi [ vp<[[VTC]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
4949
; CHECK-NEXT: Successor(s): ir-bb<loop>
5050
; CHECK-EMPTY:
5151
; CHECK-NEXT: ir-bb<loop>:
@@ -92,7 +92,7 @@ target triple = "arm64-apple-ios"
9292
; CHECK-NEXT: No successors
9393
; CHECK-EMPTY:
9494
; CHECK-NEXT: scalar.ph:
95-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
95+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = phi [ vp<[[VTC]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
9696
; CHECK-NEXT: Successor(s): ir-bb<loop>
9797
; CHECK-EMPTY:
9898
; CHECK-NEXT: ir-bb<loop>:

‎llvm/test/Transforms/LoopVectorize/RISCV/riscv-vector-reverse.ll

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ define void @vector_reverse_i64(ptr nocapture noundef writeonly %A, ptr nocaptur
9898
; CHECK-NEXT: No successors
9999
; CHECK-EMPTY:
100100
; CHECK-NEXT: scalar.ph:
101-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME1:%.+]]> = resume-phi vp<[[END1]]>, ir<%0>
102-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME2:%.+]]>.1 = resume-phi vp<[[END2]]>, ir<%n>
101+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME1:%.+]]> = phi [ vp<[[END1]]>, middle.block ], [ ir<%0>, ir-bb<for.body.preheader> ]
102+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME2:%.+]]>.1 = phi [ vp<[[END2]]>, middle.block ], [ ir<%n>, ir-bb<for.body.preheader> ]
103103
; CHECK-NEXT: Successor(s): ir-bb<for.body>
104104
; CHECK-EMPTY:
105105
; CHECK-NEXT: ir-bb<for.body>:
@@ -220,8 +220,8 @@ define void @vector_reverse_i64(ptr nocapture noundef writeonly %A, ptr nocaptur
220220
; CHECK-NEXT: No successors
221221
; CHECK-EMPTY:
222222
; CHECK-NEXT: ir-bb<scalar.ph>:
223-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_1:%.+]]> = resume-phi vp<[[END1]]>, ir<%0>
224-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_2:%.+]]>.1 = resume-phi vp<[[END2]]>, ir<%n>
223+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_1:%.+]]> = phi [ vp<[[END1]]>, middle.block ], [ ir<%0>, ir-bb<for.body.preheader> ]
224+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_2:%.+]]>.1 = phi [ vp<[[END2]]>, middle.block ], [ ir<%n>, ir-bb<for.body.preheader> ]
225225
; CHECK-NEXT: Successor(s): ir-bb<for.body>
226226
; CHECK-EMPTY:
227227
; CHECK-NEXT: ir-bb<for.body>:
@@ -346,8 +346,8 @@ define void @vector_reverse_f32(ptr nocapture noundef writeonly %A, ptr nocaptur
346346
; CHECK-NEXT: No successors
347347
; CHECK-EMPTY:
348348
; CHECK-NEXT: scalar.ph:
349-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME1:%.+]]> = resume-phi vp<[[END1]]>, ir<%0>
350-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME2:%.+]]>.1 = resume-phi vp<[[END2]]>, ir<%n>
349+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME1:%.+]]> = phi [ vp<[[END1]]>, middle.block ], [ ir<%0>, ir-bb<for.body.preheader> ]
350+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME2:%.+]]>.1 = phi [ vp<[[END2]]>, middle.block ], [ ir<%n>, ir-bb<for.body.preheader> ]
351351
; CHECK-NEXT: Successor(s): ir-bb<for.body>
352352
; CHECK-EMPTY:
353353
; CHECK-NEXT: ir-bb<for.body>:
@@ -468,8 +468,8 @@ define void @vector_reverse_f32(ptr nocapture noundef writeonly %A, ptr nocaptur
468468
; CHECK-NEXT: No successors
469469
; CHECK-EMPTY:
470470
; CHECK-NEXT: ir-bb<scalar.ph>:
471-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME1:%.+]]> = resume-phi vp<[[END1]]>, ir<%0>
472-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME2:%.+]]>.1 = resume-phi vp<[[END2]]>, ir<%n>
471+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME1:%.+]]> = phi [ vp<[[END1]]>, middle.block ], [ ir<%0>, ir-bb<for.body.preheader> ]
472+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME2:%.+]]>.1 = phi [ vp<[[END2]]>, middle.block ], [ ir<%n>, ir-bb<for.body.preheader> ]
473473
; CHECK-NEXT: Successor(s): ir-bb<for.body>
474474
; CHECK-EMPTY:
475475
; CHECK-NEXT: ir-bb<for.body>:

‎llvm/test/Transforms/LoopVectorize/RISCV/vplan-vp-intrinsics-reduction.ll

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ define i32 @reduction(ptr %a, i64 %n, i32 %start) {
145145
; NO-VP-OUTLOOP-NEXT: No successors
146146
; NO-VP-OUTLOOP-EMPTY:
147147
; NO-VP-OUTLOOP-NEXT: scalar.ph:
148-
; NO-VP-OUTLOOP-NEXT: EMIT-SCALAR vp<[[IV_RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
149-
; NO-VP-OUTLOOP-NEXT: EMIT-SCALAR vp<[[RED_RESUME:%.+]]> = resume-phi vp<[[RDX]]>, ir<%start>
148+
; NO-VP-OUTLOOP-NEXT: EMIT-SCALAR vp<[[IV_RESUME:%.+]]> = phi [ vp<[[VTC]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
149+
; NO-VP-OUTLOOP-NEXT: EMIT-SCALAR vp<[[RED_RESUME:%.+]]> = phi [ vp<[[RDX]]>, middle.block ], [ ir<%start>, ir-bb<entry> ]
150150
; NO-VP-OUTLOOP-NEXT: Successor(s): ir-bb<for.body>
151151
; NO-VP-OUTLOOP-EMPTY:
152152
; NO-VP-OUTLOOP-NEXT: ir-bb<for.body>:
@@ -193,8 +193,8 @@ define i32 @reduction(ptr %a, i64 %n, i32 %start) {
193193
; NO-VP-INLOOP-NEXT: No successors
194194
; NO-VP-INLOOP-EMPTY:
195195
; NO-VP-INLOOP-NEXT: scalar.ph:
196-
; NO-VP-INLOOP-NEXT: EMIT-SCALAR vp<[[IV_RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
197-
; NO-VP-INLOOP-NEXT: EMIT-SCALAR vp<[[RED_RESUME:%.+]]> = resume-phi vp<[[RDX]]>, ir<%start>
196+
; NO-VP-INLOOP-NEXT: EMIT-SCALAR vp<[[IV_RESUME:%.+]]> = phi [ vp<[[VTC]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
197+
; NO-VP-INLOOP-NEXT: EMIT-SCALAR vp<[[RED_RESUME:%.+]]> = phi [ vp<[[RDX]]>, middle.block ], [ ir<%start>, ir-bb<entry> ]
198198
; NO-VP-INLOOP-NEXT: Successor(s): ir-bb<for.body>
199199
; NO-VP-INLOOP-EMPTY:
200200
; NO-VP-INLOOP-NEXT: ir-bb<for.body>:

‎llvm/test/Transforms/LoopVectorize/first-order-recurrence-chains-vplan.ll

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ define void @test_chained_first_order_recurrences_1(ptr %ptr) {
4747
; CHECK-NEXT: No successors
4848
; CHECK-EMPTY:
4949
; CHECK-NEXT: scalar.ph
50-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_1_P:%.*]]> = resume-phi vp<[[RESUME_1]]>, ir<22>
51-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_2_P:%.*]]>.1 = resume-phi vp<[[RESUME_2]]>.1, ir<33>
52-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_IV:%.*]]> = resume-phi vp<[[VTC]]>, ir<0>
50+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_1_P:%.*]]> = phi [ vp<[[RESUME_1]]>, middle.block ], [ ir<22>, ir-bb<entry> ]
51+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_2_P:%.*]]>.1 = phi [ vp<[[RESUME_2]]>.1, middle.block ], [ ir<33>, ir-bb<entry> ]
52+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_IV:%.*]]> = phi [ vp<[[VTC]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
5353
; CHECK-NEXT: Successor(s): ir-bb<loop>
5454
; CHECK-EMPTY:
5555
; CHECK-NEXT: ir-bb<loop>:
@@ -128,10 +128,10 @@ define void @test_chained_first_order_recurrences_3(ptr %ptr) {
128128
; CHECK-NEXT: No successors
129129
; CHECK-EMPTY:
130130
; CHECK-NEXT: scalar.ph
131-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_1_P:%.*]]> = resume-phi vp<[[RESUME_1]]>, ir<22>
132-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_2_P:%.*]]>.1 = resume-phi vp<[[RESUME_2]]>.1, ir<33>
133-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_3_P:%.*]]>.2 = resume-phi vp<[[RESUME_3]]>.2, ir<33>
134-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_IV:%.*]]> = resume-phi vp<[[VTC]]>, ir<0>
131+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_1_P:%.*]]> = phi [ vp<[[RESUME_1]]>, middle.block ], [ ir<22>, ir-bb<entry> ]
132+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_2_P:%.*]]>.1 = phi [ vp<[[RESUME_2]]>.1, middle.block ], [ ir<33>, ir-bb<entry> ]
133+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_3_P:%.*]]>.2 = phi [ vp<[[RESUME_3]]>.2, middle.block ], [ ir<33>, ir-bb<entry> ]
134+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_IV:%.*]]> = phi [ vp<[[VTC]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
135135
; CHECK-NEXT: Successor(s): ir-bb<loop>
136136
; CHECK-EMPTY:
137137
; CHECK-NEXT: ir-bb<loop>:
@@ -213,9 +213,9 @@ define i32 @test_chained_first_order_recurrences_4(ptr %base, i64 %x) {
213213
; CHECK-NEXT: No successors
214214
; CHECK-EMPTY:
215215
; CHECK-NEXT: scalar.ph:
216-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_IV:%.*]]> = resume-phi vp<[[VTC]]>, ir<0>
217-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_X:%.+]]> = resume-phi vp<[[EXT_X]]>, ir<0>
218-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_Y:%.+]]>.1 = resume-phi vp<[[EXT_Y]]>.1, ir<0>
216+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_IV:%.*]]> = phi [ vp<[[VTC]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
217+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_X:%.+]]> = phi [ vp<[[EXT_X]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
218+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_Y:%.+]]>.1 = phi [ vp<[[EXT_Y]]>.1, middle.block ], [ ir<0>, ir-bb<entry> ]
219219
; CHECK-NEXT: Successor(s): ir-bb<loop>
220220
; CHECK-EMPTY:
221221
; CHECK-NEXT: ir-bb<loop>:
@@ -292,9 +292,9 @@ define i32 @test_chained_first_order_recurrences_5_hoist_to_load(ptr %base) {
292292
; CHECK-NEXT: No successors
293293
; CHECK-EMPTY:
294294
; CHECK-NEXT: scalar.ph:
295-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_IV:%.*]]> = resume-phi vp<[[VTC]]>, ir<0>
296-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_X:%.+]]> = resume-phi vp<[[EXT_X]]>, ir<0>
297-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_Y:%.+]]>.1 = resume-phi vp<[[EXT_Y]]>.1, ir<0>
295+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_IV:%.*]]> = phi [ vp<[[VTC]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
296+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_X:%.+]]> = phi [ vp<[[EXT_X]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
297+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME_Y:%.+]]>.1 = phi [ vp<[[EXT_Y]]>.1, middle.block ], [ ir<0>, ir-bb<entry> ]
298298
; CHECK-NEXT: Successor(s): ir-bb<loop>
299299
; CHECK-EMPTY:
300300
; CHECK-NEXT: ir-bb<loop>:

‎llvm/test/Transforms/LoopVectorize/interleave-and-scalarize-only.ll

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ declare i32 @llvm.smin.i32(i32, i32)
121121
; DBG-NEXT: No successors
122122
; DBG-EMPTY:
123123
; DBG-NEXT: scalar.ph:
124-
; DBG-NEXT: EMIT-SCALAR vp<[[RESUME1:%.+]]> = resume-phi vp<[[VEC_TC]]>, ir<0>
125-
; DBG-NEXT: EMIT-SCALAR vp<[[RESUME2:%.+]]>.1 = resume-phi vp<[[END]]>, ir<false>
124+
; DBG-NEXT: EMIT-SCALAR vp<[[RESUME1:%.+]]> = phi [ vp<[[VEC_TC]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
125+
; DBG-NEXT: EMIT-SCALAR vp<[[RESUME2:%.+]]>.1 = phi [ vp<[[END]]>, middle.block ], [ ir<false>, ir-bb<entry> ]
126126
; DBG-NEXT: Successor(s): ir-bb<loop.header>
127127
; DBG-EMPTY:
128128
; DBG-NEXT: ir-bb<loop.header>:
@@ -228,8 +228,8 @@ exit:
228228
; DBG-NEXT: No successors
229229
; DBG-EMPTY:
230230
; DBG-NEXT: scalar.ph:
231-
; DBG-NEXT: EMIT-SCALAR vp<[[RESUME_IV:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
232-
; DBG-NEXT: EMIT-SCALAR vp<[[RESUME_P:%.*]]> = resume-phi vp<[[RESUME_1]]>, ir<0>
231+
; DBG-NEXT: EMIT-SCALAR vp<[[RESUME_IV:%.+]]> = phi [ vp<[[VTC]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
232+
; DBG-NEXT: EMIT-SCALAR vp<[[RESUME_P:%.*]]> = phi [ vp<[[RESUME_1]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
233233
; DBG-NEXT: Successor(s): ir-bb<loop>
234234
; DBG-EMPTY:
235235
; DBG-NEXT: ir-bb<loop>:

‎llvm/test/Transforms/LoopVectorize/uncountable-early-exit-vplan.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ define i64 @multi_exiting_to_different_exits_live_in_exit_values() {
5959
; CHECK-NEXT: No successors
6060
; CHECK-EMPTY:
6161
; CHECK-NEXT: scalar.ph:
62-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
62+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = phi [ vp<[[VTC]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
6363
; CHECK-NEXT: ir-bb<loop.header>
6464
; CHECK-EMPTY:
6565
; CHECK-NEXT: ir-bb<loop.header>:
@@ -142,7 +142,7 @@ define i64 @multi_exiting_to_same_exit_live_in_exit_values() {
142142
; CHECK-NEXT: No successors
143143
; CHECK-EMPTY:
144144
; CHECK-NEXT: scalar.ph:
145-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
145+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = phi [ vp<[[VTC]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
146146
; CHECK-NEXT: ir-bb<loop.header>
147147
; CHECK-EMPTY:
148148
; CHECK-NEXT: ir-bb<loop.header>:
@@ -222,7 +222,7 @@ define i64 @multi_exiting_to_same_exit_live_in_exit_values_2() {
222222
; CHECK-NEXT: No successors
223223
; CHECK-EMPTY:
224224
; CHECK-NEXT: scalar.ph:
225-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
225+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = phi [ vp<[[VTC]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
226226
; CHECK-NEXT: ir-bb<loop.header>
227227
; CHECK-EMPTY:
228228
; CHECK-NEXT: ir-bb<loop.header>:

‎llvm/test/Transforms/LoopVectorize/vplan-dot-printing.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ define void @print_call_and_memory(i64 %n, ptr noalias %y, ptr noalias %x) nounw
2020
; CHECK-NEXT: N0 -> N2 [ label="F"]
2121
; CHECK-NEXT: N1 [label =
2222
; CHECK-NEXT: "scalar.ph:\l" +
23-
; CHECK-NEXT: " EMIT-SCALAR vp\<%bc.resume.val\> = resume-phi vp\<%2\>, ir\<0\>\l" +
23+
; CHECK-NEXT: " EMIT-SCALAR vp\<%bc.resume.val\> = phi [ vp\<%2\>, middle.block ], [ ir\<0\>, ir-bb\<for.body.preheader\> ]\l" +
2424
; CHECK-NEXT: "Successor(s): ir-bb\<for.body\>\l"
2525
; CHECK-NEXT: ]
2626
; CHECK-NEXT: N1 -> N3 [ label=""]

‎llvm/test/Transforms/LoopVectorize/vplan-iv-transforms.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ define void @iv_no_binary_op_in_descriptor(i1 %c, ptr %dst) {
3838
; CHECK-NEXT: No successors
3939
; CHECK-EMPTY:
4040
; CHECK-NEXT: scalar.ph:
41-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[VEC_TC]]>, ir<0>
41+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = phi [ vp<[[VEC_TC]]>, middle.block ], [ ir<0>, ir-bb<entry> ]
4242
; CHECK-NEXT: Successor(s): ir-bb<loop.header>
4343
; CHECK-EMPTY:
4444
; CHECK-NEXT: ir-bb<loop.header>:

‎llvm/test/Transforms/LoopVectorize/vplan-predicate-switch.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ define void @switch4_default_common_dest_with_case(ptr %start, ptr %end) {
9191
; CHECK-NEXT: No successors
9292
; CHECK-EMPTY:
9393
; CHECK-NEXT: ir-bb<scalar.ph>:
94-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[END]]>, ir<%start>
94+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME:%.+]]> = phi [ vp<[[END]]>, middle.block ], [ ir<%start>, ir-bb<entry> ]
9595
; CHECK-NEXT: Successor(s): ir-bb<loop.header>
9696
; CHECK-EMPTY:
9797
; CHECK-NEXT: ir-bb<loop.header>:

‎llvm/test/Transforms/LoopVectorize/vplan-printing-before-execute.ll

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ define void @test_tc_less_than_16(ptr %A, i64 %N) {
4949
; CHECK-NEXT: No successors
5050
; CHECK-EMPTY:
5151
; CHECK-NEXT: scalar.ph:
52-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME1:%.+]]> = resume-phi vp<[[END1]]>, ir<%and>
53-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME2:%.+]]>.1 = resume-phi vp<[[END2]]>, ir<%A>
52+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME1:%.+]]> = phi [ vp<[[END1]]>, middle.block ], [ ir<%and>, ir-bb<entry> ]
53+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME2:%.+]]>.1 = phi [ vp<[[END2]]>, middle.block ], [ ir<%A>, ir-bb<entry> ]
5454
; CHECK-NEXT: Successor(s): ir-bb<loop>
5555
; CHECK-EMPTY:
5656
; CHECK-NEXT: ir-bb<loop>:
@@ -98,8 +98,8 @@ define void @test_tc_less_than_16(ptr %A, i64 %N) {
9898
; CHECK-NEXT: No successors
9999
; CHECK-EMPTY:
100100
; CHECK-NEXT: ir-bb<scalar.ph>:
101-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME1:%.+]]> = resume-phi vp<[[END1]]>, ir<%and>
102-
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME2:%.+]]>.1 = resume-phi vp<[[END2]]>, ir<%A>
101+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME1:%.+]]> = phi [ vp<[[END1]]>, middle.block ], [ ir<%and>, ir-bb<entry> ]
102+
; CHECK-NEXT: EMIT-SCALAR vp<[[RESUME2:%.+]]>.1 = phi [ vp<[[END2]]>, middle.block ], [ ir<%A>, ir-bb<entry> ]
103103
; CHECK-NEXT: Successor(s): ir-bb<loop>
104104
; CHECK-EMPTY:
105105
; CHECK-NEXT: ir-bb<loop>:

0 commit comments

Comments
 (0)