For PR1336:

XFAIL tests covered by the PR. These will be un-XFAILed as they are fixed.

llvm-svn: 36093

7 files changed, 13 insertions, 6 deletions

diff --git a/llvm/test/CodeGen/X86/2004-02-14-InefficientStackPointer.llx b/llvm/test/CodeGen/X86/2004-02-14-InefficientStackPointer.llx
index 69e4c1d011f..005a7dd51f1 100644
--- a/llvm/test/CodeGen/X86/2004-02-14-InefficientStackPointer.llx
+++ b/llvm/test/CodeGen/X86/2004-02-14-InefficientStackPointer.llx
@@ -1,4 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep ESP | not grep sub
+; XFAIL: *
 
 int %test(int %X) {
 	ret int %X
diff --git a/llvm/test/CodeGen/X86/fp-stack-ret.ll b/llvm/test/CodeGen/X86/fp-stack-ret.ll
index 6ed8115945c..42cdb67cf50 100644
--- a/llvm/test/CodeGen/X86/fp-stack-ret.ll
+++ b/llvm/test/CodeGen/X86/fp-stack-ret.ll
@@ -1,7 +1,7 @@
-; RUN: llvm-as < %s | llc -mtriple=i686-apple-darwin8 -mcpu=yonah -march=x86 > %t &&
-; RUN: grep fldl %t | wc -l | grep 1 &&
+; RUN: llvm-as < %s | llc -mtriple=i686-apple-darwin8 -mcpu=yonah -march=x86 > %t
+; RUN: grep fldl %t | wc -l | grep 1
 ; RUN: not grep xmm %t &&
-; RUN: grep 'sub.*esp' %t | wc -l | grep 1
+; RUN: grep {sub.*esp} %t | wc -l | grep 1
 
 ; These testcases shouldn't require loading into an XMM register then storing 
 ; to memory, then reloading into an FPStack reg.
diff --git a/llvm/test/CodeGen/X86/fp_constant_op.llx b/llvm/test/CodeGen/X86/fp_constant_op.llx
index 97cb1c0ed13..155673fcd72 100644
--- a/llvm/test/CodeGen/X86/fp_constant_op.llx
+++ b/llvm/test/CodeGen/X86/fp_constant_op.llx
@@ -1,5 +1,6 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | \
 ; RUN:   grep ST | not grep {fadd\\|fsub\\|fdiv\\|fmul}
+; XFAIL: *
 
 ; Test that the load of the constant is folded into the operation.
 
diff --git a/llvm/test/CodeGen/X86/fp_load_fold.llx b/llvm/test/CodeGen/X86/fp_load_fold.llx
index 1d8d353e4d6..ce272cea093 100644
--- a/llvm/test/CodeGen/X86/fp_load_fold.llx
+++ b/llvm/test/CodeGen/X86/fp_load_fold.llx
@@ -1,5 +1,6 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | \
 ; RUN:   grep ST | not grep {fadd\\|fsub\\|fdiv\\|fmul}
+; XFAIL: *
 
 ; Test that the load of the memory location is folded into the operation.
 
diff --git a/llvm/test/CodeGen/X86/sse-fcopysign.ll b/llvm/test/CodeGen/X86/sse-fcopysign.ll
index 25d8aa39a74..b82f18d32b3 100644
--- a/llvm/test/CodeGen/X86/sse-fcopysign.ll
+++ b/llvm/test/CodeGen/X86/sse-fcopysign.ll
@@ -1,4 +1,5 @@
 ; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | not grep test
+; XFAIL: *
 
 define float @test1(float %a, float %b) {
 	%tmp = tail call float @copysignf( float %b, float %a )
diff --git a/llvm/test/CodeGen/X86/sse-load-ret.ll b/llvm/test/CodeGen/X86/sse-load-ret.ll
index d5f4d19686b..4777e0f551f 100644
--- a/llvm/test/CodeGen/X86/sse-load-ret.ll
+++ b/llvm/test/CodeGen/X86/sse-load-ret.ll
@@ -1,6 +1,8 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah -enable-x86-sse &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah -enable-x86-sse | not grep movss
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah -enable-x86-sse | not grep xmm
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN:   llc -march=x86 -mcpu=yonah -enable-x86-sse | not grep movss
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN:   llc -march=x86 -mcpu=yonah -enable-x86-sse | not grep xmm
+; XFAIL: *
 
 double %test1(double *%P) {
 	%X = load double* %P
diff --git a/llvm/test/CodeGen/X86/vec_call.ll b/llvm/test/CodeGen/X86/vec_call.ll
index 6875894bfec..96cd7e47c39 100644
--- a/llvm/test/CodeGen/X86/vec_call.ll
+++ b/llvm/test/CodeGen/X86/vec_call.ll
@@ -2,6 +2,7 @@
 ; RUN:   grep {subl.*60}
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | \
 ; RUN:   grep {movdqa.*32}
+; XFAIL: *
 
 void %test() {
 	tail call void %xx( int 1, int 2, int 3, int 4, int 5, int 6, int 7, <2 x long> cast (<4 x int> < int 4, int 3, int 2, int 1 > to <2 x long>), <2 x long> cast (<4 x int> < int 8, int 7, int 6, int 5 > to <2 x long>), <2 x long> cast (<4 x int> < int 6, int 4, int 2, int 0 > to <2 x long>), <2 x long> cast (<4 x int> < int 8, int 4, int 2, int 1 > to <2 x long>), <2 x long> cast (<4 x int> < int 0, int 1, int 3, int 9 > to <2 x long>) )