diff options
| author | Dan Gohman <gohman@apple.com> | 2007-08-15 13:36:28 +0000 |
|---|---|---|
| committer | Dan Gohman <gohman@apple.com> | 2007-08-15 13:36:28 +0000 |
| commit | 28beeeac4db2d582d4947db96d62e423e4b68d88 (patch) | |
| tree | 3a500b846e77d285021ec12e3ef0bbe69c498b82 | |
| parent | 7375bb9c8c82115dd401d67f0baaf30d6c481bd0 (diff) | |
| download | llvm-28beeeac4db2d582d4947db96d62e423e4b68d88.tar.gz llvm-28beeeac4db2d582d4947db96d62e423e4b68d88.tar.bz2 llvm-28beeeac4db2d582d4947db96d62e423e4b68d88.tar.xz | |
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
228 files changed, 467 insertions, 467 deletions
diff --git a/test/Analysis/LoadVN/casts.ll b/test/Analysis/LoadVN/casts.ll index 3da4d57301..3749bee366 100644 --- a/test/Analysis/LoadVN/casts.ll +++ b/test/Analysis/LoadVN/casts.ll @@ -1,7 +1,7 @@ ; Check to make sure that Value Numbering doesn't merge casts of different ; flavors. ; RUN: llvm-upgrade < %s | llvm-as | opt -load-vn -gcse | llvm-dis | \ -; RUN: grep {\[sz\]ext} | wc -l | grep 2 +; RUN: grep {\[sz\]ext} | count 2 declare void %external(int) diff --git a/test/Assembler/2007-01-12-Varargs-Upgrade.ll b/test/Assembler/2007-01-12-Varargs-Upgrade.ll index e5f0ab2784..0cc14cc790 100644 --- a/test/Assembler/2007-01-12-Varargs-Upgrade.ll +++ b/test/Assembler/2007-01-12-Varargs-Upgrade.ll @@ -1,7 +1,7 @@ ; For PR1093: This test checks that llvm-upgrade correctly translates ; the llvm.va_* intrinsics to their cannonical argument form (i8*). ; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | \ -; RUN: grep { bitcast} | wc -l | grep 5 +; RUN: grep { bitcast} | count 5 %str = internal constant [7 x ubyte] c"%d %d\0A\00" ; <[7 x ubyte]*> [#uses=1] diff --git a/test/Assembler/2007-01-27-UpgradePointers.ll b/test/Assembler/2007-01-27-UpgradePointers.ll index 41ce1a6a22..c8e817e42e 100644 --- a/test/Assembler/2007-01-27-UpgradePointers.ll +++ b/test/Assembler/2007-01-27-UpgradePointers.ll @@ -1,6 +1,6 @@ ; PR1137 ; RUN: llvm-upgrade < %s | llvm-as -o /dev/null -f -; RUN: llvm-upgrade < %s | grep {tmp = alloca} | wc -l | grep 1 +; RUN: llvm-upgrade < %s | grep {tmp = alloca} | count 1 ; target datalayout = "e-p:32:32" target endian = little diff --git a/test/C++Frontend/2007-04-11-InlineStorageClassC++.cpp b/test/C++Frontend/2007-04-11-InlineStorageClassC++.cpp index 8f3723ba17..eabcd57327 100644 --- a/test/C++Frontend/2007-04-11-InlineStorageClassC++.cpp +++ b/test/C++Frontend/2007-04-11-InlineStorageClassC++.cpp @@ -1,17 +1,17 @@ // RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | \ -// RUN: grep xglobWeak | grep linkonce | wc -l | grep 1 +// RUN: grep xglobWeak | grep linkonce | count 1 // RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | \ -// RUN: grep xextWeak | grep linkonce | wc -l | grep 1 +// RUN: grep xextWeak | grep linkonce | count 1 // RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | \ -// RUN: grep xWeaknoinline | grep weak | wc -l | grep 1 +// RUN: grep xWeaknoinline | grep weak | count 1 // RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | \ -// RUN: grep xWeakextnoinline | grep weak | wc -l | grep 1 +// RUN: grep xWeakextnoinline | grep weak | count 1 // RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | \ -// RUN: grep xglobnoWeak | grep linkonce | wc -l | grep 1 +// RUN: grep xglobnoWeak | grep linkonce | count 1 // RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | \ -// RUN: grep xstatnoWeak | grep internal | wc -l | grep 1 +// RUN: grep xstatnoWeak | grep internal | count 1 // RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | \ -// RUN: grep xextnoWeak | grep linkonce | wc -l | grep 1 +// RUN: grep xextnoWeak | grep linkonce | count 1 inline int xglobWeak(int) __attribute__((weak)); inline int xglobWeak (int i) { return i*2; diff --git a/test/CFrontend/2004-02-13-BuiltinFrameReturnAddress.c.tr b/test/CFrontend/2004-02-13-BuiltinFrameReturnAddress.c.tr index 6fc077d3e8..162d32a658 100644 --- a/test/CFrontend/2004-02-13-BuiltinFrameReturnAddress.c.tr +++ b/test/CFrontend/2004-02-13-BuiltinFrameReturnAddress.c.tr @@ -1,4 +1,4 @@ -// RUN: %llvmgcc -xc %s -c -o - | llvm-dis | grep llvm.*address | wc -l | grep 4 +// RUN: %llvmgcc -xc %s -c -o - | llvm-dis | grep llvm.*address | count 4 void *test1() { return __builtin_return_address(1); diff --git a/test/CFrontend/2004-02-13-Memset.c b/test/CFrontend/2004-02-13-Memset.c index ca0db7a18b..89ab9b9e4c 100644 --- a/test/CFrontend/2004-02-13-Memset.c +++ b/test/CFrontend/2004-02-13-Memset.c @@ -1,4 +1,4 @@ -// RUN: %llvmgcc -xc %s -c -o - | llvm-dis | grep llvm.memset | wc -l | grep 3 +// RUN: %llvmgcc -xc %s -c -o - | llvm-dis | grep llvm.memset | count 3 void test(int* X, char *Y) { memset(X, 4, 1000); diff --git a/test/CFrontend/2006-01-16-BitCountIntrinsicsUnsigned.c b/test/CFrontend/2006-01-16-BitCountIntrinsicsUnsigned.c index ee74432db3..598ffb5132 100644 --- a/test/CFrontend/2006-01-16-BitCountIntrinsicsUnsigned.c +++ b/test/CFrontend/2006-01-16-BitCountIntrinsicsUnsigned.c @@ -1,5 +1,5 @@ -// RUN: %llvmgcc -S %s -o - | grep {llvm.ctlz.i32( i32} | wc -l | grep 2 -// RUN: %llvmgcc -S %s -o - | grep {llvm.ctlz.i32(i32} | wc -l | grep 1 +// RUN: %llvmgcc -S %s -o - | grep {llvm.ctlz.i32( i32} | count 2 +// RUN: %llvmgcc -S %s -o - | grep {llvm.ctlz.i32(i32} | count 1 unsigned t2(unsigned X) { return __builtin_clz(X); diff --git a/test/CFrontend/2006-01-23-FileScopeAsm.c b/test/CFrontend/2006-01-23-FileScopeAsm.c index 57f79392ed..fb55a41e87 100644 --- a/test/CFrontend/2006-01-23-FileScopeAsm.c +++ b/test/CFrontend/2006-01-23-FileScopeAsm.c @@ -1,5 +1,5 @@ // RUN: %llvmgcc %s -S -o - | llvm-as | opt -std-compile-opts | \ -// RUN: llvm-dis | grep {foo\[12345\]} | wc -l | grep 5 +// RUN: llvm-dis | grep {foo\[12345\]} | count 5 __asm__ ("foo1"); __asm__ ("foo2"); diff --git a/test/CFrontend/2007-04-11-InlineStorageClassC89.c b/test/CFrontend/2007-04-11-InlineStorageClassC89.c index ca4ed331ca..ab1f556b84 100644 --- a/test/CFrontend/2007-04-11-InlineStorageClassC89.c +++ b/test/CFrontend/2007-04-11-InlineStorageClassC89.c @@ -1,19 +1,19 @@ // RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | grep xglobWeak | \ -// RUN: grep weak | wc -l | grep 1 +// RUN: grep weak | count 1 // RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | grep xextWeak | \ -// RUN: grep weak | wc -l | grep 1 +// RUN: grep weak | count 1 // RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | \ -// RUN: grep xWeaknoinline | grep weak | wc -l | grep 1 +// RUN: grep xWeaknoinline | grep weak | count 1 // RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | \ -// RUN: grep xWeakextnoinline | grep weak | wc -l | grep 1 +// RUN: grep xWeakextnoinline | grep weak | count 1 // RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | \ // RUN: grep xglobnoWeak | grep -v internal | grep -v weak | \ -// RUN: grep -v linkonce | wc -l | grep 1 +// RUN: grep -v linkonce | count 1 // RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | \ -// RUN: grep xstatnoWeak | grep internal | wc -l | grep 1 +// RUN: grep xstatnoWeak | grep internal | count 1 // RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep declare | \ // RUN: grep xextnoWeak | grep -v internal | grep -v weak | \ -// RUN: grep -v linkonce | wc -l | grep 1 +// RUN: grep -v linkonce | count 1 inline int xglobWeak(int) __attribute__((weak)); inline int xglobWeak (int i) { return i*2; diff --git a/test/CFrontend/2007-04-11-InlineStorageClassC99.c b/test/CFrontend/2007-04-11-InlineStorageClassC99.c index 2f09268b3f..f6193aa0ff 100644 --- a/test/CFrontend/2007-04-11-InlineStorageClassC99.c +++ b/test/CFrontend/2007-04-11-InlineStorageClassC99.c @@ -1,19 +1,19 @@ // RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep declare | \ -// RUN: grep xglobWeak | grep extern_weak | wc -l | grep 1 +// RUN: grep xglobWeak | grep extern_weak | count 1 // RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \ -// RUN: grep xextWeak | grep weak | wc -l | grep 1 +// RUN: grep xextWeak | grep weak | count 1 // RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \ -// RUN: grep xWeaknoinline | grep weak | wc -l | grep 1 +// RUN: grep xWeaknoinline | grep weak | count 1 // RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \ -// RUN: grep xWeakextnoinline | grep weak | wc -l | grep 1 +// RUN: grep xWeakextnoinline | grep weak | count 1 // RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep declare | \ // RUN: grep xglobnoWeak | grep -v internal | grep -v weak | \ -// RUN: grep -v linkonce | wc -l | grep 1 +// RUN: grep -v linkonce | count 1 // RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \ -// RUN: grep xstatnoWeak | grep internal | wc -l | grep 1 +// RUN: grep xstatnoWeak | grep internal | count 1 // RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \ // RUN: grep xextnoWeak | grep -v internal | grep -v weak | \ -// RUN: grep -v linkonce | wc -l | grep 1 +// RUN: grep -v linkonce | count 1 inline int xglobWeak(int) __attribute__((weak)); inline int xglobWeak (int i) { return i*2; diff --git a/test/CFrontend/2007-07-29-RestrictPtrArg.c b/test/CFrontend/2007-07-29-RestrictPtrArg.c index be09108b34..d54dfbe571 100644 --- a/test/CFrontend/2007-07-29-RestrictPtrArg.c +++ b/test/CFrontend/2007-07-29-RestrictPtrArg.c @@ -3,4 +3,4 @@ void foo(int * __restrict myptr1, int * myptr2) { myptr1[0] = 0; myptr2[0] = 0; -}
\ No newline at end of file +} diff --git a/test/CFrontend/sret.c b/test/CFrontend/sret.c index 5324cae368..9e34d7561e 100644 --- a/test/CFrontend/sret.c +++ b/test/CFrontend/sret.c @@ -1,4 +1,4 @@ -// RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep sret | wc -l | grep 5 +// RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep sret | count 5 struct abc { int a; 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 diff --git a/test/CodeGen/Alpha/2005-07-12-TwoMallocCalls.ll b/test/CodeGen/Alpha/2005-07-12-TwoMallocCalls.ll index 59c65053e5..2c3ba9dda0 100644 --- a/test/CodeGen/Alpha/2005-07-12-TwoMallocCalls.ll +++ b/test/CodeGen/Alpha/2005-07-12-TwoMallocCalls.ll @@ -1,5 +1,5 @@ ; There should be exactly two calls here (memset and malloc), no more. -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep jsr | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep jsr | count 2 %typedef.bc_struct = type opaque diff --git a/test/CodeGen/Alpha/add.ll b/test/CodeGen/Alpha/add.ll index add5e0c67a..260584b790 100644 --- a/test/CodeGen/Alpha/add.ll +++ b/test/CodeGen/Alpha/add.ll @@ -1,21 +1,21 @@ ;test all the shifted and signextending adds and subs with and without consts ; ; RUN: llvm-as < %s | llc -march=alpha -o %t.s -f -; RUN: grep { addl} %t.s | wc -l | grep 2 -; RUN: grep { addq} %t.s | wc -l | grep 2 -; RUN: grep { subl} %t.s | wc -l | grep 2 -; RUN: grep { subq} %t.s | wc -l | grep 1 +; RUN: grep { addl} %t.s | count 2 +; RUN: grep { addq} %t.s | count 2 +; RUN: grep { subl} %t.s | count 2 +; RUN: grep { subq} %t.s | count 1 ; -; RUN: grep {lda \$0,-100(\$16)} %t.s | wc -l | grep 1 -; RUN: grep {s4addl} %t.s | wc -l | grep 2 -; RUN: grep {s8addl} %t.s | wc -l | grep 2 -; RUN: grep {s4addq} %t.s | wc -l | grep 2 -; RUN: grep {s8addq} %t.s | wc -l | grep 2 +; RUN: grep {lda \$0,-100(\$16)} %t.s | count 1 +; RUN: grep {s4addl} %t.s | count 2 +; RUN: grep {s8addl} %t.s | count 2 +; RUN: grep {s4addq} %t.s | count 2 +; RUN: grep {s8addq} %t.s | count 2 ; -; RUN: grep {s4subl} %t.s | wc -l | grep 2 -; RUN: grep {s8subl} %t.s | wc -l | grep 2 -; RUN: grep {s4subq} %t.s | wc -l | grep 2 -; RUN: grep {s8subq} %t.s | wc -l | grep 2 +; RUN: grep {s4subl} %t.s | count 2 +; RUN: grep {s8subl} %t.s | count 2 +; RUN: grep {s4subq} %t.s | count 2 +; RUN: grep {s8subq} %t.s | count 2 define i32 @al(i32 signext %x.s, i32 signext %y.s) signext { diff --git a/test/CodeGen/Alpha/cmpbge.ll b/test/CodeGen/Alpha/cmpbge.ll index b7b1c09ce0..e99a6b1e37 100644 --- a/test/CodeGen/Alpha/cmpbge.ll +++ b/test/CodeGen/Alpha/cmpbge.ll @@ -1,4 +1,4 @@ -; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep cmpbge | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=alpha | grep cmpbge | count 2 bool %test1(ulong %A, ulong %B) { %C = and ulong %A, 255 diff --git a/test/CodeGen/CBackend/2006-12-11-Float-Bitcast.ll b/test/CodeGen/CBackend/2006-12-11-Float-Bitcast.ll index 5c6babfafe..df03c4e6ba 100644 --- a/test/CodeGen/CBackend/2006-12-11-Float-Bitcast.ll +++ b/test/CodeGen/CBackend/2006-12-11-Float-Bitcast.ll @@ -1,5 +1,5 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=c | \ -; RUN: grep __BITCAST | wc -l | grep 14 +; RUN: grep __BITCAST | count 14 int %test1(float %F) { %X = bitcast float %F to int diff --git a/test/CodeGen/Generic/SwitchLowering.ll b/test/CodeGen/Generic/SwitchLowering.ll index 37bfffaa02..a8c14f18a0 100644 --- a/test/CodeGen/Generic/SwitchLowering.ll +++ b/test/CodeGen/Generic/SwitchLowering.ll @@ -1,4 +1,4 @@ -; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep cmp | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep cmp | count 1 ; PR964 sbyte* %FindChar(sbyte* %CurPtr) { diff --git a/test/CodeGen/Generic/phi-immediate-factoring.ll b/test/CodeGen/Generic/phi-immediate-factoring.ll index 70fa9e7624..e0f675976d 100644 --- a/test/CodeGen/Generic/phi-immediate-factoring.ll +++ b/test/CodeGen/Generic/phi-immediate-factoring.ll @@ -1,5 +1,5 @@ ; PR1296 -; RUN: llvm-as < %s | llc -march=x86 | grep {movl \$1} | wc -l | grep 1 +; RUN: llvm-as < %s | llc -march=x86 | grep {movl \$1} | count 1 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64" target triple = "i686-apple-darwin8" diff --git a/test/CodeGen/Generic/switch-crit-edge-constant.ll b/test/CodeGen/Generic/switch-crit-edge-constant.ll index ef986e0ed5..c9d027bade 100644 --- a/test/CodeGen/Generic/switch-crit-edge-constant.ll +++ b/test/CodeGen/Generic/switch-crit-edge-constant.ll @@ -1,6 +1,6 @@ ; PR925 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | \ -; RUN: grep mov.*str1 | wc -l | grep 1 +; RUN: grep mov.*str1 | count 1 target endian = little target pointersize = 32 diff --git a/test/CodeGen/Generic/switch-lower-feature-2.ll b/test/CodeGen/Generic/switch-lower-feature-2.ll index 6552cb1b34..5e532a8db3 100644 --- a/test/CodeGen/Generic/switch-lower-feature-2.ll +++ b/test/CodeGen/Generic/switch-lower-feature-2.ll @@ -1,13 +1,13 @@ ; RUN: llvm-as < %s | llc -march=x86 -o %t -f -; RUN: grep jb %t | wc -l | grep 1 -; RUN: grep \\\$6 %t | wc -l | grep 2 -; RUN: grep 1024 %t | wc -l | grep 1 -; RUN: grep 1023 %t | wc -l | grep 1 -; RUN: grep 119 %t | wc -l | grep 1 -; RUN: grep JTI %t | wc -l | grep 2 -; RUN: grep jg %t | wc -l | grep 1 -; RUN: grep ja %t | wc -l | grep 1 -; RUN: grep js %t | wc -l | grep 1 +; RUN: grep jb %t | count 1 +; RUN: grep \\\$6 %t | count 2 +; RUN: grep 1024 %t | count 1 +; RUN: grep 1023 %t | count 1 +; RUN: grep 119 %t | count 1 +; RUN: grep JTI %t | count 2 +; RUN: grep jg %t | count 1 +; RUN: grep ja %t | count 1 +; RUN: grep js %t | count 1 target triple = "i686-pc-linux-gnu" diff --git a/test/CodeGen/Generic/switch-lower-feature.ll b/test/CodeGen/Generic/switch-lower-feature.ll index 71dbc26b8f..989693cf3f 100644 --- a/test/CodeGen/Generic/switch-lower-feature.ll +++ b/test/CodeGen/Generic/switch-lower-feature.ll @@ -1,8 +1,8 @@ -; RUN: llvm-as < %s | llc -march=x86 -o - | grep \$7 | wc -l | grep 1 -; RUN: llvm-as < %s | llc -march=x86 -o - | grep \$6 | wc -l | grep 1 -; RUN: llvm-as < %s | llc -march=x86 -o - | grep 1024 | wc -l | grep 1 -; RUN: llvm-as < %s | llc -march=x86 -o - | grep jb | wc -l | grep 2 -; RUN: llvm-as < %s | llc -march=x86 -o - | grep je | wc -l | grep 1 +; RUN: llvm-as < %s | llc -march=x86 -o - | grep \$7 | count 1 +; RUN: llvm-as < %s | llc -march=x86 -o - | grep \$6 | count 1 +; RUN: llvm-as < %s | llc -march=x86 -o - | grep 1024 | count 1 +; RUN: llvm-as < %s | llc -march=x86 -o - | grep jb | count 2 +; RUN: llvm-as < %s | llc -march=x86 -o - | grep je | count 1 define i32 @main(i32 %tmp158) { entry: diff --git a/test/CodeGen/PowerPC/2005-09-02-LegalizeDuplicatesCalls.ll b/test/CodeGen/PowerPC/2005-09-02-LegalizeDuplicatesCalls.ll index 7bb13176f3..4f78ce6b49 100644 --- a/test/CodeGen/PowerPC/2005-09-02-LegalizeDuplicatesCalls.ll +++ b/test/CodeGen/PowerPC/2005-09-02-LegalizeDuplicatesCalls.ll @@ -1,7 +1,7 @@ ; This function should have exactly one call to fixdfdi, no more! ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mattr=-64bit | \ -; RUN: grep {bl .*fixdfdi} | wc -l | grep 1 +; RUN: grep {bl .*fixdfdi} | count 1 double %test2(double %tmp.7705) { %mem_tmp.2.0.in = cast double %tmp.7705 to long ; <long> [#uses=1] diff --git a/test/CodeGen/PowerPC/2006-07-07-ComputeMaskedBits.ll b/test/CodeGen/PowerPC/2006-07-07-ComputeMaskedBits.ll index 10260725f0..8423bf2552 100644 --- a/test/CodeGen/PowerPC/2006-07-07-ComputeMaskedBits.ll +++ b/test/CodeGen/PowerPC/2006-07-07-ComputeMaskedBits.ll @@ -1,4 +1,4 @@ -; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=powerpc64-apple-darwin | grep extsw | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=powerpc64-apple-darwin | grep extsw | count 2 %lens = external global ubyte* %vals = external global int* diff --git a/test/CodeGen/PowerPC/2007-02-23-lr-saved-twice.ll b/test/CodeGen/PowerPC/2007-02-23-lr-saved-twice.ll index 3a7d393db8..3eef9c551b 100644 --- a/test/CodeGen/PowerPC/2007-02-23-lr-saved-twice.ll +++ b/test/CodeGen/PowerPC/2007-02-23-lr-saved-twice.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc | grep mflr | wc -l | grep 1 +; RUN: llvm-as < %s | llc | grep mflr | count 1 target datalayout = "e-p:32:32" target triple = "powerpc-apple-darwin8" diff --git a/test/CodeGen/PowerPC/2007-05-22-tailmerge-3.ll b/test/CodeGen/PowerPC/2007-05-22-tailmerge-3.ll index 0aebeb9618..5a86418f7c 100644 --- a/test/CodeGen/PowerPC/2007-05-22-tailmerge-3.ll +++ b/test/CodeGen/PowerPC/2007-05-22-tailmerge-3.ll @@ -1,7 +1,7 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | grep bl.*baz | wc -l | grep 2 -; RUN: llvm-as < %s | llc -march=ppc32 | grep bl.*quux | wc -l | grep 2 -; RUN: llvm-as < %s | llc -march=ppc32 -enable-tail-merge | grep bl.*baz | wc -l | grep 1 -; RUN: llvm-as < %s | llc -march=ppc32 -enable-tail-merge=1 | grep bl.*quux | wc -l | grep 1 +; RUN: llvm-as < %s | llc -march=ppc32 | grep bl.*baz | count 2 +; RUN: llvm-as < %s | llc -march=ppc32 | grep bl.*quux | count 2 +; RUN: llvm-as < %s | llc -march=ppc32 -enable-tail-merge | grep bl.*baz | count 1 +; RUN: llvm-as < %s | llc -march=ppc32 -enable-tail-merge=1 | grep bl.*quux | count 1 ; Check that tail merging is not the default on ppc, and that -enable-tail-merge works. ; ModuleID = 'tail.c' diff --git a/test/CodeGen/PowerPC/addc.ll b/test/CodeGen/PowerPC/addc.ll index b268389d1c..7bbd1eb039 100644 --- a/test/CodeGen/PowerPC/addc.ll +++ b/test/CodeGen/PowerPC/addc.ll @@ -1,10 +1,10 @@ ; All of these should be codegen'd without loading immediates ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -o %t -f -; RUN: grep addc %t | wc -l | grep 1 -; RUN: grep adde %t | wc -l | grep 1 -; RUN: grep addze %t | wc -l | grep 1 -; RUN: grep addme %t | wc -l | grep 1 -; RUN: grep addic %t | wc -l | grep 2 +; RUN: grep addc %t | count 1 +; RUN: grep adde %t | count 1 +; RUN: grep addze %t | count 1 +; RUN: grep addme %t | count 1 +; RUN: grep addic %t | count 2 implementation ; Functions: diff --git a/test/CodeGen/PowerPC/align.ll b/test/CodeGen/PowerPC/align.ll index caf4a5d658..9a448f95a4 100644 --- a/test/CodeGen/PowerPC/align.ll +++ b/test/CodeGen/PowerPC/align.ll @@ -1,9 +1,9 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | \ -; RUN: grep align.4 | wc -l | grep 1 +; RUN: grep align.4 | count 1 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | \ -; RUN: grep align.2 | wc -l | grep 1 +; RUN: grep align.2 | count 1 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | \ -; RUN: grep align.3 | wc -l | grep 1 +; RUN: grep align.3 | count 1 %A = global <4 x uint> < uint 10, uint 20, uint 30, uint 40 > diff --git a/test/CodeGen/PowerPC/branch-opt.ll b/test/CodeGen/PowerPC/branch-opt.ll index ab550a35b1..dfa80c65f9 100644 --- a/test/CodeGen/PowerPC/branch-opt.ll +++ b/test/CodeGen/PowerPC/branch-opt.ll @@ -1,5 +1,5 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | \ -; RUN: grep {b LBB.*} | wc -l | grep 4 +; RUN: grep {b LBB.*} | count 4 target endian = big target pointersize = 32 diff --git a/test/CodeGen/PowerPC/bswap-load-store.ll b/test/CodeGen/PowerPC/bswap-load-store.ll index 0c4a117273..272964ac46 100644 --- a/test/CodeGen/PowerPC/bswap-load-store.ll +++ b/test/CodeGen/PowerPC/bswap-load-store.ll @@ -1,9 +1,9 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | \ -; RUN: grep {stwbrx\\|lwbrx\\|sthbrx\\|lhbrx} | wc -l | grep 4 +; RUN: grep {stwbrx\\|lwbrx\\|sthbrx\\|lhbrx} | count 4 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep rlwinm ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep rlwimi ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | \ -; RUN: grep {stwbrx\\|lwbrx\\|sthbrx\\|lhbrx} | wc -l | grep 4 +; RUN: grep {stwbrx\\|lwbrx\\|sthbrx\\|lhbrx} | count 4 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | not grep rlwinm ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc64 | not grep rlwimi diff --git a/test/CodeGen/PowerPC/buildvec_canonicalize.ll b/test/CodeGen/PowerPC/buildvec_canonicalize.ll index 54cbdae914..e06090c192 100644 --- a/test/CodeGen/PowerPC/buildvec_canonicalize.ll +++ b/test/CodeGen/PowerPC/buildvec_canonicalize.ll @@ -1,12 +1,12 @@ ; There should be exactly one vxor here. ; RUN: llvm-upgrade < %s | llvm-as | \ ; RUN: llc -march=ppc32 -mcpu=g5 --enable-unsafe-fp-math | \ -; RUN: grep vxor | wc -l | grep 1 +; RUN: grep vxor | count 1 ; There should be exactly one vsplti here. ; RUN: llvm-upgrade < %s | llvm-as | \ ; RUN: llc -march=ppc32 -mcpu=g5 --enable-unsafe-fp-math | \ -; RUN: grep vsplti | wc -l | grep 1 +; RUN: grep vsplti | count 1 void %VXOR(<4 x float>* %P1, <4 x int>* %P2, <4 x float>* %P3) { diff --git a/test/CodeGen/PowerPC/calls.ll b/test/CodeGen/PowerPC/calls.ll index f2a6003673..3bd608ab59 100644 --- a/test/CodeGen/PowerPC/calls.ll +++ b/test/CodeGen/PowerPC/calls.ll @@ -1,11 +1,11 @@ ; Test various forms of calls. ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | \ -; RUN: grep {bl } | wc -l | grep 2 +; RUN: grep {bl } | count 2 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | \ -; RUN: grep {bctrl} | wc -l | grep 1 +; RUN: grep {bctrl} | count 1 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | \ -; RUN: grep {bla } | wc -l | grep 1 +; RUN: grep {bla } | count 1 declare void %foo() diff --git a/test/CodeGen/PowerPC/constants.ll b/test/CodeGen/PowerPC/constants.ll index 4689a62f3b..0c0d4edc15 100644 --- a/test/CodeGen/PowerPC/constants.ll +++ b/test/CodeGen/PowerPC/constants.ll @@ -1,10 +1,10 @@ ; All of these routines should be perform optimal load of constants. ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | \ -; RUN: grep lis | wc -l | grep 5 +; RUN: grep lis | count 5 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | \ -; RUN: grep ori | wc -l | grep 3 +; RUN: grep ori | count 3 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | \ -; RUN: grep {li } | wc -l | grep 4 +; RUN: grep {li } | count 4 implementation ; Functions: diff --git a/test/CodeGen/PowerPC/eqv-andc-orc-nor.ll b/test/CodeGen/PowerPC/eqv-andc-orc-nor.ll index 359824c7ea..30bd0b4d0b 100644 --- a/test/CodeGen/PowerPC/eqv-andc-orc-nor.ll +++ b/test/CodeGen/PowerPC/eqv-andc-orc-nor.ll @@ -1,13 +1,13 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | \ -; RUN: grep eqv | wc -l | grep 3 +; RUN: grep eqv | count 3 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | \ -; RUN: grep andc | wc -l | grep 3 +; RUN: grep andc | count 3 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | \ -; RUN: grep orc | wc -l | grep 2 +; RUN: grep orc | count 2 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | \ -; RUN: grep nor | wc -l | grep 3 +; RUN: grep nor | count 3 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | \ -; RUN: grep nand | wc -l | grep 1 +; RUN: grep nand | count 1 int %EQV1(int %X, int %Y) { %A = xor int %X, %Y diff --git a/test/CodeGen/PowerPC/extsh.ll b/test/CodeGen/PowerPC/extsh.ll index 0f4f512a25..6b5023fee3 100644 --- a/test/CodeGen/PowerPC/extsh.ll +++ b/test/CodeGen/PowerPC/extsh.ll @@ -1,5 +1,5 @@ ; This should turn into a single extsh -; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep extsh | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep extsh | count 1 int %test(int %X) { %tmp.81 = shl int %X, ubyte 16 ; <int> [#uses=1] %tmp.82 = shr int %tmp.81, ubyte 16 ; <int> [#uses=1] diff --git a/test/CodeGen/PowerPC/fma.ll b/test/CodeGen/PowerPC/fma.ll index da2790be06..da571f6672 100644 --- a/test/CodeGen/PowerPC/fma.ll +++ b/test/CodeGen/PowerPC/fma.ll @@ -1,5 +1,5 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | \ -; RUN: egrep {fn?madd|fn?msub} | wc -l | grep 8 +; RUN: egrep {fn?madd|fn?msub} | count 8 double %test_FMADD1(double %A, double %B, double %C) { %D = mul double %A, %B diff --git a/test/CodeGen/PowerPC/fp-branch.ll b/test/CodeGen/PowerPC/fp-branch.ll index 1a371ed09a..804cbf6f8c 100644 --- a/test/CodeGen/PowerPC/fp-branch.ll +++ b/test/CodeGen/PowerPC/fp-branch.ll @@ -1,4 +1,4 @@ -; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep fcmp | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep fcmp | count 1 declare bool %llvm.isunordered.f64(double, double) diff --git a/test/CodeGen/PowerPC/fp_to_uint.ll b/test/CodeGen/PowerPC/fp_to_uint.ll index 83468a42b8..4a766170d9 100644 --- a/test/CodeGen/PowerPC/fp_to_uint.ll +++ b/test/CodeGen/PowerPC/fp_to_uint.ll @@ -1,4 +1,4 @@ -; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep fctiwz | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep fctiwz | count 1 implementation diff --git a/test/CodeGen/PowerPC/mulhs.ll b/test/CodeGen/PowerPC/mulhs.ll index 967905d938..7661e9c5bd 100644 --- a/test/CodeGen/PowerPC/mulhs.ll +++ b/test/CodeGen/PowerPC/mulhs.ll @@ -3,7 +3,7 @@ ; RUN: not grep mulhwu %t ; RUN: not grep srawi %t ; RUN: not grep add %t -; RUN: grep mulhw %t | wc -l | grep 1 +; RUN: grep mulhw %t | count 1 implementation ; Functions: diff --git a/test/CodeGen/PowerPC/rlwimi.ll b/test/CodeGen/PowerPC/rlwimi.ll index 92afcf91b3..25ac0e96a3 100644 --- a/test/CodeGen/PowerPC/rlwimi.ll +++ b/test/CodeGen/PowerPC/rlwimi.ll @@ -1,6 +1,6 @@ ; All of these ands and shifts should be folded into rlwimi's ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | not grep and -; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep rlwimi | wc -l | grep 8 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 | grep rlwimi | count 8 implementation ; Functions: diff --git a/test/CodeGen/PowerPC/rlwimi2.ll b/test/CodeGen/PowerPC/rlwimi2.ll index c264d2ef94..501daf0be9 100644 --- a/test/CodeGen/PowerPC/rlwimi2.ll +++ b/test/CodeGen/PowerPC/rlwimi2.ll @@ -1,7 +1,7 @@ ; All of these ands and shifts should be folded into rlwimi's ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -o %t -f -; RUN: grep rlwimi %t | wc -l | grep 3 -; RUN: grep srwi %t | wc -l | grep 1 +; RUN: grep rlwimi %t | count 3 +; RUN: grep srwi %t | count 1 ; RUN: not grep slwi %t implementation ; Functions: diff --git a/test/CodeGen/PowerPC/rlwinm.ll b/test/CodeGen/PowerPC/rlwinm.ll index 32e8f26068..a80371bc1e 100644 --- a/test/CodeGen/PowerPC/rlwinm.ll +++ b/test/CodeGen/PowerPC/rlwinm.ll @@ -4,7 +4,7 @@ ; RUN: not grep srawi %t ; RUN: not grep srwi %t ; RUN: not grep slwi %t -; RUN: grep rlwinm %t | wc -l | grep 8 +; RUN: grep rlwinm %t | count 8 implementation ; Functions: diff --git a/test/CodeGen/PowerPC/rlwinm2.ll b/test/CodeGen/PowerPC/rlwinm2.ll index 78127f1ff5..06ceaa2a9c 100644 --- a/test/CodeGen/PowerPC/rlwinm2.ll +++ b/test/CodeGen/PowerPC/rlwinm2.ll @@ -4,8 +4,8 @@ ; RUN: not grep srawi %t ; RUN: not grep srwi %t ; RUN: not grep slwi %t -; RUN: grep rlwnm %t | wc -l | grep 1 -; RUN: grep rlwinm %t | wc -l | grep 1 +; RUN: grep rlwnm %t | count 1 +; RUN: grep rlwinm %t | count 1 define i32 @test1(i32 %X, i32 %Y) { entry: diff --git a/test/CodeGen/PowerPC/rotl-2.ll b/test/CodeGen/PowerPC/rotl-2.ll index 523b5e4c4a..1e6adb741a 100644 --- a/test/CodeGen/PowerPC/rotl-2.ll +++ b/test/CodeGen/PowerPC/rotl-2.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwinm | wc -l | grep 4 -; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwnm | wc -l | grep 2 +; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwinm | count 4 +; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwnm | count 2 ; RUN: llvm-as < %s | llc -march=ppc32 | not grep or define i32 @rotl32(i32 %A, i8 %Amt) { diff --git a/test/CodeGen/PowerPC/rotl.ll b/test/CodeGen/PowerPC/rotl.ll index aa033cfc45..aab5c8316a 100644 --- a/test/CodeGen/PowerPC/rotl.ll +++ b/test/CodeGen/PowerPC/rotl.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwnm | wc -l | grep 2 -; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwinm | wc -l | grep 2 +; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwnm | count 2 +; RUN: llvm-as < %s | llc -march=ppc32 | grep rlwinm | count 2 define i32 @rotlw(i32 %x, i32 %sh) { entry: diff --git a/test/CodeGen/PowerPC/subc.ll b/test/CodeGen/PowerPC/subc.ll index 36247912f5..36eddb181d 100644 --- a/test/CodeGen/PowerPC/subc.ll +++ b/test/CodeGen/PowerPC/subc.ll @@ -1,10 +1,10 @@ ; All of these should be codegen'd without loading immediates ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -o %t -f -; RUN: grep subfc %t | wc -l | grep 1 -; RUN: grep subfe %t | wc -l | grep 1 -; RUN: grep subfze %t | wc -l | grep 1 -; RUN: grep subfme %t | wc -l | grep 1 -; RUN: grep subfic %t | wc -l | grep 2 +; RUN: grep subfc %t | count 1 +; RUN: grep subfe %t | count 1 +; RUN: grep subfze %t | count 1 +; RUN: grep subfme %t | count 1 +; RUN: grep subfic %t | count 2 implementation ; Functions: long %sub_ll(long %a, long %b) { diff --git a/test/CodeGen/PowerPC/unsafe-math.ll b/test/CodeGen/PowerPC/unsafe-math.ll index 770dcb6862..3d52d0c9e7 100644 --- a/test/CodeGen/PowerPC/unsafe-math.ll +++ b/test/CodeGen/PowerPC/unsafe-math.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=ppc32 | grep fmul | wc -l | grep 2 +; RUN: llvm-as < %s | llc -march=ppc32 | grep fmul | count 2 ; RUN: llvm-as < %s | llc -march=ppc32 -enable-unsafe-fp-math | \ -; RUN: grep fmul | wc -l | grep 1 +; RUN: grep fmul | count 1 define double @foo(double %X) { %tmp1 = mul double %X, 1.23 diff --git a/test/CodeGen/PowerPC/vcmp-fold.ll b/test/CodeGen/PowerPC/vcmp-fold.ll index 6ae41a980c..efb727c21c 100644 --- a/test/CodeGen/PowerPC/vcmp-fold.ll +++ b/test/CodeGen/PowerPC/vcmp-fold.ll @@ -1,6 +1,6 @@ ; This should fold the "vcmpbfp." and "vcmpbfp" instructions into a single ; "vcmpbfp.". -; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vcmpbfp | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep vcmpbfp | count 1 void %test(<4 x float>* %x, <4 x float>* %y, int* %P) { entry: diff --git a/test/CodeGen/PowerPC/vec_shuffle.ll b/test/CodeGen/PowerPC/vec_shuffle.ll index ba856ee98d..e26f6c170d 100644 --- a/test/CodeGen/PowerPC/vec_shuffle.ll +++ b/test/CodeGen/PowerPC/vec_shuffle.ll @@ -1,11 +1,11 @@ ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | \ ; RUN: llc -march=ppc32 -mcpu=g5 | not grep vperm ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 > %t -; RUN: grep vsldoi %t | wc -l | grep 2 -; RUN: grep vmrgh %t | wc -l | grep 7 -; RUN: grep vmrgl %t | wc -l | grep 6 -; RUN: grep vpkuhum %t | wc -l | grep 1 -; RUN: grep vpkuwum %t | wc -l | grep 1 +; RUN: grep vsldoi %t | count 2 +; RUN: grep vmrgh %t | count 7 +; RUN: grep vmrgl %t | count 6 +; RUN: grep vpkuhum %t | count 1 +; RUN: grep vpkuwum %t | count 1 void %VSLDOI_xy(<8 x short>* %A, <8 x short>* %B) { entry: diff --git a/test/CodeGen/PowerPC/vec_spat.ll b/test/CodeGen/PowerPC/vec_spat.ll index 15e2950927..a8acee0626 100644 --- a/test/CodeGen/PowerPC/vec_spat.ll +++ b/test/CodeGen/PowerPC/vec_spat.ll @@ -1,10 +1,10 @@ ; Test that vectors are scalarized/lowered correctly. ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g3 | \ -; RUN: grep stfs | wc -l | grep 4 +; RUN: grep stfs | count 4 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 -o %t -f -; RUN: grep vspltw %t | wc -l | grep 2 -; RUN: grep vsplti %t | wc -l | grep 3 -; RUN: grep vsplth %t | wc -l | grep 1 +; RUN: grep vspltw %t | count 2 +; RUN: grep vsplti %t | count 3 +; RUN: grep vsplth %t | count 1 %f4 = type <4 x float> %i4 = type <4 x int> diff --git a/test/CodeGen/SPARC/xnor.ll b/test/CodeGen/SPARC/xnor.ll index 2365176964..2cef49de92 100644 --- a/test/CodeGen/SPARC/xnor.ll +++ b/test/CodeGen/SPARC/xnor.ll @@ -1,5 +1,5 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=sparc | \ -; RUN: grep xnor | wc -l | grep 2 +; RUN: grep xnor | count 2 int %test1(int %X, int %Y) { %A = xor int %X, %Y diff --git a/test/CodeGen/X86/2006-01-19-ISelFoldingBug.ll b/test/CodeGen/X86/2006-01-19-ISelFoldingBug.ll index 02180cbf24..aa141d20cf 100644 --- a/test/CodeGen/X86/2006-01-19-ISelFoldingBug.ll +++ b/test/CodeGen/X86/2006-01-19-ISelFoldingBug.ll @@ -1,5 +1,5 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | \ -; RUN: grep shld | wc -l | grep 1 +; RUN: grep shld | count 1 ; ; Check that the isel does not fold the shld, which already folds a load ; and has two uses, into a store. diff --git a/test/CodeGen/X86/2006-04-27-ISelFoldingBug.ll b/test/CodeGen/X86/2006-04-27-ISelFoldingBug.ll index a3d961a5b1..03e7f7bd9c 100644 --- a/test/CodeGen/X86/2006-04-27-ISelFoldingBug.ll +++ b/test/CodeGen/X86/2006-04-27-ISelFoldingBug.ll @@ -1,9 +1,9 @@ ; RUN: llvm-upgrade < %s | llvm-as | \ ; RUN: llc -march=x86 -mtriple=i686-apple-darwin8 -relocation-model=static | \ -; RUN: grep {movl _last} | wc -l | grep 1 +; RUN: grep {movl _last} | count 1 ; RUN: llvm-upgrade < %s | llvm-as | \ ; RUN: llc -march=x86 -mtriple=i686-apple-darwin8 -relocation-model=static | \ -; RUN: grep {cmpl.*_last} | wc -l | grep 1 +; RUN: grep {cmpl.*_last} | count 1 %block = external global ubyte* ; <ubyte**> [#uses=1] %last = external global int ; <int*> [#uses=3] diff --git a/test/CodeGen/X86/2006-11-28-Memcpy.ll b/test/CodeGen/X86/2006-11-28-Memcpy.ll index cbce0ef503..196dd4528c 100644 --- a/test/CodeGen/X86/2006-11-28-Memcpy.ll +++ b/test/CodeGen/X86/2006-11-28-Memcpy.ll @@ -1,8 +1,8 @@ ; PR1022, PR1023 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | \ -; RUN: grep 3721182122 | wc -l | grep 2 +; RUN: grep 3721182122 | count 2 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | \ -; RUN: grep -E {movl _?bytes2} | wc -l | grep 1 +; RUN: grep -E {movl _?bytes2} | count 1 %fmt = constant [4 x sbyte] c"%x\0A\00" %bytes = constant [4 x sbyte] c"\AA\BB\CC\DD" diff --git a/test/CodeGen/X86/2007-01-08-InstrSched.ll b/test/CodeGen/X86/2007-01-08-InstrSched.ll index bcc0d6313e..811e9ac6d1 100644 --- a/test/CodeGen/X86/2007-01-08-InstrSched.ll +++ b/test/CodeGen/X86/2007-01-08-InstrSched.ll @@ -1,6 +1,6 @@ ; PR1075 ; RUN: llvm-as < %s | llc -mtriple=x86_64-apple-darwin | \ -; RUN: %prcontext {mulss LCPI1_3} 1 | grep mulss | wc -l | grep 1 +; RUN: %prcontext {mulss LCPI1_3} 1 | grep mulss | count 1 define float @foo(float %x) { %tmp1 = mul float %x, 3.000000e+00 diff --git a/test/CodeGen/X86/2007-03-15-GEP-Idx-Sink.ll b/test/CodeGen/X86/2007-03-15-GEP-Idx-Sink.ll index 4083a24fa8..4c69ec733d 100644 --- a/test/CodeGen/X86/2007-03-15-GEP-Idx-Sink.ll +++ b/test/CodeGen/X86/2007-03-15-GEP-Idx-Sink.ll @@ -1,5 +1,5 @@ ; RUN: llvm-as < %s | llc -march=x86 -mtriple=i686-darwin | \ -; RUN: grep push | wc -l | grep 3 +; RUN: grep push | count 3 define void @foo(i8** %buf, i32 %size, i32 %col, i8* %p) { entry: diff --git a/test/CodeGen/X86/2007-04-25-MMX-PADDQ.ll b/test/CodeGen/X86/2007-04-25-MMX-PADDQ.ll index 0d2082421b..7ea9fbd2cd 100644 --- a/test/CodeGen/X86/2007-04-25-MMX-PADDQ.ll +++ b/test/CodeGen/X86/2007-04-25-MMX-PADDQ.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -o - -march=x86 -mattr=+mmx | grep paddq | wc -l | grep 2 -; RUN: llvm-as < %s | llc -o - -march=x86 -mattr=+mmx | grep movq | wc -l | grep 3 +; RUN: llvm-as < %s | llc -o - -march=x86 -mattr=+mmx | grep paddq | count 2 +; RUN: llvm-as < %s | llc -o - -march=x86 -mattr=+mmx | grep movq | count 3 define <1 x i64> @unsigned_add3(<1 x i64>* %a, <1 x i64>* %b, i32 %count) { entry: diff --git a/test/CodeGen/X86/2007-06-14-branchfold.ll b/test/CodeGen/X86/2007-06-14-branchfold.ll index a7194a08ff..b78c63d4a3 100644 --- a/test/CodeGen/X86/2007-06-14-branchfold.ll +++ b/test/CodeGen/X86/2007-06-14-branchfold.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -mcpu=i686 | grep jmp | wc -l | grep 1 +; RUN: llvm-as < %s | llc -mcpu=i686 | grep jmp | count 1 ; check that branch folding understands FP_REG_KILL is not a branch ; the remaining jmp can be removed if we take advantage of knowing ; abort does not return diff --git a/test/CodeGen/X86/2007-08-10-LEA16Use32.ll b/test/CodeGen/X86/2007-08-10-LEA16Use32.ll index 5bb696f1ea..f6a848255f 100644 --- a/test/CodeGen/X86/2007-08-10-LEA16Use32.ll +++ b/test/CodeGen/X86/2007-08-10-LEA16Use32.ll @@ -20,4 +20,4 @@ bb: ; preds = %bb, %entry return: ; preds = %bb, %entry ret void -}
\ No newline at end of file +} diff --git a/test/CodeGen/X86/2007-08-10-SignExtSubreg.ll b/test/CodeGen/X86/2007-08-10-SignExtSubreg.ll index bb75c4776f..b62d2c61bb 100644 --- a/test/CodeGen/X86/2007-08-10-SignExtSubreg.ll +++ b/test/CodeGen/X86/2007-08-10-SignExtSubreg.ll @@ -7,4 +7,4 @@ entry: store i32 %x, i32* @X, align 4 %retval67 = trunc i32 %x to i8 ; <i8> [#uses=1] ret i8 %retval67 -}
\ No newline at end of file +} diff --git a/test/CodeGen/X86/2007-08-13-SpillerReuse.ll b/test/CodeGen/X86/2007-08-13-SpillerReuse.ll index fe87046d71..8cc235ba6c 100644 --- a/test/CodeGen/X86/2007-08-13-SpillerReuse.ll +++ b/test/CodeGen/X86/2007-08-13-SpillerReuse.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -mtriple=i686-apple-darwin | grep "48(%esp)" | wc -l | grep 5 +; RUN: llvm-as < %s | llc -mtriple=i686-apple-darwin | grep "48(%esp)" | count 5 %struct..0anon = type { i32 } %struct.rtvec_def = type { i32, [1 x %struct..0anon] } diff --git a/test/CodeGen/X86/and-or-fold.ll b/test/CodeGen/X86/and-or-fold.ll index 3240bdf25a..a321710092 100644 --- a/test/CodeGen/X86/and-or-fold.ll +++ b/test/CodeGen/X86/and-or-fold.ll @@ -1,4 +1,4 @@ -; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep and | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep and | count 1 ; The dag combiner should fold together (x&127)|(y&16711680) -> (x|y)&c1 ; in this case. diff --git a/test/CodeGen/X86/bitcast2.ll b/test/CodeGen/X86/bitcast2.ll index edf85238a3..3e26931578 100644 --- a/test/CodeGen/X86/bitcast2.ll +++ b/test/CodeGen/X86/bitcast2.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86-64 | grep movd | wc -l | grep 2 +; RUN: llvm-as < %s | llc -march=x86-64 | grep movd | count 2 ; RUN: llvm-as < %s | llc -march=x86-64 | not grep rsp define i64 @test1(double %A) { diff --git a/test/CodeGen/X86/bswap.ll b/test/CodeGen/X86/bswap.ll index 4749ea8f54..ab60977115 100644 --- a/test/CodeGen/X86/bswap.ll +++ b/test/CodeGen/X86/bswap.ll @@ -1,8 +1,8 @@ ; bswap should be constant folded when it is passed a constant argument ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | \ -; RUN: grep bswapl | wc -l | grep 3 -; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep rolw | wc -l | grep 1 +; RUN: grep bswapl | count 3 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep rolw | count 1 declare ushort %llvm.bswap.i16(ushort) declare uint %llvm.bswap.i32(uint) diff --git a/test/CodeGen/X86/call-push.ll b/test/CodeGen/X86/call-push.ll index d2d33f682a..ad9b796a85 100644 --- a/test/CodeGen/X86/call-push.ll +++ b/test/CodeGen/X86/call-push.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -disable-fp-elim | grep subl | wc -l | grep 1 +; RUN: llvm-as < %s | llc -march=x86 -disable-fp-elim | grep subl | count 1 %struct.decode_t = type { i8, i8, i8, i8, i16, i8, i8, %struct.range_t** } %struct.range_t = type { float, float, i32, i32, i32, [0 x i8] } diff --git a/test/CodeGen/X86/cmp-test.ll b/test/CodeGen/X86/cmp-test.ll index 78d8d8f3d8..2792b57bd7 100644 --- a/test/CodeGen/X86/cmp-test.ll +++ b/test/CodeGen/X86/cmp-test.ll @@ -1,5 +1,5 @@ -; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep cmp | wc -l | grep 1 -; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep test | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep cmp | count 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep test | count 1 int %f1(int %X, int* %y) { %tmp = load int* %y diff --git a/test/CodeGen/X86/commute-two-addr.ll b/test/CodeGen/X86/commute-two-addr.ll index c181354784..32eef1a435 100644 --- a/test/CodeGen/X86/commute-two-addr.ll +++ b/test/CodeGen/X86/commute-two-addr.ll @@ -3,7 +3,7 @@ ; Make sure there are only 3 mov's for each testcase ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | \ -; RUN: grep {\\\<mov\\\>} | wc -l | grep 6 +; RUN: grep {\\\<mov\\\>} | count 6 target triple = "i686-pc-linux-gnu" diff --git a/test/CodeGen/X86/compare_folding.llx b/test/CodeGen/X86/compare_folding.llx index 631bc92312..e138688b11 100644 --- a/test/CodeGen/X86/compare_folding.llx +++ b/test/CodeGen/X86/compare_folding.llx @@ -1,5 +1,5 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah | \ -; RUN: grep movsd | wc -l | grep 1 +; RUN: grep movsd | count 1 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah | \ ; RUN: grep ucomisd declare bool %llvm.isunordered.f64(double,double) diff --git a/test/CodeGen/X86/dollar-name.ll b/test/CodeGen/X86/dollar-name.ll index 87c7315af8..0573056f5e 100644 --- a/test/CodeGen/X86/dollar-name.ll +++ b/test/CodeGen/X86/dollar-name.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=att | grep (\$bar) | wc -l | grep 1 -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=att | grep (\$qux) | wc -l | grep 1 -; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=att | grep (\$hen) | wc -l | grep 1 +; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=att | grep (\$bar) | count 1 +; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=att | grep (\$qux) | count 1 +; RUN: llvm-as < %s | llc -march=x86 -x86-asm-syntax=att | grep (\$hen) | count 1 ; PR1339 @"$bar" = global i32 zeroinitializer diff --git a/test/CodeGen/X86/extend.ll b/test/CodeGen/X86/extend.ll index fdad790764..a9e6ba2c27 100644 --- a/test/CodeGen/X86/extend.ll +++ b/test/CodeGen/X86/extend.ll @@ -1,5 +1,5 @@ -; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep movzx | wc -l | grep 1 -; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep movsx | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep movzx | count 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | grep movsx | count 1 %G1 = internal global ubyte 0 ; <ubyte*> [#uses=1] %G2 = internal global sbyte 0 ; <sbyte*> [#uses=1] diff --git a/test/CodeGen/X86/extern_weak.ll b/test/CodeGen/X86/extern_weak.ll index 853a713310..df05b97a3b 100644 --- a/test/CodeGen/X86/extern_weak.ll +++ b/test/CodeGen/X86/extern_weak.ll @@ -1,4 +1,4 @@ -; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=i686-apple-darwin | grep weak_reference | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=i686-apple-darwin | grep weak_reference | count 2 %Y = global int (sbyte*)* %X declare extern_weak int %X(sbyte*) diff --git a/test/CodeGen/X86/fabs.ll b/test/CodeGen/X86/fabs.ll index dd94613e7c..4b588620f9 100644 --- a/test/CodeGen/X86/fabs.ll +++ b/test/CodeGen/X86/fabs.ll @@ -1,9 +1,9 @@ ; Make sure this testcase codegens to the fabs instruction, not a call to fabsf ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=-sse2,-sse3 | \ -; RUN: grep fabs\$ | wc -l | grep 1 +; RUN: grep fabs\$ | count 1 ; RUN: llvm-upgrade < %s | llvm-as | \ ; RUN: llc -march=x86 -mattr=-sse2,-sse3 -enable-unsafe-fp-math | \ -; RUN: grep fabs\$ | wc -l | grep 2 +; RUN: grep fabs\$ | count 2 target endian = little target pointersize = 32 diff --git a/test/CodeGen/X86/fildll.ll b/test/CodeGen/X86/fildll.ll index 711eedeaac..49bbc70d10 100644 --- a/test/CodeGen/X86/fildll.ll +++ b/test/CodeGen/X86/fildll.ll @@ -1,4 +1,4 @@ -; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=att -mattr=-sse2 | grep fildll | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=att -mattr=-sse2 | grep fildll | count 2 fastcc double %sint64_to_fp(long %X) { %R = cast long %X to double diff --git a/test/CodeGen/X86/fp-stack-ret.ll b/test/CodeGen/X86/fp-stack-ret.ll index 69c5fc58e8..3e6ad54e73 100644 --- a/test/CodeGen/X86/fp-stack-ret.ll +++ b/test/CodeGen/X86/fp-stack-ret.ll @@ -1,8 +1,8 @@ ; RUN: llvm-as < %s | \ ; RUN: llc -mtriple=i686-apple-darwin8 -mcpu=yonah -march=x86 > %t -; RUN: grep fldl %t | wc -l | grep 1 +; RUN: grep fldl %t | count 1 ; RUN: not grep xmm %t -; RUN: grep {sub.*esp} %t | wc -l | grep 1 +; RUN: grep {sub.*esp} %t | count 1 ; These testcases shouldn't require loading into an XMM register then storing ; to memory, then reloading into an FPStack reg. diff --git a/test/CodeGen/X86/fsxor-alignment.ll b/test/CodeGen/X86/fsxor-alignment.ll index 0e834d6db1..71007dcc05 100644 --- a/test/CodeGen/X86/fsxor-alignment.ll +++ b/test/CodeGen/X86/fsxor-alignment.ll @@ -1,5 +1,5 @@ ; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -enable-unsafe-fp-math | \ -; RUN: grep -v sp | grep xorps | wc -l | grep 2 +; RUN: grep -v sp | grep xorps | count 2 ; Don't fold the incoming stack arguments into the xorps instructions used ; to do floating-point negations, because the arguments aren't vectors diff --git a/test/CodeGen/X86/lea-recursion.ll b/test/CodeGen/X86/lea-recursion.ll index ca7b3674d2..390e35adfa 100644 --- a/test/CodeGen/X86/lea-recursion.ll +++ b/test/CodeGen/X86/lea-recursion.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86-64 | grep lea | wc -l | grep 12 +; RUN: llvm-as < %s | llc -march=x86-64 | grep lea | count 12 ; This testcase was written to demonstrate an instruction-selection problem, ; however it also happens to expose a limitation in the DAGCombiner's diff --git a/test/CodeGen/X86/long-setcc.ll b/test/CodeGen/X86/long-setcc.ll index 6097d96850..55e7c86891 100644 --- a/test/CodeGen/X86/long-setcc.ll +++ b/test/CodeGen/X86/long-setcc.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=x86 | grep cmp | wc -l | grep 1 -; RUN: llvm-as < %s | llc -march=x86 | grep shr | wc -l | grep 1 -; RUN: llvm-as < %s | llc -march=x86 | grep xor | wc -l | grep 1 +; RUN: llvm-as < %s | llc -march=x86 | grep cmp | count 1 +; RUN: llvm-as < %s | llc -march=x86 | grep shr | count 1 +; RUN: llvm-as < %s | llc -march=x86 | grep xor | count 1 define i1 @t1(i64 %x) { %B = icmp slt i64 %x, 0 diff --git a/test/CodeGen/X86/loop-strength-reduce.ll b/test/CodeGen/X86/loop-strength-reduce.ll index eb1eee8019..37ced6075b 100644 --- a/test/CodeGen/X86/loop-strength-reduce.ll +++ b/test/CodeGen/X86/loop-strength-reduce.ll @@ -1,5 +1,5 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | \ -; RUN: grep {A(} | wc -l | grep 1 +; RUN: grep {A(} | count 1 ; ; Make sure the common loop invariant _A(reg) is hoisted up to preheader. diff --git a/test/CodeGen/X86/mingw-alloca.ll b/test/CodeGen/X86/mingw-alloca.ll index 40fc80a3e7..c0a2f3d734 100644 --- a/test/CodeGen/X86/mingw-alloca.ll +++ b/test/CodeGen/X86/mingw-alloca.ll @@ -1,8 +1,8 @@ ; RUN: llvm-as < %s | llc -o %t -f -; RUN: grep __alloca %t | wc -l | grep 2 +; RUN: grep __alloca %t | count 2 ; RUN: grep 8028 %t ; RUN: grep {pushl %eax} %t -; RUN: grep 8024 %t | wc -l | grep 2 +; RUN: grep 8024 %t | count 2 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64" target triple = "i386-mingw32" diff --git a/test/CodeGen/X86/mmx-insert-element.ll b/test/CodeGen/X86/mmx-insert-element.ll index 3f2e4020d7..e24b4821b9 100644 --- a/test/CodeGen/X86/mmx-insert-element.ll +++ b/test/CodeGen/X86/mmx-insert-element.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+mmx | grep movq | wc -l | grep 3 +; RUN: llvm-as < %s | llc -march=x86 -mattr=+mmx | grep movq | count 3 ; FIXME: This code outputs: ; diff --git a/test/CodeGen/X86/mmx-punpckhdq.ll b/test/CodeGen/X86/mmx-punpckhdq.ll index 57c73c7625..126fc9d13b 100644 --- a/test/CodeGen/X86/mmx-punpckhdq.ll +++ b/test/CodeGen/X86/mmx-punpckhdq.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -mattr=+mmx | grep punpckhdq | wc -l | grep 1 +; RUN: llvm-as < %s | llc -march=x86 -mattr=+mmx | grep punpckhdq | count 1 define void @bork(<1 x i64>* %x) { entry: diff --git a/test/CodeGen/X86/peep-vector-extract-insert.ll b/test/CodeGen/X86/peep-vector-extract-insert.ll index 2b05af4663..764a8c4c3b 100644 --- a/test/CodeGen/X86/peep-vector-extract-insert.ll +++ b/test/CodeGen/X86/peep-vector-extract-insert.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86-64 | grep {pxor %xmm0, %xmm0} | wc -l | grep 2 +; RUN: llvm-as < %s | llc -march=x86-64 | grep {pxor %xmm0, %xmm0} | count 2 define float @foo(<4 x float> %a) { %b = insertelement <4 x float> %a, float 0.0, i32 3 diff --git a/test/CodeGen/X86/pr1489.ll b/test/CodeGen/X86/pr1489.ll index 61e68dfb9f..a7f3e795c6 100644 --- a/test/CodeGen/X86/pr1489.ll +++ b/test/CodeGen/X86/pr1489.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -disable-fp-elim -fast -mcpu=i486 | grep 1082126238 | wc -l | grep 3 -; RUN: llvm-as < %s | llc -disable-fp-elim -fast -mcpu=i486 | grep 3058016715 | wc -l | grep 1 +; RUN: llvm-as < %s | llc -disable-fp-elim -fast -mcpu=i486 | grep 1082126238 | count 3 +; RUN: llvm-as < %s | llc -disable-fp-elim -fast -mcpu=i486 | grep 3058016715 | count 1 ;; magic constants are 3.999f and half of 3.999 ; ModuleID = '1489.c' target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64" diff --git a/test/CodeGen/X86/pr1505b.ll b/test/CodeGen/X86/pr1505b.ll index 1e6b7933cd..db1f1ce181 100644 --- a/test/CodeGen/X86/pr1505b.ll +++ b/test/CodeGen/X86/pr1505b.ll @@ -1,5 +1,5 @@ -; RUN: llvm-as < %s | llc -mcpu=i486 | grep fstpl | wc -l | grep 4 -; RUN: llvm-as < %s | llc -mcpu=i486 | grep fstps | wc -l | grep 3 +; RUN: llvm-as < %s | llc -mcpu=i486 | grep fstpl | count 4 +; RUN: llvm-as < %s | llc -mcpu=i486 | grep fstps | count 3 ; ModuleID = '<stdin>' target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64" diff --git a/test/CodeGen/X86/rotate.ll b/test/CodeGen/X86/rotate.ll index fb04be96d6..d0ba29cbf6 100644 --- a/test/CodeGen/X86/rotate.ll +++ b/test/CodeGen/X86/rotate.ll @@ -1,5 +1,5 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | \ -; RUN: grep {ro\[rl\]} | wc -l | grep 12 +; RUN: grep {ro\[rl\]} | count 12 uint %rotl32(uint %A, ubyte %Amt) { %B = shl uint %A, ubyte %Amt diff --git a/test/CodeGen/X86/scalar-min-max-fill-operand.ll b/test/CodeGen/X86/scalar-min-max-fill-operand.ll index 9d6fc4ff3c..6a6283a10d 100644 --- a/test/CodeGen/X86/scalar-min-max-fill-operand.ll +++ b/test/CodeGen/X86/scalar-min-max-fill-operand.ll @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s | llc -march=x86-64 | grep min | wc -l | grep 1 -; RUN: llvm-as < %s | llc -march=x86-64 | grep max | wc -l | grep 1 -; RUN: llvm-as < %s | llc -march=x86-64 | grep mov | wc -l | grep 2 +; RUN: llvm-as < %s | llc -march=x86-64 | grep min | count 1 +; RUN: llvm-as < %s | llc -march=x86-64 | grep max | count 1 +; RUN: llvm-as < %s | llc -march=x86-64 | grep mov | count 2 declare float @bar() diff --git a/test/CodeGen/X86/scalar_sse_minmax.ll b/test/CodeGen/X86/scalar_sse_minmax.ll index 61894a4a20..c462121d9c 100644 --- a/test/CodeGen/X86/scalar_sse_minmax.ll +++ b/test/CodeGen/X86/scalar_sse_minmax.ll @@ -1,7 +1,7 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse1,+sse2 | \ -; RUN: grep mins | wc -l | grep 3 +; RUN: grep mins | count 3 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse1,+sse2 | \ -; RUN: grep maxs | wc -l | grep 2 +; RUN: grep maxs | count 2 declare bool %llvm.isunordered.f64( double %x, double %y ) declare bool %llvm.isunordered.f32( float %x, float %y ) diff --git a/test/CodeGen/X86/shift-codegen.ll b/test/CodeGen/X86/shift-codegen.ll index 0b40d942d0..deb4ed1f30 100644 --- a/test/CodeGen/X86/shift-codegen.ll +++ b/test/CodeGen/X86/shift-codegen.ll @@ -1,5 +1,5 @@ ; RUN: llvm-as < %s | llc -relocation-model=static -march=x86 | \ -; RUN: grep {shll \$3} | wc -l | grep 2 +; RUN: grep {shll \$3} | count 2 ; This should produce two shll instructions, not any lea's. diff --git a/test/CodeGen/X86/shift-double.llx b/test/CodeGen/X86/shift-double.llx index 760e490dd9..46cff2d287 100644 --- a/test/CodeGen/X86/shift-double.llx +++ b/test/CodeGen/X86/shift-double.llx @@ -1,5 +1,5 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | \ -; RUN: grep {sh\[lr\]d} | wc -l | grep 5 +; RUN: grep {sh\[lr\]d} | count 5 long %test1(long %X, ubyte %C) { %Y = shl long %X, ubyte %C diff --git a/test/CodeGen/X86/shift-folding.ll b/test/CodeGen/X86/shift-folding.ll index 671476a208..19bf4ee648 100644 --- a/test/CodeGen/X86/shift-folding.ll +++ b/test/CodeGen/X86/shift-folding.ll @@ -1,5 +1,5 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | \ -; RUN: grep {s\[ah\]\[rl\]l} | wc -l | grep 1 +; RUN: grep {s\[ah\]\[rl\]l} | count 1 int* %test1(int *%P, uint %X) { %Y = shr uint %X, ubyte 2 diff --git a/test/CodeGen/X86/sse-align-1.ll b/test/CodeGen/X86/sse-align-1.ll index 1841535841..7135d7a224 100644 --- a/test/CodeGen/X86/sse-align-1.ll +++ b/test/CodeGen/X86/sse-align-1.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86-64 | grep movap | wc -l | grep 2 +; RUN: llvm-as < %s | llc -march=x86-64 | grep movap | count 2 define <4 x float> @foo(<4 x float>* %p) { diff --git a/test/CodeGen/X86/sse-align-10.ll b/test/CodeGen/X86/sse-align-10.ll index 6f2ffc495f..3738becde7 100644 --- a/test/CodeGen/X86/sse-align-10.ll +++ b/test/CodeGen/X86/sse-align-10.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86-64 | grep movups | wc -l | grep 1 +; RUN: llvm-as < %s | llc -march=x86-64 | grep movups | count 1 define <2 x i64> @bar(<2 x i64>* %p) { diff --git a/test/CodeGen/X86/sse-align-12.ll b/test/CodeGen/X86/sse-align-12.ll index 731d429608..960a4f6450 100644 --- a/test/CodeGen/X86/sse-align-12.ll +++ b/test/CodeGen/X86/sse-align-12.ll @@ -1,8 +1,8 @@ -; RUN: llvm-as < %s | llc -march=x86-64 | grep unpck | wc -l | grep 2 -; RUN: llvm-as < %s | llc -march=x86-64 | grep shuf | wc -l | grep 2 -; RUN: llvm-as < %s | llc -march=x86-64 | grep ps | wc -l | grep 4 -; RUN: llvm-as < %s | llc -march=x86-64 | grep pd | wc -l | grep 4 -; RUN: llvm-as < %s | llc -march=x86-64 | grep movup | wc -l | grep 4 +; RUN: llvm-as < %s | llc -march=x86-64 | grep unpck | count 2 +; RUN: llvm-as < %s | llc -march=x86-64 | grep shuf | count 2 +; RUN: llvm-as < %s | llc -march=x86-64 | grep ps | count 4 +; RUN: llvm-as < %s | llc -march=x86-64 | grep pd | count 4 +; RUN: llvm-as < %s | llc -march=x86-64 | grep movup | count 4 define <4 x float> @a(<4 x float>* %y) { diff --git a/test/CodeGen/X86/sse-align-2.ll b/test/CodeGen/X86/sse-align-2.ll index b5c06748aa..71587a2f68 100644 --- a/test/CodeGen/X86/sse-align-2.ll +++ b/test/CodeGen/X86/sse-align-2.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86-64 | grep movup | wc -l | grep 2 +; RUN: llvm-as < %s | llc -march=x86-64 | grep movup | count 2 define <4 x float> @foo(<4 x float>* %p, <4 x float> %x) { diff --git a/test/CodeGen/X86/sse-align-3.ll b/test/CodeGen/X86/sse-align-3.ll index 6f96bba69e..ae9faabea4 100644 --- a/test/CodeGen/X86/sse-align-3.ll +++ b/test/CodeGen/X86/sse-align-3.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86-64 | grep movap | wc -l | grep 2 +; RUN: llvm-as < %s | llc -march=x86-64 | grep movap | count 2 define void @foo(<4 x float>* %p, <4 x float> %x) { diff --git a/test/CodeGen/X86/sse-align-4.ll b/test/CodeGen/X86/sse-align-4.ll index 4bf83b38bc..c98aff76d6 100644 --- a/test/CodeGen/X86/sse-align-4.ll +++ b/test/CodeGen/X86/sse-align-4.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86-64 | grep movup | wc -l | grep 2 +; RUN: llvm-as < %s | llc -march=x86-64 | grep movup | count 2 define void @foo(<4 x float>* %p, <4 x float> %x) { diff --git a/test/CodeGen/X86/sse-align-5.ll b/test/CodeGen/X86/sse-align-5.ll index de08d13369..a5c4b0dadc 100644 --- a/test/CodeGen/X86/sse-align-5.ll +++ b/test/CodeGen/X86/sse-align-5.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86-64 | grep movaps | wc -l | grep 1 +; RUN: llvm-as < %s | llc -march=x86-64 | grep movaps | count 1 define <2 x i64> @bar(<2 x i64>* %p) { diff --git a/test/CodeGen/X86/sse-align-6.ll b/test/CodeGen/X86/sse-align-6.ll index 90729684cb..dc9d99c627 100644 --- a/test/CodeGen/X86/sse-align-6.ll +++ b/test/CodeGen/X86/sse-align-6.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86-64 | grep movups | wc -l | grep 1 +; RUN: llvm-as < %s | llc -march=x86-64 | grep movups | count 1 define <2 x i64> @bar(<2 x i64>* %p, <2 x i64> %x) { diff --git a/test/CodeGen/X86/sse-align-7.ll b/test/CodeGen/X86/sse-align-7.ll index d1762e0e2d..d93ca40577 100644 --- a/test/CodeGen/X86/sse-align-7.ll +++ b/test/CodeGen/X86/sse-align-7.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86-64 | grep movaps | wc -l | grep 1 +; RUN: llvm-as < %s | llc -march=x86-64 | grep movaps | count 1 define void @bar(<2 x i64>* %p, <2 x i64> %x) { diff --git a/test/CodeGen/X86/sse-align-8.ll b/test/CodeGen/X86/sse-align-8.ll index f9d18145e9..4353698dcc 100644 --- a/test/CodeGen/X86/sse-align-8.ll +++ b/test/CodeGen/X86/sse-align-8.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86-64 | grep movups | wc -l | grep 1 +; RUN: llvm-as < %s | llc -march=x86-64 | grep movups | count 1 define void @bar(<2 x i64>* %p, <2 x i64> %x) { diff --git a/test/CodeGen/X86/sse-align-9.ll b/test/CodeGen/X86/sse-align-9.ll index fb4fe92161..58641b38b6 100644 --- a/test/CodeGen/X86/sse-align-9.ll +++ b/test/CodeGen/X86/sse-align-9.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86-64 | grep movup | wc -l | grep 2 +; RUN: llvm-as < %s | llc -march=x86-64 | grep movup | count 2 define <4 x float> @foo(<4 x float>* %p) { diff --git a/test/CodeGen/X86/store-global-address.ll b/test/CodeGen/X86/store-global-address.ll index 77e344d959..00ae2c9404 100644 --- a/test/CodeGen/X86/store-global-address.ll +++ b/test/CodeGen/X86/store-global-address.ll @@ -1,4 +1,4 @@ -; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep movl | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | grep movl | count 1 %dst = global int 0 %ptr = global int* null diff --git a/test/CodeGen/X86/store_op_load_fold2.ll b/test/CodeGen/X86/store_op_load_fold2.ll index 82ff4dbd32..a7d719ee2e 100644 --- a/test/CodeGen/X86/store_op_load_fold2.ll +++ b/test/CodeGen/X86/store_op_load_fold2.ll @@ -1,5 +1,5 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -x86-asm-syntax=intel | \ -; RUN: grep {and DWORD PTR} | wc -l | grep 2 +; RUN: grep {and DWORD PTR} | count 2 target endian = little target pointersize = 32 diff --git a/test/CodeGen/X86/test-hidden.ll b/test/CodeGen/X86/test-hidden.ll index e95ca6af6a..058850c7b7 100644 --- a/test/CodeGen/X86/test-hidden.ll +++ b/test/CodeGen/X86/test-hidden.ll @@ -1,7 +1,7 @@ ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu | \ -; RUN: grep .hidden | wc -l | grep 2 +; RUN: grep .hidden | count 2 ; RUN: llvm-as < %s | llc -mtriple=i686-apple-darwin8.8.0 | \ -; RUN: grep .private_extern | wc -l | grep 2 +; RUN: grep .private_extern | count 2 %struct.Person = type { i32 } @a = hidden global i32 0 diff --git a/test/CodeGen/X86/test-pic-1.ll b/test/CodeGen/X86/test-pic-1.ll index 4d9703e727..8c19c7d6c6 100644 --- a/test/CodeGen/X86/test-pic-1.ll +++ b/test/CodeGen/X86/test-pic-1.ll @@ -1,8 +1,8 @@ ; RUN: llvm-as < %s | \ ; RUN: llc -mtriple=i686-pc-linux-gnu -relocation-model=pic -o %t -f ; RUN: grep _GLOBAL_OFFSET_TABLE_ %t -; RUN: grep piclabel %t | wc -l | grep 3 -; RUN: grep GOT %t | wc -l | grep 3 +; RUN: grep piclabel %t | count 3 +; RUN: grep GOT %t | count 3 ; RUN: not grep GOTOFF %t | wc -l @ptr = external global i32* diff --git a/test/CodeGen/X86/test-pic-2.ll b/test/CodeGen/X86/test-pic-2.ll index 1d875fa695..40899b35b8 100644 --- a/test/CodeGen/X86/test-pic-2.ll +++ b/test/CodeGen/X86/test-pic-2.ll @@ -1,8 +1,8 @@ ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic \ ; RUN: -o %t -f ; RUN: grep _GLOBAL_OFFSET_TABLE_ %t -; RUN: grep piclabel %t | wc -l | grep 3 -; RUN: grep GOTOFF %t | wc -l | grep 4 +; RUN: grep piclabel %t | count 3 +; RUN: grep GOTOFF %t | count 4 @ptr = internal global i32* null @dst = internal global i32 0 diff --git a/test/CodeGen/X86/test-pic-3.ll b/test/CodeGen/X86/test-pic-3.ll index 91b4761370..bbec68209b 100644 --- a/test/CodeGen/X86/test-pic-3.ll +++ b/test/CodeGen/X86/test-pic-3.ll @@ -1,8 +1,8 @@ ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic \ ; RUN: -o %t -f ; RUN: grep _GLOBAL_OFFSET_TABLE_ %t -; RUN: grep piclabel %t | wc -l | grep 3 -; RUN: grep PLT %t | wc -l | grep 1 +; RUN: grep piclabel %t | count 3 +; RUN: grep PLT %t | count 1 define void @bar() { entry: diff --git a/test/CodeGen/X86/test-pic-4.ll b/test/CodeGen/X86/test-pic-4.ll index 7637d35fe4..49b9000f12 100644 --- a/test/CodeGen/X86/test-pic-4.ll +++ b/test/CodeGen/X86/test-pic-4.ll @@ -1,9 +1,9 @@ ; RUN: llvm-as < %s | \ ; RUN: llc -mtriple=i686-pc-linux-gnu -relocation-model=pic -o %t -f ; RUN: grep _GLOBAL_OFFSET_TABLE_ %t -; RUN: grep piclabel %t | wc -l | grep 3 -; RUN: grep PLT %t | wc -l | grep 1 -; RUN: grep GOT %t | wc -l | grep 1 +; RUN: grep piclabel %t | count 3 +; RUN: grep PLT %t | count 1 +; RUN: grep GOT %t | count 1 ; RUN: not grep GOTOFF %t @pfoo = external global void(...)* diff --git a/test/CodeGen/X86/test-pic-5.ll b/test/CodeGen/X86/test-pic-5.ll index 0ed38b979a..3f7e16934d 100644 --- a/test/CodeGen/X86/test-pic-5.ll +++ b/test/CodeGen/X86/test-pic-5.ll @@ -1,8 +1,8 @@ ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic \ ; RUN: -o %t -f ; RUN: grep _GLOBAL_OFFSET_TABLE_ %t -; RUN: grep piclabel %t | wc -l | grep 3 -; RUN: grep PLT %t | wc -l | grep 1 +; RUN: grep piclabel %t | count 3 +; RUN: grep PLT %t | count 1 @ptr = external global i32* diff --git a/test/CodeGen/X86/test-pic-6.ll b/test/CodeGen/X86/test-pic-6.ll index 43485c301c..d55da1f4c6 100644 --- a/test/CodeGen/X86/test-pic-6.ll +++ b/test/CodeGen/X86/test-pic-6.ll @@ -1,8 +1,8 @@ ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic \ ; RUN: -o %t -f ; RUN: grep _GLOBAL_OFFSET_TABLE_ %t -; RUN: grep piclabel %t | wc -l | grep 3 -; RUN: grep GOT %t | wc -l | grep 3 +; RUN: grep piclabel %t | count 3 +; RUN: grep GOT %t | count 3 @ptr = global i32* null @dst = global i32 0 diff --git a/test/CodeGen/X86/test-pic-cpool.ll b/test/CodeGen/X86/test-pic-cpool.ll index 79f5607b75..cac31ed2ad 100644 --- a/test/CodeGen/X86/test-pic-cpool.ll +++ b/test/CodeGen/X86/test-pic-cpool.ll @@ -1,9 +1,9 @@ ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic \ ; RUN: -o %t -f ; RUN: grep _GLOBAL_OFFSET_TABLE_ %t -; RUN: grep piclabel %t | wc -l | grep 3 -; RUN: grep GOTOFF %t | wc -l | grep 2 -; RUN: grep CPI %t | wc -l | grep 4 +; RUN: grep piclabel %t | count 3 +; RUN: grep GOTOFF %t | count 2 +; RUN: grep CPI %t | count 4 define double @foo(i32 %a.u) { entry: diff --git a/test/CodeGen/X86/test-pic-jtbl.ll b/test/CodeGen/X86/test-pic-jtbl.ll index 516b766595..7347e281fa 100644 --- a/test/CodeGen/X86/test-pic-jtbl.ll +++ b/test/CodeGen/X86/test-pic-jtbl.ll @@ -1,10 +1,10 @@ ; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -relocation-model=pic \ ; RUN: -o %t -f ; RUN: grep _GLOBAL_OFFSET_TABLE_ %t -; RUN: grep piclabel %t | wc -l | grep 3 -; RUN: grep PLT %t | wc -l | grep 6 -; RUN: grep GOTOFF %t | wc -l | grep 2 -; RUN: grep JTI %t | wc -l | grep 9 +; RUN: grep piclabel %t | count 3 +; RUN: grep PLT %t | count 6 +; RUN: grep GOTOFF %t | count 2 +; RUN: grep JTI %t | count 9 define void @bar(i32 %n.u) { entry: diff --git a/test/CodeGen/X86/vec_extract.ll b/test/CodeGen/X86/vec_extract.ll index 2d3e87ea46..f0f0a62005 100644 --- a/test/CodeGen/X86/vec_extract.ll +++ b/test/CodeGen/X86/vec_extract.ll @@ -1,8 +1,8 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -o %t -f -; RUN: grep movss %t | wc -l | grep 3 -; RUN: grep movhlps %t | wc -l | grep 1 -; RUN: grep pshufd %t | wc -l | grep 1 -; RUN: grep unpckhpd %t | wc -l | grep 1 +; RUN: grep movss %t | count 3 +; RUN: grep movhlps %t | count 1 +; RUN: grep pshufd %t | count 1 +; RUN: grep unpckhpd %t | count 1 void %test1(<4 x float>* %F, float* %f) { %tmp = load <4 x float>* %F diff --git a/test/CodeGen/X86/vec_insert.ll b/test/CodeGen/X86/vec_insert.ll index 021685e509..8ee0484fda 100644 --- a/test/CodeGen/X86/vec_insert.ll +++ b/test/CodeGen/X86/vec_insert.ll @@ -1,6 +1,6 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -o %t -f -; RUN: grep movss %t | wc -l | grep 1 -; RUN: grep pinsrw %t | wc -l | grep 2 +; RUN: grep movss %t | count 1 +; RUN: grep pinsrw %t | count 2 void %test(<4 x float>* %F, int %I) { %tmp = load <4 x float>* %F diff --git a/test/CodeGen/X86/vec_logical.ll b/test/CodeGen/X86/vec_logical.ll index 3aac23a4cc..cf45a4a670 100644 --- a/test/CodeGen/X86/vec_logical.ll +++ b/test/CodeGen/X86/vec_logical.ll @@ -1,7 +1,7 @@ ; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep xorps | wc -l | grep 2 +; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep xorps | count 2 ; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep andnps -; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movaps | wc -l | grep 2 +; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep movaps | count 2 define void @t(<4 x float> %A) { %tmp1277 = sub <4 x float> < float -0.000000e+00, float -0.000000e+00, float -0.000000e+00, float -0.000000e+00 >, %A diff --git a/test/CodeGen/X86/vec_set-2.ll b/test/CodeGen/X86/vec_set-2.ll index 1d1449d4e3..ac8936862a 100644 --- a/test/CodeGen/X86/vec_set-2.ll +++ b/test/CodeGen/X86/vec_set-2.ll @@ -1,5 +1,5 @@ -; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movss | wc -l | grep 1 -; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movd | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movss | count 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movd | count 1 <4 x float> %test1(float %a) { %tmp = insertelement <4 x float> zeroinitializer, float %a, uint 0 diff --git a/test/CodeGen/X86/vec_set-3.ll b/test/CodeGen/X86/vec_set-3.ll index 1edaa58703..ff108970ac 100644 --- a/test/CodeGen/X86/vec_set-3.ll +++ b/test/CodeGen/X86/vec_set-3.ll @@ -1,6 +1,6 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -o %t -f -; RUN: grep shufps %t | wc -l | grep 1 -; RUN: grep pshufd %t | wc -l | grep 1 +; RUN: grep shufps %t | count 1 +; RUN: grep pshufd %t | count 1 <4 x float> %test(float %a) { %tmp = insertelement <4 x float> zeroinitializer, float %a, uint 1 diff --git a/test/CodeGen/X86/vec_set-4.ll b/test/CodeGen/X86/vec_set-4.ll index c656a5817a..6843cbc36e 100644 --- a/test/CodeGen/X86/vec_set-4.ll +++ b/test/CodeGen/X86/vec_set-4.ll @@ -1,4 +1,4 @@ -; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep pinsrw | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep pinsrw | count 2 <2 x long> %test(short %a) { entry: diff --git a/test/CodeGen/X86/vec_set-5.ll b/test/CodeGen/X86/vec_set-5.ll index 218f0415fd..cf3ac4c978 100644 --- a/test/CodeGen/X86/vec_set-5.ll +++ b/test/CodeGen/X86/vec_set-5.ll @@ -1,7 +1,7 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -o %t -f -; RUN: grep movlhps %t | wc -l | grep 2 -; RUN: grep unpcklps %t | wc -l | grep 1 -; RUN: grep punpckldq %t | wc -l | grep 1 +; RUN: grep movlhps %t | count 2 +; RUN: grep unpcklps %t | count 1 +; RUN: grep punpckldq %t | count 1 <4 x float> %test1(float %a, float %b) { %tmp = insertelement <4 x float> zeroinitializer, float %a, uint 0 diff --git a/test/CodeGen/X86/vec_set-6.ll b/test/CodeGen/X86/vec_set-6.ll index ea6be7412a..ae9e7e6374 100644 --- a/test/CodeGen/X86/vec_set-6.ll +++ b/test/CodeGen/X86/vec_set-6.ll @@ -1,6 +1,6 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -o %t -f -; RUN: grep unpcklps %t | wc -l | grep 1 -; RUN: grep shufps %t | wc -l | grep 1 +; RUN: grep unpcklps %t | count 1 +; RUN: grep shufps %t | count 1 <4 x float> %test(float %a, float %b, float %c) { %tmp = insertelement <4 x float> zeroinitializer, float %a, uint 1 diff --git a/test/CodeGen/X86/vec_set-7.ll b/test/CodeGen/X86/vec_set-7.ll index ab342df905..d622d96e8b 100644 --- a/test/CodeGen/X86/vec_set-7.ll +++ b/test/CodeGen/X86/vec_set-7.ll @@ -1,4 +1,4 @@ -; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movq | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep movq | count 1 <2 x long> %test(<2 x long>* %p) { %tmp = cast <2 x long>* %p to double* diff --git a/test/CodeGen/X86/vec_set.ll b/test/CodeGen/X86/vec_set.ll index c190e41bd0..f955707f3e 100644 --- a/test/CodeGen/X86/vec_set.ll +++ b/test/CodeGen/X86/vec_set.ll @@ -1,4 +1,4 @@ -; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep punpckl | wc -l | grep 7 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep punpckl | count 7 void %test(<8 x short>* %b, short %a0, short %a1, short %a2, short %a3, short %a4, short %a5, short %a6, short %a7) { %tmp = insertelement <8 x short> zeroinitializer, short %a0, uint 0 diff --git a/test/CodeGen/X86/vec_shuffle-10.ll b/test/CodeGen/X86/vec_shuffle-10.ll index 34a97c4ffd..e1716dd280 100644 --- a/test/CodeGen/X86/vec_shuffle-10.ll +++ b/test/CodeGen/X86/vec_shuffle-10.ll @@ -1,7 +1,7 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | \ -; RUN: grep unpcklps | wc -l | grep 1 +; RUN: grep unpcklps | count 1 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | \ -; RUN: grep unpckhps | wc -l | grep 1 +; RUN: grep unpckhps | count 1 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | \ ; RUN: not grep {sub.*esp} diff --git a/test/CodeGen/X86/vec_shuffle-2.ll b/test/CodeGen/X86/vec_shuffle-2.ll index df78323a53..2a909d68e9 100644 --- a/test/CodeGen/X86/vec_shuffle-2.ll +++ b/test/CodeGen/X86/vec_shuffle-2.ll @@ -1,7 +1,7 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -o %t -f -; RUN: grep pshufhw %t | wc -l | grep 1 -; RUN: grep pshuflw %t | wc -l | grep 1 -; RUN: grep movhps %t | wc -l | grep 1 +; RUN: grep pshufhw %t | count 1 +; RUN: grep pshuflw %t | count 1 +; RUN: grep movhps %t | count 1 void %test1(<2 x long>* %res, <2 x long>* %A) { %tmp = load <2 x long>* %A diff --git a/test/CodeGen/X86/vec_shuffle-3.ll b/test/CodeGen/X86/vec_shuffle-3.ll index a0ce0f0639..e17545d3e0 100644 --- a/test/CodeGen/X86/vec_shuffle-3.ll +++ b/test/CodeGen/X86/vec_shuffle-3.ll @@ -1,6 +1,6 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -o %t -f -; RUN: grep movlhps %t | wc -l | grep 1 -; RUN: grep movhlps %t | wc -l | grep 1 +; RUN: grep movlhps %t | count 1 +; RUN: grep movhlps %t | count 1 <4 x float> %test1(<4 x float>* %x, <4 x float>* %y) { %tmp = load <4 x float>* %y diff --git a/test/CodeGen/X86/vec_shuffle-4.ll b/test/CodeGen/X86/vec_shuffle-4.ll index 5bb30bf564..0359b32b86 100644 --- a/test/CodeGen/X86/vec_shuffle-4.ll +++ b/test/CodeGen/X86/vec_shuffle-4.ll @@ -1,5 +1,5 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 > %t -; RUN: grep shuf %t | wc -l | grep 2 +; RUN: grep shuf %t | count 2 ; RUN: not grep unpck %t void %test(<4 x float>* %res, <4 x float>* %A, <4 x float>* %B, <4 x float>* %C) { %tmp3 = load <4 x float>* %B diff --git a/test/CodeGen/X86/vec_shuffle-5.ll b/test/CodeGen/X86/vec_shuffle-5.ll index e980a124ee..1b6ebe1216 100644 --- a/test/CodeGen/X86/vec_shuffle-5.ll +++ b/test/CodeGen/X86/vec_shuffle-5.ll @@ -1,6 +1,6 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -o %t -f -; RUN: grep movhlps %t | wc -l | grep 1 -; RUN: grep shufps %t | wc -l | grep 1 +; RUN: grep movhlps %t | count 1 +; RUN: grep shufps %t | count 1 void %test() { %tmp1 = load <4 x float>* null diff --git a/test/CodeGen/X86/vec_shuffle-6.ll b/test/CodeGen/X86/vec_shuffle-6.ll index 661fe09d5c..343ec82da8 100644 --- a/test/CodeGen/X86/vec_shuffle-6.ll +++ b/test/CodeGen/X86/vec_shuffle-6.ll @@ -1,7 +1,7 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -o %t -f -; RUN: grep movapd %t | wc -l | grep 1 -; RUN: grep movaps %t | wc -l | grep 1 -; RUN: grep movups %t | wc -l | grep 2 +; RUN: grep movapd %t | count 1 +; RUN: grep movaps %t | count 1 +; RUN: grep movups %t | count 2 target triple = "i686-apple-darwin" diff --git a/test/CodeGen/X86/vec_shuffle-7.ll b/test/CodeGen/X86/vec_shuffle-7.ll index ae64c2856a..c846e2a90d 100644 --- a/test/CodeGen/X86/vec_shuffle-7.ll +++ b/test/CodeGen/X86/vec_shuffle-7.ll @@ -1,5 +1,5 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -o %t -f -; RUN: grep xorps %t | wc -l | grep 1 +; RUN: grep xorps %t | count 1 ; RUN: not grep shufps %t void %test() { diff --git a/test/CodeGen/X86/vec_shuffle-9.ll b/test/CodeGen/X86/vec_shuffle-9.ll index e83e2984d4..250ee7cb93 100644 --- a/test/CodeGen/X86/vec_shuffle-9.ll +++ b/test/CodeGen/X86/vec_shuffle-9.ll @@ -1,5 +1,5 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -o %t -f -; RUN: grep punpck %t | wc -l | grep 2 +; RUN: grep punpck %t | count 2 ; RUN: not grep pextrw %t <4 x int> %test(sbyte** %ptr) { diff --git a/test/CodeGen/X86/vec_shuffle.ll b/test/CodeGen/X86/vec_shuffle.ll index 16ce3dac54..a599fdf9a9 100644 --- a/test/CodeGen/X86/vec_shuffle.ll +++ b/test/CodeGen/X86/vec_shuffle.ll @@ -1,7 +1,7 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 -o %t -f -; RUN: grep shufp %t | wc -l | grep 1 -; RUN: grep movupd %t | wc -l | grep 1 -; RUN: grep pshufhw %t | wc -l | grep 1 +; RUN: grep shufp %t | count 1 +; RUN: grep movupd %t | count 1 +; RUN: grep pshufhw %t | count 1 void %test_v4sf(<4 x float>* %P, float %X, float %Y) { %tmp = insertelement <4 x float> zeroinitializer, float %X, uint 0 diff --git a/test/CodeGen/X86/vec_splat-2.ll b/test/CodeGen/X86/vec_splat-2.ll index a874500f3d..9e39b2190c 100644 --- a/test/CodeGen/X86/vec_splat-2.ll +++ b/test/CodeGen/X86/vec_splat-2.ll @@ -1,4 +1,4 @@ -; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep pshufd | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep pshufd | count 1 void %test(<2 x long>* %P, sbyte %x) { %tmp = insertelement <16 x sbyte> zeroinitializer, sbyte %x, uint 0 ; <<16 x sbyte>> [#uses=1] diff --git a/test/CodeGen/X86/vec_ss_load_fold.ll b/test/CodeGen/X86/vec_ss_load_fold.ll index 1c9f6f1e0d..1ea87c128c 100644 --- a/test/CodeGen/X86/vec_ss_load_fold.ll +++ b/test/CodeGen/X86/vec_ss_load_fold.ll @@ -1,5 +1,5 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse,+sse2 -o %t -f -; RUN: grep minss %t | grep CPI | wc -l | grep 2 +; RUN: grep minss %t | grep CPI | count 2 ; RUN: grep CPI %t | not grep movss target endian = little diff --git a/test/CodeGen/X86/vec_zero.ll b/test/CodeGen/X86/vec_zero.ll index f976fc1834..0f94174b34 100644 --- a/test/CodeGen/X86/vec_zero.ll +++ b/test/CodeGen/X86/vec_zero.ll @@ -1,4 +1,4 @@ -; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep xorps | wc -l | grep 2 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mattr=+sse2 | grep xorps | count 2 void %foo(<4 x float> *%P) { %T = load <4 x float> * %P diff --git a/test/CodeGen/X86/x86-64-mem.ll b/test/CodeGen/X86/x86-64-mem.ll index 1e942c5c19..930383d8e9 100644 --- a/test/CodeGen/X86/x86-64-mem.ll +++ b/test/CodeGen/X86/x86-64-mem.ll @@ -1,13 +1,13 @@ ; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple=x86_64-apple-darwin -o %t1 -f -; RUN: grep GOTPCREL %t1 | wc -l | grep 4 -; RUN: grep rip %t1 | wc -l | grep 6 -; RUN: grep movq %t1 | wc -l | grep 6 -; RUN: grep leaq %t1 | wc -l | grep 1 +; RUN: grep GOTPCREL %t1 | count 4 +; RUN: grep rip %t1 | count 6 +; RUN: grep movq %t1 | count 6 +; RUN: grep leaq %t1 | count 1 ; RUN: llvm-upgrade < %s | llvm-as | \ ; RUN: llc -mtriple=x86_64-pc-linux -relocation-model=static -o %t2 -f -; RUN: grep rip %t2 | wc -l | grep 4 -; RUN: grep movl %t2 | wc -l | grep 2 -; RUN: grep movq %t2 | wc -l | grep 2 +; RUN: grep rip %t2 | count 4 +; RUN: grep movl %t2 | count 2 +; RUN: grep movq %t2 | count 2 %ptr = external global int* %src = external global [0 x int] diff --git a/test/Other/2004-08-16-LowerPacked.ll b/test/Other/2004-08-16-LowerPacked.ll index 1d8da1d557..910f89a6a8 100644 --- a/test/Other/2004-08-16-LowerPacked.ll +++ b/test/Other/2004-08-16-LowerPacked.ll @@ -17,4 +17,4 @@ void %main() %c2 = select bool true, <2 x int> <int 1, int 1>, <2 x int> %t0 store <2 x int> <int 4, int 4>, <2 x int>* %foo ret void -}
\ No newline at end of file +} diff --git a/test/Other/2004-08-16-PackedGlobalConstant.ll b/test/Other/2004-08-16-PackedGlobalConstant.ll index 01b0d5dd40..638e862cc6 100644 --- a/test/Other/2004-08-16-PackedGlobalConstant.ll +++ b/test/Other/2004-08-16-PackedGlobalConstant.ll @@ -10,4 +10,4 @@ void %main() %t0 = load <2 x int>* %foo; store <2 x int> %t0, <2 x int>* %bar ret void -}
\ No newline at end of file +} diff --git a/test/Other/2004-08-16-PackedSelect.ll b/test/Other/2004-08-16-PackedSelect.ll index 5bbf20caa5..4485543708 100644 --- a/test/Other/2004-08-16-PackedSelect.ll +++ b/test/Other/2004-08-16-PackedSelect.ll @@ -12,4 +12,4 @@ void %main() %t2 = select bool true, <4 x float> %t0, <4 x float> %t1 store <4 x float> %t2, <4 x float>* %bar ret void -}
\ No newline at end of file +} diff --git a/test/Other/2004-08-16-PackedSimple.ll b/test/Other/2004-08-16-PackedSimple.ll index 9835199ba7..f50cd210a5 100644 --- a/test/Other/2004-08-16-PackedSimple.ll +++ b/test/Other/2004-08-16-PackedSimple.ll @@ -12,4 +12,4 @@ void %main() %t3 = select bool false, <4 x float> %t0, <4 x float> %t2 store <4 x float> %t3, <4 x float>* %bar ret void -}
\ No newline at end of file +} diff --git a/test/TableGen/MultiClass.td b/test/TableGen/MultiClass.td index 41019eb675..52ba59c230 100644 --- a/test/TableGen/MultiClass.td +++ b/test/TableGen/MultiClass.td @@ -1,4 +1,4 @@ -// RUN: tblgen %s | grep {zing = 4} | wc -l | grep 2 +// RUN: tblgen %s | grep {zing = 4} | count 2 class C1<int A, string B> { int bar = A; diff --git a/test/Transforms/ConstProp/float-to-ptr-cast.ll b/test/Transforms/ConstProp/float-to-ptr-cast.ll index f5201defb5..239b7482bf 100644 --- a/test/Transforms/ConstProp/float-to-ptr-cast.ll +++ b/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/test/Transforms/GVN/basic.ll b/test/Transforms/GVN/basic.ll index 8c72e78533..ebf5daaf92 100644 --- a/test/Transforms/GVN/basic.ll +++ b/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/test/Transforms/GVN/dominated.ll b/test/Transforms/GVN/dominated.ll index 4a9e97517e..d7c9417bcf 100644 --- a/test/Transforms/GVN/dominated.ll +++ b/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/test/Transforms/GVN/mixed.ll b/test/Transforms/GVN/mixed.ll index 08c80d60a5..0c4f65cf96 100644 --- a/test/Transforms/GVN/mixed.ll +++ b/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/test/Transforms/GVN/nonlocal.ll b/test/Transforms/GVN/nonlocal.ll index 7e5ef910b5..1618d05efb 100644 --- a/test/Transforms/GVN/nonlocal.ll +++ b/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/test/Transforms/GVN/semidominated.ll b/test/Transforms/GVN/semidominated.ll index 89eac46d9c..95ee56a39c 100644 --- a/test/Transforms/GVN/semidominated.ll +++ b/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/test/Transforms/IndVarsSimplify/complex-scev.ll b/test/Transforms/IndVarsSimplify/complex-scev.ll index 773d71a20c..7d7e8a3562 100644 --- a/test/Transforms/IndVarsSimplify/complex-scev.ll +++ b/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/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll b/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll index 2c53224e7f..2c41a37d9a 100644 --- a/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll +++ b/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/test/Transforms/InstCombine/2006-12-15-Range-Test.ll b/test/Transforms/InstCombine/2006-12-15-Range-Test.ll index cf253a9745..4767558616 100644 --- a/test/Transforms/InstCombine/2006-12-15-Range-Test.ll +++ b/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/test/Transforms/InstCombine/and-compare.ll b/test/Transforms/InstCombine/and-compare.ll index 5980631c69..8969f98fc1 100644 --- a/test/Transforms/InstCombine/and-compare.ll +++ b/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/test/Transforms/InstCombine/and-or-not.ll b/test/Transforms/InstCombine/and-or-not.ll index e9c7b12684..8fc53a7e0a 100644 --- a/test/Transforms/InstCombine/and-or-not.ll +++ b/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/test/Transforms/InstCombine/and-xor-merge.ll b/test/Transforms/InstCombine/and-xor-merge.ll index c53ebc6f3d..85f8026ab5 100644 --- a/test/Transforms/InstCombine/and-xor-merge.ll +++ b/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/test/Transforms/InstCombine/apint-and-compare.ll b/test/Transforms/InstCombine/apint-and-compare.ll index 4d250a0377..ad2e41d718 100644 --- a/test/Transforms/InstCombine/apint-and-compare.ll +++ b/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/test/Transforms/InstCombine/apint-and-xor-merge.ll b/test/Transforms/InstCombine/apint-and-xor-merge.ll index 665a643afe..e1e4e3caae 100644 --- a/test/Transforms/InstCombine/apint-and-xor-merge.ll +++ b/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/test/Transforms/InstCombine/apint-shift-simplify.ll b/test/Transforms/InstCombine/apint-shift-simplify.ll index 4c352cf817..a0046fbacb 100644 --- a/test/Transforms/InstCombine/apint-shift-simplify.ll +++ b/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/test/Transforms/InstCombine/bswap-fold.ll b/test/Transforms/InstCombine/bswap-fold.ll index 1552386db1..8dad43fa73 100644 --- a/test/Transforms/InstCombine/bswap-fold.ll +++ b/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/test/Transforms/InstCombine/bswap.ll b/test/Transforms/InstCombine/bswap.ll index fde5ff054f..d8be73c45e 100644 --- a/test/Transforms/InstCombine/bswap.ll +++ b/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/test/Transforms/InstCombine/loadstore-alignment.ll b/test/Transforms/InstCombine/loadstore-alignment.ll index fd8b0e2e17..82be575b32 100644 --- a/test/Transforms/InstCombine/loadstore-alignment.ll +++ b/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/test/Transforms/InstCombine/shift-simplify.ll b/test/Transforms/InstCombine/shift-simplify.ll index e028385839..ecf3f5f92f 100644 --- a/test/Transforms/InstCombine/shift-simplify.ll +++ b/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/test/Transforms/InstCombine/shift-sra.ll b/test/Transforms/InstCombine/shift-sra.ll index f390772917..1339eddc87 100644 --- a/test/Transforms/InstCombine/shift-sra.ll +++ b/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/test/Transforms/InstCombine/store-merge.ll b/test/Transforms/InstCombine/store-merge.ll index 4df30e4ead..7b117ca7f5 100644 --- a/test/Transforms/InstCombine/store-merge.ll +++ b/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/test/Transforms/InstCombine/udiv_select_to_select_shift.ll b/test/Transforms/InstCombine/udiv_select_to_select_shift.ll index fe057410cd..277592c983 100644 --- a/test/Transforms/InstCombine/udiv_select_to_select_shift.ll +++ b/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/test/Transforms/InstCombine/vec_insert_to_shuffle.ll b/test/Transforms/InstCombine/vec_insert_to_shuffle.ll index 54ac8825db..04d3ee56eb 100644 --- a/test/Transforms/InstCombine/vec_insert_to_shuffle.ll +++ b/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/test/Transforms/InstCombine/zext-fold.ll b/test/Transforms/InstCombine/zext-fold.ll index 2b66a745da..690a2275e0 100644 --- a/test/Transforms/InstCombine/zext-fold.ll +++ b/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/test/Transforms/LoopSimplify/phi-node-simplify.ll b/test/Transforms/LoopSimplify/phi-node-simplify.ll index aa52d66cf9..9427b7a2ed 100644 --- a/test/Transforms/LoopSimplify/phi-node-simplify.ll +++ b/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/test/Transforms/LoopStrengthReduce/dont_insert_redundant_ops.ll b/test/Transforms/LoopStrengthReduce/dont_insert_redundant_ops.ll index aecade80d7..1954a20446 100644 --- a/test/Transforms/LoopStrengthReduce/dont_insert_redundant_ops.ll +++ b/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/test/Transforms/LoopStrengthReduce/related_indvars.ll b/test/Transforms/LoopStrengthReduce/related_indvars.ll index 533279b9eb..c1cd8d218f 100644 --- a/test/Transforms/LoopStrengthReduce/related_indvars.ll +++ b/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/test/Transforms/LoopStrengthReduce/share_code_in_preheader.ll b/test/Transforms/LoopStrengthReduce/share_code_in_preheader.ll index d8316a52bc..27c72d2852 100644 --- a/test/Transforms/LoopStrengthReduce/share_code_in_preheader.ll +++ b/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/test/Transforms/LoopStrengthReduce/share_ivs.ll b/test/Transforms/LoopStrengthReduce/share_ivs.ll index 76bfe1d529..edc29b7442 100644 --- a/test/Transforms/LoopStrengthReduce/share_ivs.ll +++ b/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/test/Transforms/LoopUnswitch/2007-07-18-DomInfo.ll b/test/Transforms/LoopUnswitch/2007-07-18-DomInfo.ll index 9c2f938afa..edd7d1ff58 100644 --- a/test/Transforms/LoopUnswitch/2007-07-18-DomInfo.ll +++ b/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/test/Transforms/LowerSwitch/feature.ll b/test/Transforms/LowerSwitch/feature.ll index 0b3cdc780f..7523ad235b 100644 --- a/test/Transforms/LowerSwitch/feature.ll +++ b/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/test/Transforms/Reassociate/basictest3.ll b/test/Transforms/Reassociate/basictest3.ll index a3da5a0400..4aa134ae7f 100644 --- a/test/Transforms/Reassociate/basictest3.ll +++ b/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/test/Transforms/Reassociate/mul-factor3.ll b/test/Transforms/Reassociate/mul-factor3.ll index 1272ff62dd..c6aeedefcf 100644 --- a/test/Transforms/Reassociate/mul-factor3.ll +++ b/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/test/Transforms/Reassociate/mulfactor.ll b/test/Transforms/Reassociate/mulfactor.ll index bb7efc3f7a..91667a4c54 100644 --- a/test/Transforms/Reassociate/mulfactor.ll +++ b/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/test/Transforms/Reassociate/mulfactor2.ll b/test/Transforms/Reassociate/mulfactor2.ll index dd1e8ae8a3..61c9f0444a 100644 --- a/test/Transforms/Reassociate/mulfactor2.ll +++ b/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/test/Transforms/Reassociate/shift-factor.ll b/test/Transforms/Reassociate/shift-factor.ll index ed8ed392c5..b381d45f79 100644 --- a/test/Transforms/Reassociate/shift-factor.ll +++ b/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/test/Transforms/SimplifyCFG/branch-fold.ll b/test/Transforms/SimplifyCFG/branch-fold.ll index f13f82676b..aeea929903 100644 --- a/test/Transforms/SimplifyCFG/branch-fold.ll +++ b/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/test/Transforms/SimplifyCFG/switch_switch_fold.ll b/test/Transforms/SimplifyCFG/switch_switch_fold.ll index 5403955da4..5cfa4ea182 100644 --- a/test/Transforms/SimplifyCFG/switch_switch_fold.ll +++ b/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. |