Skip to content

Commit 1dc91a7

Browse files
fhahnfhahn
committed
[VPlan] Use SINGLE-SCALAR when printing single-scalar VPInstructions.
By using SINGLE-SCALAR when printing, it is clear in the debug output that those VPInstructions only produce a single scalar.
1 parent 843e362 commit 1dc91a7

17 files changed

+78
-78
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,7 @@ void VPInstruction::dump() const {
965965

966966
void VPInstruction::print(raw_ostream &O, const Twine &Indent,
967967
VPSlotTracker &SlotTracker) const {
968-
O << Indent << "EMIT ";
968+
O << Indent << (isSingleScalar() ? "SINGLE-SCALAR " : "EMIT ");
969969

970970
if (hasResult()) {
971971
printAsOperand(O, SlotTracker);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ target triple = "aarch64-unknown-linux-gnu"
4646
; CHECK-NEXT: Successor(s): ir-bb<for.exit>, scalar.ph
4747
; CHECK-EMPTY:
4848
; CHECK-NEXT: scalar.ph:
49-
; CHECK-NEXT: EMIT vp<[[RESUME:%.+]]> = resume-phi [[VTC]], ir<0>
49+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME:%.+]]> = resume-phi [[VTC]], ir<0>
5050
; CHECK-NEXT: Successor(s): ir-bb<for.body>
5151
; CHECK-EMPTY:
5252
; CHECK-NEXT: ir-bb<for.body>:
@@ -93,7 +93,7 @@ target triple = "aarch64-unknown-linux-gnu"
9393
; CHECK-NEXT: Successor(s): ir-bb<for.exit>, scalar.ph
9494
; CHECK-EMPTY:
9595
; CHECK-NEXT: scalar.ph:
96-
; CHECK-NEXT: EMIT vp<[[RESUME:%.+]]> = resume-phi [[VTC]], ir<0>
96+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME:%.+]]> = resume-phi [[VTC]], ir<0>
9797
; CHECK-NEXT: Successor(s): ir-bb<for.body>
9898
; CHECK-EMPTY:
9999
; 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
@@ -44,7 +44,7 @@ target triple = "aarch64-unknown-linux-gnu"
4444
; CHECK-NEXT: Successor(s): ir-bb<for.cond.cleanup>, scalar.ph
4545
; CHECK-EMPTY:
4646
; CHECK-NEXT: scalar.ph:
47-
; CHECK-NEXT: EMIT vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
47+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
4848
; CHECK-NEXT: Successor(s): ir-bb<for.body>
4949
; CHECK-EMPTY:
5050
; CHECK-NEXT: ir-bb<for.body>:
@@ -91,7 +91,7 @@ target triple = "aarch64-unknown-linux-gnu"
9191
; CHECK-NEXT: Successor(s): ir-bb<for.cond.cleanup>, scalar.ph
9292
; CHECK-EMPTY:
9393
; CHECK-NEXT: scalar.ph:
94-
; CHECK-NEXT: EMIT vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
94+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
9595
; CHECK-NEXT: Successor(s): ir-bb<for.body>
9696
; CHECK-EMPTY:
9797
; CHECK-NEXT: ir-bb<for.body>:
@@ -143,7 +143,7 @@ target triple = "aarch64-unknown-linux-gnu"
143143
; CHECK-NEXT: Successor(s): ir-bb<for.cond.cleanup>, scalar.ph
144144
; CHECK-EMPTY:
145145
; CHECK-NEXT: scalar.ph:
146-
; CHECK-NEXT: EMIT vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
146+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
147147
; CHECK-NEXT: Successor(s): ir-bb<for.body>
148148
; CHECK-EMPTY:
149149
; CHECK-NEXT: ir-bb<for.body>:
@@ -190,7 +190,7 @@ target triple = "aarch64-unknown-linux-gnu"
190190
; CHECK-NEXT: Successor(s): ir-bb<for.cond.cleanup>, scalar.ph
191191
; CHECK-EMPTY:
192192
; CHECK-NEXT: scalar.ph:
193-
; CHECK-NEXT: EMIT vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
193+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
194194
; CHECK-NEXT: Successor(s): ir-bb<for.body>
195195
; CHECK-EMPTY:
196196
; CHECK-NEXT: ir-bb<for.body>:
@@ -241,7 +241,7 @@ target triple = "aarch64-unknown-linux-gnu"
241241
; CHECK-NEXT: Successor(s): ir-bb<for.cond.cleanup>, scalar.ph
242242
; CHECK-EMPTY:
243243
; CHECK-NEXT: scalar.ph:
244-
; CHECK-NEXT: EMIT vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
244+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
245245
; CHECK-NEXT: Successor(s): ir-bb<for.body>
246246
; CHECK-EMPTY:
247247
; CHECK-NEXT: ir-bb<for.body>:
@@ -288,7 +288,7 @@ target triple = "aarch64-unknown-linux-gnu"
288288
; CHECK-NEXT: Successor(s): ir-bb<for.cond.cleanup>, scalar.ph
289289
; CHECK-EMPTY:
290290
; CHECK-NEXT: scalar.ph:
291-
; CHECK-NEXT: EMIT vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
291+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
292292
; CHECK-NEXT: Successor(s): ir-bb<for.body>
293293
; CHECK-EMPTY:
294294
; 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
@@ -48,8 +48,8 @@ define i32 @print_partial_reduction(ptr %a, ptr %b) {
4848
; CHECK-NEXT: Successor(s): ir-bb<exit>, scalar.ph
4949
; CHECK-EMPTY:
5050
; CHECK-NEXT: scalar.ph:
51-
; CHECK-NEXT: EMIT vp<%bc.resume.val> = resume-phi vp<[[VEC_TC]]>, ir<0>
52-
; CHECK-NEXT: EMIT vp<%bc.merge.rdx> = resume-phi vp<[[RED_RESULT]]>, ir<0>
51+
; CHECK-NEXT: SINGLE-SCALAR vp<%bc.resume.val> = resume-phi vp<[[VEC_TC]]>, ir<0>
52+
; CHECK-NEXT: SINGLE-SCALAR vp<%bc.merge.rdx> = resume-phi vp<[[RED_RESULT]]>, ir<0>
5353
; CHECK-NEXT: Successor(s): ir-bb<for.body>
5454
; CHECK-EMPTY:
5555
; 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 vp<[[EP_RESUME:%.+]]> = resume-phi ir<1024>, ir<0>
118-
; CHECK-NEXT: EMIT vp<[[EP_MERGE:%.+]]> = resume-phi vp<[[RED_RESULT]]>, ir<0>
117+
; CHECK-NEXT: SINGLE-SCALAR vp<[[EP_RESUME:%.+]]> = resume-phi ir<1024>, ir<0>
118+
; CHECK-NEXT: SINGLE-SCALAR vp<[[EP_MERGE:%.+]]> = resume-phi vp<[[RED_RESULT]]>, ir<0>
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
@@ -42,7 +42,7 @@ target triple = "arm64-apple-ios"
4242
; CHECK-NEXT: Successor(s): ir-bb<exit>, scalar.ph
4343
; CHECK-EMPTY:
4444
; CHECK-NEXT: scalar.ph:
45-
; CHECK-NEXT: EMIT vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
45+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
4646
; CHECK-NEXT: Successor(s): ir-bb<loop>
4747
; CHECK-EMPTY:
4848
; CHECK-NEXT: ir-bb<loop>:
@@ -89,7 +89,7 @@ target triple = "arm64-apple-ios"
8989
; CHECK-NEXT: Successor(s): ir-bb<exit>, scalar.ph
9090
; CHECK-EMPTY:
9191
; CHECK-NEXT: scalar.ph:
92-
; CHECK-NEXT: EMIT vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
92+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
9393
; CHECK-NEXT: Successor(s): ir-bb<loop>
9494
; CHECK-EMPTY:
9595
; 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
@@ -95,8 +95,8 @@ define void @vector_reverse_i64(ptr nocapture noundef writeonly %A, ptr nocaptur
9595
; CHECK-NEXT: Successor(s): ir-bb<for.cond.cleanup.loopexit>, scalar.ph
9696
; CHECK-EMPTY:
9797
; CHECK-NEXT: scalar.ph:
98-
; CHECK-NEXT: EMIT vp<[[RESUME1:%.+]]> = resume-phi vp<[[END1]]>, ir<%0>
99-
; CHECK-NEXT: EMIT vp<[[RESUME2:%.+]]>.1 = resume-phi vp<[[END2]]>, ir<%n>
98+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME1:%.+]]> = resume-phi vp<[[END1]]>, ir<%0>
99+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME2:%.+]]>.1 = resume-phi vp<[[END2]]>, ir<%n>
100100
; CHECK-NEXT: Successor(s): ir-bb<for.body>
101101
; CHECK-EMPTY:
102102
; 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 vp<[[RESUME_1:%.+]]> = resume-phi vp<[[END1]]>, ir<%0>
224-
; CHECK-NEXT: EMIT vp<[[RESUME_2:%.+]]>.1 = resume-phi vp<[[END2]]>, ir<%n>
223+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME_1:%.+]]> = resume-phi vp<[[END1]]>, ir<%0>
224+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME_2:%.+]]>.1 = resume-phi vp<[[END2]]>, ir<%n>
225225
; CHECK-NEXT: Successor(s): ir-bb<for.body>
226226
; CHECK-EMPTY:
227227
; CHECK-NEXT: ir-bb<for.body>:
@@ -343,8 +343,8 @@ define void @vector_reverse_f32(ptr nocapture noundef writeonly %A, ptr nocaptur
343343
; CHECK-NEXT: Successor(s): ir-bb<for.cond.cleanup.loopexit>, scalar.ph
344344
; CHECK-EMPTY:
345345
; CHECK-NEXT: scalar.ph:
346-
; CHECK-NEXT: EMIT vp<[[RESUME1:%.+]]> = resume-phi vp<[[END1]]>, ir<%0>
347-
; CHECK-NEXT: EMIT vp<[[RESUME2:%.+]]>.1 = resume-phi vp<[[END2]]>, ir<%n>
346+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME1:%.+]]> = resume-phi vp<[[END1]]>, ir<%0>
347+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME2:%.+]]>.1 = resume-phi vp<[[END2]]>, ir<%n>
348348
; CHECK-NEXT: Successor(s): ir-bb<for.body>
349349
; CHECK-EMPTY:
350350
; 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 vp<[[RESUME1:%.+]]> = resume-phi vp<[[END1]]>, ir<%0>
472-
; CHECK-NEXT: EMIT vp<[[RESUME2:%.+]]>.1 = resume-phi vp<[[END2]]>, ir<%n>
471+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME1:%.+]]> = resume-phi vp<[[END1]]>, ir<%0>
472+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME2:%.+]]>.1 = resume-phi vp<[[END2]]>, ir<%n>
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
@@ -143,8 +143,8 @@ define i32 @reduction(ptr %a, i64 %n, i32 %start) {
143143
; NO-VP-OUTLOOP-NEXT: Successor(s): ir-bb<for.end>, scalar.ph
144144
; NO-VP-OUTLOOP-EMPTY:
145145
; NO-VP-OUTLOOP-NEXT: scalar.ph:
146-
; NO-VP-OUTLOOP-NEXT: EMIT vp<[[IV_RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
147-
; NO-VP-OUTLOOP-NEXT: EMIT vp<[[RED_RESUME:%.+]]> = resume-phi vp<[[RDX]]>, ir<%start>
146+
; NO-VP-OUTLOOP-NEXT: SINGLE-SCALAR vp<[[IV_RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
147+
; NO-VP-OUTLOOP-NEXT: SINGLE-SCALAR vp<[[RED_RESUME:%.+]]> = resume-phi vp<[[RDX]]>, ir<%start>
148148
; NO-VP-OUTLOOP-NEXT: Successor(s): ir-bb<for.body>
149149
; NO-VP-OUTLOOP-EMPTY:
150150
; NO-VP-OUTLOOP-NEXT: ir-bb<for.body>:
@@ -191,8 +191,8 @@ define i32 @reduction(ptr %a, i64 %n, i32 %start) {
191191
; NO-VP-INLOOP-NEXT: Successor(s): ir-bb<for.end>, scalar.ph
192192
; NO-VP-INLOOP-EMPTY:
193193
; NO-VP-INLOOP-NEXT: scalar.ph:
194-
; NO-VP-INLOOP-NEXT: EMIT vp<[[IV_RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
195-
; NO-VP-INLOOP-NEXT: EMIT vp<[[RED_RESUME:%.+]]> = resume-phi vp<[[RDX]]>, ir<%start>
194+
; NO-VP-INLOOP-NEXT: SINGLE-SCALAR vp<[[IV_RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
195+
; NO-VP-INLOOP-NEXT: SINGLE-SCALAR vp<[[RED_RESUME:%.+]]> = resume-phi vp<[[RDX]]>, ir<%start>
196196
; NO-VP-INLOOP-NEXT: Successor(s): ir-bb<for.body>
197197
; NO-VP-INLOOP-EMPTY:
198198
; 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
@@ -44,9 +44,9 @@ define void @test_chained_first_order_recurrences_1(ptr %ptr) {
4444
; CHECK-NEXT: Successor(s): ir-bb<exit>, scalar.ph
4545
; CHECK-EMPTY:
4646
; CHECK-NEXT: scalar.ph
47-
; CHECK-NEXT: EMIT vp<[[RESUME_1_P:%.*]]> = resume-phi vp<[[RESUME_1]]>, ir<22>
48-
; CHECK-NEXT: EMIT vp<[[RESUME_2_P:%.*]]>.1 = resume-phi vp<[[RESUME_2]]>.1, ir<33>
49-
; CHECK-NEXT: EMIT vp<[[RESUME_IV:%.*]]> = resume-phi vp<[[VTC]]>, ir<0>
47+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME_1_P:%.*]]> = resume-phi vp<[[RESUME_1]]>, ir<22>
48+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME_2_P:%.*]]>.1 = resume-phi vp<[[RESUME_2]]>.1, ir<33>
49+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME_IV:%.*]]> = resume-phi vp<[[VTC]]>, ir<0>
5050
; CHECK-NEXT: Successor(s): ir-bb<loop>
5151
; CHECK-EMPTY:
5252
; CHECK-NEXT: ir-bb<loop>:
@@ -125,10 +125,10 @@ define void @test_chained_first_order_recurrences_3(ptr %ptr) {
125125
; CHECK-NEXT: Successor(s): ir-bb<exit>, scalar.ph
126126
; CHECK-EMPTY:
127127
; CHECK-NEXT: scalar.ph
128-
; CHECK-NEXT: EMIT vp<[[RESUME_1_P:%.*]]> = resume-phi vp<[[RESUME_1]]>, ir<22>
129-
; CHECK-NEXT: EMIT vp<[[RESUME_2_P:%.*]]>.1 = resume-phi vp<[[RESUME_2]]>.1, ir<33>
130-
; CHECK-NEXT: EMIT vp<[[RESUME_3_P:%.*]]>.2 = resume-phi vp<[[RESUME_3]]>.2, ir<33>
131-
; CHECK-NEXT: EMIT vp<[[RESUME_IV:%.*]]> = resume-phi vp<[[VTC]]>, ir<0>
128+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME_1_P:%.*]]> = resume-phi vp<[[RESUME_1]]>, ir<22>
129+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME_2_P:%.*]]>.1 = resume-phi vp<[[RESUME_2]]>.1, ir<33>
130+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME_3_P:%.*]]>.2 = resume-phi vp<[[RESUME_3]]>.2, ir<33>
131+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME_IV:%.*]]> = resume-phi vp<[[VTC]]>, ir<0>
132132
; CHECK-NEXT: Successor(s): ir-bb<loop>
133133
; CHECK-EMPTY:
134134
; CHECK-NEXT: ir-bb<loop>:
@@ -210,9 +210,9 @@ define i32 @test_chained_first_order_recurrences_4(ptr %base, i64 %x) {
210210
; CHECK-NEXT: Successor(s): ir-bb<ret>, scalar.ph
211211
; CHECK-EMPTY:
212212
; CHECK-NEXT: scalar.ph:
213-
; CHECK-NEXT: EMIT vp<[[RESUME_IV:%.*]]> = resume-phi vp<[[VTC]]>, ir<0>
214-
; CHECK-NEXT: EMIT vp<[[RESUME_X:%.+]]> = resume-phi vp<[[EXT_X]]>, ir<0>
215-
; CHECK-NEXT: EMIT vp<[[RESUME_Y:%.+]]>.1 = resume-phi vp<[[EXT_Y]]>.1, ir<0>
213+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME_IV:%.*]]> = resume-phi vp<[[VTC]]>, ir<0>
214+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME_X:%.+]]> = resume-phi vp<[[EXT_X]]>, ir<0>
215+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME_Y:%.+]]>.1 = resume-phi vp<[[EXT_Y]]>.1, ir<0>
216216
; CHECK-NEXT: Successor(s): ir-bb<loop>
217217
; CHECK-EMPTY:
218218
; CHECK-NEXT: ir-bb<loop>:
@@ -289,9 +289,9 @@ define i32 @test_chained_first_order_recurrences_5_hoist_to_load(ptr %base) {
289289
; CHECK-NEXT: Successor(s): ir-bb<ret>, scalar.ph
290290
; CHECK-EMPTY:
291291
; CHECK-NEXT: scalar.ph:
292-
; CHECK-NEXT: EMIT vp<[[RESUME_IV:%.*]]> = resume-phi vp<[[VTC]]>, ir<0>
293-
; CHECK-NEXT: EMIT vp<[[RESUME_X:%.+]]> = resume-phi vp<[[EXT_X]]>, ir<0>
294-
; CHECK-NEXT: EMIT vp<[[RESUME_Y:%.+]]>.1 = resume-phi vp<[[EXT_Y]]>.1, ir<0>
292+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME_IV:%.*]]> = resume-phi vp<[[VTC]]>, ir<0>
293+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME_X:%.+]]> = resume-phi vp<[[EXT_X]]>, ir<0>
294+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME_Y:%.+]]>.1 = resume-phi vp<[[EXT_Y]]>.1, ir<0>
295295
; CHECK-NEXT: Successor(s): ir-bb<loop>
296296
; CHECK-EMPTY:
297297
; 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
@@ -118,8 +118,8 @@ declare i32 @llvm.smin.i32(i32, i32)
118118
; DBG-NEXT: Successor(s): ir-bb<exit>, scalar.ph
119119
; DBG-EMPTY:
120120
; DBG-NEXT: scalar.ph:
121-
; DBG-NEXT: EMIT vp<[[RESUME1:%.+]]> = resume-phi vp<[[VEC_TC]]>, ir<0>
122-
; DBG-NEXT: EMIT vp<[[RESUME2:%.+]]>.1 = resume-phi vp<[[END]]>, ir<false>
121+
; DBG-NEXT: SINGLE-SCALAR vp<[[RESUME1:%.+]]> = resume-phi vp<[[VEC_TC]]>, ir<0>
122+
; DBG-NEXT: SINGLE-SCALAR vp<[[RESUME2:%.+]]>.1 = resume-phi vp<[[END]]>, ir<false>
123123
; DBG-NEXT: Successor(s): ir-bb<loop.header>
124124
; DBG-EMPTY:
125125
; DBG-NEXT: ir-bb<loop.header>:
@@ -225,8 +225,8 @@ exit:
225225
; DBG-NEXT: Successor(s): ir-bb<exit>, scalar.ph
226226
; DBG-EMPTY:
227227
; DBG-NEXT: scalar.ph:
228-
; DBG-NEXT: EMIT vp<[[RESUME_IV:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
229-
; DBG-NEXT: EMIT vp<[[RESUME_P:%.*]]> = resume-phi vp<[[RESUME_1]]>, ir<0>
228+
; DBG-NEXT: SINGLE-SCALAR vp<[[RESUME_IV:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
229+
; DBG-NEXT: SINGLE-SCALAR vp<[[RESUME_P:%.*]]> = resume-phi vp<[[RESUME_1]]>, ir<0>
230230
; DBG-NEXT: Successor(s): ir-bb<loop>
231231
; DBG-EMPTY:
232232
; 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
@@ -48,7 +48,7 @@ define i64 @multi_exiting_to_different_exits_live_in_exit_values() {
4848
; CHECK-NEXT: Successor(s): ir-bb<e2>, scalar.ph
4949
; CHECK-EMPTY:
5050
; CHECK-NEXT: scalar.ph:
51-
; CHECK-NEXT: EMIT vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
51+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
5252
; CHECK-NEXT: ir-bb<loop.header>
5353
; CHECK-EMPTY:
5454
; CHECK-NEXT: ir-bb<loop.header>:
@@ -135,7 +135,7 @@ define i64 @multi_exiting_to_same_exit_live_in_exit_values() {
135135
; CHECK-NEXT: Successor(s): ir-bb<exit>, scalar.ph
136136
; CHECK-EMPTY:
137137
; CHECK-NEXT: scalar.ph:
138-
; CHECK-NEXT: EMIT vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
138+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
139139
; CHECK-NEXT: ir-bb<loop.header>
140140
; CHECK-EMPTY:
141141
; CHECK-NEXT: ir-bb<loop.header>:
@@ -215,7 +215,7 @@ define i64 @multi_exiting_to_same_exit_live_in_exit_values_2() {
215215
; CHECK-NEXT: Successor(s): ir-bb<exit>, scalar.ph
216216
; CHECK-EMPTY:
217217
; CHECK-NEXT: scalar.ph:
218-
; CHECK-NEXT: EMIT vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
218+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
219219
; CHECK-NEXT: ir-bb<loop.header>
220220
; CHECK-EMPTY:
221221
; CHECK-NEXT: ir-bb<loop.header>:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ define void @iv_no_binary_op_in_descriptor(i1 %c, ptr %dst) {
3535
; CHECK-NEXT: Successor(s): ir-bb<exit>, scalar.ph
3636
; CHECK-EMPTY:
3737
; CHECK-NEXT: scalar.ph:
38-
; CHECK-NEXT: EMIT vp<[[RESUME:%.+]]> = resume-phi vp<[[VEC_TC]]>, ir<0>
38+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[VEC_TC]]>, ir<0>
3939
; CHECK-NEXT: Successor(s): ir-bb<loop.header>
4040
; CHECK-EMPTY:
4141
; 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 vp<[[RESUME:%.+]]> = resume-phi vp<[[END]]>, ir<%start>
94+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME:%.+]]> = resume-phi vp<[[END]]>, ir<%start>
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
@@ -46,8 +46,8 @@ define void @test_tc_less_than_16(ptr %A, i64 %N) {
4646
; CHECK-NEXT: Successor(s): ir-bb<exit>, scalar.ph
4747
; CHECK-EMPTY:
4848
; CHECK-NEXT: scalar.ph:
49-
; CHECK-NEXT: EMIT vp<[[RESUME1:%.+]]> = resume-phi vp<[[END1]]>, ir<%and>
50-
; CHECK-NEXT: EMIT vp<[[RESUME2:%.+]]>.1 = resume-phi vp<[[END2]]>, ir<%A>
49+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME1:%.+]]> = resume-phi vp<[[END1]]>, ir<%and>
50+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME2:%.+]]>.1 = resume-phi vp<[[END2]]>, ir<%A>
5151
; CHECK-NEXT: Successor(s): ir-bb<loop>
5252
; CHECK-EMPTY:
5353
; CHECK-NEXT: ir-bb<loop>:
@@ -99,8 +99,8 @@ define void @test_tc_less_than_16(ptr %A, i64 %N) {
9999
; CHECK-NEXT: No successors
100100
; CHECK-EMPTY:
101101
; CHECK-NEXT: ir-bb<scalar.ph>:
102-
; CHECK-NEXT: EMIT vp<[[RESUME1:%.+]]> = resume-phi vp<[[END1]]>, ir<%and>
103-
; CHECK-NEXT: EMIT vp<[[RESUME2:%.+]]>.1 = resume-phi vp<[[END2]]>, ir<%A>
102+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME1:%.+]]> = resume-phi vp<[[END1]]>, ir<%and>
103+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME2:%.+]]>.1 = resume-phi vp<[[END2]]>, ir<%A>
104104
; CHECK-NEXT: Successor(s): ir-bb<loop>
105105
; CHECK-EMPTY:
106106
; CHECK-NEXT: ir-bb<loop>:

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ define float @print_reduction(i64 %n, ptr noalias %y) {
4141
; CHECK-NEXT: Successor(s): ir-bb<exit>, scalar.ph
4242
; CHECK-EMPTY:
4343
; CHECK-NEXT: scalar.ph
44-
; CHECK-NEXT: EMIT vp<[[RESUME_IV:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
45-
; CHECK-NEXT: EMIT vp<[[RED_RESUME:%.+]]> = resume-phi vp<[[RED_RES]]>, ir<0.000000e+00>
44+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME_IV:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
45+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RED_RESUME:%.+]]> = resume-phi vp<[[RED_RES]]>, ir<0.000000e+00>
4646
; CHECK-NEXT: Successor(s): ir-bb<loop>
4747
; CHECK-EMPTY:
4848
; CHECK-NEXT: ir-bb<loop>:
@@ -109,8 +109,8 @@ define void @print_reduction_with_invariant_store(i64 %n, ptr noalias %y, ptr no
109109
; CHECK-NEXT: Successor(s): ir-bb<exit>, scalar.ph
110110
; CHECK-EMPTY:
111111
; CHECK-NEXT: scalar.ph
112-
; CHECK-NEXT: EMIT vp<[[RESUME_IV:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
113-
; CHECK-NEXT: EMIT vp<[[RED_RESUME:%.+]]> = resume-phi vp<[[RED_RES]]>, ir<0.000000e+00>
112+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME_IV:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
113+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RED_RESUME:%.+]]> = resume-phi vp<[[RED_RES]]>, ir<0.000000e+00>
114114
; CHECK-NEXT: Successor(s): ir-bb<loop>
115115
; CHECK-EMPTY:
116116
; CHECK-NEXT: ir-bb<loop>:
@@ -182,8 +182,8 @@ define float @print_fmuladd_strict(ptr %a, ptr %b, i64 %n) {
182182
; CHECK-NEXT: Successor(s): ir-bb<exit>, scalar.ph
183183
; CHECK-EMPTY:
184184
; CHECK-NEXT: scalar.ph
185-
; CHECK-NEXT: EMIT vp<[[RESUME_IV:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
186-
; CHECK-NEXT: EMIT vp<[[RED_RESUME:%.+]]> = resume-phi vp<[[RED_RES]]>, ir<0.000000e+00>
185+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RESUME_IV:%.+]]> = resume-phi vp<[[VTC]]>, ir<0>
186+
; CHECK-NEXT: SINGLE-SCALAR vp<[[RED_RESUME:%.+]]> = resume-phi vp<[[RED_RES]]>, ir<0.000000e+00>
187187
; CHECK-NEXT: Successor(s): ir-bb<loop>
188188
; CHECK-EMPTY:
189189
; CHECK-NEXT: ir-bb<loop>:
@@ -244,8 +244,8 @@ define i64 @find_last_iv(ptr %a, i64 %n, i64 %start) {
244244
; CHECK-NEXT: Successor(s): ir-bb<exit>, scalar.ph
245245
; CHECK-EMPTY:
246246
; CHECK-NEXT: scalar.ph:
247-
; CHECK-NEXT: EMIT vp<%bc.resume.val> = resume-phi vp<{{.+}}>, ir<0>
248-
; CHECK-NEXT: EMIT vp<%bc.merge.rdx> = resume-phi vp<[[RDX_RES]]>, ir<%start>
247+
; CHECK-NEXT: SINGLE-SCALAR vp<%bc.resume.val> = resume-phi vp<{{.+}}>, ir<0>
248+
; CHECK-NEXT: SINGLE-SCALAR vp<%bc.merge.rdx> = resume-phi vp<[[RDX_RES]]>, ir<%start>
249249
;
250250
; CHECK: ir-bb<exit>:
251251
; CHECK-NEXT: IR %cond.lcssa = phi i64 [ %cond, %loop ] (extra operand: vp<[[EXT]]> from middle.block)

0 commit comments

Comments
 (0)