Skip to content

Commit 38f8b7c

Browse files
committed
[LV] Replace value numbers with patterns in tests (NFC).
Replace some hardcoded value numbers in CHECK-LINES to use patterns, to make the tests more robust wrt renumbering.
1 parent 47401b6 commit 38f8b7c

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ define void @vector_reverse_i64(ptr nocapture noundef writeonly %A, ptr nocaptur
5151
; CHECK-NEXT: LV: Scalarizing: %cmp = icmp ugt i64 %indvars.iv, 1
5252
; CHECK-NEXT: LV: Scalarizing: %indvars.iv.next = add nsw i64 %indvars.iv, -1
5353
; CHECK-NEXT: VPlan 'Initial VPlan for VF={vscale x 4},UF>=1' {
54-
; CHECK-NEXT: Live-in vp<%0> = vector-trip-count
54+
; CHECK-NEXT: Live-in vp<[[VEC_TC:%.+]]> = vector-trip-count
5555
; CHECK-NEXT: vp<%1> = original trip-count
5656
; CHECK: ph:
5757
; CHECK-NEXT: EMIT vp<%1> = EXPAND SCEV (zext i32 %n to i64)
@@ -60,18 +60,18 @@ define void @vector_reverse_i64(ptr nocapture noundef writeonly %A, ptr nocaptur
6060
; CHECK-NEXT: Successor(s): vector loop
6161
; CHECK: <x1> vector loop: {
6262
; CHECK-NEXT: vector.body:
63-
; CHECK-NEXT: EMIT vp<%2> = CANONICAL-INDUCTION
64-
; CHECK-NEXT: vp<%3> = DERIVED-IV ir<%n> + vp<%2> * ir<-1>
65-
; CHECK-NEXT: vp<%4> = SCALAR-STEPS vp<%3>, ir<-1>
66-
; CHECK-NEXT: CLONE ir<%i.0> = add nsw vp<%4>, ir<-1>
63+
; CHECK-NEXT: EMIT vp<[[CAN_IV:%.+]]> = CANONICAL-INDUCTION
64+
; CHECK-NEXT: vp<[[DERIVED_IV:%.+]]> = DERIVED-IV ir<%n> + vp<[[CAN_IV]]> * ir<-1>
65+
; CHECK-NEXT: vp<[[STEPS:%.+]]> = SCALAR-STEPS vp<[[DERIVED_IV]]>, ir<-1>
66+
; CHECK-NEXT: CLONE ir<%i.0> = add nsw vp<[[STEPS]]>, ir<-1>
6767
; CHECK-NEXT: CLONE ir<%idxprom> = zext ir<%i.0>
6868
; CHECK-NEXT: CLONE ir<%arrayidx> = getelementptr inbounds ir<%B>, ir<%idxprom>
6969
; CHECK-NEXT: WIDEN ir<%1> = load ir<%arrayidx>
7070
; CHECK-NEXT: WIDEN ir<%add9> = add ir<%1>, ir<1>
7171
; CHECK-NEXT: CLONE ir<%arrayidx3> = getelementptr inbounds ir<%A>, ir<%idxprom>
7272
; CHECK-NEXT: WIDEN store ir<%arrayidx3>, ir<%add9>
73-
; CHECK-NEXT: EMIT vp<%11> = VF * UF + nuw vp<%2>
74-
; CHECK-NEXT: EMIT branch-on-count vp<%11>, vp<%0>
73+
; CHECK-NEXT: EMIT vp<[[IV_INC:%.+]]> = VF * UF + nuw vp<[[CAN_IV]]>
74+
; CHECK-NEXT: EMIT branch-on-count vp<[[IV_INC]]>, vp<[[VEC_TC]]>
7575
; CHECK-NEXT: No successors
7676
; CHECK-NEXT: }
7777
; CHECK-NEXT: Successor(s): middle.block
@@ -188,7 +188,7 @@ define void @vector_reverse_f32(ptr nocapture noundef writeonly %A, ptr nocaptur
188188
; CHECK-NEXT: LV: Scalarizing: %cmp = icmp ugt i64 %indvars.iv, 1
189189
; CHECK-NEXT: LV: Scalarizing: %indvars.iv.next = add nsw i64 %indvars.iv, -1
190190
; CHECK-NEXT: VPlan 'Initial VPlan for VF={vscale x 4},UF>=1' {
191-
; CHECK-NEXT: Live-in vp<%0> = vector-trip-count
191+
; CHECK-NEXT: Live-in vp<[[VEC_TC:%.+]]> = vector-trip-count
192192
; CHECK-NEXT: vp<%1> = original trip-count
193193
; CHECK: ph:
194194
; CHECK-NEXT: EMIT vp<%1> = EXPAND SCEV (zext i32 %n to i64)
@@ -197,18 +197,18 @@ define void @vector_reverse_f32(ptr nocapture noundef writeonly %A, ptr nocaptur
197197
; CHECK-NEXT: Successor(s): vector loop
198198
; CHECK: <x1> vector loop: {
199199
; CHECK-NEXT: vector.body:
200-
; CHECK-NEXT: EMIT vp<%2> = CANONICAL-INDUCTION
201-
; CHECK-NEXT: vp<%3> = DERIVED-IV ir<%n> + vp<%2> * ir<-1>
202-
; CHECK-NEXT: vp<%4> = SCALAR-STEPS vp<%3>, ir<-1>
203-
; CHECK-NEXT: CLONE ir<%i.0> = add nsw vp<%4>, ir<-1>
200+
; CHECK-NEXT: EMIT vp<[[CAN_IV:%.+]]> = CANONICAL-INDUCTION
201+
; CHECK-NEXT: vp<[[DERIVED_IV:%.+]]> = DERIVED-IV ir<%n> + vp<[[CAN_IV]]> * ir<-1>
202+
; CHECK-NEXT: vp<[[STEPS]]> = SCALAR-STEPS vp<[[DERIVED_IV]]>, ir<-1>
203+
; CHECK-NEXT: CLONE ir<%i.0> = add nsw vp<[[STEPS]]>, ir<-1>
204204
; CHECK-NEXT: CLONE ir<%idxprom> = zext ir<%i.0>
205205
; CHECK-NEXT: CLONE ir<%arrayidx> = getelementptr inbounds ir<%B>, ir<%idxprom>
206206
; CHECK-NEXT: WIDEN ir<%1> = load ir<%arrayidx>
207207
; CHECK-NEXT: WIDEN ir<%conv1> = fadd ir<%1>, ir<1.000000e+00>
208208
; CHECK-NEXT: CLONE ir<%arrayidx3> = getelementptr inbounds ir<%A>, ir<%idxprom>
209209
; CHECK-NEXT: WIDEN store ir<%arrayidx3>, ir<%conv1>
210-
; CHECK-NEXT: EMIT vp<%11> = VF * UF + nuw vp<%2>
211-
; CHECK-NEXT: EMIT branch-on-count vp<%11>, vp<%0>
210+
; CHECK-NEXT: EMIT vp<[[IV_INC:%.+]]> = VF * UF + nuw vp<[[CAN_IV]]>
211+
; CHECK-NEXT: EMIT branch-on-count vp<[[IV_INC]]>, vp<[[VEC_TC]]>
212212
; CHECK-NEXT: No successors
213213
; CHECK-NEXT: }
214214
; CHECK-NEXT: Successor(s): middle.block

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ define void @print_call_flags(ptr readonly %src, ptr noalias %dest, i64 %n) {
691691
; CHECK-NEXT: vector.body:
692692
; CHECK-NEXT: EMIT vp<[[CAN_IV:%.+]]> = CANONICAL-INDUCTION
693693
; CHECK-NEXT: vp<[[STEPS:%.+]]> = SCALAR-STEPS vp<[[CAN_IV]]>, ir<1>
694-
; CHECK-NEXT: CLONE ir<%ld.addr> = getelementptr inbounds ir<%src>, vp<%2>
694+
; CHECK-NEXT: CLONE ir<%ld.addr> = getelementptr inbounds ir<%src>, vp<[[STEPS]]>
695695
; CHECK-NEXT: WIDEN ir<%ld.value> = load ir<%ld.addr>
696696
; CHECK-NEXT: WIDEN ir<%ifcond> = fcmp oeq ir<%ld.value>, ir<5.000000e+00>
697697
; CHECK-NEXT: Successor(s): pred.call
@@ -707,17 +707,17 @@ define void @print_call_flags(ptr readonly %src, ptr noalias %dest, i64 %n) {
707707
; CHECK-NEXT: Successor(s): pred.call.continue
708708
; CHECK-EMPTY:
709709
; CHECK-NEXT: pred.call.continue:
710-
; CHECK-NEXT: PHI-PREDICATED-INSTRUCTION vp<%8> = ir<%foo.ret.1>
711-
; CHECK-NEXT: PHI-PREDICATED-INSTRUCTION vp<%9> = ir<%foo.ret.2>
710+
; CHECK-NEXT: PHI-PREDICATED-INSTRUCTION vp<[[PHI1:%.+]]> = ir<%foo.ret.1>
711+
; CHECK-NEXT: PHI-PREDICATED-INSTRUCTION vp<[[PHI2:%.+]]> = ir<%foo.ret.2>
712712
; CHECK-NEXT: No successors
713713
; CHECK-NEXT: }
714714
; CHECK-NEXT: Successor(s): if.then.1
715715
; CHECK-EMPTY:
716716
; CHECK-NEXT: if.then.1:
717-
; CHECK-NEXT: WIDEN ir<%fadd> = fadd vp<%8>, vp<%9>
718-
; CHECK-NEXT: EMIT vp<%11> = not ir<%ifcond>
719-
; CHECK-NEXT: BLEND ir<%st.value> = ir<%ld.value>/vp<%11> ir<%fadd>/ir<%ifcond>
720-
; CHECK-NEXT: CLONE ir<%st.addr> = getelementptr inbounds ir<%dest>, vp<%2>
717+
; CHECK-NEXT: WIDEN ir<%fadd> = fadd vp<[[PHI1]]>, vp<[[PHI2]]>
718+
; CHECK-NEXT: EMIT vp<[[NOT_COND:%.+]]> = not ir<%ifcond>
719+
; CHECK-NEXT: BLEND ir<%st.value> = ir<%ld.value>/vp<[[NOT_COND]]> ir<%fadd>/ir<%ifcond>
720+
; CHECK-NEXT: CLONE ir<%st.addr> = getelementptr inbounds ir<%dest>, vp<[[STEPS]]>
721721
; CHECK-NEXT: WIDEN store ir<%st.addr>, ir<%st.value>
722722
; CHECK-NEXT: EMIT vp<[[CAN_IV_NEXT:%.+]]> = VF * UF + nuw vp<[[CAN_IV]]>
723723
; CHECK-NEXT: EMIT branch-on-count vp<[[CAN_IV_NEXT]]>, vp<[[VEC_TC]]>

0 commit comments

Comments
 (0)