Update these tests to work by disabling the new correct CFG generation. This flag...

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@54334 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/CodeGen/ARM/2007-08-15-ReuseBug.ll b/test/CodeGen/ARM/2007-08-15-ReuseBug.ll
index d4ce286..71469b3 100644 (file)
--- a/test/CodeGen/ARM/2007-08-15-ReuseBug.ll
+++ b/test/CodeGen/ARM/2007-08-15-ReuseBug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin -relocation-model=pic -mattr=+v6 | %prcontext {ldr.*\\!} 1 | grep mov
+; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin -relocation-model=pic -mattr=+v6 -disable-correct-folding | %prcontext {ldr.*\\!} 1 | grep mov
 ; PR1609
 
        %struct.FILE = type { i8*, i32, i32, i16, i16, %struct.__sbuf, i32, i8*, i32 (i8*)*, i32 (i8*, i8*, i32)*, i64 (i8*, i64, i32)*, i32 (i8*, i8*, i32)*, %struct.__sbuf, %struct.__sFILEX*, i32, [3 x i8], [1 x i8], %struct.__sbuf, i32, i64 }

diff --git a/test/CodeGen/ARM/remat.ll b/test/CodeGen/ARM/remat.ll
index 82bf5f0..3eee710 100644 (file)
--- a/test/CodeGen/ARM/remat.ll
+++ b/test/CodeGen/ARM/remat.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin 
-; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin -stats -info-output-file - | grep "Number of re-materialization" | grep 3
+; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin -disable-correct-folding -stats -info-output-file - | grep "Number of re-materialization" | grep 3
 
        %struct.CONTENTBOX = type { i32, i32, i32, i32, i32 }
        %struct.LOCBOX = type { i32, i32, i32, i32 }

diff --git a/test/CodeGen/X86/2007-07-25-EpilogueBug.ll b/test/CodeGen/X86/2007-07-25-EpilogueBug.ll
index ddac6ce..64890ef 100644 (file)
--- a/test/CodeGen/X86/2007-07-25-EpilogueBug.ll
+++ b/test/CodeGen/X86/2007-07-25-EpilogueBug.ll
@@ -1,6 +1,6 @@
 ; Verify that the addl comes before any popl.
 
-; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -mcpu=i386 | \
+; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -disable-correct-folding -mcpu=i386 | \
 ; RUN:   %prcontext ret 1 | grep popl
 ; PR1573
 

diff --git a/test/CodeGen/X86/2007-11-14-Coalescer-Bug.ll b/test/CodeGen/X86/2007-11-14-Coalescer-Bug.ll
index 07e926a..b5635b3 100644 (file)
--- a/test/CodeGen/X86/2007-11-14-Coalescer-Bug.ll
+++ b/test/CodeGen/X86/2007-11-14-Coalescer-Bug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=att | grep movl | count 2
+; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=att | grep movl | count 1
 
        %struct.double_int = type { i64, i64 }
        %struct.tree_common = type <{ i8, [3 x i8] }>

diff --git a/test/CodeGen/X86/2007-11-30-LoadFolding-Bug.ll b/test/CodeGen/X86/2007-11-30-LoadFolding-Bug.ll
index 21dff69..7afb9bf 100644 (file)
--- a/test/CodeGen/X86/2007-11-30-LoadFolding-Bug.ll
+++ b/test/CodeGen/X86/2007-11-30-LoadFolding-Bug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -stats |& \
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -disable-correct-folding -stats |& \
 ; RUN:   grep {1 .*folded into instructions}
 
 declare fastcc void @rdft(i32, i32, double*, i32*, double*)

diff --git a/test/CodeGen/X86/2007-11-30-TestLoadFolding.ll b/test/CodeGen/X86/2007-11-30-TestLoadFolding.ll
index f2e0cc5..925e7f0 100644 (file)
--- a/test/CodeGen/X86/2007-11-30-TestLoadFolding.ll
+++ b/test/CodeGen/X86/2007-11-30-TestLoadFolding.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=x86 -stats |& \
+; RUN: llvm-as < %s | llc -march=x86 -disable-correct-folding -stats |& \
 ; RUN:   grep {1 .*folded into instructions}
-; RUN: llvm-as < %s | llc -march=x86 | grep cmp | count 3
+; RUN: llvm-as < %s | llc -march=x86 -disable-correct-folding | grep cmp | count 3
 
        %struct.quad_struct = type { i32, i32, %struct.quad_struct*, %struct.quad_struct*, %struct.quad_struct*, %struct.quad_struct*, %struct.quad_struct* }
 

diff --git a/test/CodeGen/X86/2008-04-17-CoalescerBug.ll b/test/CodeGen/X86/2008-04-17-CoalescerBug.ll
index cd7c29b..df9b13e 100644 (file)
--- a/test/CodeGen/X86/2008-04-17-CoalescerBug.ll
+++ b/test/CodeGen/X86/2008-04-17-CoalescerBug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -mtriple=i386-apple-darwin | grep xorl | grep {%e}
+; RUN: llvm-as < %s | llc -mtriple=i386-apple-darwin -disable-correct-folding | grep xorl | grep {%e}
 ; Make sure xorl operands are 32-bit registers.
 
        %struct.tm = type { i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i8* }

diff --git a/test/CodeGen/X86/2008-05-06-SpillerBug.ll b/test/CodeGen/X86/2008-05-06-SpillerBug.ll
index 19231e9..19e8ca8 100644 (file)
--- a/test/CodeGen/X86/2008-05-06-SpillerBug.ll
+++ b/test/CodeGen/X86/2008-05-06-SpillerBug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -mtriple=i386-apple-darwin -relocation-model=pic -disable-fp-elim | grep addb | grep ebp
+; RUN: llvm-as < %s | llc -mtriple=i386-apple-darwin -relocation-model=pic -disable-fp-elim -disable-correct-folding | grep addb | grep ebp
 
        %struct.rc4_state = type { i32, i32, [256 x i32] }
 @.str1 = internal constant [65 x i8] c"m[%d] = 0x%02x, m[%d] = 0x%02x, 0x%02x, k = %d, key[k] = 0x%02x\0A\00"          ; <[65 x i8]*> [#uses=1]

diff --git a/test/CodeGen/X86/2008-05-21-CoalescerBug.ll b/test/CodeGen/X86/2008-05-21-CoalescerBug.ll
index 0445b0a..62a3330 100644 (file)
--- a/test/CodeGen/X86/2008-05-21-CoalescerBug.ll
+++ b/test/CodeGen/X86/2008-05-21-CoalescerBug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -fast | grep mov | count 4
+; RUN: llvm-as < %s | llc -march=x86 -fast -disable-correct-folding | grep mov | count 4
 ; PR2343
 
        %llvm.dbg.anchor.type = type { i32, i32 }

diff --git a/test/CodeGen/X86/2008-06-13-SpillerCommuting.ll b/test/CodeGen/X86/2008-06-13-SpillerCommuting.ll
index 5183e5b..6e4523a 100644 (file)
--- a/test/CodeGen/X86/2008-06-13-SpillerCommuting.ll
+++ b/test/CodeGen/X86/2008-06-13-SpillerCommuting.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -mtriple=i386-apple-darwin -relocation-model=pic -stats |& grep {spiller       - Number of instructions commuted}
+; RUN: llvm-as < %s | llc -mtriple=i386-apple-darwin -relocation-model=pic -disable-correct-folding -stats |& grep {spiller       - Number of instructions commuted}
 
        %struct.CABAC_context_element = type { i8, i8 }
        %struct.MB_Info_CABAC = type { i8, i8, [2 x i8], i8, i8, i8, i16, i16, [4 x i8], [8 x %struct.MotionVector] }

diff --git a/test/CodeGen/X86/ins_subreg_coalesce-3.ll b/test/CodeGen/X86/ins_subreg_coalesce-3.ll
index ead920a..5bddef8 100644 (file)
--- a/test/CodeGen/X86/ins_subreg_coalesce-3.ll
+++ b/test/CodeGen/X86/ins_subreg_coalesce-3.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86-64 | grep mov | count 9
+; RUN: llvm-as < %s | llc -march=x86-64 -disable-correct-folding | grep mov | count 9
 
        %struct.COMPOSITE = type { i8, i16, i16 }
        %struct.FILE = type { i8*, i32, i32, i16, i16, %struct.__sbuf, i32, i8*, i32 (i8*)*, i32 (i8*, i8*, i32)*, i64 (i8*, i64, i32)*, i32 (i8*, i8*, i32)*, %struct.__sbuf, %struct.__sFILEX*, i32, [3 x i8], [1 x i8], %struct.__sbuf, i32, i64 }