Skip to content

Commit aeb88f6

Browse files
authored
Fix test failures introduced by PR #113697 (#116941)
Don't match the entire floating point debug output since it's prone to rounding errors depending upon the target.
1 parent ddc0c5c commit aeb88f6

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

llvm/test/Transforms/LoopVectorize/AArch64/scalable-vectorization-cost-tuning.ll

+8-8
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@
1919
; RUN: -force-target-instruction-cost=1 -passes=loop-vectorize -S -debug-only=loop-vectorize < %s 2>&1 \
2020
; RUN: | FileCheck %s --check-prefixes=NEOVERSE-V2,VF-16
2121

22-
; GENERIC: Cost for VF vscale x 2: 11 (Estimated cost per lane: 2.8)
23-
; GENERIC: Cost for VF vscale x 4: 11 (Estimated cost per lane: 1.4)
22+
; GENERIC: Cost for VF vscale x 2: 11 (Estimated cost per lane: 2.
23+
; GENERIC: Cost for VF vscale x 4: 11 (Estimated cost per lane: 1.
2424
; GENERIC: LV: Selecting VF: vscale x 16
2525

26-
; NEOVERSE-V1: Cost for VF vscale x 2: 11 (Estimated cost per lane: 2.8)
27-
; NEOVERSE-V1: Cost for VF vscale x 4: 11 (Estimated cost per lane: 1.4)
26+
; NEOVERSE-V1: Cost for VF vscale x 2: 11 (Estimated cost per lane: 2.
27+
; NEOVERSE-V1: Cost for VF vscale x 4: 11 (Estimated cost per lane: 1.
2828
; NEOVERSE-V1: LV: Selecting VF: vscale x 16
2929

30-
; NEOVERSE-N2: Cost for VF vscale x 2: 11 (Estimated cost per lane: 5.5)
31-
; NEOVERSE-N2: Cost for VF vscale x 4: 11 (Estimated cost per lane: 2.8)
30+
; NEOVERSE-N2: Cost for VF vscale x 2: 11 (Estimated cost per lane: 5.
31+
; NEOVERSE-N2: Cost for VF vscale x 4: 11 (Estimated cost per lane: 2.
3232
; NEOVERSE-N2: LV: Selecting VF: vscale x 16
3333

34-
; NEOVERSE-V2: Cost for VF vscale x 2: 11 (Estimated cost per lane: 5.5)
35-
; NEOVERSE-V2: Cost for VF vscale x 4: 11 (Estimated cost per lane: 2.8)
34+
; NEOVERSE-V2: Cost for VF vscale x 2: 11 (Estimated cost per lane: 5.
35+
; NEOVERSE-V2: Cost for VF vscale x 4: 11 (Estimated cost per lane: 2.
3636
; NEOVERSE-V2: LV: Selecting VF: 16
3737

3838
; VF-16: <16 x i8>

llvm/test/Transforms/LoopVectorize/ARM/mve-icmpcost.ll

+6-6
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ target triple = "thumbv8.1m.main-arm-none-eabi"
3535
; CHECK: Cost of 16 for VF 2: WIDEN store vp<%5>, ir<%conv6>, ir<%cmp2>
3636
; CHECK: Cost of 0 for VF 2: EMIT vp<%index.next> = add nuw vp<%2>, vp<%0>
3737
; CHECK: Cost of 0 for VF 2: EMIT branch-on-count vp<%index.next>, vp<%1>
38-
; CHECK: Cost for VF 2: 86 (Estimated cost per lane: 43.0)
38+
; CHECK: Cost for VF 2: 86 (Estimated cost per lane: 43.
3939
; CHECK: Cost of 1 for VF 4: induction instruction %inc = add nuw nsw i32 %i.016, 1
4040
; CHECK: Cost of 0 for VF 4: induction instruction %i.016 = phi i32 [ 0, %for.body.lr.ph ], [ %inc, %for.inc ]
4141
; CHECK: Cost of 1 for VF 4: exit condition instruction %exitcond.not = icmp eq i32 %inc, %n
@@ -52,7 +52,7 @@ target triple = "thumbv8.1m.main-arm-none-eabi"
5252
; CHECK: Cost of 2 for VF 4: WIDEN store vp<%5>, ir<%conv6>, ir<%cmp2>
5353
; CHECK: Cost of 0 for VF 4: EMIT vp<%index.next> = add nuw vp<%2>, vp<%0>
5454
; CHECK: Cost of 0 for VF 4: EMIT branch-on-count vp<%index.next>, vp<%1>
55-
; CHECK: Cost for VF 4: 10 (Estimated cost per lane: 2.5)
55+
; CHECK: Cost for VF 4: 10 (Estimated cost per lane: 2.
5656
; CHECK: Cost of 1 for VF 8: induction instruction %inc = add nuw nsw i32 %i.016, 1
5757
; CHECK: Cost of 0 for VF 8: induction instruction %i.016 = phi i32 [ 0, %for.body.lr.ph ], [ %inc, %for.inc ]
5858
; CHECK: Cost of 1 for VF 8: exit condition instruction %exitcond.not = icmp eq i32 %inc, %n
@@ -69,7 +69,7 @@ target triple = "thumbv8.1m.main-arm-none-eabi"
6969
; CHECK: Cost of 2 for VF 8: WIDEN store vp<%5>, ir<%conv6>, ir<%cmp2>
7070
; CHECK: Cost of 0 for VF 8: EMIT vp<%index.next> = add nuw vp<%2>, vp<%0>
7171
; CHECK: Cost of 0 for VF 8: EMIT branch-on-count vp<%index.next>, vp<%1>
72-
; CHECK: Cost for VF 8: 46 (Estimated cost per lane: 5.8)
72+
; CHECK: Cost for VF 8: 46 (Estimated cost per lane: 5.
7373
; CHECK: LV: Selecting VF: 4.
7474
define void @expensive_icmp(ptr noalias nocapture %d, ptr nocapture readonly %s, i32 %n, i16 zeroext %m) #0 {
7575
entry:
@@ -157,7 +157,7 @@ for.inc: ; preds = %for.body, %if.then
157157
; CHECK: Cost of 18 for VF 2: WIDEN store vp<%8>, ir<%conv4>
158158
; CHECK: Cost of 0 for VF 2: EMIT vp<%index.next> = add nuw vp<%2>, vp<%0>
159159
; CHECK: Cost of 0 for VF 2: EMIT branch-on-count vp<%index.next>, vp<%1>
160-
; CHECK: Cost for VF 2: 130 (Estimated cost per lane: 65.0)
160+
; CHECK: Cost for VF 2: 130 (Estimated cost per lane: 65.
161161
; CHECK: Cost of 1 for VF 4: induction instruction %dec = add i32 %blkCnt.012, -1
162162
; CHECK: Cost of 0 for VF 4: induction instruction %blkCnt.012 = phi i32 [ %dec, %while.body ], [ %blockSize, %while.body.preheader ]
163163
; CHECK: Cost of 0 for VF 4: induction instruction %incdec.ptr = getelementptr inbounds i8, ptr %pSrcA.addr.011, i32 1
@@ -189,7 +189,7 @@ for.inc: ; preds = %for.body, %if.then
189189
; CHECK: Cost of 2 for VF 4: WIDEN store vp<%8>, ir<%conv4>
190190
; CHECK: Cost of 0 for VF 4: EMIT vp<%index.next> = add nuw vp<%2>, vp<%0>
191191
; CHECK: Cost of 0 for VF 4: EMIT branch-on-count vp<%index.next>, vp<%1>
192-
; CHECK: Cost for VF 4: 14 (Estimated cost per lane: 3.5)
192+
; CHECK: Cost for VF 4: 14 (Estimated cost per lane: 3.
193193
; CHECK: Cost of 1 for VF 8: induction instruction %dec = add i32 %blkCnt.012, -1
194194
; CHECK: Cost of 0 for VF 8: induction instruction %blkCnt.012 = phi i32 [ %dec, %while.body ], [ %blockSize, %while.body.preheader ]
195195
; CHECK: Cost of 0 for VF 8: induction instruction %incdec.ptr = getelementptr inbounds i8, ptr %pSrcA.addr.011, i32 1
@@ -221,7 +221,7 @@ for.inc: ; preds = %for.body, %if.then
221221
; CHECK: Cost of 2 for VF 8: WIDEN store vp<%8>, ir<%conv4>
222222
; CHECK: Cost of 0 for VF 8: EMIT vp<%index.next> = add nuw vp<%2>, vp<%0>
223223
; CHECK: Cost of 0 for VF 8: EMIT branch-on-count vp<%index.next>, vp<%1>
224-
; CHECK: Cost for VF 8: 26 (Estimated cost per lane: 3.2)
224+
; CHECK: Cost for VF 8: 26 (Estimated cost per lane: 3.
225225
; CHECK: Cost of 1 for VF 16: induction instruction %dec = add i32 %blkCnt.012, -1
226226
; CHECK: Cost of 0 for VF 16: induction instruction %blkCnt.012 = phi i32 [ %dec, %while.body ], [ %blockSize, %while.body.preheader ]
227227
; CHECK: Cost of 0 for VF 16: induction instruction %incdec.ptr = getelementptr inbounds i8, ptr %pSrcA.addr.011, i32 1

llvm/test/Transforms/LoopVectorize/X86/redundant-vf2-cost.ll

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
; CHECK: Cost of {{.*}} for VF 2: WIDEN store
99
; CHECK-NOT: Cost of {{.*}} for VF 2: WIDEN {{.*}} = load
1010
; CHECK-NOT: Cost of {{.*}} for VF 2: WIDEN store
11-
; CHECK: Cost for VF 2: 5 (Estimated cost per lane: 2.5)
11+
; CHECK: Cost for VF 2: 5 (Estimated cost per lane: 2.
1212

1313
define i32 @foo(ptr %A, i32 %n) {
1414
entry:

0 commit comments

Comments
 (0)