diff --git a/llvm/test/Analysis/BasicAA/2003-11-04-SimpleCases.ll b/llvm/test/Analysis/BasicAA/2003-11-04-SimpleCases.ll index fe6ed0804a988cc65eff13905e4236a30fae8e00..1d122fd033c506d842acd4e17748b1f5363b5d36 100644 --- a/llvm/test/Analysis/BasicAA/2003-11-04-SimpleCases.ll +++ b/llvm/test/Analysis/BasicAA/2003-11-04-SimpleCases.ll @@ -1,7 +1,8 @@ ; This testcase consists of alias relations which should be completely ; resolvable by basicaa. -; RUN: llvm-upgrade < %s | llvm-as | opt -aa-eval -print-may-aliases 2>&1 -disable-output | not grep May: +; RUN: llvm-upgrade < %s | llvm-as | \ +; RUN: opt -aa-eval -print-may-aliases -disable-output |& not grep May: %T = type { uint, [10 x ubyte] } diff --git a/llvm/test/Analysis/BasicAA/2003-12-11-ConstExprGEP.ll b/llvm/test/Analysis/BasicAA/2003-12-11-ConstExprGEP.ll index f74bdba2c1789858d9117697071d3c5696f60980..5f602b893493b16a633193ac262c879b4dbdfead 100644 --- a/llvm/test/Analysis/BasicAA/2003-12-11-ConstExprGEP.ll +++ b/llvm/test/Analysis/BasicAA/2003-12-11-ConstExprGEP.ll @@ -1,7 +1,8 @@ ; This testcase consists of alias relations which should be completely ; resolvable by basicaa, but require analysis of getelementptr constant exprs. -; RUN: llvm-upgrade < %s | llvm-as | opt -aa-eval -print-may-aliases 2>&1 -disable-output | not grep May: +; RUN: llvm-upgrade < %s | llvm-as | \ +; RUN: opt -aa-eval -print-may-aliases -disable-output |& not grep May: %T = type { uint, [10 x ubyte] } diff --git a/llvm/test/Analysis/BasicAA/2006-03-03-BadArraySubscript.ll b/llvm/test/Analysis/BasicAA/2006-03-03-BadArraySubscript.ll index 6c822172392f1a510474b91372d481b136b65045..d7ae66ee9f5e44448d032f31abd8420e3ef43e49 100644 --- a/llvm/test/Analysis/BasicAA/2006-03-03-BadArraySubscript.ll +++ b/llvm/test/Analysis/BasicAA/2006-03-03-BadArraySubscript.ll @@ -1,4 +1,5 @@ -; RUN: llvm-upgrade < %s | llvm-as | opt -aa-eval -disable-output 2>&1 | grep '2 no alias respon' +; RUN: llvm-upgrade < %s | llvm-as | \ +; RUN: opt -aa-eval -disable-output |& grep '2 no alias respon' ;; TEST that A[1][0] may alias A[0][i]. diff --git a/llvm/test/Analysis/BasicAA/modref.ll b/llvm/test/Analysis/BasicAA/modref.ll index be2506c801d05b978617e8503b65f6ee365bde40..27b9c402f97628b87f69747f86e6459ce4579e69 100644 --- a/llvm/test/Analysis/BasicAA/modref.ll +++ b/llvm/test/Analysis/BasicAA/modref.ll @@ -1,6 +1,7 @@ ; A very rudimentary test on AliasAnalysis::getModRefInfo. -; RUN: llvm-upgrade < %s | llvm-as | opt -print-all-alias-modref-info -aa-eval -disable-output && -; RUN: llvm-upgrade < %s | llvm-as | opt -print-all-alias-modref-info -aa-eval -disable-output 2>&1 | not grep NoModRef +; RUN: llvm-upgrade < %s | llvm-as | \ +; RUN: opt -print-all-alias-modref-info -aa-eval -disable-output |& +; RUN: not grep NoModRef int %callee() { %X = alloca { int, int } diff --git a/llvm/test/C++Frontend/2003-08-29-ArgPassingBug.cpp.tr b/llvm/test/C++Frontend/2003-08-29-ArgPassingBug.cpp.tr index ddb0dcec8c4603c64d44bff612e1a0946fa94eff..d4cddff3147cc2147c19dd6d91d3db7c5950e816 100644 --- a/llvm/test/C++Frontend/2003-08-29-ArgPassingBug.cpp.tr +++ b/llvm/test/C++Frontend/2003-08-29-ArgPassingBug.cpp.tr @@ -1,5 +1,5 @@ -// RUN: %llvmgcc -xc++ -c -o /dev/null %s 2>&1 | not grep WARNING +// RUN: %llvmgcc -xc++ -c -o /dev/null %s |& not grep WARNING struct iterator { iterator(); diff --git a/llvm/test/CFrontend/2003-11-19-AddressOfRegister.c.tr b/llvm/test/CFrontend/2003-11-19-AddressOfRegister.c.tr index ae37cbd2511581ce6388e5df81525182a0a29b14..30cac7ba8e9bb8a7c34eb17c354abe4934e71ae4 100644 --- a/llvm/test/CFrontend/2003-11-19-AddressOfRegister.c.tr +++ b/llvm/test/CFrontend/2003-11-19-AddressOfRegister.c.tr @@ -1,4 +1,4 @@ -// RUN: %llvmgcc -xc %s -S -o /dev/null 2>&1 | not grep 'warning' +// RUN: %llvmgcc -xc %s -S -o /dev/null |& not grep 'warning' struct item { short delta[4]; diff --git a/llvm/test/CFrontend/2005-01-02-VAArgError-ICE.c b/llvm/test/CFrontend/2005-01-02-VAArgError-ICE.c index 26a2da08172b123156f8abb5fa327f98348b75e5..db8255846274774bab1dda3b3bea9038685b83fc 100644 --- a/llvm/test/CFrontend/2005-01-02-VAArgError-ICE.c +++ b/llvm/test/CFrontend/2005-01-02-VAArgError-ICE.c @@ -1,6 +1,6 @@ // This file is erroneous, but should not cause the compiler to ICE. // PR481 -// RUN: %llvmgcc %s -S -o /dev/null 2>&1 | not grep 'internal compiler error' +// RUN: %llvmgcc %s -S -o /dev/null |& not grep {internal compiler error} #include int flags(int a, int b, ...) { diff --git a/llvm/test/CFrontend/2006-09-21-IncompleteElementType.c b/llvm/test/CFrontend/2006-09-21-IncompleteElementType.c index 1899f363e25a3fdd8b8fd1cd340e567a1e4c1b10..64f7501a64c02a10b14e6c7cbd006b44595f3028 100644 --- a/llvm/test/CFrontend/2006-09-21-IncompleteElementType.c +++ b/llvm/test/CFrontend/2006-09-21-IncompleteElementType.c @@ -1,3 +1,3 @@ -// RUN: %llvmgcc %s -S -o /dev/null 2>&1 | not grep 'internal compiler error' +// RUN: %llvmgcc %s -S -o /dev/null |& not grep {internal compiler error} struct A X[(927 - 37) / sizeof(struct A)]; diff --git a/llvm/test/CFrontend/2006-09-25-DebugFilename.c.tr b/llvm/test/CFrontend/2006-09-25-DebugFilename.c.tr index c59e9ad2ce7c2c7aad08942ea410db72e3aef141..893a79ec886d132cdb58fc02903e052b2b6e01b5 100644 --- a/llvm/test/CFrontend/2006-09-25-DebugFilename.c.tr +++ b/llvm/test/CFrontend/2006-09-25-DebugFilename.c.tr @@ -1,5 +1,6 @@ -// RUN: %llvmgcc -xc %s -S -o /dev/null 2>&1 | grep fluffy | grep '2006-09-25-DebugFilename.c.tr' +// RUN: %llvmgcc -xc %s -S -o /dev/null |& \ +// RUN: grep fluffy | grep 2006-09-25-DebugFilename.c.tr #include "2006-09-25-DebugFilename.h" int func1() { return hfunc1(); } -int func2() { fluffy; return hfunc1(); } +int func2() { int fluffy; return hfunc1(); } diff --git a/llvm/test/CodeGen/ARM/2007-03-13-InstrSched.ll b/llvm/test/CodeGen/ARM/2007-03-13-InstrSched.ll index 33df4063c7e0cc53e6217b7d2a34ad0765fe21f8..8fdff52f015f2a9e9ffb69942a15e6bb71e0c8bf 100644 --- a/llvm/test/CodeGen/ARM/2007-03-13-InstrSched.ll +++ b/llvm/test/CodeGen/ARM/2007-03-13-InstrSched.ll @@ -1,4 +1,5 @@ -; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin -relocation-model=pic -mattr=+v6 -stats 2>&1 | grep 'asm-printer' | grep 41 +; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin -relocation-model=pic \ +; RUN: -mattr=+v6 -stats |& grep asm-printer | grep 41 define void @test(i32 %tmp56222, i32 %tmp36224, i32 %tmp46223, i32 %i.0196.0.ph, i32 %tmp8, i32* %tmp1011, i32** %tmp1, i32* %d2.1.out, i32* %d3.1.out, i32* %d0.1.out, i32* %d1.1.out) { newFuncRoot: diff --git a/llvm/test/CodeGen/ARM/addrmode.ll b/llvm/test/CodeGen/ARM/addrmode.ll index 59b14214a9b4caf76f959d0847b80040b8049e05..a3832c0ea3dbab6aab50e817fd777cb53cb15227 100644 --- a/llvm/test/CodeGen/ARM/addrmode.ll +++ b/llvm/test/CodeGen/ARM/addrmode.ll @@ -1,5 +1,4 @@ -; RUN: llvm-as < %s | llc -march=arm && -; RUN: llvm-as < %s | llc -march=arm -stats 2>&1 | grep 'asm-printer' | grep 4 +; RUN: llvm-as < %s | llc -march=arm -stats |& grep asm-printer | grep 4 define i32 @t1(i32 %a) { %b = mul i32 %a, 9 diff --git a/llvm/test/CodeGen/ARM/iabs.ll b/llvm/test/CodeGen/ARM/iabs.ll index 26819deec64df9dfece4d9d2e9b48bfbb95aa525..f10591f41f76526fda7747227413ed02eb6f7c3a 100644 --- a/llvm/test/CodeGen/ARM/iabs.ll +++ b/llvm/test/CodeGen/ARM/iabs.ll @@ -1,5 +1,7 @@ -; RUN: llvm-as < %s | llc -march=arm -stats 2>&1 | grep '3 .*Number of machine instrs printed' && -; RUN: llvm-as < %s | llc -march=thumb -stats 2>&1 | grep '4 .*Number of machine instrs printed' +; RUN: llvm-as < %s | llc -march=arm -stats |& \ +; RUN: grep {3 .*Number of machine instrs printed} +; RUN: llvm-as < %s | llc -march=thumb -stats |& \ +; RUN: grep {4 .*Number of machine instrs printed} ;; Integer absolute value, should produce something as good as: ARM: ;; add r3, r0, r0, asr #31 diff --git a/llvm/test/CodeGen/ARM/lsr-code-insertion.ll b/llvm/test/CodeGen/ARM/lsr-code-insertion.ll index baa8cdddc61327c0f3528946a18cb3e675b2c505..04b856f840dc77134158f72a948eb90d8a654ec8 100644 --- a/llvm/test/CodeGen/ARM/lsr-code-insertion.ll +++ b/llvm/test/CodeGen/ARM/lsr-code-insertion.ll @@ -1,7 +1,7 @@ -; RUN: llvm-as < %s | llc -stats 2>&1 | grep '40.*Number of machine instrs printed' -; This test really wants to check that the resultant "cond_true" block only has a single -; store in it, and that cond_true55 only has code to materialize the constant and do -; a store. We do *not* want something like this: +; RUN: llvm-as < %s | llc -stats |& grep {40.*Number of machine instrs printed} +; This test really wants to check that the resultant "cond_true" block only +; has a single store in it, and that cond_true55 only has code to materialize +; the constant and do a store. We do *not* want something like this: ; ;LBB1_3: @cond_true ; add r8, r0, r6 diff --git a/llvm/test/CodeGen/PowerPC/iabs.ll b/llvm/test/CodeGen/PowerPC/iabs.ll index 1414c0e67c3af6164c3c784a7f1ab8b29ef4515e..677b41bb12e16cf6539fd34f7bf1fe2f4f348dac 100644 --- a/llvm/test/CodeGen/PowerPC/iabs.ll +++ b/llvm/test/CodeGen/PowerPC/iabs.ll @@ -1,4 +1,5 @@ -; RUN: llvm-as < %s | llc -march=ppc32 -stats 2>&1 | grep '4 .*Number of machine instrs printed' +; RUN: llvm-as < %s | llc -march=ppc32 -stats |& \ +; RUN: grep {4 .*Number of machine instrs printed} ;; Integer absolute value, should produce something as good as: ;; srawi r2, r3, 31 diff --git a/llvm/test/CodeGen/PowerPC/rlwimi3.ll b/llvm/test/CodeGen/PowerPC/rlwimi3.ll index 44bc034237ca67e8da0c57739e176c84f0acfb39..b313ef92e136b3633e1e8545f637536ba02ca93c 100644 --- a/llvm/test/CodeGen/PowerPC/rlwimi3.ll +++ b/llvm/test/CodeGen/PowerPC/rlwimi3.ll @@ -1,4 +1,5 @@ -; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -stats 2>&1 | grep 'Number of machine instrs printed' | grep 12 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -stats |& \ +; RUN: grep {Number of machine instrs printed} | grep 12 ushort %Trans16Bit(uint %srcA, uint %srcB, uint %alpha) { %tmp1 = shl uint %srcA, ubyte 15 ; [#uses=1] diff --git a/llvm/test/CodeGen/X86/2003-08-03-CallArgLiveRanges.llx b/llvm/test/CodeGen/X86/2003-08-03-CallArgLiveRanges.llx index 77ac17bc30ea39bf50ba5336d00ac7753e73387f..9a4541b717a81cd2b327dcf2e6bdb8768ef54d10 100644 --- a/llvm/test/CodeGen/X86/2003-08-03-CallArgLiveRanges.llx +++ b/llvm/test/CodeGen/X86/2003-08-03-CallArgLiveRanges.llx @@ -3,7 +3,7 @@ ; it makes a ton of annoying overlapping live ranges. This code should not ; cause spills! ; -; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -stats 2>&1 | not grep spilled +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -stats |& not grep spilled target endian = little target pointersize = 32 diff --git a/llvm/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll b/llvm/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll index bf96708da25e71284c989d67ab07e06df3e51bbc..da063df46cb09ba01da5c2afff64c252a43e6c59 100644 --- a/llvm/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll +++ b/llvm/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll @@ -1,4 +1,5 @@ -; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -stats 2>&1 | grep 'asm-printer' | grep 7 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -stats |& \ +; RUN: grep asm-printer | grep 7 int %g(int %a, int %b) { %tmp.1 = shl int %b, ubyte 1 diff --git a/llvm/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll b/llvm/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll index 71b90760e3364e5ce1b80324cd4809e21f3b439e..f89cfe04496d48dc0b780c0a001afee6e8fb636a 100644 --- a/llvm/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll +++ b/llvm/test/CodeGen/X86/2006-05-01-SchedCausingSpills.ll @@ -1,4 +1,5 @@ -; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah -stats 2>&1 | not grep 'Number of register spills' +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah -stats |& \ +; RUN: not grep {Number of register spills} int %foo(<4 x float>* %a, <4 x float>* %b, <4 x float>* %c, <4 x float>* %d) { %tmp44 = load <4 x float>* %a ; <<4 x float>> [#uses=9] diff --git a/llvm/test/CodeGen/X86/2006-05-02-InstrSched1.ll b/llvm/test/CodeGen/X86/2006-05-02-InstrSched1.ll index 631e416836de4b82da0b817804c088296bfd8687..59a15f4ec952ba94d16bf12bcecaf49accd2b51a 100644 --- a/llvm/test/CodeGen/X86/2006-05-02-InstrSched1.ll +++ b/llvm/test/CodeGen/X86/2006-05-02-InstrSched1.ll @@ -1,4 +1,7 @@ -; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -relocation-model=static -stats 2>&1 | grep "asm-printer" | grep 14 +; RUN: llvm-upgrade < %s | llvm-as | \ +; RUN: llc -march=x86 -relocation-model=static -stats |& \ +; RUN: grep asm-printer | grep 14 +; %size20 = external global uint ; [#uses=1] %in5 = external global ubyte* ; [#uses=1] diff --git a/llvm/test/CodeGen/X86/2006-05-02-InstrSched2.ll b/llvm/test/CodeGen/X86/2006-05-02-InstrSched2.ll index 9b58de251a6d36bfdacf8a138d963c77dd03118a..b7ef09f91dc36c73b687fb68e12268e4a620ce75 100644 --- a/llvm/test/CodeGen/X86/2006-05-02-InstrSched2.ll +++ b/llvm/test/CodeGen/X86/2006-05-02-InstrSched2.ll @@ -1,4 +1,5 @@ -; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -stats 2>&1 | grep "asm-printer" | grep 18 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -stats |& \ +; RUN: grep asm-printer | grep 18 void %_ZN9__gnu_cxx9hashtableISt4pairIKPKciES3_NS_4hashIS3_EESt10_Select1stIS5_E5eqstrSaIiEE14find_or_insertERKS5__cond_true456.i(sbyte* %tmp435.i, uint* %tmp449.i.out) { newFuncRoot: diff --git a/llvm/test/CodeGen/X86/iabs.ll b/llvm/test/CodeGen/X86/iabs.ll index e1eab33e5ebe5600c99b9165dee685efa27fcd14..7c23645c6a320b8eb11f5208c841580f0919c791 100644 --- a/llvm/test/CodeGen/X86/iabs.ll +++ b/llvm/test/CodeGen/X86/iabs.ll @@ -1,4 +1,5 @@ -; RUN: llvm-as < %s | llc -march=x86-64 -stats 2>&1 | grep '6 .*Number of machine instrs printed' +; RUN: llvm-as < %s | llc -march=x86-64 -stats |& \ +; RUN: grep {6 .*Number of machine instrs printed} ;; Integer absolute value, should produce something at least as good as: ;; movl %edi, %eax diff --git a/llvm/test/Transforms/LICM/scalar_promote.ll b/llvm/test/Transforms/LICM/scalar_promote.ll index 219b16bad09f6889df57a73229a5db61b047fe17..8720a6a80ba14775a00f97c4fd9af286cdf1284e 100644 --- a/llvm/test/Transforms/LICM/scalar_promote.ll +++ b/llvm/test/Transforms/LICM/scalar_promote.ll @@ -1,4 +1,5 @@ -; RUN: llvm-upgrade < %s | llvm-as | opt -licm -stats 2>&1 | grep "memory locations promoted to register" +; RUN: llvm-upgrade < %s | llvm-as | opt -licm -stats |& \ +; RUN: grep {memory locations promoted to register} %X = global int 7 diff --git a/llvm/test/Transforms/TailCallElim/ackermann.ll b/llvm/test/Transforms/TailCallElim/ackermann.ll index eed684b946a493f4908a05273d40512472d51cd8..dd6e2769f18a062d8c6b08e4a8ee6dea4ca098db 100644 --- a/llvm/test/Transforms/TailCallElim/ackermann.ll +++ b/llvm/test/Transforms/TailCallElim/ackermann.ll @@ -1,5 +1,6 @@ ; This function contains two tail calls, which should be eliminated -; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim -stats -disable-output 2>&1 | grep '2 tailcallelim' +; RUN: llvm-upgrade < %s | llvm-as | \ +; RUN: opt -tailcallelim -stats -disable-output |& grep {2 tailcallelim} int %Ack(int %M.1, int %N.1) { entry: