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

llvm-svn: 41097

38 files changed, 48 insertions, 48 deletions

diff --git a/llvm/test/Transforms/ConstProp/float-to-ptr-cast.ll b/llvm/test/Transforms/ConstProp/float-to-ptr-cast.ll
index f5201defb5a..239b7482bfc 100644
--- a/llvm/test/Transforms/ConstProp/float-to-ptr-cast.ll
+++ b/llvm/test/Transforms/ConstProp/float-to-ptr-cast.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -constprop | llvm-dis | \
-; RUN:    grep -F {ret i32* null} | wc -l | grep 2
+; RUN:    grep -F {ret i32* null} | count 2
 
 int* %test1() {
   %X = cast float 0.0 to int*
diff --git a/llvm/test/Transforms/GVN/basic.ll b/llvm/test/Transforms/GVN/basic.ll
index 8c72e78533f..ebf5daaf927 100644
--- a/llvm/test/Transforms/GVN/basic.ll
+++ b/llvm/test/Transforms/GVN/basic.ll
@@ -7,4 +7,4 @@ block1:
 block2:
   %z2 = bitcast i32 0 to i32
   ret i32 %z2
-}
\ No newline at end of file
+}
diff --git a/llvm/test/Transforms/GVN/dominated.ll b/llvm/test/Transforms/GVN/dominated.ll
index 4a9e97517e4..d7c9417bcf7 100644
--- a/llvm/test/Transforms/GVN/dominated.ll
+++ b/llvm/test/Transforms/GVN/dominated.ll
@@ -17,4 +17,4 @@ block4:
   %DEAD = load i32** %p
   %c = load i32* %DEAD
   ret i32 %c
-}
\ No newline at end of file
+}
diff --git a/llvm/test/Transforms/GVN/mixed.ll b/llvm/test/Transforms/GVN/mixed.ll
index 08c80d60a51..0c4f65cf965 100644
--- a/llvm/test/Transforms/GVN/mixed.ll
+++ b/llvm/test/Transforms/GVN/mixed.ll
@@ -10,4 +10,4 @@ block1:
 	%DEADGEP = getelementptr i32* %DEADLOAD, i32 0
 	%DEADLOAD2 = load i32* %DEADGEP
 	ret i32 %DEADLOAD2
-}
\ No newline at end of file
+}
diff --git a/llvm/test/Transforms/GVN/nonlocal.ll b/llvm/test/Transforms/GVN/nonlocal.ll
index 7e5ef910b54..1618d05efb5 100644
--- a/llvm/test/Transforms/GVN/nonlocal.ll
+++ b/llvm/test/Transforms/GVN/nonlocal.ll
@@ -16,4 +16,4 @@ block4:
   %DEAD = load i32** %p
   %c = load i32* %DEAD
   ret i32 %c
-}
\ No newline at end of file
+}
diff --git a/llvm/test/Transforms/GVN/semidominated.ll b/llvm/test/Transforms/GVN/semidominated.ll
index 89eac46d9c4..95ee56a39c0 100644
--- a/llvm/test/Transforms/GVN/semidominated.ll
+++ b/llvm/test/Transforms/GVN/semidominated.ll
@@ -16,4 +16,4 @@ block3:
 block4:
   %DEAD = load i32* %p
   ret i32 %DEAD
-}
\ No newline at end of file
+}
diff --git a/llvm/test/Transforms/IndVarsSimplify/complex-scev.ll b/llvm/test/Transforms/IndVarsSimplify/complex-scev.ll
index 773d71a20ca..7d7e8a3562f 100644
--- a/llvm/test/Transforms/IndVarsSimplify/complex-scev.ll
+++ b/llvm/test/Transforms/IndVarsSimplify/complex-scev.ll
@@ -1,7 +1,7 @@
 ; The i induction variable looks like a wrap-around, but it really is just
 ; a simple affine IV.  Make sure that indvars eliminates it.
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | grep phi | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | opt -indvars | llvm-dis | grep phi | count 1
 
 void %foo() {
 entry:
diff --git a/llvm/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll b/llvm/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll
index 2c53224e7fe..2c41a37d9a2 100644
--- a/llvm/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll
+++ b/llvm/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:   grep mul | wc -l | grep 2
+; RUN:   grep mul | count 2
 
 
 <4 x float> %test(<4 x float> %V) {
diff --git a/llvm/test/Transforms/InstCombine/2006-12-15-Range-Test.ll b/llvm/test/Transforms/InstCombine/2006-12-15-Range-Test.ll
index cf253a97451..4767558616f 100644
--- a/llvm/test/Transforms/InstCombine/2006-12-15-Range-Test.ll
+++ b/llvm/test/Transforms/InstCombine/2006-12-15-Range-Test.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:   grep icmp | wc -l | grep 1
+; RUN:   grep icmp | count 1
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:   grep {icmp ugt} | wc -l | grep 1
+; RUN:   grep {icmp ugt} | count 1
 ; END.
 
 ; ModuleID = 'bugpoint-tooptimize.bc'
diff --git a/llvm/test/Transforms/InstCombine/and-compare.ll b/llvm/test/Transforms/InstCombine/and-compare.ll
index 5980631c69f..8969f98fc18 100644
--- a/llvm/test/Transforms/InstCombine/and-compare.ll
+++ b/llvm/test/Transforms/InstCombine/and-compare.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:    grep and | wc -l | grep 1
+; RUN:    grep and | count 1
 
 ; Should be optimized to one and.
 bool %test1(uint %a, uint %b) {
diff --git a/llvm/test/Transforms/InstCombine/and-or-not.ll b/llvm/test/Transforms/InstCombine/and-or-not.ll
index e9c7b126843..8fc53a7e0ac 100644
--- a/llvm/test/Transforms/InstCombine/and-or-not.ll
+++ b/llvm/test/Transforms/InstCombine/and-or-not.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep xor | wc -l | grep 4
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep xor | count 4
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep and
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep { or}
 
diff --git a/llvm/test/Transforms/InstCombine/and-xor-merge.ll b/llvm/test/Transforms/InstCombine/and-xor-merge.ll
index c53ebc6f3d3..85f8026ab57 100644
--- a/llvm/test/Transforms/InstCombine/and-xor-merge.ll
+++ b/llvm/test/Transforms/InstCombine/and-xor-merge.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep and | wc -l | grep 1
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep xor | wc -l | grep 2
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep and | count 1
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep xor | count 2
 
 ; (x&z) ^ (y&z) -> (x^y)&z
 define i32 @test1(i32 %x, i32 %y, i32 %z) {
diff --git a/llvm/test/Transforms/InstCombine/apint-and-compare.ll b/llvm/test/Transforms/InstCombine/apint-and-compare.ll
index 4d250a03772..ad2e41d718e 100644
--- a/llvm/test/Transforms/InstCombine/apint-and-compare.ll
+++ b/llvm/test/Transforms/InstCombine/apint-and-compare.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep and | wc -l | grep 2
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep and | count 2
 
 ; Should be optimized to one and.
 define i1 @test1(i33 %a, i33 %b) {
diff --git a/llvm/test/Transforms/InstCombine/apint-and-xor-merge.ll b/llvm/test/Transforms/InstCombine/apint-and-xor-merge.ll
index 665a643afe9..e1e4e3caaef 100644
--- a/llvm/test/Transforms/InstCombine/apint-and-xor-merge.ll
+++ b/llvm/test/Transforms/InstCombine/apint-and-xor-merge.ll
@@ -1,8 +1,8 @@
 ; This test case checks that the merge of and/xor can work on arbitrary
 ; precision integers.
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep and | wc -l | grep 1
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep xor | wc -l | grep 2
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep and | count 1
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep xor | count 2
 
 ; (x &z ) ^ (y & z) -> (x ^ y) & z
 define i57 @test1(i57 %x, i57 %y, i57 %z) {
diff --git a/llvm/test/Transforms/InstCombine/apint-shift-simplify.ll b/llvm/test/Transforms/InstCombine/apint-shift-simplify.ll
index 4c352cf8176..a0046fbacb6 100644
--- a/llvm/test/Transforms/InstCombine/apint-shift-simplify.ll
+++ b/llvm/test/Transforms/InstCombine/apint-shift-simplify.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
-; RUN:    egrep {shl|lshr|ashr} | wc -l | grep 3
+; RUN:    egrep {shl|lshr|ashr} | count 3
 
 define i41 @test0(i41 %A, i41 %B, i41 %C) {
 	%X = shl i41 %A, %C
diff --git a/llvm/test/Transforms/InstCombine/bswap-fold.ll b/llvm/test/Transforms/InstCombine/bswap-fold.ll
index 1552386db1f..8dad43fa734 100644
--- a/llvm/test/Transforms/InstCombine/bswap-fold.ll
+++ b/llvm/test/Transforms/InstCombine/bswap-fold.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:   grep ret | wc -l | grep 3
+; RUN:   grep ret | count 3
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
 ; RUN:   not grep call.*bswap
 
diff --git a/llvm/test/Transforms/InstCombine/bswap.ll b/llvm/test/Transforms/InstCombine/bswap.ll
index fde5ff054fc..d8be73c45e6 100644
--- a/llvm/test/Transforms/InstCombine/bswap.ll
+++ b/llvm/test/Transforms/InstCombine/bswap.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:    grep {call.*llvm.bswap} | wc -l | grep 5
+; RUN:    grep {call.*llvm.bswap} | count 5
 ; END.
 
 uint %test1(uint %i) {
diff --git a/llvm/test/Transforms/InstCombine/loadstore-alignment.ll b/llvm/test/Transforms/InstCombine/loadstore-alignment.ll
index fd8b0e2e17a..82be575b328 100644
--- a/llvm/test/Transforms/InstCombine/loadstore-alignment.ll
+++ b/llvm/test/Transforms/InstCombine/loadstore-alignment.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {, align 16} | wc -l | grep 12
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {, align 16} | count 12
 
 @x = external global <2 x i64>, align 16
 @xx = external global [13 x <2 x i64>], align 16
diff --git a/llvm/test/Transforms/InstCombine/shift-simplify.ll b/llvm/test/Transforms/InstCombine/shift-simplify.ll
index e0283858395..ecf3f5f92fe 100644
--- a/llvm/test/Transforms/InstCombine/shift-simplify.ll
+++ b/llvm/test/Transforms/InstCombine/shift-simplify.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
-; RUN:    egrep {shl|lshr|ashr} | wc -l | grep 3
+; RUN:    egrep {shl|lshr|ashr} | count 3
 
 define i32 @test0(i32 %A, i32 %B, i32 %C) {
 	%X = shl i32 %A, %C
diff --git a/llvm/test/Transforms/InstCombine/shift-sra.ll b/llvm/test/Transforms/InstCombine/shift-sra.ll
index f3907729177..1339eddc879 100644
--- a/llvm/test/Transforms/InstCombine/shift-sra.ll
+++ b/llvm/test/Transforms/InstCombine/shift-sra.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:    grep {lshr i32} | wc -l | grep 2
+; RUN:    grep {lshr i32} | count 2
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep ashr
 
 int %test1(int %X, ubyte %A) {
diff --git a/llvm/test/Transforms/InstCombine/store-merge.ll b/llvm/test/Transforms/InstCombine/store-merge.ll
index 4df30e4ead5..7b117ca7f5f 100644
--- a/llvm/test/Transforms/InstCombine/store-merge.ll
+++ b/llvm/test/Transforms/InstCombine/store-merge.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
-; RUN:    grep {ret i32 %.toremerge} | wc -l | grep 2
+; RUN:    grep {ret i32 %.toremerge} | count 2
 ;; Simple sinking tests
 
 ; "if then else"
diff --git a/llvm/test/Transforms/InstCombine/udiv_select_to_select_shift.ll b/llvm/test/Transforms/InstCombine/udiv_select_to_select_shift.ll
index fe057410cd8..277592c983d 100644
--- a/llvm/test/Transforms/InstCombine/udiv_select_to_select_shift.ll
+++ b/llvm/test/Transforms/InstCombine/udiv_select_to_select_shift.ll
@@ -2,9 +2,9 @@
 ; udiv X, (Select Cond, C1, C2) --> Select Cond, (shr X, C1), (shr X, C2)
 ;
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis -f -o %t
-; RUN:   grep select %t | wc -l | grep 1
-; RUN:   grep lshr %t | wc -l | grep 2 
-; RUN:   ignore grep udiv %t | wc -l | grep 0
+; RUN:   grep select %t | count 1
+; RUN:   grep lshr %t | count 2
+; RUN:   ignore grep udiv %t | count 0
 
 define i64 @test(i64 %X, i1 %Cond ) {
 entry:
diff --git a/llvm/test/Transforms/InstCombine/vec_insert_to_shuffle.ll b/llvm/test/Transforms/InstCombine/vec_insert_to_shuffle.ll
index 54ac8825db0..04d3ee56ebd 100644
--- a/llvm/test/Transforms/InstCombine/vec_insert_to_shuffle.ll
+++ b/llvm/test/Transforms/InstCombine/vec_insert_to_shuffle.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:   grep shufflevec | wc -l | grep 1
+; RUN:   grep shufflevec | count 1
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
 ; RUN:   not grep insertelement
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
diff --git a/llvm/test/Transforms/InstCombine/zext-fold.ll b/llvm/test/Transforms/InstCombine/zext-fold.ll
index 2b66a745da5..690a2275e06 100644
--- a/llvm/test/Transforms/InstCombine/zext-fold.ll
+++ b/llvm/test/Transforms/InstCombine/zext-fold.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {zext } | wc -l | grep 1
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {zext } | count 1
 ; PR1570
 ; XFAIL: *
 
diff --git a/llvm/test/Transforms/LoopSimplify/phi-node-simplify.ll b/llvm/test/Transforms/LoopSimplify/phi-node-simplify.ll
index aa52d66cf96..9427b7a2ed8 100644
--- a/llvm/test/Transforms/LoopSimplify/phi-node-simplify.ll
+++ b/llvm/test/Transforms/LoopSimplify/phi-node-simplify.ll
@@ -1,5 +1,5 @@
 ; Loop Simplify should turn phi nodes like X = phi [X, Y]  into just Y, eliminating them.
-; RUN: llvm-upgrade < %s | llvm-as | opt -loopsimplify | llvm-dis | grep phi | wc -l | grep 6
+; RUN: llvm-upgrade < %s | llvm-as | opt -loopsimplify | llvm-dis | grep phi | count 6
 
 %A = weak global [3000000 x int] zeroinitializer		; <[3000000 x int]*> [#uses=1]
 %B = weak global [20000 x int] zeroinitializer		; <[20000 x int]*> [#uses=1]
diff --git a/llvm/test/Transforms/LoopStrengthReduce/dont_insert_redundant_ops.ll b/llvm/test/Transforms/LoopStrengthReduce/dont_insert_redundant_ops.ll
index aecade80d79..1954a20446a 100644
--- a/llvm/test/Transforms/LoopStrengthReduce/dont_insert_redundant_ops.ll
+++ b/llvm/test/Transforms/LoopStrengthReduce/dont_insert_redundant_ops.ll
@@ -1,5 +1,5 @@
 ; Check that this test makes INDVAR and related stuff dead.
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | grep phi | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | grep phi | count 2
 
 declare bool %pred()
 
diff --git a/llvm/test/Transforms/LoopStrengthReduce/related_indvars.ll b/llvm/test/Transforms/LoopStrengthReduce/related_indvars.ll
index 533279b9eb1..c1cd8d218fc 100644
--- a/llvm/test/Transforms/LoopStrengthReduce/related_indvars.ll
+++ b/llvm/test/Transforms/LoopStrengthReduce/related_indvars.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | grep phi | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | grep phi | count 1
 
 ; This should only result in one PHI node!
 
diff --git a/llvm/test/Transforms/LoopStrengthReduce/share_code_in_preheader.ll b/llvm/test/Transforms/LoopStrengthReduce/share_code_in_preheader.ll
index d8316a52bcc..27c72d2852e 100644
--- a/llvm/test/Transforms/LoopStrengthReduce/share_code_in_preheader.ll
+++ b/llvm/test/Transforms/LoopStrengthReduce/share_code_in_preheader.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | grep mul | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | grep mul | count 1
 ; LSR should not make two copies of the Q*L expression in the preheader!
 
 sbyte %test(sbyte* %A, sbyte* %B, int %L, int %Q, int %N.s) {
diff --git a/llvm/test/Transforms/LoopStrengthReduce/share_ivs.ll b/llvm/test/Transforms/LoopStrengthReduce/share_ivs.ll
index 76bfe1d529c..edc29b74422 100644
--- a/llvm/test/Transforms/LoopStrengthReduce/share_ivs.ll
+++ b/llvm/test/Transforms/LoopStrengthReduce/share_ivs.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | grep phi | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | grep phi | count 1
 
 ; This testcase should have ONE stride 18 indvar, the other use should have a
 ; loop invariant value (B) added to it inside of the loop, instead of having
diff --git a/llvm/test/Transforms/LoopUnswitch/2007-07-18-DomInfo.ll b/llvm/test/Transforms/LoopUnswitch/2007-07-18-DomInfo.ll
index 9c2f938afa7..edd7d1ff58e 100644
--- a/llvm/test/Transforms/LoopUnswitch/2007-07-18-DomInfo.ll
+++ b/llvm/test/Transforms/LoopUnswitch/2007-07-18-DomInfo.ll
@@ -63,4 +63,4 @@ bb5700:         ; preds = %bb147
 
 normal_char:            ; preds = %bb147
         ret i32 0
-}
\ No newline at end of file
+}
diff --git a/llvm/test/Transforms/LowerSwitch/feature.ll b/llvm/test/Transforms/LowerSwitch/feature.ll
index 0b3cdc780fb..7523ad235b6 100644
--- a/llvm/test/Transforms/LowerSwitch/feature.ll
+++ b/llvm/test/Transforms/LowerSwitch/feature.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-as %s -o - | opt -lowerswitch | llvm-dis > %t
-; RUN: grep slt %t | wc -l | grep 10
-; RUN: grep ule %t | wc -l | grep 3
-; RUN: grep eq  %t | wc -l | grep 9
+; RUN: grep slt %t | count 10
+; RUN: grep ule %t | count 3
+; RUN: grep eq  %t | count 9
 
 define i32 @main(i32 %tmp158) {
 entry:
diff --git a/llvm/test/Transforms/Reassociate/basictest3.ll b/llvm/test/Transforms/Reassociate/basictest3.ll
index a3da5a0400a..4aa134ae7fb 100644
--- a/llvm/test/Transforms/Reassociate/basictest3.ll
+++ b/llvm/test/Transforms/Reassociate/basictest3.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -gcse | llvm-dis | grep add | wc -l | grep 6
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -gcse | llvm-dis | grep add | count 6
 ; Each of these functions should turn into two adds each.
 
 %e = external global int
diff --git a/llvm/test/Transforms/Reassociate/mul-factor3.ll b/llvm/test/Transforms/Reassociate/mul-factor3.ll
index 1272ff62dd8..c6aeedefcf4 100644
--- a/llvm/test/Transforms/Reassociate/mul-factor3.ll
+++ b/llvm/test/Transforms/Reassociate/mul-factor3.ll
@@ -2,8 +2,8 @@
 
 ; RUN: llvm-upgrade < %s | llvm-as | \
 ; RUN:   opt -reassociate -instcombine | llvm-dis > %t 
-; RUN: grep mul %t | wc -l | grep 2
-; RUN: grep add %t | wc -l | grep 1
+; RUN: grep mul %t | count 2
+; RUN: grep add %t | count 1
 
 int %test(int %A, int %B, int %C) {
 	%aa = mul int %A, %A
diff --git a/llvm/test/Transforms/Reassociate/mulfactor.ll b/llvm/test/Transforms/Reassociate/mulfactor.ll
index bb7efc3f7a2..91667a4c54b 100644
--- a/llvm/test/Transforms/Reassociate/mulfactor.ll
+++ b/llvm/test/Transforms/Reassociate/mulfactor.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep mul | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep mul | count 2
 
 ; This should have exactly 2 multiplies when we're done.
 
diff --git a/llvm/test/Transforms/Reassociate/mulfactor2.ll b/llvm/test/Transforms/Reassociate/mulfactor2.ll
index dd1e8ae8a35..61c9f0444ac 100644
--- a/llvm/test/Transforms/Reassociate/mulfactor2.ll
+++ b/llvm/test/Transforms/Reassociate/mulfactor2.ll
@@ -2,8 +2,8 @@
 
 ; RUN: llvm-upgrade < %s | llvm-as | \
 ; RUN:   opt -instcombine -reassociate -instcombine | llvm-dis -o %t 
-; RUN: grep mul %t | wc -l | grep 1
-; RUN: grep add %t | wc -l | grep 1
+; RUN: grep mul %t | count 1
+; RUN: grep add %t | count 1
 
 int %main(int %t) {
         %tmp.3 = mul int %t, 12         ; <int> [#uses=1]
diff --git a/llvm/test/Transforms/Reassociate/shift-factor.ll b/llvm/test/Transforms/Reassociate/shift-factor.ll
index ed8ed392c5f..b381d45f798 100644
--- a/llvm/test/Transforms/Reassociate/shift-factor.ll
+++ b/llvm/test/Transforms/Reassociate/shift-factor.ll
@@ -1,8 +1,8 @@
 ; There should be exactly one shift and one add left.
 ; RUN: llvm-upgrade < %s | llvm-as | \
 ; RUN:   opt -reassociate -instcombine | llvm-dis > %t  
-; RUN: grep shl %t | wc -l | grep 1
-; RUN: grep add %t | wc -l | grep 1
+; RUN: grep shl %t | count 1
+; RUN: grep add %t | count 1
 
 int %test(int %X, int %Y) {
         %tmp.2 = shl int %X, ubyte 1            ; <int> [#uses=1]
diff --git a/llvm/test/Transforms/SimplifyCFG/branch-fold.ll b/llvm/test/Transforms/SimplifyCFG/branch-fold.ll
index f13f82676b3..aeea929903e 100644
--- a/llvm/test/Transforms/SimplifyCFG/branch-fold.ll
+++ b/llvm/test/Transforms/SimplifyCFG/branch-fold.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | grep {br i1} | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | grep {br i1} | count 1
 
 void %test(int* %P, int* %Q, bool %A, bool %B) {
 	br bool %A, label %a, label %b   ;; fold the two branches into one
diff --git a/llvm/test/Transforms/SimplifyCFG/switch_switch_fold.ll b/llvm/test/Transforms/SimplifyCFG/switch_switch_fold.ll
index 5403955da47..5cfa4ea182f 100644
--- a/llvm/test/Transforms/SimplifyCFG/switch_switch_fold.ll
+++ b/llvm/test/Transforms/SimplifyCFG/switch_switch_fold.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -simplifycfg | llvm-dis | \
-; RUN:   grep switch | wc -l | grep 1
+; RUN:   grep switch | count 1
 
 ; Test that a switch going to a switch on the same value can be merged.   All 
 ; three switches in this example can be merged into one big one.