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

diff --git a/test/CodeGen/PowerPC/compare-fcmp-ord.ll b/test/CodeGen/PowerPC/compare-fcmp-ord.ll
index 6d4d3e99fc4413df15fc05f40d9c01c3f89db192..fc770f9028ce7bb5a17ed3e125cbd4ac821db9fd 100644 (file)
--- 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 2c301a9b8d186c4e962c02ffda06106aaf10a276..e3464139e1eb1b39b21d54ce923fd01906b8a26e 100644 (file)
--- 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 ce7a24c0b07b0165b4bd3700f89e9a7941217e3d..8336421539f4edb1abdf91a9412f1dd981fd231c 100644 (file)
--- 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            ; <i32> [#uses=1]

diff --git a/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll b/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll
index 6da71171e5e0c990611bbcb20530f157a7b9eb05..f3382c77926b2ad060b01b6dd682ff735f9c6c60 100644 (file)
--- 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 d9ef5b0f71b0611801ef81164562bda5ba09d8b6..075b32ed7eac8cd4d317d5b2dac8e37083dea50a 100644 (file)
--- 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          ; <i32*> [#uses=1]

diff --git a/test/CodeGen/X86/2006-05-02-InstrSched2.ll b/test/CodeGen/X86/2006-05-02-InstrSched2.ll
index de87fc4e2bbfa072ee079b44639db5db23955f94..6ba30bfdf6460700e3af409c544129c19599db21 100644 (file)
--- 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 19eface83cd955c2ada62ae4ebc685cd780d62bf..9d1c67a4f34c65445b614a4caff4383f4c372cfa 100644 (file)
--- 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 4c2e7db759287cdb552b4cd882f3f641dc933457..9935f4c9c4306dead599c74e8e0080bd31a19560 100644 (file)
--- 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 3e07d0d0b2d67ac339a75dd15810dfb490c37c4c..9967bf8909ab033f8cc28c2ae0c6648fb17934c2 100644 (file)
--- 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 7427678db0030c2343a64aa302d420897ba48e51..d5d11f30c031f2b3f717683aac976498d1d64b09 100644 (file)
--- 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 75de9f637956cee66f7071c86da47d47505fd3d6..dd390395fdb79acb71c3a6b7ce215fd2d53e426e 100644 (file)
--- 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 e6b840daba2c74b00a6bd369307004898f92225d..820c995ce4f81992928a1ac839be4d0909564913 100644 (file)
--- 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 a41b223fb2a74e8f070ffc04032e15f2b8e0f1dc..aeb0f7d9f94d02d7d51ded4fb1d8b0176db68ec8 100644 (file)
--- 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         ; <i1> [#uses=1]

diff --git a/test/CodeGen/X86/setuge.ll b/test/CodeGen/X86/setuge.ll
index 5342b1b089c5248a87292b262bf347700f545b6f..37dff15d2004bfbb9395f3d06685577ee3c4438c 100644 (file)
--- 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 3a475789f3d898328b9883be4db47ed9d1832974..7497362a15462c5926e71f576c06cdc9bf3fcff6 100644 (file)
--- 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 5195a11bcd41c479db8befda749f02dda5c470bb..dc0322682f2aa5b9910ffaa884f259950311d494 100644 (file)
--- 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