2 files changed, 66 insertions, 18 deletions

diff --git a/test/CodeGen/X86/xor-undef.ll b/test/CodeGen/X86/xor-undef.ll
deleted file mode 100644
index d279fbb..0000000
--- a/test/CodeGen/X86/xor-undef.ll
+++ /dev/null
@@ -1,11 +0,0 @@
-; RUN: llc < %s -march=x86 -mattr=+sse2 | grep xor | count 2
-
-define <4 x i32> @t1() {
-	%tmp = xor <4 x i32> undef, undef
-	ret <4 x i32> %tmp
-}
-
-define i32 @t2() {
-	%tmp = xor i32 undef, undef
-	ret i32 %tmp
-}
diff --git a/test/CodeGen/X86/xor_not.ll b/test/CodeGen/X86/xor.ll
index 34fd0f0..86ecbe5 100644
--- a/test/CodeGen/X86/xor_not.ll
+++ b/test/CodeGen/X86/xor.ll
@@ -1,14 +1,48 @@
-; RUN: llc < %s -march=x86 | grep {not\[lwb\]} | count 4
-; RUN: llc < %s -march=x86-64 | grep {not\[lwb\]}  | count 4
-define i32 @test(i32 %a, i32 %b) nounwind  {
+; RUN: llc < %s -march=x86 -mattr=+sse2  | FileCheck %s -check-prefix=X32
+; RUN: llc < %s -march=x86-64 | FileCheck %s -check-prefix=X64
+
+; Though it is undefined, we want xor undef,undef to produce zero.
+define <4 x i32> @test1() nounwind {
+	%tmp = xor <4 x i32> undef, undef
+	ret <4 x i32> %tmp
+        
+; X32: test1:
+; X32:	xorps	%xmm0, %xmm0
+; X32:	ret
+}
+
+; Though it is undefined, we want xor undef,undef to produce zero.
+define i32 @test2() nounwind{
+	%tmp = xor i32 undef, undef
+	ret i32 %tmp
+; X32: test2:
+; X32:	xorl	%eax, %eax
+; X32:	ret
+}
+
+define i32 @test3(i32 %a, i32 %b) nounwind  {
 entry:
         %tmp1not = xor i32 %b, -2
 	%tmp3 = and i32 %tmp1not, %a
         %tmp4 = lshr i32 %tmp3, 1
         ret i32 %tmp4
+        
+; X64: test3:
+; X64:	notl	%esi
+; X64:	andl	%edi, %esi
+; X64:	movl	%esi, %eax
+; X64:	shrl	%eax
+; X64:	ret
+
+; X32: test3:
+; X32: 	movl	8(%esp), %eax
+; X32: 	notl	%eax
+; X32: 	andl	4(%esp), %eax
+; X32: 	shrl	%eax
+; X32: 	ret
 }
 
-define i32 @sum32(i32 %a, i32 %b) nounwind  {
+define i32 @test4(i32 %a, i32 %b) nounwind  {
 entry:
         br label %bb
 bb:
@@ -22,9 +56,16 @@ bb:
 	br i1 %tmp10, label %bb12, label %bb
 bb12:
 	ret i32 %tmp3
+        
+; X64: test4:
+; X64:    notl	%eax
+; X64:    andl	{{.*%eax}}
+; X32: test4:
+; X32:    notl	%edx
+; X32:    andl	{{.*%edx}}
 }
 
-define i16 @sum16(i16 %a, i16 %b) nounwind  {
+define i16 @test5(i16 %a, i16 %b) nounwind  {
 entry:
         br label %bb
 bb:
@@ -38,9 +79,15 @@ bb:
 	br i1 %tmp10, label %bb12, label %bb
 bb12:
 	ret i16 %tmp3
+; X64: test5:
+; X64:    notw	%ax
+; X64:    andw	{{.*%ax}}
+; X32: test5:
+; X32:    notw	%dx
+; X32:    andw	{{.*%dx}}
 }
 
-define i8 @sum8(i8 %a, i8 %b) nounwind  {
+define i8 @test6(i8 %a, i8 %b) nounwind  {
 entry:
         br label %bb
 bb:
@@ -54,9 +101,15 @@ bb:
 	br i1 %tmp10, label %bb12, label %bb
 bb12:
 	ret i8 %tmp3
+; X64: test6:
+; X64:    notb	%al
+; X64:    andb	{{.*%al}}
+; X32: test6:
+; X32:    notb	%dl
+; X32:    andb	{{.*%dl}}
 }
 
-define i32 @test2(i32 %a, i32 %b) nounwind  {
+define i32 @test7(i32 %a, i32 %b) nounwind  {
 entry:
         br label %bb
 bb:
@@ -70,5 +123,11 @@ bb:
 	br i1 %tmp10, label %bb12, label %bb
 bb12:
 	ret i32 %tmp3
+; X64: test7:
+; X64:    xorl	$2147483646, %eax
+; X64:    andl	{{.*%eax}}
+; X32: test7:
+; X32:    xorl	$2147483646, %edx
+; X32:    andl	{{.*%edx}}
 }