From 02923d7f979bb70b5e365200beccc992e810e2d9 Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Thu, 8 Dec 2022 02:27:30 +0300 Subject: [PATCH] [NFC] Port all LowerExpectIntrinsic tests to `-passes=` syntax --- .../Transforms/LowerExpectIntrinsic/PR33346.ll | 2 +- llvm/test/Transforms/LowerExpectIntrinsic/basic.ll | 1 - .../expect-with-probability.ll | 1 - .../LowerExpectIntrinsic/expect_nonboolean.ll | 2 +- .../Transforms/LowerExpectIntrinsic/phi_merge.ll | 24 +++++++++++----------- .../test/Transforms/LowerExpectIntrinsic/phi_or.ll | 10 ++++----- .../Transforms/LowerExpectIntrinsic/phi_tern.ll | 8 ++++---- 7 files changed, 23 insertions(+), 25 deletions(-) diff --git a/llvm/test/Transforms/LowerExpectIntrinsic/PR33346.ll b/llvm/test/Transforms/LowerExpectIntrinsic/PR33346.ll index 7580565..68c3b6d 100644 --- a/llvm/test/Transforms/LowerExpectIntrinsic/PR33346.ll +++ b/llvm/test/Transforms/LowerExpectIntrinsic/PR33346.ll @@ -1,4 +1,4 @@ -; RUN: opt -lower-expect -S < %s +; RUN: opt -passes=lower-expect -S < %s ; RUN: opt -passes='function(lower-expect)' -S < %s define i64 @foo(i64 %arg) #0 { diff --git a/llvm/test/Transforms/LowerExpectIntrinsic/basic.ll b/llvm/test/Transforms/LowerExpectIntrinsic/basic.ll index d974e87..0abca5b 100644 --- a/llvm/test/Transforms/LowerExpectIntrinsic/basic.ll +++ b/llvm/test/Transforms/LowerExpectIntrinsic/basic.ll @@ -1,4 +1,3 @@ -; RUN: opt -lower-expect -strip-dead-prototypes -S -o - < %s | FileCheck %s ; RUN: opt -S -passes='function(lower-expect),strip-dead-prototypes' < %s | FileCheck %s ; CHECK-LABEL: @test1( diff --git a/llvm/test/Transforms/LowerExpectIntrinsic/expect-with-probability.ll b/llvm/test/Transforms/LowerExpectIntrinsic/expect-with-probability.ll index 054f40f..6429355 100644 --- a/llvm/test/Transforms/LowerExpectIntrinsic/expect-with-probability.ll +++ b/llvm/test/Transforms/LowerExpectIntrinsic/expect-with-probability.ll @@ -1,4 +1,3 @@ -; RUN: opt -lower-expect -strip-dead-prototypes -S -o - < %s | FileCheck %s ; RUN: opt -S -passes='function(lower-expect),strip-dead-prototypes' < %s | FileCheck %s ; CHECK-LABEL: @test1( diff --git a/llvm/test/Transforms/LowerExpectIntrinsic/expect_nonboolean.ll b/llvm/test/Transforms/LowerExpectIntrinsic/expect_nonboolean.ll index 736ddc3..2bcfb1e 100644 --- a/llvm/test/Transforms/LowerExpectIntrinsic/expect_nonboolean.ll +++ b/llvm/test/Transforms/LowerExpectIntrinsic/expect_nonboolean.ll @@ -1,4 +1,4 @@ -; RUN: opt -lower-expect -S -o - < %s | FileCheck %s +; RUN: opt -passes=lower-expect -S -o - < %s | FileCheck %s ; RUN: opt -S -passes='function(lower-expect)' < %s | FileCheck %s define i32 @foo(i32 %arg) #0 { diff --git a/llvm/test/Transforms/LowerExpectIntrinsic/phi_merge.ll b/llvm/test/Transforms/LowerExpectIntrinsic/phi_merge.ll index 3b407c0..32ae9b0 100644 --- a/llvm/test/Transforms/LowerExpectIntrinsic/phi_merge.ll +++ b/llvm/test/Transforms/LowerExpectIntrinsic/phi_merge.ll @@ -1,18 +1,18 @@ -; RUN: opt -lower-expect -S -o - < %s | FileCheck %s +; RUN: opt -passes=lower-expect -S -o - < %s | FileCheck %s ; RUN: opt -S -passes='function(lower-expect)' < %s | FileCheck %s ; The C case -; if (__builtin_expect((x > goo() && y > hoo() && z > too()), 1)) +; if (__builtin_expect((x > goo() && y > hoo() && z > too()), 1)) ; For the above case, all 3 branches should be annotated. ; -; if (__builtin_expect((x > goo() && y > hoo() && z > too()), 0)) +; if (__builtin_expect((x > goo() && y > hoo() && z > too()), 0)) ; For the above case, we don't have enough information, so ; only the last branch is annotated. define void @foo(i32 %arg, i32 %arg1, i32 %arg2, i32 %arg3) { ; CHECK-LABEL: void @foo bb: - %tmp8 = call i32 @goo() + %tmp8 = call i32 @goo() %tmp9 = icmp sgt i32 %tmp8, %arg br i1 %tmp9, label %bb10, label %bb18 ; CHECK: !prof [[WEIGHT:![0-9]+]] @@ -54,7 +54,7 @@ bb30: ; preds = %bb28, %bb26 define void @foo2(i32 %arg, i32 %arg1, i32 %arg2, i32 %arg3) { ; CHECK-LABEL: void @foo2 bb: - %tmp8 = call i32 @goo() + %tmp8 = call i32 @goo() %tmp9 = icmp sgt i32 %tmp8, %arg br i1 %tmp9, label %bb10, label %bb18 ; CHECK: br i1 %tmp9 @@ -98,7 +98,7 @@ bb30: ; preds = %bb28, %bb26 define void @foo_i32(i32 %arg, i32 %arg1, i32 %arg2, i32 %arg3) { ; CHECK-LABEL: void @foo_i32 bb: - %tmp8 = call i32 @goo() + %tmp8 = call i32 @goo() %tmp9 = icmp sgt i32 %tmp8, %arg br i1 %tmp9, label %bb10, label %bb18 ; CHECK: !prof [[WEIGHT]] @@ -138,7 +138,7 @@ bb30: ; preds = %bb28, %bb26 define void @foo_i32_not_unlikely(i32 %arg, i32 %arg1, i32 %arg2, i32 %arg3) { ; CHECK-LABEL: void @foo_i32_not_unlikely bb: - %tmp8 = call i32 @goo() + %tmp8 = call i32 @goo() %tmp9 = icmp sgt i32 %tmp8, %arg br i1 %tmp9, label %bb10, label %bb18 ; CHECK: br i1 %tmp9 @@ -179,7 +179,7 @@ bb30: ; preds = %bb28, %bb26 define void @foo_i32_xor(i32 %arg, i32 %arg1, i32 %arg2, i32 %arg3) { ; CHECK-LABEL: void @foo_i32_xor bb: - %tmp8 = call i32 @goo() + %tmp8 = call i32 @goo() %tmp9 = icmp sgt i32 %tmp8, %arg br i1 %tmp9, label %bb10, label %bb18 ; CHECK: br i1 %tmp9,{{.*}}!prof [[WEIGHT]] @@ -218,7 +218,7 @@ bb30: ; preds = %bb28, %bb26 define void @foo_i8_sext(i32 %arg, i32 %arg1, i8 %arg2, i32 %arg3) { ; CHECK-LABEL: void @foo_i8_sext bb: - %tmp8 = call i32 @goo() + %tmp8 = call i32 @goo() %tmp9 = icmp sgt i32 %tmp8, %arg br i1 %tmp9, label %bb10, label %bb18 ; CHECK: br i1 %tmp9,{{.*}}!prof [[WEIGHT]] @@ -257,7 +257,7 @@ bb30: ; preds = %bb28, %bb26 define void @foo_i8_sext_not_unlikely(i32 %arg, i32 %arg1, i8 %arg2, i32 %arg3) { ; CHECK-LABEL: void @foo_i8_sext_not_unlikely bb: - %tmp8 = call i32 @goo() + %tmp8 = call i32 @goo() %tmp9 = icmp sgt i32 %tmp8, %arg br i1 %tmp9, label %bb10, label %bb18 ; CHECK: br i1 %tmp9 @@ -299,7 +299,7 @@ bb30: ; preds = %bb28, %bb26 define void @foo_i32_xor_not_unlikely(i32 %arg, i32 %arg1, i32 %arg2, i32 %arg3) { ; CHECK-LABEL: void @foo_i32_xor_not_unlikely bb: - %tmp8 = call i32 @goo() + %tmp8 = call i32 @goo() %tmp9 = icmp sgt i32 %tmp8, %arg br i1 %tmp9, label %bb10, label %bb18 ; CHECK: br i1 %tmp9 @@ -347,7 +347,7 @@ declare i32 @too() declare i8 @too8() ; Function Attrs: nounwind readnone -declare i64 @llvm.expect.i64(i64, i64) +declare i64 @llvm.expect.i64(i64, i64) !llvm.ident = !{!0} diff --git a/llvm/test/Transforms/LowerExpectIntrinsic/phi_or.ll b/llvm/test/Transforms/LowerExpectIntrinsic/phi_or.ll index cebade1..1efa632 100644 --- a/llvm/test/Transforms/LowerExpectIntrinsic/phi_or.ll +++ b/llvm/test/Transforms/LowerExpectIntrinsic/phi_or.ll @@ -1,6 +1,6 @@ -; RUN: opt -lower-expect -S -o - < %s | FileCheck %s +; RUN: opt -passes=lower-expect -S -o - < %s | FileCheck %s ; RUN: opt -S -passes='function(lower-expect)' < %s | FileCheck %s -; +; ; if (__builtin_expect((x > goo() || y > hoo()), 1)) { ; .. ; } @@ -90,9 +90,9 @@ bb23: ; preds = %bb21, %bb19 ret void } -declare i32 @goo() -declare i32 @hoo() -declare i64 @llvm.expect.i64(i64, i64) +declare i32 @goo() +declare i32 @hoo() +declare i64 @llvm.expect.i64(i64, i64) !llvm.ident = !{!0} diff --git a/llvm/test/Transforms/LowerExpectIntrinsic/phi_tern.ll b/llvm/test/Transforms/LowerExpectIntrinsic/phi_tern.ll index 3c603d5..9cbaca8 100644 --- a/llvm/test/Transforms/LowerExpectIntrinsic/phi_tern.ll +++ b/llvm/test/Transforms/LowerExpectIntrinsic/phi_tern.ll @@ -1,8 +1,8 @@ -; RUN: opt -lower-expect -S -o - < %s | FileCheck %s +; RUN: opt -passes=lower-expect -S -o - < %s | FileCheck %s ; RUN: opt -S -passes='function(lower-expect)' < %s | FileCheck %s ; return __builtin_expect((a > b ? 1, goo(), 0); -; +; ; Function Attrs: noinline nounwind uwtable define i32 @foo(i32 %arg, i32 %arg1) { ; CHECK-LABEL: i32 @foo @@ -44,8 +44,8 @@ bb9: ; preds = %bb7, %bb6 ret i32 %tmp12 } -declare i32 @goo() -declare i64 @llvm.expect.i64(i64, i64) +declare i32 @goo() +declare i64 @llvm.expect.i64(i64, i64) -- 2.7.4