Convert tests using "| wc -l | grep ..." to use the count script.

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

51 files changed, 142 insertions, 142 deletions

diff --git a/test/CodeGen/ARM/2007-05-07-tailmerge-1.ll b/test/CodeGen/ARM/2007-05-07-tailmerge-1.ll
index 15efd60c14..137aaf5938 100644
--- a/test/CodeGen/ARM/2007-05-07-tailmerge-1.ll
+++ b/test/CodeGen/ARM/2007-05-07-tailmerge-1.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=arm -enable-tail-merge | grep bl.*baz | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=arm -enable-tail-merge | grep bl.*quux | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm -enable-tail-merge | grep bl.*baz | count 1
+; RUN: llvm-as < %s | llc -march=arm -enable-tail-merge | grep bl.*quux | count 1
 ; Check that calls to baz and quux are tail-merged.
 
 ; ModuleID = 'tail.c'
diff --git a/test/CodeGen/ARM/2007-05-09-tailmerge-2.ll b/test/CodeGen/ARM/2007-05-09-tailmerge-2.ll
index 70c0777a95..c1b307b603 100644
--- a/test/CodeGen/ARM/2007-05-09-tailmerge-2.ll
+++ b/test/CodeGen/ARM/2007-05-09-tailmerge-2.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=arm -enable-tail-merge | grep bl.*baz | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=arm -enable-tail-merge | grep bl.*quux | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm -enable-tail-merge | grep bl.*baz | count 1
+; RUN: llvm-as < %s | llc -march=arm -enable-tail-merge | grep bl.*quux | count 1
 ; Check that calls to baz and quux are tail-merged.
 
 ; ModuleID = 'tail.c'
diff --git a/test/CodeGen/ARM/2007-05-22-tailmerge-3.ll b/test/CodeGen/ARM/2007-05-22-tailmerge-3.ll
index 94c116da59..3857d7d3e1 100644
--- a/test/CodeGen/ARM/2007-05-22-tailmerge-3.ll
+++ b/test/CodeGen/ARM/2007-05-22-tailmerge-3.ll
@@ -1,7 +1,7 @@
-; RUN: llvm-as < %s | llc -march=arm | grep bl.*baz | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=arm | grep bl.*quux | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=arm -enable-tail-merge=0 | grep bl.*baz | wc -l | grep 2
-; RUN: llvm-as < %s | llc -march=arm -enable-tail-merge=0 | grep bl.*quux | wc -l | grep 2
+; RUN: llvm-as < %s | llc -march=arm | grep bl.*baz | count 1
+; RUN: llvm-as < %s | llc -march=arm | grep bl.*quux | count 1
+; RUN: llvm-as < %s | llc -march=arm -enable-tail-merge=0 | grep bl.*baz | count 2
+; RUN: llvm-as < %s | llc -march=arm -enable-tail-merge=0 | grep bl.*quux | count 2
 ; Check that tail merging is the default on ARM, and that -enable-tail-merge=0 works.
 
 ; ModuleID = 'tail.c'
diff --git a/test/CodeGen/ARM/arguments.ll b/test/CodeGen/ARM/arguments.ll
index fbaaa23708..833e22dc26 100644
--- a/test/CodeGen/ARM/arguments.ll
+++ b/test/CodeGen/ARM/arguments.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-as < %s | llc -mtriple=arm-linux-gnueabi | \
-; RUN:   grep {mov r0, r2} | wc -l | grep 1
+; RUN:   grep {mov r0, r2} | count 1
 ; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin | \
-; RUN:   grep {mov r0, r1} | wc -l | grep 1
+; RUN:   grep {mov r0, r1} | count 1
 
 define i32 @f(i32 %a, i64 %b) {
         %tmp = call i32 @g(i64 %b)
diff --git a/test/CodeGen/ARM/bits.ll b/test/CodeGen/ARM/bits.ll
index 82b4fa7e91..0ac4f9a383 100644
--- a/test/CodeGen/ARM/bits.ll
+++ b/test/CodeGen/ARM/bits.ll
@@ -1,9 +1,9 @@
 ; RUN: llvm-as < %s | llc -march=arm > %t
-; RUN: grep and      %t | wc -l | grep 1
-; RUN: grep orr      %t | wc -l | grep 1
-; RUN: grep eor      %t | wc -l | grep 1
-; RUN: grep mov.*lsl %t | wc -l | grep 1
-; RUN: grep mov.*asr %t | wc -l | grep 1
+; RUN: grep and      %t | count 1
+; RUN: grep orr      %t | count 1
+; RUN: grep eor      %t | count 1
+; RUN: grep mov.*lsl %t | count 1
+; RUN: grep mov.*asr %t | count 1
 
 define i32 @f1(i32 %a, i32 %b) {
 entry:
diff --git a/test/CodeGen/ARM/constants.ll b/test/CodeGen/ARM/constants.ll
index 7302617256..63cca2484d 100644
--- a/test/CodeGen/ARM/constants.ll
+++ b/test/CodeGen/ARM/constants.ll
@@ -1,17 +1,17 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep {mov r0, #0} | wc -l | grep 1
+; RUN:   grep {mov r0, #0} | count 1
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep {mov r0, #255$} | wc -l | grep 1
+; RUN:   grep {mov r0, #255$} | count 1
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep {mov r0.*256} | wc -l | grep 1
+; RUN:   grep {mov r0.*256} | count 1
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep {orr.*256} | wc -l | grep 1
+; RUN:   grep {orr.*256} | count 1
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep {mov r0, .*-1073741761} | wc -l | grep 1
+; RUN:   grep {mov r0, .*-1073741761} | count 1
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep {mov r0, .*1008} | wc -l | grep 1
+; RUN:   grep {mov r0, .*1008} | count 1
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep {cmp r0, #1, 16} | wc -l | grep 1
+; RUN:   grep {cmp r0, #1, 16} | count 1
 
 uint %f1() {
   ret uint 0
diff --git a/test/CodeGen/ARM/fcopysign.ll b/test/CodeGen/ARM/fcopysign.ll
index e24a5d8f0c..66acda9c9b 100644
--- a/test/CodeGen/ARM/fcopysign.ll
+++ b/test/CodeGen/ARM/fcopysign.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=arm | grep bic | wc -l | grep 2
+; RUN: llvm-as < %s | llc -march=arm | grep bic | count 2
 ; RUN: llvm-as < %s | llc -march=arm -mattr=+v6,+vfp2 | \
-; RUN:   grep fneg | wc -l | grep 2
+; RUN:   grep fneg | count 2
 
 define float @test1(float %x, double %y) {
 	%tmp = fpext float %x to double
diff --git a/test/CodeGen/ARM/fp.ll b/test/CodeGen/ARM/fp.ll
index 4de9a06521..038dd42e2d 100644
--- a/test/CodeGen/ARM/fp.ll
+++ b/test/CodeGen/ARM/fp.ll
@@ -1,10 +1,10 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 > %t
-; RUN: grep fmsr %t | wc -l | grep 4
+; RUN: grep fmsr %t | count 4
 ; RUN: grep fsitos %t
-; RUN: grep fmrs %t | wc -l | grep 2
+; RUN: grep fmrs %t | count 2
 ; RUN: grep fsitod %t
-; RUN: grep fmrrd %t | wc -l | grep 5
-; RUN: grep fmdrr %t | wc -l | grep 2
+; RUN: grep fmrrd %t | count 5
+; RUN: grep fmdrr %t | count 2
 ; RUN: grep fldd %t
 ; RUN: grep fuitod %t
 ; RUN: grep fuitos %t
diff --git a/test/CodeGen/ARM/fpcmp.ll b/test/CodeGen/ARM/fpcmp.ll
index adee88cccc..f16c9d46bc 100644
--- a/test/CodeGen/ARM/fpcmp.ll
+++ b/test/CodeGen/ARM/fpcmp.ll
@@ -4,8 +4,8 @@
 ; RUN: grep movgt %t
 ; RUN: grep movge %t
 ; RUN: grep movne %t
-; RUN: grep fcmped %t | wc -l | grep 1
-; RUN: grep fcmpes %t | wc -l | grep 6
+; RUN: grep fcmped %t | count 1
+; RUN: grep fcmpes %t | count 6
 
 int %f1(float %a) {
 entry:
diff --git a/test/CodeGen/ARM/fpmem.ll b/test/CodeGen/ARM/fpmem.ll
index 3ed9f2dccb..936d6fd87c 100644
--- a/test/CodeGen/ARM/fpmem.ll
+++ b/test/CodeGen/ARM/fpmem.ll
@@ -1,9 +1,9 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep {mov r0, #0} | wc -l | grep 1
+; RUN:   grep {mov r0, #0} | count 1
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
-; RUN:   grep {flds.*\\\[} | wc -l | grep 1
+; RUN:   grep {flds.*\\\[} | count 1
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
-; RUN:   grep {fsts.*\\\[} | wc -l | grep 1
+; RUN:   grep {fsts.*\\\[} | count 1
 
 float %f1(float %a) {
 	ret float 0.000000e+00
diff --git a/test/CodeGen/ARM/fptoint.ll b/test/CodeGen/ARM/fptoint.ll
index b0db83cc2b..41168acc42 100644
--- a/test/CodeGen/ARM/fptoint.ll
+++ b/test/CodeGen/ARM/fptoint.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=arm -mattr=+v6,+vfp2 | grep fmrs | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm -mattr=+v6,+vfp2 | grep fmrs | count 1
 ; RUN: llvm-as < %s | llc -march=arm -mattr=+v6,+vfp2 | not grep fmrrd
 
 @i = weak global i32 0		; <i32*> [#uses=2]
diff --git a/test/CodeGen/ARM/hello.ll b/test/CodeGen/ARM/hello.ll
index d49480019c..16231da39b 100644
--- a/test/CodeGen/ARM/hello.ll
+++ b/test/CodeGen/ARM/hello.ll
@@ -1,8 +1,8 @@
 ; RUN: llvm-as < %s | llc -march=arm
-; RUN: llvm-as < %s | llc -mtriple=arm-linux-gnueabi | grep mov | wc -l | grep 1
+; RUN: llvm-as < %s | llc -mtriple=arm-linux-gnueabi | grep mov | count 1
 ; RUN: llvm-as < %s | llc -mtriple=arm-linux-gnu --disable-fp-elim | \
-; RUN:   grep mov | wc -l | grep 3
-; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin | grep mov | wc -l | grep 2
+; RUN:   grep mov | count 3
+; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin | grep mov | count 2
 
 @str = internal constant [12 x i8] c"Hello World\00"
 
diff --git a/test/CodeGen/ARM/ifcvt1.ll b/test/CodeGen/ARM/ifcvt1.ll
index b76b3e3a62..21ebb2e747 100644
--- a/test/CodeGen/ARM/ifcvt1.ll
+++ b/test/CodeGen/ARM/ifcvt1.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s | llc -march=arm -enable-arm-if-conversion
-; RUN: llvm-as < %s | llc -march=arm -enable-arm-if-conversion | grep bx | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm -enable-arm-if-conversion | grep bx | count 1
 
 define i32 @t1(i32 %a, i32 %b) {
 	%tmp2 = icmp eq i32 %a, 0
diff --git a/test/CodeGen/ARM/ifcvt2.ll b/test/CodeGen/ARM/ifcvt2.ll
index 96400eaf3a..636705beda 100644
--- a/test/CodeGen/ARM/ifcvt2.ll
+++ b/test/CodeGen/ARM/ifcvt2.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-as < %s | llc -march=arm -enable-arm-if-conversion
-; RUN: llvm-as < %s | llc -march=arm -enable-arm-if-conversion | grep bxlt | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=arm -enable-arm-if-conversion | grep bxgt | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=arm -enable-arm-if-conversion | grep bxge | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm -enable-arm-if-conversion | grep bxlt | count 1
+; RUN: llvm-as < %s | llc -march=arm -enable-arm-if-conversion | grep bxgt | count 1
+; RUN: llvm-as < %s | llc -march=arm -enable-arm-if-conversion | grep bxge | count 1
 
 define i32 @t1(i32 %a, i32 %b, i32 %c, i32 %d) {
 	%tmp2 = icmp sgt i32 %c, 10
diff --git a/test/CodeGen/ARM/ifcvt3.ll b/test/CodeGen/ARM/ifcvt3.ll
index 0236386114..fd1a6d1717 100644
--- a/test/CodeGen/ARM/ifcvt3.ll
+++ b/test/CodeGen/ARM/ifcvt3.ll
@@ -1,6 +1,6 @@
 ; RUN: llvm-as < %s | llc -march=arm -enable-arm-if-conversion
-; RUN: llvm-as < %s | llc -march=arm -enable-arm-if-conversion | grep cmpne | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=arm -enable-arm-if-conversion | grep bx | wc -l | grep 2
+; RUN: llvm-as < %s | llc -march=arm -enable-arm-if-conversion | grep cmpne | count 1
+; RUN: llvm-as < %s | llc -march=arm -enable-arm-if-conversion | grep bx | count 2
 
 define i32 @t1(i32 %a, i32 %b, i32 %c, i32 %d) {
 	switch i32 %c, label %cond_next [
diff --git a/test/CodeGen/ARM/ifcvt4.ll b/test/CodeGen/ARM/ifcvt4.ll
index 1a5728eba1..b3a5ea0884 100644
--- a/test/CodeGen/ARM/ifcvt4.ll
+++ b/test/CodeGen/ARM/ifcvt4.ll
@@ -1,6 +1,6 @@
 ; RUN: llvm-as < %s | llc -march=arm -enable-arm-if-conversion
-; RUN: llvm-as < %s | llc -march=arm -enable-arm-if-conversion | grep subgt | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=arm -enable-arm-if-conversion | grep suble | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm -enable-arm-if-conversion | grep subgt | count 1
+; RUN: llvm-as < %s | llc -march=arm -enable-arm-if-conversion | grep suble | count 1
 ; FIXME: Check for # of unconditional branch after adding branch folding post ifcvt.
 
 define i32 @t(i32 %a, i32 %b) {
diff --git a/test/CodeGen/ARM/ifcvt5.ll b/test/CodeGen/ARM/ifcvt5.ll
index 4a3c137738..afd7146fe6 100644
--- a/test/CodeGen/ARM/ifcvt5.ll
+++ b/test/CodeGen/ARM/ifcvt5.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s | llc -march=arm -enable-arm-if-conversion
-; RUN: llvm-as < %s | llc -march=arm -enable-arm-if-conversion | grep blge | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm -enable-arm-if-conversion | grep blge | count 1
 
 @x = external global i32*		; <i32**> [#uses=1]
 
diff --git a/test/CodeGen/ARM/ifcvt6.ll b/test/CodeGen/ARM/ifcvt6.ll
index 18aaf13be3..ae06312d3e 100644
--- a/test/CodeGen/ARM/ifcvt6.ll
+++ b/test/CodeGen/ARM/ifcvt6.ll
@@ -2,10 +2,10 @@
 ; RUN:   llc -march=arm -mtriple=arm-apple-darwin -enable-arm-if-conversion
 ; RUN: llvm-as < %s | \
 ; RUN:   llc -march=arm -mtriple=arm-apple-darwin -enable-arm-if-conversion | \
-; RUN:   grep cmpne | wc -l | grep 1
+; RUN:   grep cmpne | count 1
 ; RUN: llvm-as < %s | \
 ; RUN:   llc -march=arm -mtriple=arm-apple-darwin -enable-arm-if-conversion | \
-; RUN:   grep ldmhi | wc -l | grep 1
+; RUN:   grep ldmhi | count 1
 
 define void @foo(i32 %X, i32 %Y) {
 entry:
diff --git a/test/CodeGen/ARM/ifcvt7.ll b/test/CodeGen/ARM/ifcvt7.ll
index 4816cea50f..f0b6e473e4 100644
--- a/test/CodeGen/ARM/ifcvt7.ll
+++ b/test/CodeGen/ARM/ifcvt7.ll
@@ -2,13 +2,13 @@
 ; RUN:   llc -march=arm -mtriple=arm-apple-darwin -enable-arm-if-conversion
 ; RUN: llvm-as < %s | \
 ; RUN:   llc -march=arm -mtriple=arm-apple-darwin -enable-arm-if-conversion | \
-; RUN:   grep cmpeq | wc -l | grep 1
+; RUN:   grep cmpeq | count 1
 ; RUN: llvm-as < %s | \
 ; RUN:   llc -march=arm -mtriple=arm-apple-darwin -enable-arm-if-conversion | \
-; RUN:   grep moveq | wc -l | grep 1
+; RUN:   grep moveq | count 1
 ; RUN: llvm-as < %s | \
 ; RUN:   llc -march=arm -mtriple=arm-apple-darwin -enable-arm-if-conversion | \
-; RUN:   grep ldmeq | wc -l | grep 1
+; RUN:   grep ldmeq | count 1
 ; FIXME: Need post-ifcvt branch folding to get rid of the extra br at end of BB1.
 
 	%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/ARM/ifcvt8.ll b/test/CodeGen/ARM/ifcvt8.ll
index 811aa57fdb..a5d9e65c17 100644
--- a/test/CodeGen/ARM/ifcvt8.ll
+++ b/test/CodeGen/ARM/ifcvt8.ll
@@ -2,7 +2,7 @@
 ; RUN:   llc -march=arm -mtriple=arm-apple-darwin -enable-arm-if-conversion
 ; RUN: llvm-as < %s | \
 ; RUN:   llc -march=arm -mtriple=arm-apple-darwin -enable-arm-if-conversion | \
-; RUN:   grep ldmne | wc -l | grep 1
+; RUN:   grep ldmne | count 1
 
 	%struct.SString = type { i8*, i32, i32 }
 
diff --git a/test/CodeGen/ARM/insn-sched1.ll b/test/CodeGen/ARM/insn-sched1.ll
index 6dc4650cf0..a993e65e4c 100644
--- a/test/CodeGen/ARM/insn-sched1.ll
+++ b/test/CodeGen/ARM/insn-sched1.ll
@@ -1,6 +1,6 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6
 ; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-apple-darwin -mattr=+v6 |\
-; RUN:   grep mov | wc -l | grep 3
+; RUN:   grep mov | count 3
 
 int %test(int %x) {
 	%tmp = cast int %x to short
diff --git a/test/CodeGen/ARM/large-stack.ll b/test/CodeGen/ARM/large-stack.ll
index 5f85ec098a..42d7d0972d 100644
--- a/test/CodeGen/ARM/large-stack.ll
+++ b/test/CodeGen/ARM/large-stack.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s | llc -march=arm
-; RUN: llvm-as < %s | llc -march=thumb | grep {ldr.*LCP} | wc -l | grep 5
+; RUN: llvm-as < %s | llc -march=thumb | grep {ldr.*LCP} | count 5
 
 define void @test1() {
     %tmp = alloca [ 64 x i32 ] , align 4
diff --git a/test/CodeGen/ARM/ldm.ll b/test/CodeGen/ARM/ldm.ll
index b69e04ddf0..46917252e8 100644
--- a/test/CodeGen/ARM/ldm.ll
+++ b/test/CodeGen/ARM/ldm.ll
@@ -1,9 +1,9 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep ldmia | wc -l | grep 2
+; RUN:   grep ldmia | count 2
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep ldmib | wc -l | grep 1
+; RUN:   grep ldmib | count 1
 ; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=arm-apple-darwin | \
-; RUN:   grep {ldmfd sp\!} | wc -l | grep 3
+; RUN:   grep {ldmfd sp\!} | count 3
 
 %X = external global [0 x int]
 
diff --git a/test/CodeGen/ARM/ldr.ll b/test/CodeGen/ARM/ldr.ll
index 3a9ab813da..833668caf9 100644
--- a/test/CodeGen/ARM/ldr.ll
+++ b/test/CodeGen/ARM/ldr.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep {ldr r0} | wc -l | grep 3
+; RUN:   grep {ldr r0} | count 3
 
 int %f1(int* %v) {
 entry:
diff --git a/test/CodeGen/ARM/ldr_ext.ll b/test/CodeGen/ARM/ldr_ext.ll
index 2b50b30aa7..edb70d5396 100644
--- a/test/CodeGen/ARM/ldr_ext.ll
+++ b/test/CodeGen/ARM/ldr_ext.ll
@@ -1,11 +1,11 @@
-; RUN: llvm-as < %s | llc -march=arm | grep ldrb  | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=arm | grep ldrh  | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=arm | grep ldrsb | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=arm | grep ldrsh | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=thumb | grep ldrb  | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=thumb | grep ldrh  | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=thumb | grep ldrsb | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=thumb | grep ldrsh | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm | grep ldrb | count 1
+; RUN: llvm-as < %s | llc -march=arm | grep ldrh | count 1
+; RUN: llvm-as < %s | llc -march=arm | grep ldrsb | count 1
+; RUN: llvm-as < %s | llc -march=arm | grep ldrsh | count 1
+; RUN: llvm-as < %s | llc -march=thumb | grep ldrb | count 1
+; RUN: llvm-as < %s | llc -march=thumb | grep ldrh | count 1
+; RUN: llvm-as < %s | llc -march=thumb | grep ldrsb | count 1
+; RUN: llvm-as < %s | llc -march=thumb | grep ldrsh | count 1
 
 define i32 @test1(i8* %v.pntr.s0.u1) {
     %tmp.u = load i8* %v.pntr.s0.u1
diff --git a/test/CodeGen/ARM/ldr_frame.ll b/test/CodeGen/ARM/ldr_frame.ll
index 1fd6ed37c4..56acc90097 100644
--- a/test/CodeGen/ARM/ldr_frame.ll
+++ b/test/CodeGen/ARM/ldr_frame.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s | llc -march=arm | not grep mov
-; RUN: llvm-as < %s | llc -march=thumb | grep cpy | wc -l | grep 2
+; RUN: llvm-as < %s | llc -march=thumb | grep cpy | count 2
 
 define i32 @f1() {
 	%buf = alloca [32 x i32], align 4
diff --git a/test/CodeGen/ARM/ldr_post.ll b/test/CodeGen/ARM/ldr_post.ll
index 78b31352ba..a1b31ec464 100644
--- a/test/CodeGen/ARM/ldr_post.ll
+++ b/test/CodeGen/ARM/ldr_post.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep {ldr.*\\\[.*\],} | wc -l | grep 1
+; RUN:   grep {ldr.*\\\[.*\],} | count 1
 
 int %test(int %a, int %b, int %c) {
 	%tmp1 = mul int %a, %b
diff --git a/test/CodeGen/ARM/ldr_pre.ll b/test/CodeGen/ARM/ldr_pre.ll
index e9af1c90db..4bc1fcc6da 100644
--- a/test/CodeGen/ARM/ldr_pre.ll
+++ b/test/CodeGen/ARM/ldr_pre.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep {ldr.*\\!}  | wc -l | grep 2
+; RUN:   grep {ldr.*\\!} | count 2
 
 int *%test1(int *%X, int *%dest) {
         %Y = getelementptr int* %X, int 4
diff --git a/test/CodeGen/ARM/load-global.ll b/test/CodeGen/ARM/load-global.ll
index fe9bf82f37..8896ead5a5 100644
--- a/test/CodeGen/ARM/load-global.ll
+++ b/test/CodeGen/ARM/load-global.ll
@@ -3,13 +3,13 @@
 ; RUN:   not grep {L_G\$non_lazy_ptr}
 ; RUN: llvm-as < %s | \
 ; RUN:   llc -mtriple=arm-apple-darwin -relocation-model=dynamic-no-pic | \
-; RUN:   grep {L_G\$non_lazy_ptr} | wc -l | grep 2
+; RUN:   grep {L_G\$non_lazy_ptr} | count 2
 ; RUN: llvm-as < %s | \
 ; RUN:   llc -mtriple=arm-apple-darwin -relocation-model=pic | \
-; RUN:   grep {ldr.*pc} | wc -l | grep 1
+; RUN:   grep {ldr.*pc} | count 1
 ; RUN: llvm-as < %s | \
 ; RUN:   llc -mtriple=arm-linux-gnueabi -relocation-model=pic | \
-; RUN:   grep {GOT} | wc -l | grep 1
+; RUN:   grep {GOT} | count 1
 
 @G = external global i32
 
diff --git a/test/CodeGen/ARM/long-setcc.ll b/test/CodeGen/ARM/long-setcc.ll
index 9111ab388e..12af8b8d11 100644
--- a/test/CodeGen/ARM/long-setcc.ll
+++ b/test/CodeGen/ARM/long-setcc.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=arm | grep cmp | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=thumb | grep cmp | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm | grep cmp | count 1
+; RUN: llvm-as < %s | llc -march=thumb | grep cmp | count 1
 
 
 define i1 @t1(i64 %x) {
diff --git a/test/CodeGen/ARM/long.ll b/test/CodeGen/ARM/long.ll
index 54da192717..fc05d1e51d 100644
--- a/test/CodeGen/ARM/long.ll
+++ b/test/CodeGen/ARM/long.ll
@@ -1,20 +1,20 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep -- {-2147483648} | wc -l | grep 3
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep mvn | wc -l | grep 3
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep adds | wc -l | grep 1
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep adc | wc -l | grep 1
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep {subs } | wc -l | grep 1
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep sbc | wc -l | grep 1
+; RUN:   grep -- {-2147483648} | count 3
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep mvn | count 3
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep adds | count 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep adc | count 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep {subs } | count 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep sbc | count 1
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep smull | wc -l | grep 1
+; RUN:   grep smull | count 1
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep umull | wc -l | grep 1 
+; RUN:   grep umull | count 1
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=thumb | \
-; RUN:   grep mvn | wc -l | grep 1 
+; RUN:   grep mvn | count 1
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=thumb | \
-; RUN:   grep adc | wc -l | grep 1 
+; RUN:   grep adc | count 1
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=thumb | \
-; RUN:   grep sbc | wc -l | grep 1 
+; RUN:   grep sbc | count 1
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=thumb | grep __muldi3
 ; END.
 
diff --git a/test/CodeGen/ARM/long_shift.ll b/test/CodeGen/ARM/long_shift.ll
index b0a3ee83ab..8d5d2f3879 100644
--- a/test/CodeGen/ARM/long_shift.ll
+++ b/test/CodeGen/ARM/long_shift.ll
@@ -1,6 +1,6 @@
 ; RUN: llvm-as < %s | llc -march=thumb
 ; RUN: llvm-as < %s | llc -march=arm > %t
-; RUN: grep rrx %t | wc -l | grep 1
+; RUN: grep rrx %t | count 1
 ; RUN: grep __ashldi3 %t
 ; RUN: grep __ashrdi3 %t
 ; RUN: grep __lshrdi3 %t
diff --git a/test/CodeGen/ARM/mul.ll b/test/CodeGen/ARM/mul.ll
index 7a2c43b3fc..f4f0a04266 100644
--- a/test/CodeGen/ARM/mul.ll
+++ b/test/CodeGen/ARM/mul.ll
@@ -1,7 +1,7 @@
-; RUN: llvm-as < %s | llc -march=arm | grep mul | wc -l | grep 2
-; RUN: llvm-as < %s | llc -march=arm | grep lsl | wc -l | grep 2
-; RUN: llvm-as < %s | llc -march=thumb | grep mul | wc -l | grep 3
-; RUN: llvm-as < %s | llc -march=thumb | grep lsl | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm | grep mul | count 2
+; RUN: llvm-as < %s | llc -march=arm | grep lsl | count 2
+; RUN: llvm-as < %s | llc -march=thumb | grep mul | count 3
+; RUN: llvm-as < %s | llc -march=thumb | grep lsl | count 1
 
 define i32 @f1(i32 %u) {
     %tmp = mul i32 %u, %u
diff --git a/test/CodeGen/ARM/mulhi.ll b/test/CodeGen/ARM/mulhi.ll
index 9367258ef5..bed3dba2a0 100644
--- a/test/CodeGen/ARM/mulhi.ll
+++ b/test/CodeGen/ARM/mulhi.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6 | \
-; RUN:   grep smmul | wc -l | grep 1
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep umull | wc -l | grep 1
+; RUN:   grep smmul | count 1
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep umull | count 1
 
 int %smulhi(int %x, int %y) {
         %tmp = cast int %x to ulong             ; <ulong> [#uses=1]
diff --git a/test/CodeGen/ARM/mvn.ll b/test/CodeGen/ARM/mvn.ll
index 3f4a6f71d6..0672a3be77 100644
--- a/test/CodeGen/ARM/mvn.ll
+++ b/test/CodeGen/ARM/mvn.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep mvn | wc -l | grep 8
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep mvn | count 8
 ; END.
 
 int %f1() {
diff --git a/test/CodeGen/ARM/pack.ll b/test/CodeGen/ARM/pack.ll
index 8cd392bcb8..feb49d02c0 100644
--- a/test/CodeGen/ARM/pack.ll
+++ b/test/CodeGen/ARM/pack.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6 | \
-; RUN:   grep pkhbt | wc -l | grep 5
+; RUN:   grep pkhbt | count 5
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6 | \
-; RUN:   grep pkhtb | wc -l | grep 4
+; RUN:   grep pkhtb | count 4
 ; END.
 
 implementation   ; Functions:
diff --git a/test/CodeGen/ARM/select.ll b/test/CodeGen/ARM/select.ll
index 7758a8d2e7..ba29c30af5 100644
--- a/test/CodeGen/ARM/select.ll
+++ b/test/CodeGen/ARM/select.ll
@@ -1,17 +1,17 @@
-; RUN: llvm-as < %s | llc -march=arm | grep moveq | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=arm | grep movgt | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=arm | grep movlt | wc -l | grep 3
-; RUN: llvm-as < %s | llc -march=arm | grep movle | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=arm | grep movls | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=arm | grep movhi | wc -l | grep 1 
+; RUN: llvm-as < %s | llc -march=arm | grep moveq | count 1
+; RUN: llvm-as < %s | llc -march=arm | grep movgt | count 1
+; RUN: llvm-as < %s | llc -march=arm | grep movlt | count 3
+; RUN: llvm-as < %s | llc -march=arm | grep movle | count 1
+; RUN: llvm-as < %s | llc -march=arm | grep movls | count 1
+; RUN: llvm-as < %s | llc -march=arm | grep movhi | count 1
 ; RUN: llvm-as < %s | llc -march=arm -mattr=+vfp2 | \
-; RUN:   grep fcpydmi | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=thumb | grep beq | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=thumb | grep bgt | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=thumb | grep blt | wc -l | grep 3
-; RUN: llvm-as < %s | llc -march=thumb | grep ble | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=thumb | grep bls | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=thumb | grep bhi | wc -l | grep 1
+; RUN:   grep fcpydmi | count 1
+; RUN: llvm-as < %s | llc -march=thumb | grep beq | count 1
+; RUN: llvm-as < %s | llc -march=thumb | grep bgt | count 1
+; RUN: llvm-as < %s | llc -march=thumb | grep blt | count 3
+; RUN: llvm-as < %s | llc -march=thumb | grep ble | count 1
+; RUN: llvm-as < %s | llc -march=thumb | grep bls | count 1
+; RUN: llvm-as < %s | llc -march=thumb | grep bhi | count 1
 ; RUN: llvm-as < %s | llc -march=thumb | grep __ltdf2
 
 define i32 @f1(i32 %a.s) {
diff --git a/test/CodeGen/ARM/select_xform.ll b/test/CodeGen/ARM/select_xform.ll
index 36071be6b2..97ac9a13ed 100644
--- a/test/CodeGen/ARM/select_xform.ll
+++ b/test/CodeGen/ARM/select_xform.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s | llc -march=arm
-; RUN: llvm-as < %s | llc -march=arm | grep mov | wc -l | grep 2
+; RUN: llvm-as < %s | llc -march=arm | grep mov | count 2
 
 define i32 @t1(i32 %a, i32 %b, i32 %c) {
         %tmp1 = icmp sgt i32 %c, 10
diff --git a/test/CodeGen/ARM/smul.ll b/test/CodeGen/ARM/smul.ll
index 4ea61f386c..6458ac807b 100644
--- a/test/CodeGen/ARM/smul.ll
+++ b/test/CodeGen/ARM/smul.ll
@@ -1,11 +1,11 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v5TE
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v5TE | \
-; RUN:   grep smulbt | wc -l | grep 1
+; RUN:   grep smulbt | count 1
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v5TE | \
-; RUN:   grep smultt | wc -l | grep 1
+; RUN:   grep smultt | count 1
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v5TE | \
-; RUN:   grep smlabt | wc -l | grep 1
+; RUN:   grep smlabt | count 1
 
 %x = weak global short 0
 %y = weak global short 0
diff --git a/test/CodeGen/ARM/stack-frame.ll b/test/CodeGen/ARM/stack-frame.ll
index fc34785ded..73ae11b973 100644
--- a/test/CodeGen/ARM/stack-frame.ll
+++ b/test/CodeGen/ARM/stack-frame.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-as < %s | llc -march=arm
-; RUN: llvm-as < %s | llc -march=arm | grep add | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm | grep add | count 1
 ; RUN: llvm-as < %s | llc -march=thumb
-; RUN: llvm-as < %s | llc -march=thumb | grep add | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=thumb | grep add | count 1
 
 define void @f1() {
 	%c = alloca i8, align 1
diff --git a/test/CodeGen/ARM/str_post.ll b/test/CodeGen/ARM/str_post.ll
index a388f54d67..1dc4155c64 100644
--- a/test/CodeGen/ARM/str_post.ll
+++ b/test/CodeGen/ARM/str_post.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep {strh .*\\\[.*\], #-4}  | wc -l | grep 1
+; RUN:   grep {strh .*\\\[.*\], #-4} | count 1
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep {str .*\\\[.*\],}  | wc -l | grep 1
+; RUN:   grep {str .*\\\[.*\],} | count 1
 
 short %test1(int *%X, short *%A) {
         %Y = load int* %X
diff --git a/test/CodeGen/ARM/str_pre.ll b/test/CodeGen/ARM/str_pre.ll
index 69f9928df5..c948f69af3 100644
--- a/test/CodeGen/ARM/str_pre.ll
+++ b/test/CodeGen/ARM/str_pre.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep {str.*\\!}  | wc -l | grep 2
+; RUN:   grep {str.*\\!} | count 2
 
 void %test1(int *%X, int *%A, int **%dest) {
         %B = load int* %A
diff --git a/test/CodeGen/ARM/str_trunc.ll b/test/CodeGen/ARM/str_trunc.ll
index 5a1b961194..391e774ac8 100644
--- a/test/CodeGen/ARM/str_trunc.ll
+++ b/test/CodeGen/ARM/str_trunc.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep strb | wc -l | grep 1
+; RUN:   grep strb | count 1
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | \
-; RUN:   grep strh | wc -l | grep 1
+; RUN:   grep strh | count 1
 
 void %test1(int %v, short* %ptr) {
         %tmp = cast int %v to short
diff --git a/test/CodeGen/ARM/sxt_rot.ll b/test/CodeGen/ARM/sxt_rot.ll
index fde671f034..bfecce8bde 100644
--- a/test/CodeGen/ARM/sxt_rot.ll
+++ b/test/CodeGen/ARM/sxt_rot.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-as < %s | llc -march=arm -mattr=+v6 | \
-; RUN:   grep sxtb  | wc -l | grep 1
+; RUN:   grep sxtb | count 1
 ; RUN: llvm-as < %s | llc -march=arm -mattr=+v6 | \
-; RUN:   grep sxtab | wc -l | grep 1
+; RUN:   grep sxtab | count 1
 
 define i8 @test1(i32 %A) signext {
 	%B = lshr i32 %A, 8
diff --git a/test/CodeGen/ARM/trunc_ldr.ll b/test/CodeGen/ARM/trunc_ldr.ll
index bb13ac9e2b..6111ec9d2f 100644
--- a/test/CodeGen/ARM/trunc_ldr.ll
+++ b/test/CodeGen/ARM/trunc_ldr.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | llc -march=arm | grep ldrb.*7  | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=arm | grep ldrsb.*7 | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm | grep ldrb.*7 | count 1
+; RUN: llvm-as < %s | llc -march=arm | grep ldrsb.*7 | count 1
 
 	%struct.A = type { i8, i8, i8, i8, i16, i8, i8, %struct.B** }
 	%struct.B = type { float, float, i32, i32, i32, [0 x i8] }
diff --git a/test/CodeGen/ARM/unord.ll b/test/CodeGen/ARM/unord.ll
index ce587f06e9..e1774232d1 100644
--- a/test/CodeGen/ARM/unord.ll
+++ b/test/CodeGen/ARM/unord.ll
@@ -1,7 +1,7 @@
-; RUN: llvm-as < %s | llc -march=arm | grep movne | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=arm | grep moveq | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=thumb | grep bne | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=thumb | grep beq | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm | grep movne | count 1
+; RUN: llvm-as < %s | llc -march=arm | grep moveq | count 1
+; RUN: llvm-as < %s | llc -march=thumb | grep bne | count 1
+; RUN: llvm-as < %s | llc -march=thumb | grep beq | count 1
 
 define i32 @f1(float %X, float %Y) {
 	%tmp = fcmp uno float %X, %Y
diff --git a/test/CodeGen/ARM/uxt_rot.ll b/test/CodeGen/ARM/uxt_rot.ll
index 66275eae0e..09c74ebbb7 100644
--- a/test/CodeGen/ARM/uxt_rot.ll
+++ b/test/CodeGen/ARM/uxt_rot.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=arm -mattr=+v6 | grep uxtb  | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=arm -mattr=+v6 | grep uxtab | wc -l | grep 1
-; RUN: llvm-as < %s | llc -march=arm -mattr=+v6 | grep uxth  | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm -mattr=+v6 | grep uxtb | count 1
+; RUN: llvm-as < %s | llc -march=arm -mattr=+v6 | grep uxtab | count 1
+; RUN: llvm-as < %s | llc -march=arm -mattr=+v6 | grep uxth | count 1
 
 define i8 @test1(i32 %A.u) zeroext {
     %B.u = trunc i32 %A.u to i8
diff --git a/test/CodeGen/ARM/uxtb.ll b/test/CodeGen/ARM/uxtb.ll
index 86c99da625..1787d6f58a 100644
--- a/test/CodeGen/ARM/uxtb.ll
+++ b/test/CodeGen/ARM/uxtb.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+v6 | \
-; RUN:   grep uxt | wc -l | grep 10
+; RUN:   grep uxt | count 10
 ; END.
 
 uint %test1(uint %x) {
diff --git a/test/CodeGen/ARM/vargs2.ll b/test/CodeGen/ARM/vargs2.ll
index a58516f582..ae4ca5be56 100644
--- a/test/CodeGen/ARM/vargs2.ll
+++ b/test/CodeGen/ARM/vargs2.ll
@@ -1,6 +1,6 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=thumb
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=thumb | \
-; RUN:   grep pop | wc -l | grep 2
+; RUN:   grep pop | count 2
 
 %str = internal constant [4 x sbyte] c"%d\0A\00"		; <[4 x sbyte]*> [#uses=1]
 
diff --git a/test/CodeGen/ARM/vargs_align.ll b/test/CodeGen/ARM/vargs_align.ll
index 8d49e19f9d..1f2f05bd60 100644
--- a/test/CodeGen/ARM/vargs_align.ll
+++ b/test/CodeGen/ARM/vargs_align.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-as < %s | llc -march=arm -mtriple=arm-linux-gnueabi | \
-; RUN:   grep {add sp, sp, #16} | wc -l | grep 1
+; RUN:   grep {add sp, sp, #16} | count 1
 ; RUN: llvm-as < %s | llc -march=arm -mtriple=arm-linux-gnu | \
-; RUN:   grep {add sp, sp, #12} | wc -l | grep 2
+; RUN:   grep {add sp, sp, #12} | count 2
 
 define i32 @f(i32 %a, ...) {
 entry:
diff --git a/test/CodeGen/ARM/vfp.ll b/test/CodeGen/ARM/vfp.ll
index b2a6d70777..11f668efa5 100644
--- a/test/CodeGen/ARM/vfp.ll
+++ b/test/CodeGen/ARM/vfp.ll
@@ -1,19 +1,19 @@
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
-; RUN:   grep fabs | wc -l | grep 2
+; RUN:   grep fabs | count 2
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
-; RUN:   grep fmscs | wc -l | grep 1
+; RUN:   grep fmscs | count 1
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
-; RUN:   grep fcvt | wc -l | grep 2
+; RUN:   grep fcvt | count 2
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
-; RUN:   grep fuito | wc -l | grep 2
+; RUN:   grep fuito | count 2
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
-; RUN:   grep fto.i | wc -l | grep 4
+; RUN:   grep fto.i | count 4
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
-; RUN:   grep bmi | wc -l | grep 1
+; RUN:   grep bmi | count 1
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
-; RUN:   grep bgt | wc -l | grep 1
+; RUN:   grep bgt | count 1
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -mattr=+vfp2 | \
-; RUN:   grep fcmpezs | wc -l | grep 1
+; RUN:   grep fcmpezs | count 1
 
 void %test(float *%P, double* %D) {
   %A = load float* %P