Skip to content

Fix test failures introduced by PR #113697 #116941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 20, 2024
Merged

Fix test failures introduced by PR #113697 #116941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions llvm/test/Transforms/LoopVectorize/AArch64/scalable-vectorization-cost-tuning.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@
; RUN: -force-target-instruction-cost=1 -passes=loop-vectorize -S -debug-only=loop-vectorize < %s 2>&1 \
; RUN: | FileCheck %s --check-prefixes=NEOVERSE-V2,VF-16

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

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

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

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

; VF-16: <16 x i8>
Expand Down
12 changes: 6 additions & 6 deletions llvm/test/Transforms/LoopVectorize/ARM/mve-icmpcost.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ target triple = "thumbv8.1m.main-arm-none-eabi"
; CHECK: Cost of 16 for VF 2: WIDEN store vp<%5>, ir<%conv6>, ir<%cmp2>
; CHECK: Cost of 0 for VF 2: EMIT vp<%index.next> = add nuw vp<%2>, vp<%0>
; CHECK: Cost of 0 for VF 2: EMIT branch-on-count vp<%index.next>, vp<%1>
; CHECK: Cost for VF 2: 86 (Estimated cost per lane: 43.0)
; CHECK: Cost for VF 2: 86 (Estimated cost per lane: 43.
; CHECK: Cost of 1 for VF 4: induction instruction %inc = add nuw nsw i32 %i.016, 1
; CHECK: Cost of 0 for VF 4: induction instruction %i.016 = phi i32 [ 0, %for.body.lr.ph ], [ %inc, %for.inc ]
; CHECK: Cost of 1 for VF 4: exit condition instruction %exitcond.not = icmp eq i32 %inc, %n
Expand All @@ -52,7 +52,7 @@ target triple = "thumbv8.1m.main-arm-none-eabi"
; CHECK: Cost of 2 for VF 4: WIDEN store vp<%5>, ir<%conv6>, ir<%cmp2>
; CHECK: Cost of 0 for VF 4: EMIT vp<%index.next> = add nuw vp<%2>, vp<%0>
; CHECK: Cost of 0 for VF 4: EMIT branch-on-count vp<%index.next>, vp<%1>
; CHECK: Cost for VF 4: 10 (Estimated cost per lane: 2.5)
; CHECK: Cost for VF 4: 10 (Estimated cost per lane: 2.
; CHECK: Cost of 1 for VF 8: induction instruction %inc = add nuw nsw i32 %i.016, 1
; CHECK: Cost of 0 for VF 8: induction instruction %i.016 = phi i32 [ 0, %for.body.lr.ph ], [ %inc, %for.inc ]
; CHECK: Cost of 1 for VF 8: exit condition instruction %exitcond.not = icmp eq i32 %inc, %n
Expand All @@ -69,7 +69,7 @@ target triple = "thumbv8.1m.main-arm-none-eabi"
; CHECK: Cost of 2 for VF 8: WIDEN store vp<%5>, ir<%conv6>, ir<%cmp2>
; CHECK: Cost of 0 for VF 8: EMIT vp<%index.next> = add nuw vp<%2>, vp<%0>
; CHECK: Cost of 0 for VF 8: EMIT branch-on-count vp<%index.next>, vp<%1>
; CHECK: Cost for VF 8: 46 (Estimated cost per lane: 5.8)
; CHECK: Cost for VF 8: 46 (Estimated cost per lane: 5.
; CHECK: LV: Selecting VF: 4.
define void @expensive_icmp(ptr noalias nocapture %d, ptr nocapture readonly %s, i32 %n, i16 zeroext %m) #0 {
entry:
Expand Down Expand Up @@ -157,7 +157,7 @@ for.inc: ; preds = %for.body, %if.then
; CHECK: Cost of 18 for VF 2: WIDEN store vp<%8>, ir<%conv4>
; CHECK: Cost of 0 for VF 2: EMIT vp<%index.next> = add nuw vp<%2>, vp<%0>
; CHECK: Cost of 0 for VF 2: EMIT branch-on-count vp<%index.next>, vp<%1>
; CHECK: Cost for VF 2: 130 (Estimated cost per lane: 65.0)
; CHECK: Cost for VF 2: 130 (Estimated cost per lane: 65.
; CHECK: Cost of 1 for VF 4: induction instruction %dec = add i32 %blkCnt.012, -1
; CHECK: Cost of 0 for VF 4: induction instruction %blkCnt.012 = phi i32 [ %dec, %while.body ], [ %blockSize, %while.body.preheader ]
; CHECK: Cost of 0 for VF 4: induction instruction %incdec.ptr = getelementptr inbounds i8, ptr %pSrcA.addr.011, i32 1
Expand Down Expand Up @@ -189,7 +189,7 @@ for.inc: ; preds = %for.body, %if.then
; CHECK: Cost of 2 for VF 4: WIDEN store vp<%8>, ir<%conv4>
; CHECK: Cost of 0 for VF 4: EMIT vp<%index.next> = add nuw vp<%2>, vp<%0>
; CHECK: Cost of 0 for VF 4: EMIT branch-on-count vp<%index.next>, vp<%1>
; CHECK: Cost for VF 4: 14 (Estimated cost per lane: 3.5)
; CHECK: Cost for VF 4: 14 (Estimated cost per lane: 3.
; CHECK: Cost of 1 for VF 8: induction instruction %dec = add i32 %blkCnt.012, -1
; CHECK: Cost of 0 for VF 8: induction instruction %blkCnt.012 = phi i32 [ %dec, %while.body ], [ %blockSize, %while.body.preheader ]
; CHECK: Cost of 0 for VF 8: induction instruction %incdec.ptr = getelementptr inbounds i8, ptr %pSrcA.addr.011, i32 1
Expand Down Expand Up @@ -221,7 +221,7 @@ for.inc: ; preds = %for.body, %if.then
; CHECK: Cost of 2 for VF 8: WIDEN store vp<%8>, ir<%conv4>
; CHECK: Cost of 0 for VF 8: EMIT vp<%index.next> = add nuw vp<%2>, vp<%0>
; CHECK: Cost of 0 for VF 8: EMIT branch-on-count vp<%index.next>, vp<%1>
; CHECK: Cost for VF 8: 26 (Estimated cost per lane: 3.2)
; CHECK: Cost for VF 8: 26 (Estimated cost per lane: 3.
; CHECK: Cost of 1 for VF 16: induction instruction %dec = add i32 %blkCnt.012, -1
; CHECK: Cost of 0 for VF 16: induction instruction %blkCnt.012 = phi i32 [ %dec, %while.body ], [ %blockSize, %while.body.preheader ]
; CHECK: Cost of 0 for VF 16: induction instruction %incdec.ptr = getelementptr inbounds i8, ptr %pSrcA.addr.011, i32 1
Expand Down
2 changes: 1 addition & 1 deletion llvm/test/Transforms/LoopVectorize/X86/redundant-vf2-cost.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
; CHECK: Cost of {{.*}} for VF 2: WIDEN store
; CHECK-NOT: Cost of {{.*}} for VF 2: WIDEN {{.*}} = load
; CHECK-NOT: Cost of {{.*}} for VF 2: WIDEN store
; CHECK: Cost for VF 2: 5 (Estimated cost per lane: 2.5)
; CHECK: Cost for VF 2: 5 (Estimated cost per lane: 2.

define i32 @foo(ptr %A, i32 %n) {
entry:
Expand Down
Loading