cleanup some tests

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

3 files changed, 43 insertions, 45 deletions

diff --git a/test/CodeGen/ARM/fp.ll b/test/CodeGen/ARM/fp.ll
index 510adc3ebf..681ccc1bf6 100644
--- a/test/CodeGen/ARM/fp.ll
+++ b/test/CodeGen/ARM/fp.ll
@@ -1,42 +1,14 @@
 ; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep fmsr  | wc -l | grep 5 &&
-; RUN: llvm-as < %s | llc -march=arm | grep fsitos &&
+; RUN: llvm-as < %s | llc -march=arm | grep fmsr &&
 ; RUN: llvm-as < %s | llc -march=arm | grep fmrs &&
-; RUN: llvm-as < %s | llc -march=arm | grep fsitod &&
-; RUN: llvm-as < %s | llc -march=arm | grep fmrrd | wc -l | grep 5 &&
-; RUN: llvm-as < %s | llc -march=arm | grep fmdrr | wc -l | grep 3 &&
+; RUN: llvm-as < %s | llc -march=arm | grep fmrrd &&
+; RUN: llvm-as < %s | llc -march=arm | grep fmdrr &&
 ; RUN: llvm-as < %s | llc -march=arm | grep fldd &&
 ; RUN: llvm-as < %s | llc -march=arm | grep flds &&
 ; RUN: llvm-as < %s | llc -march=arm | grep fstd &&
 ; RUN: llvm-as < %s | llc -march=arm | grep fsts &&
-; RUN: llvm-as < %s | llc -march=arm | grep fuitod &&
-; RUN: llvm-as < %s | llc -march=arm | grep fuitos &&
 ; RUN: llvm-as < %s | llc -march=arm | grep ".word.*1065353216"
 
-float %f(int %a) {
-entry:
-	%tmp = cast int %a to float		; <float> [#uses=1]
-	ret float %tmp
-}
-
-double %g(int %a) {
-entry:
-        %tmp = cast int %a to double            ; <double> [#uses=1]
-        ret double %tmp
-}
-
-double %uint_to_double(uint %a) {
-entry:
-	%tmp = cast uint %a to double
-	ret double %tmp
-}
-
-float %uint_to_float(uint %a) {
-entry:
-	%tmp = cast uint %a to float
-	ret float %tmp
-}
-
 
 double %h(double* %v) {
 entry:
diff --git a/test/CodeGen/ARM/fpcmp.ll b/test/CodeGen/ARM/fpcmp.ll
index 16e9a1b140..61dc489356 100644
--- a/test/CodeGen/ARM/fpcmp.ll
+++ b/test/CodeGen/ARM/fpcmp.ll
@@ -4,6 +4,7 @@
 ; RUN: llvm-as < %s | llc -march=arm  | grep movgt &&
 ; RUN: llvm-as < %s | llc -march=arm  | grep movge &&
 ; RUN: llvm-as < %s | llc -march=arm  | grep movls &&
+; RUN: llvm-as < %s | llc -march=arm  | grep movne &&
 ; RUN: llvm-as < %s | llc -march=arm  | grep fcmps &&
 ; RUN: llvm-as < %s | llc -march=arm  | grep fcmpd
 
@@ -55,10 +56,3 @@ entry:
 	%tmp = cast bool %tmp to int		; <int> [#uses=1]
 	ret int %tmp
 }
-
-int %g2(double %a) {
-entry:
-	%tmp = setne double %a, 1.000000e+00		; <bool> [#uses=1]
-	%tmp = cast bool %tmp to int		; <int> [#uses=1]
-	ret int %tmp
-}
diff --git a/test/CodeGen/ARM/fpconv.ll b/test/CodeGen/ARM/fpconv.ll
index 863c2e957b..a86feb6c05 100644
--- a/test/CodeGen/ARM/fpconv.ll
+++ b/test/CodeGen/ARM/fpconv.ll
@@ -1,6 +1,14 @@
 ; RUN: llvm-as < %s | llc -march=arm &&
+; RUN: llvm-as < %s | llc -march=arm | grep fcvtsd &&
 ; RUN: llvm-as < %s | llc -march=arm | grep fcvtds &&
-; RUN: llvm-as < %s | llc -march=arm | grep fcvtsd
+; RUN: llvm-as < %s | llc -march=arm | grep ftosis &&
+; RUN: llvm-as < %s | llc -march=arm | grep ftouis &&
+; RUN: llvm-as < %s | llc -march=arm | grep ftosid &&
+; RUN: llvm-as < %s | llc -march=arm | grep ftouid &&
+; RUN: llvm-as < %s | llc -march=arm | grep fsitos &&
+; RUN: llvm-as < %s | llc -march=arm | grep fsitod &&
+; RUN: llvm-as < %s | llc -march=arm | grep fuitos &&
+; RUN: llvm-as < %s | llc -march=arm | grep fuitod
 
 float %f1(double %x) {
 entry:
@@ -20,16 +28,16 @@ entry:
         ret int %tmp
 }
 
-int %f4(double %x) {
+uint %f4(float %x) {
 entry:
-        %tmp = cast double %x to int
-        ret int %tmp
+        %tmp = cast float %x to uint
+        ret uint %tmp
 }
 
-uint %f5(float %x) {
+int %f5(double %x) {
 entry:
-        %tmp = cast float %x to uint
-        ret uint %tmp
+        %tmp = cast double %x to int
+        ret int %tmp
 }
 
 uint %f6(double %x) {
@@ -37,3 +45,27 @@ entry:
         %tmp = cast double %x to uint
         ret uint %tmp
 }
+
+float %f7(int %a) {
+entry:
+	%tmp = cast int %a to float
+	ret float %tmp
+}
+
+double %f8(int %a) {
+entry:
+        %tmp = cast int %a to double
+        ret double %tmp
+}
+
+float %f9(uint %a) {
+entry:
+	%tmp = cast uint %a to float
+	ret float %tmp
+}
+
+double %f10(uint %a) {
+entry:
+	%tmp = cast uint %a to double
+	ret double %tmp
+}