From 235f7fb474a65aa006c266c1fce0b1c3dc678207 Mon Sep 17 00:00:00 2001 From: Dale Johannesen Date: Tue, 8 Apr 2008 00:14:17 +0000 Subject: [PATCH] Add -disable-required-unwind-tables to tests that need it (usually, grepping for some string found in unwind info) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@49364 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/CodeGen/PowerPC/compare-fcmp-ord.ll | 2 +- test/CodeGen/PowerPC/reg-coalesce-simple.ll | 2 +- test/CodeGen/PowerPC/rotl-2.ll | 6 +++--- test/CodeGen/X86/2006-03-02-InstrSchedBug.ll | 2 +- test/CodeGen/X86/2006-05-02-InstrSched1.ll | 2 +- test/CodeGen/X86/2006-05-02-InstrSched2.ll | 2 +- test/CodeGen/X86/2006-05-11-InstrSched.ll | 2 +- test/CodeGen/X86/2007-09-17-ObjcFrameEH.ll | 2 +- test/CodeGen/X86/constant-pool-remat-0.ll | 4 ++-- test/CodeGen/X86/dagcombine-cse.ll | 2 +- test/CodeGen/X86/iabs.ll | 2 +- test/CodeGen/X86/or-branch.ll | 2 +- test/CodeGen/X86/select.ll | 6 +++--- test/CodeGen/X86/setuge.ll | 2 +- test/CodeGen/X86/x86-64-mem.ll | 2 +- test/CodeGen/X86/zero-remat.ll | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/test/CodeGen/PowerPC/compare-fcmp-ord.ll b/test/CodeGen/PowerPC/compare-fcmp-ord.ll index 6d4d3e99fc4..fc770f9028c 100644 --- a/test/CodeGen/PowerPC/compare-fcmp-ord.ll +++ b/test/CodeGen/PowerPC/compare-fcmp-ord.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | grep or | count 3 +; RUN: llvm-as < %s | llc -march=ppc32 -disable-required-unwind-tables | grep or | count 3 ; This should produce one 'or' or 'cror' instruction per function. define i32 @test(double %x, double %y) nounwind { diff --git a/test/CodeGen/PowerPC/reg-coalesce-simple.ll b/test/CodeGen/PowerPC/reg-coalesce-simple.ll index 2c301a9b8d1..e3464139e1e 100644 --- a/test/CodeGen/PowerPC/reg-coalesce-simple.ll +++ b/test/CodeGen/PowerPC/reg-coalesce-simple.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | not grep or +; RUN: llvm-as < %s | llc -march=ppc32 -disable-required-unwind-tables | not grep or %struct.foo = type { i32, i32, [0 x i8] } diff --git a/test/CodeGen/PowerPC/rotl-2.ll b/test/CodeGen/PowerPC/rotl-2.ll index ce7a24c0b07..8336421539f 100644 --- a/test/CodeGen/PowerPC/rotl-2.ll +++ b/test/CodeGen/PowerPC/rotl-2.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwinm | count 4 -; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwnm | count 2 -; RUN: llvm-as < %s | llc -march=ppc32 | not grep or +; RUN: llvm-as < %s | llc -march=ppc32 -disable-required-unwind-tables | grep rlwinm | count 4 +; RUN: llvm-as < %s | llc -march=ppc32 -disable-required-unwind-tables | grep rlwnm | count 2 +; RUN: llvm-as < %s | llc -march=ppc32 -disable-required-unwind-tables | not grep or define i32 @rotl32(i32 %A, i8 %Amt) nounwind { %shift.upgrd.1 = zext i8 %Amt to i32 ; [#uses=1] diff --git a/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll b/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll index 6da71171e5e..f3382c77926 100644 --- a/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll +++ b/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -stats |& \ +; RUN: llvm-as < %s | llc -march=x86 -disable-required-unwind-tables -stats |& \ ; RUN: grep asm-printer | grep 7 define i32 @g(i32 %a, i32 %b) nounwind { diff --git a/test/CodeGen/X86/2006-05-02-InstrSched1.ll b/test/CodeGen/X86/2006-05-02-InstrSched1.ll index d9ef5b0f71b..075b32ed7ea 100644 --- a/test/CodeGen/X86/2006-05-02-InstrSched1.ll +++ b/test/CodeGen/X86/2006-05-02-InstrSched1.ll @@ -1,5 +1,5 @@ ; RUN: llvm-as < %s | \ -; RUN: llc -march=x86 -relocation-model=static -stats |& \ +; RUN: llc -march=x86 -relocation-model=static -disable-required-unwind-tables -stats |& \ ; RUN: grep asm-printer | grep 14 ; @size20 = external global i32 ; [#uses=1] diff --git a/test/CodeGen/X86/2006-05-02-InstrSched2.ll b/test/CodeGen/X86/2006-05-02-InstrSched2.ll index de87fc4e2bb..6ba30bfdf64 100644 --- a/test/CodeGen/X86/2006-05-02-InstrSched2.ll +++ b/test/CodeGen/X86/2006-05-02-InstrSched2.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -stats |& \ +; RUN: llvm-as < %s | llc -march=x86 -stats -disable-required-unwind-tables |& \ ; RUN: grep asm-printer | grep 13 define void @_ZN9__gnu_cxx9hashtableISt4pairIKPKciES3_NS_4hashIS3_EESt10_Select1stIS5_E5eqstrSaIiEE14find_or_insertERKS5__cond_true456.i(i8* %tmp435.i, i32* %tmp449.i.out) nounwind { diff --git a/test/CodeGen/X86/2006-05-11-InstrSched.ll b/test/CodeGen/X86/2006-05-11-InstrSched.ll index 19eface83cd..9d1c67a4f34 100644 --- a/test/CodeGen/X86/2006-05-11-InstrSched.ll +++ b/test/CodeGen/X86/2006-05-11-InstrSched.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -stats |&\ +; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -stats -disable-required-unwind-tables |&\ ; RUN: grep {asm-printer} | grep 32 target datalayout = "e-p:32:32" diff --git a/test/CodeGen/X86/2007-09-17-ObjcFrameEH.ll b/test/CodeGen/X86/2007-09-17-ObjcFrameEH.ll index 4c2e7db7592..9935f4c9c43 100644 --- a/test/CodeGen/X86/2007-09-17-ObjcFrameEH.ll +++ b/test/CodeGen/X86/2007-09-17-ObjcFrameEH.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -mtriple=i686-apple-darwin -enable-eh | grep {isNullOrNil].eh"} | count 2 +; RUN: llvm-as < %s | llc -march=x86 -mtriple=i686-apple-darwin -enable-eh -disable-required-unwind-tables | grep {isNullOrNil].eh"} | count 2 %struct.NSString = type { } %struct._objc__method_prototype_list = type opaque diff --git a/test/CodeGen/X86/constant-pool-remat-0.ll b/test/CodeGen/X86/constant-pool-remat-0.ll index 3e07d0d0b2d..9967bf8909a 100644 --- a/test/CodeGen/X86/constant-pool-remat-0.ll +++ b/test/CodeGen/X86/constant-pool-remat-0.ll @@ -1,7 +1,7 @@ ; RUN: llvm-as < %s | llc -march=x86-64 | grep LCPI | count 3 -; RUN: llvm-as < %s | llc -march=x86-64 -stats -info-output-file - | grep asm-printer | grep 6 +; RUN: llvm-as < %s | llc -march=x86-64 -stats -disable-required-unwind-tables -info-output-file - | grep asm-printer | grep 6 ; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep LCPI | count 3 -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -stats -info-output-file - | grep asm-printer | grep 8 +; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -stats -disable-required-unwind-tables -info-output-file - | grep asm-printer | grep 8 declare fastcc float @qux(float %y) diff --git a/test/CodeGen/X86/dagcombine-cse.ll b/test/CodeGen/X86/dagcombine-cse.ll index 7427678db00..d5d11f30c03 100644 --- a/test/CodeGen/X86/dagcombine-cse.ll +++ b/test/CodeGen/X86/dagcombine-cse.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -stats |& grep asm-printer | grep 14 +; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -disable-required-unwind-tables -stats |& grep asm-printer | grep 14 define i32 @t(i8* %ref_frame_ptr, i32 %ref_frame_stride, i32 %idxX, i32 %idxY) nounwind { entry: diff --git a/test/CodeGen/X86/iabs.ll b/test/CodeGen/X86/iabs.ll index 75de9f63795..dd390395fdb 100644 --- a/test/CodeGen/X86/iabs.ll +++ b/test/CodeGen/X86/iabs.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86-64 -stats |& \ +; RUN: llvm-as < %s | llc -march=x86-64 -stats -disable-required-unwind-tables |& \ ; RUN: grep {6 .*Number of machine instrs printed} ;; Integer absolute value, should produce something at least as good as: diff --git a/test/CodeGen/X86/or-branch.ll b/test/CodeGen/X86/or-branch.ll index e6b840daba2..820c995ce4f 100644 --- a/test/CodeGen/X86/or-branch.ll +++ b/test/CodeGen/X86/or-branch.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | not grep set +; RUN: llvm-as < %s | llc -march=x86 -disable-required-unwind-tables | not grep set define void @foo(i32 %X, i32 %Y, i32 %Z) nounwind { entry: diff --git a/test/CodeGen/X86/select.ll b/test/CodeGen/X86/select.ll index a41b223fb2a..aeb0f7d9f94 100644 --- a/test/CodeGen/X86/select.ll +++ b/test/CodeGen/X86/select.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=x86 -mcpu=pentium -; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah -; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah | not grep set +; RUN: llvm-as < %s | llc -march=x86 -mcpu=pentium -disable-required-unwind-tables +; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah -disable-required-unwind-tables +; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah -disable-required-unwind-tables | not grep set define i1 @boolSel(i1 %A, i1 %B, i1 %C) nounwind { %X = select i1 %A, i1 %B, i1 %C ; [#uses=1] diff --git a/test/CodeGen/X86/setuge.ll b/test/CodeGen/X86/setuge.ll index 5342b1b089c..37dff15d200 100644 --- a/test/CodeGen/X86/setuge.ll +++ b/test/CodeGen/X86/setuge.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 | not grep set +; RUN: llvm-as < %s | llc -march=x86 -disable-required-unwind-tables | not grep set declare i1 @llvm.isunordered.f32(float, float) diff --git a/test/CodeGen/X86/x86-64-mem.ll b/test/CodeGen/X86/x86-64-mem.ll index 3a475789f3d..7497362a154 100644 --- a/test/CodeGen/X86/x86-64-mem.ll +++ b/test/CodeGen/X86/x86-64-mem.ll @@ -1,6 +1,6 @@ ; RUN: llvm-as < %s | llc -mtriple=x86_64-apple-darwin -o %t1 -f ; RUN: grep GOTPCREL %t1 | count 4 -; RUN: grep rip %t1 | count 6 +; RUN: grep %%rip %t1 | count 6 ; RUN: grep movq %t1 | count 6 ; RUN: grep leaq %t1 | count 1 ; RUN: llvm-as < %s | \ diff --git a/test/CodeGen/X86/zero-remat.ll b/test/CodeGen/X86/zero-remat.ll index 5195a11bcd4..dc0322682f2 100644 --- a/test/CodeGen/X86/zero-remat.ll +++ b/test/CodeGen/X86/zero-remat.ll @@ -1,5 +1,5 @@ ; RUN: llvm-as < %s | llc -march=x86-64 | grep xor | count 4 -; RUN: llvm-as < %s | llc -march=x86-64 -stats -info-output-file - | grep asm-printer | grep 12 +; RUN: llvm-as < %s | llc -march=x86-64 -stats -disable-required-unwind-tables -info-output-file - | grep asm-printer | grep 12 ; RUN: llvm-as < %s | llc -march=x86 | grep fldz ; RUN: llvm-as < %s | llc -march=x86 | not grep fldl -- 2.34.1