X86: Test cleanup

Use FileCheck, make it more consistent and do not rely on unoptimized
or(cmp,cmp) getting combined for max to be matched.

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

diff --git a/test/CodeGen/X86/scalar_sse_minmax.ll b/test/CodeGen/X86/scalar_sse_minmax.ll
index bc4ab5d836c78ce5fc7ebe7532a533f6918d5e57..5ca3f85ce029897fca03005b1e9108ccff7cc382 100644 (file)
--- a/test/CodeGen/X86/scalar_sse_minmax.ll
+++ b/test/CodeGen/X86/scalar_sse_minmax.ll
@@ -1,44 +1,53 @@
-; RUN: llc < %s -march=x86 -mattr=+sse,+sse2 | \
-; RUN:   grep mins | count 3
-; RUN: llc < %s -march=x86 -mattr=+sse,+sse2 | \
-; RUN:   grep maxs | count 2
-
-declare i1 @llvm.isunordered.f64(double, double)
-
-declare i1 @llvm.isunordered.f32(float, float)
+; RUN: llc < %s -march=x86 -mattr=+sse,+sse2 | FileCheck %s
 
 define float @min1(float %x, float %y) {
-       %tmp = fcmp olt float %x, %y            ; <i1> [#uses=1]
-       %retval = select i1 %tmp, float %x, float %y            ; <float> [#uses=1]
+; CHECK-LABEL: min1
+; CHECK: mins
+       %tmp = fcmp olt float %x, %y
+       %retval = select i1 %tmp, float %x, float %y
        ret float %retval
 }
 
 define double @min2(double %x, double %y) {
-       %tmp = fcmp olt double %x, %y           ; <i1> [#uses=1]
-       %retval = select i1 %tmp, double %x, double %y          ; <double> [#uses=1]
+; CHECK-LABEL: min2
+; CHECK: mins
+       %tmp = fcmp olt double %x, %y
+       %retval = select i1 %tmp, double %x, double %y
        ret double %retval
 }
 
+declare <4 x float> @llvm.x86.sse.min.ss(<4 x float>, <4 x float>)
+define <4 x float> @min3(float %x, float %y) {
+; CHECK-LABEL: min3
+; CHECK: mins
+       %vec0 = insertelement <4 x float> undef, float %x, i32 0
+       %vec1 = insertelement <4 x float> undef, float %y, i32 0
+       %retval = tail call <4 x float> @llvm.x86.sse.min.ss(<4 x float> %vec0, <4 x float> %vec1)
+       ret <4 x float> %retval
+}
+
 define float @max1(float %x, float %y) {
-       %tmp = fcmp oge float %x, %y            ; <i1> [#uses=1]
-       %tmp2 = fcmp uno float %x, %y           ; <i1> [#uses=1]
-       %tmp3 = or i1 %tmp2, %tmp               ; <i1> [#uses=1]
-       %retval = select i1 %tmp3, float %x, float %y           ; <float> [#uses=1]
+; CHECK-LABEL: max1
+; CHECK: maxs
+       %tmp = fcmp uge float %x, %y
+       %retval = select i1 %tmp, float %x, float %y
        ret float %retval
 }
 
 define double @max2(double %x, double %y) {
-       %tmp = fcmp oge double %x, %y           ; <i1> [#uses=1]
-       %tmp2 = fcmp uno double %x, %y          ; <i1> [#uses=1]
-       %tmp3 = or i1 %tmp2, %tmp               ; <i1> [#uses=1]
-       %retval = select i1 %tmp3, double %x, double %y         ; <double> [#uses=1]
+; CHECK-LABEL: max2
+; CHECK: maxs
+       %tmp = fcmp uge double %x, %y
+       %retval = select i1 %tmp, double %x, double %y
        ret double %retval
 }
 
-define <4 x float> @min3(float %tmp37) {
-       %tmp375 = insertelement <4 x float> undef, float %tmp37, i32 0          ; <<4 x float>> [#uses=1]
-       %tmp48 = tail call <4 x float> @llvm.x86.sse.min.ss( <4 x float> %tmp375, <4 x float> < float 6.553500e+04, float undef, float undef, float undef > )           ; <<4 x float>> [#uses=1]
-       ret <4 x float> %tmp48
+declare <4 x float> @llvm.x86.sse.max.ss(<4 x float>, <4 x float>)
+define <4 x float> @max3(float %x, float %y) {
+; CHECK-LABEL: max3
+; CHECK: maxs
+       %vec0 = insertelement <4 x float> undef, float %x, i32 0
+       %vec1 = insertelement <4 x float> undef, float %y, i32 0
+       %retval = tail call <4 x float> @llvm.x86.sse.max.ss(<4 x float> %vec0, <4 x float> %vec1)
+       ret <4 x float> %retval
 }
-
-declare <4 x float> @llvm.x86.sse.min.ss(<4 x float>, <4 x float>)