Skip to content

Commit f38d84c

Browse files
fhahnfhahn
committed
[VPlan] Use ir-bb prefix for VPIRBasicBlock.
Follow-up to adjust the names and tests after #93398.
1 parent e1c3e16 commit f38d84c

File tree

10 files changed

+25
-23
lines changed

10 files changed

+25
-23
lines changed

‎llvm/lib/Transforms/Vectorize/VPlan.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2972,7 +2972,9 @@ class VPIRBasicBlock : public VPBasicBlock {
29722972

29732973
public:
29742974
VPIRBasicBlock(BasicBlock *IRBB)
2975-
: VPBasicBlock(VPIRBasicBlockSC, "ph"), IRBB(IRBB) {}
2975+
: VPBasicBlock(VPIRBasicBlockSC,
2976+
(Twine("ir-bb<") + IRBB->getName() + Twine(">")).str()),
2977+
IRBB(IRBB) {}
29762978

29772979
~VPIRBasicBlock() override {}
29782980

‎llvm/test/Transforms/LoopVectorize/AArch64/sve-tail-folding-forced.ll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ target triple = "aarch64-unknown-linux-gnu"
1313
; VPLANS-NEXT: Live-in vp<[[VFxUF:%.+]]> = VF * UF
1414
; VPLANS-NEXT: vp<[[TC:%[0-9]+]]> = original trip-count
1515
; VPLANS-EMPTY:
16-
; VPLANS-NEXT: ph:
16+
; VPLANS-NEXT: ir-bb<entry>:
1717
; VPLANS-NEXT: EMIT vp<[[TC]]> = EXPAND SCEV (1 umax %n)
1818
; VPLANS-NEXT: No successors
1919
; VPLANS-EMPTY:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ define void @vector_reverse_i64(ptr nocapture noundef writeonly %A, ptr nocaptur
5454
; CHECK-NEXT: Live-in vp<[[VFxUF:%.+]]> = VF * UF
5555
; CHECK-NEXT: Live-in vp<[[VEC_TC:%.+]]> = vector-trip-count
5656
; CHECK-NEXT: vp<[[TC:%.+]]> = original trip-count
57-
; CHECK: ph:
57+
; CHECK: ir-bb<for.body.preheader>:
5858
; CHECK-NEXT: EMIT vp<[[TC]]> = EXPAND SCEV (zext i32 %n to i64)
5959
; CHECK-NEXT: No successors
6060
; CHECK: vector.ph:
@@ -195,7 +195,7 @@ define void @vector_reverse_f32(ptr nocapture noundef writeonly %A, ptr nocaptur
195195
; CHECK-NEXT: Live-in vp<[[VFxUF:%.+]]> = VF * UF
196196
; CHECK-NEXT: Live-in vp<[[VEC_TC:%.+]]> = vector-trip-count
197197
; CHECK-NEXT: vp<[[TC:%.+]]> = original trip-count
198-
; CHECK: ph:
198+
; CHECK: ir-bb<for.body.preheader>:
199199
; CHECK-NEXT: EMIT vp<[[TC]]> = EXPAND SCEV (zext i32 %n to i64)
200200
; CHECK-NEXT: No successors
201201
; CHECK: vector.ph:

‎llvm/test/Transforms/LoopVectorize/first-order-recurrence-sink-replicate-region.ll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ define void @sink_replicate_region_after_replicate_region(ptr %ptr, ptr noalias
350350
; CHECK-NEXT: Live-in vp<[[BTC:%.+]]> = backedge-taken count
351351
; CHECK-NEXT: vp<[[TC:%.+]]> = original trip-count
352352
; CHECK-EMPTY:
353-
; CHECK-NEXT: ph:
353+
; CHECK-NEXT: ir-bb<entry>:
354354
; CHECK-NEXT: EMIT vp<[[TC]]> = EXPAND SCEV (1 smax (1 + (sext i8 %y to i32))<nsw>)
355355
; CHECK-NEXT: No successors
356356
; CHECK-EMPTY:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
; DBG-NEXT: Live-in vp<[[VEC_TC:%.+]]> = vector-trip-count
1010
; DBG-NEXT: vp<[[TC:%.+]]> = original trip-count
1111
; DBG-EMPTY:
12-
; DBG-NEXT: ph:
12+
; DBG-NEXT: ir-bb<entry>:
1313
; DBG-NEXT: EMIT vp<[[TC]]> = EXPAND SCEV (1000 + (-1 * %start))
1414
; DBG-NEXT: No successors
1515
; DBG-EMPTY:
@@ -179,7 +179,7 @@ exit:
179179
; DBG-NEXT: Live-in vp<[[VTC:%.+]]> = vector-trip-count
180180
; DBG-NEXT: vp<[[TC:%.+]]> = original trip-count
181181
; DBG-EMPTY:
182-
; DBG-NEXT: ph:
182+
; DBG-NEXT: ir-bb<entry>:
183183
; DBG-NEXT: EMIT vp<[[TC]]> = EXPAND SCEV (zext i32 (1 smax %n) to i64)
184184
; DBG-NEXT: No successors
185185
; DBG-EMPTY:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ define void @print_call_and_memory(i64 %n, ptr noalias %y, ptr noalias %x) nounw
1313
; CHECK-NEXT: edge [fontname=Courier, fontsize=30]
1414
; CHECK-NEXT: compound=true
1515
; CHECK-NEXT: N0 [label =
16-
; CHECK-NEXT: "ph:\l" +
16+
; CHECK-NEXT: "ir-bb\<for.body.preheader\>:\l" +
1717
; CHECK-NEXT: "No successors\l"
1818
; CHECK-NEXT: ]
1919
; CHECK-NEXT: N1 [label =

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ define void @test_tc_less_than_16(ptr %A, i64 %N) {
1313
; CHECK-NEXT: Live-in vp<[[VTC:%.+]]> = vector-trip-count
1414
; CHECK-NEXT: vp<[[TC:%.+]]> = original trip-count
1515
; CHECK-EMPTY:
16-
; CHECK-NEXT: ph:
16+
; CHECK-NEXT: ir-bb<entry>:
1717
; CHECK-NEXT: EMIT vp<[[TC]]> = EXPAND SCEV (zext i4 (trunc i64 %N to i4) to i64)
1818
; CHECK-NEXT: No successors
1919
; CHECK-EMPTY:
@@ -45,7 +45,7 @@ define void @test_tc_less_than_16(ptr %A, i64 %N) {
4545
; CHECK-NEXT: Live-in vp<[[VFxUF:%.+]]> = VF * UF
4646
; CHECK-NEXT: vp<[[TC:%.+]]> = original trip-count
4747
; CHECK-EMPTY:
48-
; CHECK-NEXT: ph:
48+
; CHECK-NEXT: ir-bb<entry>:
4949
; CHECK-NEXT: EMIT vp<[[TC]]> = EXPAND SCEV (zext i4 (trunc i64 %N to i4) to i64)
5050
; CHECK-NEXT: No successors
5151
; CHECK-EMPTY:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ define void @print_replicate_predicated_phi(i64 %n, ptr %x) {
215215
; CHECK-NEXT: Live-in vp<[[VEC_TC:%.+]]> = vector-trip-count
216216
; CHECK-NEXT: vp<[[TC:%.+]]> = original trip-count
217217
; CHECK-EMPTY:
218-
; CHECK-NEXT: ph:
218+
; CHECK-NEXT: ir-bb<entry>:
219219
; CHECK-NEXT: EMIT vp<[[TC]]> = EXPAND SCEV (1 smax %n)
220220
; CHECK-NEXT: No successors
221221
; CHECK-EMPTY:
@@ -507,7 +507,7 @@ define void @print_expand_scev(i64 %y, ptr %ptr) {
507507
; CHECK-NEXT: Live-in vp<[[VTC:%.+]]> = vector-trip-count
508508
; CHECK-NEXT: vp<[[TC:%.+]]> = original trip-count
509509
; CHECK-EMPTY:
510-
; CHECK-NEXT: ph:
510+
; CHECK-NEXT: ir-bb<entry>:
511511
; CHECK-NEXT: EMIT vp<[[TC]]> = EXPAND SCEV (1 + ((15 + (%y /u 492802768830814060))<nuw><nsw> /u (1 + (%y /u 492802768830814060))<nuw><nsw>))<nuw><nsw>
512512
; CHECK-NEXT: EMIT vp<[[EXP_SCEV:%.+]]> = EXPAND SCEV (1 + (%y /u 492802768830814060))<nuw><nsw>
513513
; CHECK-NEXT: No successors

‎llvm/test/Transforms/LoopVectorize/vplan-sink-scalars-and-merge.ll‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f3
1616
; CHECK-NEXT: Live-in vp<[[BTC:%.+]]> = backedge-taken count
1717
; CHECK-NEXT: vp<[[TC:%.+]]> = original trip-count
1818
; CHECK-EMPTY:
19-
; CHECK-NEXT: ph:
19+
; CHECK-NEXT: ir-bb<entry>:
2020
; CHECK-NEXT: EMIT vp<[[TC]]> = EXPAND SCEV (1 + (8 umin %k))<nuw><nsw>
2121
; CHECK-NEXT: No successors
2222
; CHECK-EMPTY:
@@ -85,7 +85,7 @@ exit:
8585
; CHECK-NEXT: Live-in vp<[[BTC:%.+]]> = backedge-taken count
8686
; CHECK-NEXT: vp<[[TC:%.+]]> = original trip-count
8787
; CHECK-EMPTY:
88-
; CHECK-NEXT: ph:
88+
; CHECK-NEXT: ir-bb<entry>:
8989
; CHECK-NEXT: EMIT vp<[[TC]]> = EXPAND SCEV (1 + (8 umin %k))<nuw><nsw>
9090
; CHECK-NEXT: No successors
9191
; CHECK-EMPTY:
@@ -169,7 +169,7 @@ exit:
169169
; CHECK-NEXT: Live-in vp<[[BTC:%.+]]> = backedge-taken count
170170
; CHECK-NEXT: vp<[[TC:%.+]]> = original trip-count
171171
; CHECK-EMPTY:
172-
; CHECK-NEXT: ph:
172+
; CHECK-NEXT: ir-bb<entry>:
173173
; CHECK-NEXT: EMIT vp<[[TC]]> = EXPAND SCEV (1 + (8 umin %k))<nuw><nsw>
174174
; CHECK-NEXT: No successors
175175
; CHECK-EMPTY:
@@ -326,7 +326,7 @@ define void @pred_cfg1(i32 %k, i32 %j) {
326326
; CHECK-NEXT: Live-in vp<[[BTC:%.+]]> = backedge-taken count
327327
; CHECK-NEXT: vp<[[TC:%.+]]> = original trip-count
328328
; CHECK-EMPTY:
329-
; CHECK-NEXT: ph:
329+
; CHECK-NEXT: ir-bb<entry>:
330330
; CHECK-NEXT: EMIT vp<[[TC]]> = EXPAND SCEV (1 + (8 umin %k))<nuw><nsw>
331331
; CHECK-NEXT: No successors
332332
; CHECK-EMPTY:
@@ -423,7 +423,7 @@ define void @pred_cfg2(i32 %k, i32 %j) {
423423
; CHECK-NEXT: Live-in vp<[[BTC:%.+]]> = backedge-taken count
424424
; CHECK-NEXT: vp<[[TC:%.+]]> = original trip-count
425425
; CHECK-EMPTY:
426-
; CHECK-NEXT: ph:
426+
; CHECK-NEXT: ir-bb<entry>:
427427
; CHECK-NEXT: EMIT vp<[[TC]]> = EXPAND SCEV (1 + (8 umin %k))<nuw><nsw>
428428
; CHECK-NEXT: No successors
429429
; CHECK-EMPTY:
@@ -529,7 +529,7 @@ define void @pred_cfg3(i32 %k, i32 %j) {
529529
; CHECK-NEXT: Live-in vp<[[BTC:%.+]]> = backedge-taken count
530530
; CHECK-NEXT: vp<[[TC:%.+]]> = original trip-count
531531
; CHECK-EMPTY:
532-
; CHECK-NEXT: ph:
532+
; CHECK-NEXT: ir-bb<entry>:
533533
; CHECK-NEXT: EMIT vp<[[TC]]> = EXPAND SCEV (1 + (8 umin %k))<nuw><nsw>
534534
; CHECK-NEXT: No successors
535535
; CHECK-EMPTY:
@@ -635,7 +635,7 @@ define void @merge_3_replicate_region(i32 %k, i32 %j) {
635635
; CHECK-NEXT: Live-in vp<[[BTC:%.+]]> = backedge-taken count
636636
; CHECK-NEXT: vp<[[TC:%.+]]> = original trip-count
637637
; CHECK-EMPTY:
638-
; CHECK-NEXT: ph:
638+
; CHECK-NEXT: ir-bb<entry>:
639639
; CHECK-NEXT: EMIT vp<[[TC]]> = EXPAND SCEV (1 + (8 umin %k))<nuw><nsw>
640640
; CHECK-NEXT: No successors
641641
; CHECK-EMPTY:
@@ -740,7 +740,7 @@ define void @update_2_uses_in_same_recipe_in_merged_block(i32 %k) {
740740
; CHECK-NEXT: Live-in vp<[[BTC:%.+]]> = backedge-taken count
741741
; CHECK-NEXT: vp<[[TC:%.+]]> = original trip-count
742742
; CHECK-EMPTY:
743-
; CHECK-NEXT: ph:
743+
; CHECK-NEXT: ir-bb<entry>:
744744
; CHECK-NEXT: EMIT vp<[[TC]]> = EXPAND SCEV (1 + (8 umin %k))<nuw><nsw>
745745
; CHECK-NEXT: No successors
746746
; CHECK-EMPTY:
@@ -807,7 +807,7 @@ define void @recipe_in_merge_candidate_used_by_first_order_recurrence(i32 %k) {
807807
; CHECK-NEXT: Live-in vp<[[BTC:%.+]]> = backedge-taken count
808808
; CHECK-NEXT: vp<[[TC:%.+]]> = original trip-count
809809
; CHECK-EMPTY:
810-
; CHECK-NEXT: ph:
810+
; CHECK-NEXT: ir-bb<entry>:
811811
; CHECK-NEXT: EMIT vp<[[TC]]> = EXPAND SCEV (1 + (8 umin %k))<nuw><nsw>
812812
; CHECK-NEXT: No successors
813813
; CHECK-EMPTY:
@@ -1094,7 +1094,7 @@ define void @ptr_induction_remove_dead_recipe(ptr %start, ptr %end) {
10941094
; CHECK-NEXT: Live-in vp<[[VEC_TC:%.+]]> = vector-trip-count
10951095
; CHECK-NEXT: vp<[[TC:%.+]]> = original trip-count
10961096
; CHECK-EMPTY:
1097-
; CHECK-NEXT: ph:
1097+
; CHECK-NEXT: ir-bb<entry>:
10981098
; CHECK-NEXT: EMIT vp<[[TC]]> = EXPAND SCEV ((-1 * (ptrtoint ptr %end to i64)) + (ptrtoint ptr %start to i64))
10991099
; CHECK-NEXT: No successors
11001100
; CHECK-EMPTY:

‎llvm/unittests/Transforms/Vectorize/VPlanHCFGTest.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ node [shape=rect, fontname=Courier, fontsize=30]
106106
edge [fontname=Courier, fontsize=30]
107107
compound=true
108108
N0 [label =
109-
"ph:\l" +
109+
"ir-bb\<entry\>:\l" +
110110
" EMIT vp\<%1\> = EXPAND SCEV (-1 + %N)\l" +
111111
"No successors\l"
112112
]

0 commit comments

Comments
 (0)