For PR1319:

Upgrade tests to work with new llvm.exp version of llvm_runtest.

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

diff --git a/test/Transforms/InstCombine/2002-08-02-CastTest.ll b/test/Transforms/InstCombine/2002-08-02-CastTest.ll
index 55609f1e7f86e64db816e5d288ed79293981c0d7..23284a6312dbadbafb82559a3641c84632172656 100644 (file)
--- a/test/Transforms/InstCombine/2002-08-02-CastTest.ll
+++ b/test/Transforms/InstCombine/2002-08-02-CastTest.ll
@@ -1,7 +1,7 @@
 ; This testcase is incorrectly getting completely eliminated.  There should be
 ; SOME instruction named %c here, even if it's a bitwise and.
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep '%c'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep %c
 ;
 ulong %test3(ulong %A) {
         %c1 = cast ulong %A to ubyte

diff --git a/test/Transforms/InstCombine/2003-08-12-AllocaNonNull.ll b/test/Transforms/InstCombine/2003-08-12-AllocaNonNull.ll
index 52b778c10d0b7c4942050c895fbe09461622071c..81594dbb6b7a97f14515e80da99b026b4df6c2a2 100644 (file)
--- a/test/Transforms/InstCombine/2003-08-12-AllocaNonNull.ll
+++ b/test/Transforms/InstCombine/2003-08-12-AllocaNonNull.ll
@@ -1,6 +1,7 @@
 ; This testcase can be simplified by "realizing" that alloca can never return 
 ; null.
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -simplifycfg | llvm-dis | not grep 'br '
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -simplifycfg | \
+; RUN:    llvm-dis | not grep br
 
 implementation   ; Functions:
 

diff --git a/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll b/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll
index e1144b61b0ee8dc116d8765cc137b827138fce9d..0a0038f217ae8f6ef72e1557be6b0989a89fdcfe 100644 (file)
--- a/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll
+++ b/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'ret i1 false'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   grep {ret i1 false}
 bool %test(bool %V) {
        %Y = setlt bool %V, false
        ret bool %Y

diff --git a/test/Transforms/InstCombine/2004-09-20-BadLoadCombine.llx b/test/Transforms/InstCombine/2004-09-20-BadLoadCombine.llx
index 3fcbb88e2dea0937ba8abf7222204bafe9011959..ddc40394aa81116846aa46e487a2ba0e238b7331 100644 (file)
--- a/test/Transforms/InstCombine/2004-09-20-BadLoadCombine.llx
+++ b/test/Transforms/InstCombine/2004-09-20-BadLoadCombine.llx
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -mem2reg | llvm-dis | not grep 'int 1'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -mem2reg | llvm-dis | \
+; RUN:   not grep {int 1}
 
 ; When propagating the load through the select, make sure that the load is
 ; inserted where the original load was, not where the select is.  Not doing

diff --git a/test/Transforms/InstCombine/2004-09-20-BadLoadCombine2.llx b/test/Transforms/InstCombine/2004-09-20-BadLoadCombine2.llx
index 83acd702c666efb98fc16d6eaea14ddebb434b18..c3478a82a2b78d7402c86bab4c9e2e17c12ee459 100644 (file)
--- a/test/Transforms/InstCombine/2004-09-20-BadLoadCombine2.llx
+++ b/test/Transforms/InstCombine/2004-09-20-BadLoadCombine2.llx
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -mem2reg -simplifycfg | llvm-dis | \
-; RUN:   grep -v store | not grep 'int 1'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -mem2reg -simplifycfg | \
+; RUN:   llvm-dis | grep -v store | not grep {int 1}
 
 ; Test to make sure that instcombine does not accidentally propagate the load
 ; into the PHI, which would break the program.

diff --git a/test/Transforms/InstCombine/2004-11-27-SetCCForCastLargerAndConstant.ll b/test/Transforms/InstCombine/2004-11-27-SetCCForCastLargerAndConstant.ll
index 17958e198a4230879d425f46e1eee46558598519..7a78b93d5313cdbfebf4f06b32665112cf9a38a8 100644 (file)
--- a/test/Transforms/InstCombine/2004-11-27-SetCCForCastLargerAndConstant.ll
+++ b/test/Transforms/InstCombine/2004-11-27-SetCCForCastLargerAndConstant.ll
@@ -9,7 +9,8 @@
 ; be eliminated. In many cases the setCC is also eliminated based on the
 ; constant value and the range of the casted value.
 ;
-; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | notcast '.*int'
+; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    notcast .*int
 
 implementation   ; Functions:
 

diff --git a/test/Transforms/InstCombine/2005-03-04-ShiftOverflow.ll b/test/Transforms/InstCombine/2005-03-04-ShiftOverflow.ll
index c203bb1c442be3e34f023fa3308e2932acb3262c..9a754d842eb254d3724299e0cf70bb2150082897 100644 (file)
--- a/test/Transforms/InstCombine/2005-03-04-ShiftOverflow.ll
+++ b/test/Transforms/InstCombine/2005-03-04-ShiftOverflow.ll
@@ -1,4 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'ret bool false'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   not grep {ret bool false}
+
 bool %test(ulong %tmp.169) {
        %tmp.1710 = shr ulong %tmp.169, ubyte 1
        %tmp.1912 = setgt ulong %tmp.1710, 0

diff --git a/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll b/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll
index f4d6703873b3125d469ce1bcc34a115aa3010c36..764b035b5474aea5ed2e00ed52ea7846822a2f23 100644 (file)
--- a/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll
+++ b/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:   grep 'ret i1 true'
+; RUN:   grep {ret i1 true}
 ; PR586
 
 %g_07918478 = external global uint             ; <uint*> [#uses=1]

diff --git a/test/Transforms/InstCombine/2006-02-13-DemandedMiscompile.ll b/test/Transforms/InstCombine/2006-02-13-DemandedMiscompile.ll
index f3457751492019ae8958ff90827b911e2fd0290d..73ad700961f6a806679f4f6ff96f13ffff57ff77 100644 (file)
--- a/test/Transforms/InstCombine/2006-02-13-DemandedMiscompile.ll
+++ b/test/Transforms/InstCombine/2006-02-13-DemandedMiscompile.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep undef
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   not grep undef
 
 int %test(sbyte %A) {
        %B = cast sbyte %A to int

diff --git a/test/Transforms/InstCombine/2006-04-28-ShiftShiftLongLong.ll b/test/Transforms/InstCombine/2006-04-28-ShiftShiftLongLong.ll
index 12fc742a5fe949df8f0fc0e11dd25503e9b1caef..6e25d79ecb822ddabcfb35a7fa142df6f95156f8 100644 (file)
--- a/test/Transforms/InstCombine/2006-04-28-ShiftShiftLongLong.ll
+++ b/test/Transforms/InstCombine/2006-04-28-ShiftShiftLongLong.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep shl &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep shl
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | notcast
 
 ; This cannot be turned into a sign extending cast!

diff --git a/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll b/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll
index 89ec03dbbee8314d9ffebbad6f5a631e7d534351..58c847fb92a7ae660135588da299ea0dd47d3c1a 100644 (file)
--- a/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll
+++ b/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll
@@ -1,5 +1,6 @@
 ; The optimizer should be able to remove cast operation here.
-; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | not grep 'sext.*i32'
+; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    not grep sext.*i32
 
 bool %eq_signed_to_small_unsigned(sbyte %SB) {
    %Y = cast sbyte %SB to uint         ; <uint> [#uses=1]

diff --git a/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll b/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll
index edd9054f2f59266ef59e0c505eaefbe51de5051c..3ada90ddc63c04ee2e608c90f7b379ebdb697040 100644 (file)
--- a/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll
+++ b/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll
@@ -1,6 +1,7 @@
 ; This test case is reduced from llvmAsmParser.cpp
 ; The optimizer should not remove the cast here.
-; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | grep 'sext.*i32'
+; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    grep sext.*i32
 
 bool %test(short %X) {
     %A = cast short %X to uint

diff --git a/test/Transforms/InstCombine/2006-10-20-mask.ll b/test/Transforms/InstCombine/2006-10-20-mask.ll
index 51855cd9b5d0265ed868d13050c8cd0824e5b6ab..8e829a79859a577300d45fe74f7a9c87e1a21fc8 100644 (file)
--- a/test/Transforms/InstCombine/2006-10-20-mask.ll
+++ b/test/Transforms/InstCombine/2006-10-20-mask.ll
@@ -1,4 +1,5 @@
-;  RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | grep 'and'
+; RUN: llvm-upgrade %s -o - | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    grep and
 ulong %foo(ulong %tmp, ulong %tmp2) {
   %tmp = cast ulong %tmp to uint
   %tmp2 = cast ulong %tmp2 to uint

diff --git a/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll b/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll
index a7172b8a09e758a98d647a58740738ada4185c1e..2c53224e7fe75f22825c7ec66c6ef9bbb630330b 100644 (file)
--- a/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll
+++ b/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep mul | wc -l | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   grep mul | wc -l | grep 2
 
 
 <4 x float> %test(<4 x float> %V) {

diff --git a/test/Transforms/InstCombine/2006-11-03-Memmove64.ll b/test/Transforms/InstCombine/2006-11-03-Memmove64.ll
index e863ab86e89028402116175b1a9a878401b6cf49..550c2eb0c7d900053abf98d127a178fac8a0ba56 100644 (file)
--- a/test/Transforms/InstCombine/2006-11-03-Memmove64.ll
+++ b/test/Transforms/InstCombine/2006-11-03-Memmove64.ll
@@ -1,4 +1,5 @@
-;RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis |not grep memmove.i32
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    not grep memmove.i32
 ; Instcombine was trying to turn this into a memmove.i32
 
 target datalayout = "e-p:64:64"

diff --git a/test/Transforms/InstCombine/2006-11-27-XorBug.ll b/test/Transforms/InstCombine/2006-11-27-XorBug.ll
index 615016682987a078daf6ced98f7bb6fd943a4786..7cbd18eda7b45699151a0f87b96c74490cc36747 100644 (file)
--- a/test/Transforms/InstCombine/2006-11-27-XorBug.ll
+++ b/test/Transforms/InstCombine/2006-11-27-XorBug.ll
@@ -1,5 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'and.*32' &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'or.*153'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep and.*32
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    not grep or.*153
 ; PR1014
 
 int %test(int %tmp1) {

diff --git a/test/Transforms/InstCombine/2006-12-01-BadFPVectorXform.ll b/test/Transforms/InstCombine/2006-12-01-BadFPVectorXform.ll
index 54f70746d1d5f868fc2f863eec8c8cf2ae1b07f3..e2cdf31e2f7cdc3e6b688bc5450fc9589ce5d498 100644 (file)
--- a/test/Transforms/InstCombine/2006-12-01-BadFPVectorXform.ll
+++ b/test/Transforms/InstCombine/2006-12-01-BadFPVectorXform.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep sub &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep sub
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep add
 
 <4 x float> %test(<4 x float> %tmp26, <4 x float> %tmp53) {

diff --git a/test/Transforms/InstCombine/2006-12-08-ICmp-Combining.ll b/test/Transforms/InstCombine/2006-12-08-ICmp-Combining.ll
index 7d4e3f3f779216a1ffc6c39f85ee92205af9d4b1..db4b9e289fbeaa380772b58e608c4b393e68c580 100644 (file)
--- a/test/Transforms/InstCombine/2006-12-08-ICmp-Combining.ll
+++ b/test/Transforms/InstCombine/2006-12-08-ICmp-Combining.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep '%bothcond ='
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    grep {%bothcond =}
 bool %Doit_bb(int %i.0) {
 bb:             ; preds = %newFuncRoot
         %tmp = setgt int %i.0, 0             ; <bool> [#uses=1]

diff --git a/test/Transforms/InstCombine/2006-12-08-Phi-ICmp-Op-Fold.ll b/test/Transforms/InstCombine/2006-12-08-Phi-ICmp-Op-Fold.ll
index 5e5822a868f4af4c289acc5049da4cb06ba301c3..0965623409416bcab45406e4b43d7845877ddd9c 100644 (file)
--- a/test/Transforms/InstCombine/2006-12-08-Phi-ICmp-Op-Fold.ll
+++ b/test/Transforms/InstCombine/2006-12-08-Phi-ICmp-Op-Fold.ll
@@ -1,4 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis|grep 'icmp sgt'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   grep {icmp sgt}
+; END.
+
 ; ModuleID = 'visible.bc'
 target datalayout = "e-p:32:32"
 target endian = little

diff --git a/test/Transforms/InstCombine/2006-12-08-Select-ICmp.ll b/test/Transforms/InstCombine/2006-12-08-Select-ICmp.ll
index 647e15df98f521b4ddebf4733b59b6804e1d912c..8e46bfd42cdcfb97c1f1616545131b24e50c56a1 100644 (file)
--- a/test/Transforms/InstCombine/2006-12-08-Select-ICmp.ll
+++ b/test/Transforms/InstCombine/2006-12-08-Select-ICmp.ll
@@ -1,4 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep select
+; END.
 target datalayout = "e-p:32:32"
 target endian = little
 target pointersize = 32

diff --git a/test/Transforms/InstCombine/2006-12-10-ICmp-GEP-GEP.ll b/test/Transforms/InstCombine/2006-12-10-ICmp-GEP-GEP.ll
index e5ac37b950bcd9bb6fa57f56250a7c69ec6a8fc5..80ff0cfc5822dcaf681b193ec3c868ddbda972cc 100644 (file)
--- a/test/Transforms/InstCombine/2006-12-10-ICmp-GEP-GEP.ll
+++ b/test/Transforms/InstCombine/2006-12-10-ICmp-GEP-GEP.ll
@@ -1,5 +1,6 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:    grep -v 'icmp ult int'
+; RUN:    grep -v {icmp ult int}
+; END.
 ; ModuleID = 'good.bc'
 target datalayout = "e-p:32:32"
 target endian = little

diff --git a/test/Transforms/InstCombine/2006-12-15-Range-Test.ll b/test/Transforms/InstCombine/2006-12-15-Range-Test.ll
index 30ea4ee445abfc253a7baa20ecb8c94d462b6f06..cf253a97451f03e1e9cc298bf7182b400fd3df82 100644 (file)
--- a/test/Transforms/InstCombine/2006-12-15-Range-Test.ll
+++ b/test/Transforms/InstCombine/2006-12-15-Range-Test.ll
@@ -1,8 +1,9 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:   grep 'icmp' | wc -l | grep 1
+; RUN:   grep icmp | wc -l | grep 1
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:   grep 'icmp ugt' | wc -l | grep 1
-;
+; RUN:   grep {icmp ugt} | wc -l | grep 1
+; END.
+
 ; ModuleID = 'bugpoint-tooptimize.bc'
 target datalayout = "e-p:32:32"
 target endian = little

diff --git a/test/Transforms/InstCombine/2006-12-23-Select-Cmp-Cmp.ll b/test/Transforms/InstCombine/2006-12-23-Select-Cmp-Cmp.ll
index b9881e3624ba42636d41e5f4d1703aa8cab34349..0430a614578ea0314de345a368d2a5159024d4bc 100644 (file)
--- a/test/Transforms/InstCombine/2006-12-23-Select-Cmp-Cmp.ll
+++ b/test/Transforms/InstCombine/2006-12-23-Select-Cmp-Cmp.ll
@@ -1,6 +1,7 @@
 ; For PR1065. This causes an assertion in instcombine if a select with two cmp
 ; operands is encountered.
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
+; END.
 ; ModuleID = 'PR1065.bc'
 target datalayout = "e-p:32:32"
 target endian = little

diff --git a/test/Transforms/InstCombine/2007-01-14-FcmpSelf.ll b/test/Transforms/InstCombine/2007-01-14-FcmpSelf.ll
index 6d27d4544d3a692c6e206799d4fc43e5915cc5c7..073d3a154128616aff486c332220b2fd7abf71e2 100644 (file)
--- a/test/Transforms/InstCombine/2007-01-14-FcmpSelf.ll
+++ b/test/Transforms/InstCombine/2007-01-14-FcmpSelf.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'fcmp uno.*0.0'
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {fcmp uno.*0.0}
 ; PR1111
 define i1 @test(double %X) {
   %tmp = fcmp une double %X, %X

diff --git a/test/Transforms/InstCombine/2007-01-27-AndICmp.ll b/test/Transforms/InstCombine/2007-01-27-AndICmp.ll
index 7175c1a5d5c3fe8570513b32b9a4860a019b8eae..0e8c5b17666e3cafa2c0b4290d222f2ff86e4ccd 100644 (file)
--- a/test/Transforms/InstCombine/2007-01-27-AndICmp.ll
+++ b/test/Transforms/InstCombine/2007-01-27-AndICmp.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep "ugt.*, 1"
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {ugt.*, 1}
 
 define i1 @test(i32 %tmp1030) {
        %tmp1037 = icmp ne i32 %tmp1030, 40             ; <i1> [#uses=1]

diff --git a/test/Transforms/InstCombine/2007-02-01-LoadSinkAlloca.ll b/test/Transforms/InstCombine/2007-02-01-LoadSinkAlloca.ll
index 5f55579387236b43f439f9df6cd020024333c38c..e559cdd914a910df263da5a7becf1be11846e2ad 100644 (file)
--- a/test/Transforms/InstCombine/2007-02-01-LoadSinkAlloca.ll
+++ b/test/Transforms/InstCombine/2007-02-01-LoadSinkAlloca.ll
@@ -1,5 +1,7 @@
-; RUN: llvm-as < %s | opt -instcombine -mem2reg | llvm-dis | grep '%A = alloca' &&
-; RUN: llvm-as < %s | opt -instcombine -mem2reg | llvm-dis | not grep '%B = alloca'
+; RUN: llvm-as < %s | opt -instcombine -mem2reg | llvm-dis | grep {%A = alloca} 
+; RUN: llvm-as < %s | opt -instcombine -mem2reg | llvm-dis | \
+; RUN:    not grep {%B = alloca}
+; END.
 
 ; Ensure that instcombine doesn't sink the loads in entry/cond_true into 
 ; cond_next.  Doing so prevents mem2reg from promoting the B alloca.

diff --git a/test/Transforms/InstCombine/2007-02-07-PointerCast.ll b/test/Transforms/InstCombine/2007-02-07-PointerCast.ll
index 1f7f199c6b6709bff6a095fbdc39a00c830cc8e1..f38b4c1d463d244788767a7ec05fe0911edbe352 100644 (file)
--- a/test/Transforms/InstCombine/2007-02-07-PointerCast.ll
+++ b/test/Transforms/InstCombine/2007-02-07-PointerCast.ll
@@ -1,11 +1,9 @@
-;RUN: llvm-upgrade < %s | llvm-as | opt -instcombine |llvm-dis |grep zext
+;RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep zext
 
-;Make sure the uint isn't removed.
-;instcombine in llvm 1.9 was dropping the uint cast which was causing a sign
-;extend
-;this only affected code with pointers in the high half of memory, so it wasn't
-;noticed much :)
-;compile a kernel though...
+; Make sure the uint isn't removed.  Instcombine in llvm 1.9 was dropping the 
+; uint cast which was causing a sign extend. This only affected code with 
+; pointers in the high half of memory, so it wasn't noticed much
+; compile a kernel though...
 
 target datalayout = "e-p:32:32"
 target endian = little

diff --git a/test/Transforms/InstCombine/2007-03-13-CompareMerge.ll b/test/Transforms/InstCombine/2007-03-13-CompareMerge.ll
index 44418e24121878a72ecb747e0684a335cf68f891..d101050e93074aa855d3f8c3261040475d92eb17 100644 (file)
--- a/test/Transforms/InstCombine/2007-03-13-CompareMerge.ll
+++ b/test/Transforms/InstCombine/2007-03-13-CompareMerge.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'icmp sle'
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {icmp sle}
 ; PR1244
 
 define i1 @test(i32 %c.3.i, i32 %d.292.2.i) {

diff --git a/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll b/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll
index 75d9fb37de5153fd352c2dd237a6501d4fa7ee99..c8dafd166299be68f24eefbf720ab117dd2a11f8 100644 (file)
--- a/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll
+++ b/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll
@@ -1,5 +1,5 @@
 ; For PR1248
-; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | grep 'ugt i32 .*, 11'
+; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | grep {ugt i32 .*, 11}
 define i1 @test(i32 %tmp6) {
   %tmp7 = sdiv i32 %tmp6, 12     ; <i32> [#uses=1]
   icmp ne i32 %tmp7, -6           ; <i1>:1 [#uses=1]

diff --git a/test/Transforms/InstCombine/2007-03-25-BadShiftMask.ll b/test/Transforms/InstCombine/2007-03-25-BadShiftMask.ll
index dcd70478c66ed5a4c057bd05bbe694e1e9e95986..0b05f7c643201801fc80bddc000b0c0b1f463c13 100644 (file)
--- a/test/Transforms/InstCombine/2007-03-25-BadShiftMask.ll
+++ b/test/Transforms/InstCombine/2007-03-25-BadShiftMask.ll
@@ -1,6 +1,6 @@
 ; PR1271
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
-; RUN:    grep 'icmp eq i32 .tmp.*, 2146435072'
+; RUN:    grep {icmp eq i32 .tmp.*, 2146435072}
 %struct..0anon = type { i32, i32 }
 %struct..1anon = type { double }
 

diff --git a/test/Transforms/InstCombine/2007-03-26-BadShiftMask.ll b/test/Transforms/InstCombine/2007-03-26-BadShiftMask.ll
index 0e08cb0d9d854acd01009af26afafae38a1a9047..6197fcc4f91174509be191bcbfecf378b3716ab8 100644 (file)
--- a/test/Transforms/InstCombine/2007-03-26-BadShiftMask.ll
+++ b/test/Transforms/InstCombine/2007-03-26-BadShiftMask.ll
@@ -1,6 +1,7 @@
 ; PR1271
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
-; RUN:    grep 'ashr i32 %.mp137, 2'
+; RUN:    grep {ashr i32 %.mp137, 2}
+; END.
 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-pc-linux-gnu"
 

diff --git a/test/Transforms/InstCombine/2007-03-27-PR1280.ll b/test/Transforms/InstCombine/2007-03-27-PR1280.ll
index 9505751c8d3a0198f8178567cc778d1391fa9718..6cb9aaec09873d6a74dfc580943882843c38a7ef 100644 (file)
--- a/test/Transforms/InstCombine/2007-03-27-PR1280.ll
+++ b/test/Transforms/InstCombine/2007-03-27-PR1280.ll
@@ -4,7 +4,7 @@
 ;          is not done. It should be removed when code gen supports "funny"
 ;          bit widths.
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'add i49.*-8388608'
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {add i49.*-8388608}
 
 define i49 @test5(i49 %x) {
         ;; If we have ADD(XOR(AND(X, 0xFF), 0x80), 0xF..F80), it's a sext.

diff --git a/test/Transforms/InstCombine/2007-03-31-InfiniteLoop.ll b/test/Transforms/InstCombine/2007-03-31-InfiniteLoop.ll
index d59c43e81bd8aa4fda83c147491072c859bedd16..640f6d57504b56718ba06b817c23f37ae7dad3e9 100644 (file)
--- a/test/Transforms/InstCombine/2007-03-31-InfiniteLoop.ll
+++ b/test/Transforms/InstCombine/2007-03-31-InfiniteLoop.ll
@@ -1,4 +1,5 @@
 ; RUN: llvm-as < %s | opt -instcombine -disable-output
+; END.
 
 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/Transforms/InstCombine/2007-04-04-BadFoldBitcastIntoMalloc.ll b/test/Transforms/InstCombine/2007-04-04-BadFoldBitcastIntoMalloc.ll
index a890e59c14bf69d2d4d5ada1d7c52b4b8b8e97f9..d7a5b44b033996b5ee290acc8c2d8adc58bf2649 100644 (file)
--- a/test/Transforms/InstCombine/2007-04-04-BadFoldBitcastIntoMalloc.ll
+++ b/test/Transforms/InstCombine/2007-04-04-BadFoldBitcastIntoMalloc.ll
@@ -3,7 +3,7 @@
 ; 64-bit targets.
 ;
 ; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep '= add '
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep {= add }
 
 target datalayout = "e-p:64:64:64-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 = "x86_64-unknown-freebsd6.2"

diff --git a/test/Transforms/InstCombine/CPP_min_max.llx b/test/Transforms/InstCombine/CPP_min_max.llx
index e64d0b91887dc671a45397a950cd4524a04fbd56..3d99ad603b021c0735870a0847dc8e960fd06f6c 100644 (file)
--- a/test/Transforms/InstCombine/CPP_min_max.llx
+++ b/test/Transforms/InstCombine/CPP_min_max.llx
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep select | not grep 'int\*'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   grep select | not grep {i32\\*}
 
 ; This testcase corresponds to PR362, which notices that this horrible code
 ; is generated by the C++ front-end and LLVM optimizers, which has lots of

diff --git a/test/Transforms/InstCombine/GEPIdxCanon.ll b/test/Transforms/InstCombine/GEPIdxCanon.ll
index afaabc3e2f05baac5d00e1c531220074ca902a29..bf0ab798414ea0950114ceffcf6c6cfc4ff16063 100644 (file)
--- a/test/Transforms/InstCombine/GEPIdxCanon.ll
+++ b/test/Transforms/InstCombine/GEPIdxCanon.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -gcse -instcombine | llvm-dis | not grep getelementptr
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -gcse -instcombine | \
+; RUN:    llvm-dis | not grep getelementptr
 
 bool %test(int* %A) {
        %B = getelementptr int* %A, int 1

diff --git a/test/Transforms/InstCombine/JavaCompare.ll b/test/Transforms/InstCombine/JavaCompare.ll
index 11f706e5662d0fddb3a99237d06bf8835d9c7125..4ed064c674cbd7acf738eac73b02144799b607da 100644 (file)
--- a/test/Transforms/InstCombine/JavaCompare.ll
+++ b/test/Transforms/InstCombine/JavaCompare.ll
@@ -1,7 +1,8 @@
 ; This is the sequence of stuff that the Java front-end expands for a single 
 ; <= comparison.  Check to make sure we turn it into a <= (only)
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v 'icmp sle'| not grep '#uses'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    grep -v {icmp sle} | not grep #uses
 
 bool %le(int %A, int %B) {
         %c1 = setgt int %A, %B;

diff --git a/test/Transforms/InstCombine/alloca.ll b/test/Transforms/InstCombine/alloca.ll
index 8ce7b65b0c07fa3115a13e27bf14efc0f53e58c1..43e4e3249a7870f0e3bebbdfeba7e886d03ed81f 100644 (file)
--- a/test/Transforms/InstCombine/alloca.ll
+++ b/test/Transforms/InstCombine/alloca.ll
@@ -1,6 +1,8 @@
 ; Zero byte allocas should be deleted.
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep alloca
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   not grep alloca
+; END.
 
 declare void %use(...)
 void %test() {

diff --git a/test/Transforms/InstCombine/and-compare.ll b/test/Transforms/InstCombine/and-compare.ll
index 864b8c25e21bdfe0de941f9f3af8b87b491dfc93..5980631c69fe1e97a161521cf771b33a18264b0c 100644 (file)
--- a/test/Transforms/InstCombine/and-compare.ll
+++ b/test/Transforms/InstCombine/and-compare.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep and | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    grep and | wc -l | grep 1
 
 ; Should be optimized to one and.
 bool %test1(uint %a, uint %b) {

diff --git a/test/Transforms/InstCombine/and-or-and.ll b/test/Transforms/InstCombine/and-or-and.ll
index 1c8465c7302e0344816a1ac04ae9432e83f4ef0f..dc1eea1a2d08e69ecb85abd330fb873cf2ce9ccc 100644 (file)
--- a/test/Transforms/InstCombine/and-or-and.ll
+++ b/test/Transforms/InstCombine/and-or-and.ll
@@ -9,7 +9,8 @@
 ;
 ; Which corresponds to test1.
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'or '
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   not grep {or }
 
 int %test1(int %X, int %Y) {
        %A = and int %X, 7

diff --git a/test/Transforms/InstCombine/and-xor-merge.ll b/test/Transforms/InstCombine/and-xor-merge.ll
index 290c2d73ee0aefb754bbe5f8d024ac4b6dd1e63e..c53ebc6f3d3d1a83dde4d702c208d4d4ffe78b05 100644 (file)
--- a/test/Transforms/InstCombine/and-xor-merge.ll
+++ b/test/Transforms/InstCombine/and-xor-merge.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep and | wc -l | grep 1 &&
+; 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
 
 ; (x&z) ^ (y&z) -> (x^y)&z

diff --git a/test/Transforms/InstCombine/apint-add1.ll b/test/Transforms/InstCombine/apint-add1.ll
index 925009214f17d057d38916682a4b2d6ed780ba4a..74280ee7f7cad1a132b92c9a2a301ce6d7d0f054 100644 (file)
--- a/test/Transforms/InstCombine/apint-add1.ll
+++ b/test/Transforms/InstCombine/apint-add1.ll
@@ -1,7 +1,6 @@
 ; This test makes sure that add instructions are properly eliminated.
 ; This test is for Integer BitWidth <= 64 && BitWidth % 8 != 0.
 
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
 ; RUN:    grep -v OK | not grep add
 

diff --git a/test/Transforms/InstCombine/apint-add2.ll b/test/Transforms/InstCombine/apint-add2.ll
index e06b07c61d1c6a76fa06f124e5bd0125a1ed2120..39a54b1ec5cb00ba8b251e64158e4bd60b2f7a8e 100644 (file)
--- a/test/Transforms/InstCombine/apint-add2.ll
+++ b/test/Transforms/InstCombine/apint-add2.ll
@@ -1,7 +1,6 @@
 ; This test makes sure that add instructions are properly eliminated.
 ; This test is for Integer BitWidth > 64 && BitWidth <= 1024.
 
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
 ; RUN:    grep -v OK | not grep add
 

diff --git a/test/Transforms/InstCombine/apint-and-or-and.ll b/test/Transforms/InstCombine/apint-and-or-and.ll
index 6bea6126cdce3cb9de2d0fa73766f459ae56dd8d..e60a1fa16dfcf27831838d046818ec7f9c0fd69b 100644 (file)
--- a/test/Transforms/InstCombine/apint-and-or-and.ll
+++ b/test/Transforms/InstCombine/apint-and-or-and.ll
@@ -11,7 +11,7 @@
 ; 
 ; This tests arbitrary precision integers.
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'or '
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep {or }
 
 define i17 @test1(i17 %X, i17 %Y) {
        %A = and i17 %X, 7

diff --git a/test/Transforms/InstCombine/apint-and-xor-merge.ll b/test/Transforms/InstCombine/apint-and-xor-merge.ll
index d2265ed4b6709e3f097155984cf70239b2411601..665a643afe9d9fe8dc2d0b00a79ecc166f4f926a 100644 (file)
--- a/test/Transforms/InstCombine/apint-and-xor-merge.ll
+++ b/test/Transforms/InstCombine/apint-and-xor-merge.ll
@@ -1,7 +1,7 @@
 ; 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 and | wc -l | grep 1
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep xor | wc -l | grep 2
 
 ; (x &z ) ^ (y & z) -> (x ^ y) & z

diff --git a/test/Transforms/InstCombine/apint-and1.ll b/test/Transforms/InstCombine/apint-and1.ll
index 53b9e23f4bf144472374751d3d5c608afb97c176..b6c7bd9a6b0eab27ad19e9dc4c18cdaf02b0be80 100644 (file)
--- a/test/Transforms/InstCombine/apint-and1.ll
+++ b/test/Transforms/InstCombine/apint-and1.ll
@@ -1,8 +1,7 @@
 ; This test makes sure that and instructions are properly eliminated.
 ; This test is for Integer BitWidth <= 64 && BitWidth % 8 != 0.
 
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'and '
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep {and }
 
 define i39 @test0(i39 %A) {
         %B = and i39 %A, 0 ; zero result

diff --git a/test/Transforms/InstCombine/apint-and2.ll b/test/Transforms/InstCombine/apint-and2.ll
index e66eeff12d39f78a90f05d629483401bc02d05ec..3b6901690080b3d55db006c6110e19623765a10d 100644 (file)
--- a/test/Transforms/InstCombine/apint-and2.ll
+++ b/test/Transforms/InstCombine/apint-and2.ll
@@ -1,8 +1,7 @@
 ; This test makes sure that and instructions are properly eliminated.
 ; This test is for Integer BitWidth > 64 && BitWidth <= 1024.
 
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'and '
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep {and }
 
 
 define i999 @test0(i999 %A) {

diff --git a/test/Transforms/InstCombine/apint-cast.ll b/test/Transforms/InstCombine/apint-cast.ll
index 9973b4aab1c27d07fe669f2f4e73aa66cb178559..dd00146400212e2cb0abc3bce04f7f3f79300500 100644 (file)
--- a/test/Transforms/InstCombine/apint-cast.ll
+++ b/test/Transforms/InstCombine/apint-cast.ll
@@ -1,5 +1,4 @@
 ; Tests to make sure elimination of casts is working correctly
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast
 
 define i17 @test1(i17 %a) {

diff --git a/test/Transforms/InstCombine/apint-elim-logicalops.ll b/test/Transforms/InstCombine/apint-elim-logicalops.ll
index 7920d91c60b89794c1ecbc712c5caa1da25bde13..13d032cacf21e94edf08609bde1045b5617cda35 100644 (file)
--- a/test/Transforms/InstCombine/apint-elim-logicalops.ll
+++ b/test/Transforms/InstCombine/apint-elim-logicalops.ll
@@ -1,9 +1,8 @@
 ; Test that elimination of logical operators works with 
 ; arbitrary precision integers.
-
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
-; RUN:    not grep '(and\|xor\|add\|shl\|shr)'
+; RUN:    not grep {(and\|xor\|add\|shl\|shr)}
+; END.
 
 define i33 @test1(i33 %x) {
         %tmp.1 = and i33 %x, 65535           ; <i33> [#uses=1]

diff --git a/test/Transforms/InstCombine/apint-or2.ll b/test/Transforms/InstCombine/apint-or2.ll
index b8f87836887d27a264a6e5d3092bbd0b79bb5d07..21dc5654ceeca7d0139bcb50addceba9f1f384cf 100644 (file)
--- a/test/Transforms/InstCombine/apint-or2.ll
+++ b/test/Transforms/InstCombine/apint-or2.ll
@@ -1,8 +1,6 @@
 ; This test makes sure that or instructions are properly eliminated.
 ; This test is for Integer BitWidth > 64 && BitWidth <= 1024.
 ;
-
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis > /tmp/or2.rel &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep or
 
 

diff --git a/test/Transforms/InstCombine/apint-rem1.ll b/test/Transforms/InstCombine/apint-rem1.ll
index 6b1c772dd59a871e369feb1bcda9e73944fefe38..2ec8c749972d5ac29a06858eb7251b3e0cd1fb3f 100644 (file)
--- a/test/Transforms/InstCombine/apint-rem1.ll
+++ b/test/Transforms/InstCombine/apint-rem1.ll
@@ -1,7 +1,6 @@
 ; This test makes sure that these instructions are properly eliminated.
 ; This test is for Integer BitWidth < 64 && BitWidth % 2 != 0.
 ;
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep rem
 
 

diff --git a/test/Transforms/InstCombine/apint-rem2.ll b/test/Transforms/InstCombine/apint-rem2.ll
index 4704018b394edb47e239238c79017bca10be48af..4d22c22d540105b6d79c3436a78d43d6b44d21db 100644 (file)
--- a/test/Transforms/InstCombine/apint-rem2.ll
+++ b/test/Transforms/InstCombine/apint-rem2.ll
@@ -1,7 +1,6 @@
 ; This test makes sure that these instructions are properly eliminated.
 ; This test is for Integer BitWidth >= 64 && BitWidth <= 1024.
 ;
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep rem
 
 

diff --git a/test/Transforms/InstCombine/apint-select.ll b/test/Transforms/InstCombine/apint-select.ll
index 54e905eb10456320fdc7286c13512eb02c908400..c2399fb88efeb2cdd8f58b26fd3f1ac506ac8c3b 100644 (file)
--- a/test/Transforms/InstCombine/apint-select.ll
+++ b/test/Transforms/InstCombine/apint-select.ll
@@ -1,7 +1,6 @@
 ; This test makes sure that these instructions are properly eliminated.
 
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep select &&
-; RUN: llvm-as < %s | opt -instcombine -disable-output
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep select
 
 
 define i41 @test1(i1 %C) {

diff --git a/test/Transforms/InstCombine/apint-shift-simplify.ll b/test/Transforms/InstCombine/apint-shift-simplify.ll
index 43c00f86fdf9b64bbeda43d29ba52276d16d84d6..4c352cf817637a2b09db363080a0c434595f5b45 100644 (file)
--- 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} | wc -l | grep 3
 
 define i41 @test0(i41 %A, i41 %B, i41 %C) {
        %X = shl i41 %A, %C

diff --git a/test/Transforms/InstCombine/apint-shift.ll b/test/Transforms/InstCombine/apint-shift.ll
index 5ed70dce13531d10a2650989e38f5e7203cbd6d8..afc5360d8de449e0030c1fc6c10f275f16b57578 100644 (file)
--- a/test/Transforms/InstCombine/apint-shift.ll
+++ b/test/Transforms/InstCombine/apint-shift.ll
@@ -1,8 +1,7 @@
 ; This test makes sure that shit instructions are properly eliminated
 ; even with arbitrary precision integers.
-
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep sh
+; END.
 
 define i47 @test1(i47 %A) {
        %B = shl i47 %A, 0              ; <i47> [#uses=1]

diff --git a/test/Transforms/InstCombine/apint-shl-trunc.ll b/test/Transforms/InstCombine/apint-shl-trunc.ll
index cf5b1f86834331e0e80f106c7cfdc50fa7bacf1c..a9cffdef04f432389a1436c64ad2e7bdef55a676 100644 (file)
--- a/test/Transforms/InstCombine/apint-shl-trunc.ll
+++ b/test/Transforms/InstCombine/apint-shl-trunc.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis > /tmp/sht.rel &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep shl
+; END.
 
 define i1 @test0(i39 %X, i39 %A) {
        %B = lshr i39 %X, %A

diff --git a/test/Transforms/InstCombine/apint-sub.ll b/test/Transforms/InstCombine/apint-sub.ll
index 05328bc1a87fd3fdb1aa69c6c287a5ecdbb1b8b3..75ea36d143a2c35707dc0bbf5852883223ae1875 100644 (file)
--- a/test/Transforms/InstCombine/apint-sub.ll
+++ b/test/Transforms/InstCombine/apint-sub.ll
@@ -2,8 +2,8 @@
 ; even with arbitrary precision integers.
 ;
 
-; RUN:  llvm-as < %s | opt -instcombine | llvm-dis | \
-; RUN:   grep -v 'sub i19 %Cok, %Bok' | not grep sub
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
+; RUN:   grep -v {sub i19 %Cok, %Bok} | not grep sub
 
 define i23 @test1(i23 %A) {
        %B = sub i23 %A, %A             ; <i23> [#uses=1]

diff --git a/test/Transforms/InstCombine/apint-xor1.ll b/test/Transforms/InstCombine/apint-xor1.ll
index 35cf6ae8225c1eb79122ed438a2b7ad17c8ed4f5..5ddf5cf9c9b6b8e5ed416619976d9eb0efce9ffe 100644 (file)
--- a/test/Transforms/InstCombine/apint-xor1.ll
+++ b/test/Transforms/InstCombine/apint-xor1.ll
@@ -1,8 +1,7 @@
 ; This test makes sure that xor instructions are properly eliminated.
 ; This test is for Integer BitWidth <= 64 && BitWidth % 8 != 0.
 
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'xor '
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep {xor }
 
 
 define i47 @test1(i47 %A, i47 %B) {

diff --git a/test/Transforms/InstCombine/apint-xor2.ll b/test/Transforms/InstCombine/apint-xor2.ll
index b9d7e82f28839e08d521d49834af3691cfa7db35..7ce5ad8473d83eace7a2b847a5cf3ef2ef798864 100644 (file)
--- a/test/Transforms/InstCombine/apint-xor2.ll
+++ b/test/Transforms/InstCombine/apint-xor2.ll
@@ -1,8 +1,7 @@
 ; This test makes sure that xor instructions are properly eliminated.
 ; This test is for Integer BitWidth > 64 && BitWidth <= 1024.
 
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'xor '
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep {xor }
 
 
 define i447 @test1(i447 %A, i447 %B) {

diff --git a/test/Transforms/InstCombine/apint-zext1.ll b/test/Transforms/InstCombine/apint-zext1.ll
index 462e6910ca36ddb934067a212d982ca8a7ff157c..03330c7be966fb87e590a93d1a27a5001886cec6 100644 (file)
--- a/test/Transforms/InstCombine/apint-zext1.ll
+++ b/test/Transforms/InstCombine/apint-zext1.ll
@@ -1,7 +1,6 @@
 ; Tests to make sure elimination of casts is working correctly
 ; This test is for Integer BitWidth <= 64 && BitWidth % 2 != 0.
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast '' '%c1.*'
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast {} {%c1.*}
 
 define i47 @test_sext_zext(i11 %A) {
     %c1 = zext i11 %A to i39

diff --git a/test/Transforms/InstCombine/apint-zext2.ll b/test/Transforms/InstCombine/apint-zext2.ll
index ea6000926b5b2efc6b6b5d79827e13ff1685825c..8350d10282b694efa2a92aa4b906aad45e0c9882 100644 (file)
--- a/test/Transforms/InstCombine/apint-zext2.ll
+++ b/test/Transforms/InstCombine/apint-zext2.ll
@@ -1,7 +1,6 @@
 ; Tests to make sure elimination of casts is working correctly
 ; This test is for Integer BitWidth > 64 && BitWidth <= 1024.
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast '' '%c1.*'
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast {} {%c1.*}
 
 define i1024 @test_sext_zext(i77 %A) {
     %c1 = zext i77 %A to i533

diff --git a/test/Transforms/InstCombine/bit-tracking.ll b/test/Transforms/InstCombine/bit-tracking.ll
index f6654738d7f1d531d829a10fe598b274b2154448..2575ae5520d0f486bc144234bd0c0e44e21762b2 100644 (file)
--- a/test/Transforms/InstCombine/bit-tracking.ll
+++ b/test/Transforms/InstCombine/bit-tracking.ll
@@ -1,7 +1,7 @@
 ; This file contains various testcases that require tracking whether bits are
 ; set or cleared by various instructions.
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -instcombine -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -instcombine | llvm-dis | not grep %ELIM
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -instcombine | llvm-dis |\
+; RUN:   not grep %ELIM
 
 ; Reduce down to a single XOR
 int %test3(int %B) {

diff --git a/test/Transforms/InstCombine/bitcount.ll b/test/Transforms/InstCombine/bitcount.ll
index f23f65521f76ed1d98cf2f18fcfe81341767f104..da539200e7f536696690bc00fd23098588e3e32e 100644 (file)
--- a/test/Transforms/InstCombine/bitcount.ll
+++ b/test/Transforms/InstCombine/bitcount.ll
@@ -1,6 +1,7 @@
 ; Tests to make sure bit counts of constants are folded
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'ret i32 19' &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep -v declare | not grep 'llvm.ct'
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {ret i32 19}
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
+; RUN:   grep -v declare | not grep llvm.ct
 
 declare i32 @llvm.ctpop.i31(i31 %val) 
 declare i32 @llvm.cttz.i32(i32 %val) 

diff --git a/test/Transforms/InstCombine/bittest.ll b/test/Transforms/InstCombine/bittest.ll
index 7fb5fdee5777054a5d912565feab26a6f2bcdc17..1ba42895a11fefe3ea70df3ee61c371ff09176d7 100644 (file)
--- a/test/Transforms/InstCombine/bittest.ll
+++ b/test/Transforms/InstCombine/bittest.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -simplifycfg -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -simplifycfg | llvm-dis | not grep 'call void %abort'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -simplifycfg | llvm-dis |\
+; RUN:    not grep {call void %abort}
 
 %b_rec.0 = external global int
 

diff --git a/test/Transforms/InstCombine/bswap-fold.ll b/test/Transforms/InstCombine/bswap-fold.ll
index 0ee486ad1aa869013ea2d5ab4fe03d830b3a8dfb..1552386db1f086eb148b539ac641fb17f9466e31 100644 (file)
--- a/test/Transforms/InstCombine/bswap-fold.ll
+++ b/test/Transforms/InstCombine/bswap-fold.ll
@@ -1,5 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep ret | wc -l | grep 3 &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'call.*bswap'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   grep ret | wc -l | grep 3
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   not grep call.*bswap
 
 bool %test1(ushort %tmp2) {
        %tmp10 = call ushort %llvm.bswap.i16( ushort %tmp2 )            

diff --git a/test/Transforms/InstCombine/bswap.ll b/test/Transforms/InstCombine/bswap.ll
index da2354e96ee7cf4e9b1a462563c668ff9eaaf5d0..209f76c33ac7ff8beed29e5627fd794e5fb2cfec 100644 (file)
--- a/test/Transforms/InstCombine/bswap.ll
+++ b/test/Transforms/InstCombine/bswap.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'call.*llvm.bswap' | wc -l | grep 5
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    grep {call.*llvm.bswap} | wc -l | grep 5
 
 uint %test1(uint %i) {
         %tmp1 = shr uint %i, ubyte 24           ; <uint> [#uses=1]

diff --git a/test/Transforms/InstCombine/call-cast-target.ll b/test/Transforms/InstCombine/call-cast-target.ll
index 4a3cb2af2283d0a238d7023cde33a01109b4f043..6d964905aa4d9a8cc851c0c7f816dd622877f9ba 100644 (file)
--- a/test/Transforms/InstCombine/call-cast-target.ll
+++ b/test/Transforms/InstCombine/call-cast-target.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep call | not grep bitcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   grep call | not grep bitcast
 
 target endian = little
 target pointersize = 32

diff --git a/test/Transforms/InstCombine/call.ll b/test/Transforms/InstCombine/call.ll
index aa9495e0c279e668220461cfea6cf51ce6b9dce9..d5a6465e1c2865b0f01c0f84dcaee499a0e42278 100644 (file)
--- a/test/Transforms/InstCombine/call.ll
+++ b/test/Transforms/InstCombine/call.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep call | notcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    grep call | notcast
 
 implementation
 

diff --git a/test/Transforms/InstCombine/canonicalize_branch.ll b/test/Transforms/InstCombine/canonicalize_branch.ll
index 1434c7bee08768cc6924c8792c937c9302491897..032e2931887077ea634ae30cc88f2bc6a4e18367 100644 (file)
--- a/test/Transforms/InstCombine/canonicalize_branch.ll
+++ b/test/Transforms/InstCombine/canonicalize_branch.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'setne\|setle\|setge'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    not grep {setne\|setle\|setge}
 
 int %test1(uint %X, uint %Y) {
        %C = setne uint %X, %Y

diff --git a/test/Transforms/InstCombine/cast-and-cast.ll b/test/Transforms/InstCombine/cast-and-cast.ll
index b141974bece66b2c4426d775f88cbb9c43b544e7..8da9d3370d54c73ec41f8e73c1a39e7c884c9ee4 100644 (file)
--- a/test/Transforms/InstCombine/cast-and-cast.ll
+++ b/test/Transforms/InstCombine/cast-and-cast.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep bitcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   not grep bitcast
 
 bool %test1(uint %val) {
   %t1 = bitcast uint %val to int 

diff --git a/test/Transforms/InstCombine/cast-cast-to-and.ll b/test/Transforms/InstCombine/cast-cast-to-and.ll
index 8789b98b44be6fb421a22be501c1607a00bb4263..97386bb5384272289725538edcbe07a4218f1163 100644 (file)
--- a/test/Transforms/InstCombine/cast-cast-to-and.ll
+++ b/test/Transforms/InstCombine/cast-cast-to-and.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep ubyte
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   not grep ubyte
 
 int %test1(uint %X) {
         %Y = cast uint %X to ubyte ;; Turn into an AND

diff --git a/test/Transforms/InstCombine/cast-load-gep.ll b/test/Transforms/InstCombine/cast-load-gep.ll
index 0a369bce039b6acbb0c7921f6a05211a402f1ec2..4fa63ddd6ab566813a1f732eb9473a0440d8614b 100644 (file)
--- a/test/Transforms/InstCombine/cast-load-gep.ll
+++ b/test/Transforms/InstCombine/cast-load-gep.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -globaldce | llvm-dis | not grep Array
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -globaldce | llvm-dis | \
+; RUN:   not grep Array
 
 ; Pulling the cast out of the load allows us to eliminate the load, and then 
 ; the whole array.

diff --git a/test/Transforms/InstCombine/cast-propagate.ll b/test/Transforms/InstCombine/cast-propagate.ll
index d4f07a4d842e7297d389a74790bdbdd5463c60e5..d556473932f291eba8b06c2c74c244b60c5724be 100644 (file)
--- a/test/Transforms/InstCombine/cast-propagate.ll
+++ b/test/Transforms/InstCombine/cast-propagate.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -mem2reg | llvm-dis | not grep load
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -mem2reg | llvm-dis | \
+; RUN:    not grep load
 
 int %test1(uint* %P) {
        %A = alloca uint 

diff --git a/test/Transforms/InstCombine/cast.ll b/test/Transforms/InstCombine/cast.ll
index 6cad43bd7dc9e5f427f653ed1896e912fed1ec30..36361b7ad9243c2852a1a7c408bd37940ed85e96 100644 (file)
--- a/test/Transforms/InstCombine/cast.ll
+++ b/test/Transforms/InstCombine/cast.ll
@@ -1,6 +1,6 @@
 ; Tests to make sure elimination of casts is working correctly
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep '%c' | notcast
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    grep %c | notcast
 
 %inbuf = external global [32832 x ubyte]
 

diff --git a/test/Transforms/InstCombine/cast2.ll b/test/Transforms/InstCombine/cast2.ll
index c5e91461fa8ce2cabfbdf9a548ffdebeb5ef07ce..5cc9087198b2730d0f9c0cecd1f73929d9d62043 100644 (file)
--- a/test/Transforms/InstCombine/cast2.ll
+++ b/test/Transforms/InstCombine/cast2.ll
@@ -1,5 +1,4 @@
 ; Tests to make sure elimination of casts is working correctly
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast
 
 define i16 @test1(i16 %a) {

diff --git a/test/Transforms/InstCombine/cast_ptr.ll b/test/Transforms/InstCombine/cast_ptr.ll
index a89e65bfd9057092fffe6d3e1bcb5b084d45305d..ee19f7a80e61457738dfe22b47f069a7b50d7759 100644 (file)
--- a/test/Transforms/InstCombine/cast_ptr.ll
+++ b/test/Transforms/InstCombine/cast_ptr.ll
@@ -1,5 +1,4 @@
 ; Tests to make sure elimination of casts is working correctly
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | notcast
 ; XFAIL: *
 

diff --git a/test/Transforms/InstCombine/deadcode.ll b/test/Transforms/InstCombine/deadcode.ll
index 836d6147f231e55c320aca34361255108de04f42..370390a834cbc5e70adc755f948a8e4515403b4d 100644 (file)
--- a/test/Transforms/InstCombine/deadcode.ll
+++ b/test/Transforms/InstCombine/deadcode.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'ret i32 %A'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   grep {ret i32 %A}
 
 int %test(int %A) {
   %X = or bool false, false

diff --git a/test/Transforms/InstCombine/dg.exp b/test/Transforms/InstCombine/dg.exp
index ff34508c3c64c167429097e1c896dd65daaff278..694e4fdd88ab661ec85ee1d7be23899c5970ef26 100644 (file)
--- a/test/Transforms/InstCombine/dg.exp
+++ b/test/Transforms/InstCombine/dg.exp
@@ -1,3 +1,3 @@
-load_lib llvm-dg.exp
+load_lib llvm.exp
 
 llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]

diff --git a/test/Transforms/InstCombine/getelementptr-setcc.ll b/test/Transforms/InstCombine/getelementptr-setcc.ll
index 4b637f2cfb11e2792cdc3dde0155cb3f867cc017..edf0ccbc6791b96db6fd0cf10cdf0c0050937c2e 100644 (file)
--- a/test/Transforms/InstCombine/getelementptr-setcc.ll
+++ b/test/Transforms/InstCombine/getelementptr-setcc.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep getelementptr
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   not grep getelementptr
 
 bool %test1(short* %P, int %I, int %J) {
     %X = getelementptr short* %P, int %I

diff --git a/test/Transforms/InstCombine/getelementptr.ll b/test/Transforms/InstCombine/getelementptr.ll
index 2e1c59387f110bef493f294fed3f8659cc030ddc..5862b4ca2a4b54736b5189c16a66e952fdeaa4d7 100644 (file)
--- a/test/Transforms/InstCombine/getelementptr.ll
+++ b/test/Transforms/InstCombine/getelementptr.ll
@@ -1,6 +1,7 @@
 ; The %A getelementptr instruction should be eliminated here
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v '%B' | not grep getelementptr &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    grep -v %B | not grep getelementptr
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep foo1
 
 %Global = constant [10 x sbyte] c"helloworld"

diff --git a/test/Transforms/InstCombine/getelementptr_cast.ll b/test/Transforms/InstCombine/getelementptr_cast.ll
index 9d629d3bad35cb1164baf54caffa73f7d1b822b2..5a0d132519b811e74dee668ef4793047ff1f2f8f 100644 (file)
--- a/test/Transforms/InstCombine/getelementptr_cast.ll
+++ b/test/Transforms/InstCombine/getelementptr_cast.ll
@@ -1,4 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | notcast '' 'getelementptr.*'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    notcast {} {getelementptr.*}
+
 %G = external global [3 x sbyte]
 
 implementation

diff --git a/test/Transforms/InstCombine/getelementptr_const.ll b/test/Transforms/InstCombine/getelementptr_const.ll
index 9a078c50fd1a38fee71829c86c733cea378dee7e..e4265f41973b552b3fa76712c784a4cf879d26db 100644 (file)
--- a/test/Transforms/InstCombine/getelementptr_const.ll
+++ b/test/Transforms/InstCombine/getelementptr_const.ll
@@ -1,5 +1,6 @@
 ; Test folding of constantexpr geps into normal geps.
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -gcse -instcombine | llvm-dis | not grep getelementptr
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -gcse -instcombine | \
+; RUN:    llvm-dis | not grep getelementptr
 
 %Array = external global [40 x int]
 

diff --git a/test/Transforms/InstCombine/hoist_instr.ll b/test/Transforms/InstCombine/hoist_instr.ll
index 4059563dc23a298335fa967d7e39c68722553f3c..cfe704d56934124d65ee1018753d3f1966fe8191 100644 (file)
--- a/test/Transforms/InstCombine/hoist_instr.ll
+++ b/test/Transforms/InstCombine/hoist_instr.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | %prcontext div 1 | grep then:
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   %prcontext div 1 | grep then:
 
 ;; This tests that the div is hoisted into the then block.
 

diff --git a/test/Transforms/InstCombine/icmp.ll b/test/Transforms/InstCombine/icmp.ll
index e07b53e63a77718a1655d1c8f289a0099c5ad30a..bb69ba3be47148961ea126b28c587d5215ebaa4e 100644 (file)
--- a/test/Transforms/InstCombine/icmp.ll
+++ b/test/Transforms/InstCombine/icmp.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep icmp
+; END.
 
 define i32 @test1(i32 %X) {
 entry:

diff --git a/test/Transforms/InstCombine/load.ll b/test/Transforms/InstCombine/load.ll
index 58f9894903bee69a4af9323907440922027d8d80..d1b8eda2bf8ac77a5b935bfb4dd71f7293b6d3f1 100644 (file)
--- a/test/Transforms/InstCombine/load.ll
+++ b/test/Transforms/InstCombine/load.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep load
+; END.
 
 %X = constant int 42
 %X2 = constant int 47

diff --git a/test/Transforms/InstCombine/malloc-free-delete.ll b/test/Transforms/InstCombine/malloc-free-delete.ll
index e75b1f32481c6270e86201a32739228e8aa749d3..24f793f7ca8f6881848f19f45d995415c83687be 100644 (file)
--- a/test/Transforms/InstCombine/malloc-free-delete.ll
+++ b/test/Transforms/InstCombine/malloc-free-delete.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'ret i32 0' &&
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {ret i32 0}
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep malloc
 ; PR1201
 define i32 @main(i32 %argc, i8** %argv) {
@@ -9,4 +9,3 @@ define i32 @main(i32 %argc, i8** %argv) {
         free i8* %tmp_207
         ret i32 0
 }
-

diff --git a/test/Transforms/InstCombine/malloc2.ll b/test/Transforms/InstCombine/malloc2.ll
index 0ebb52154519dc956106f913c4d9ce8b08555553..eb7c9abfcef506613fc50c5902848fa222303fd4 100644 (file)
--- a/test/Transforms/InstCombine/malloc2.ll
+++ b/test/Transforms/InstCombine/malloc2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'ret i32 0' &&
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {ret i32 0}
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep malloc
 ; PR1313
 

diff --git a/test/Transforms/InstCombine/memmove.ll b/test/Transforms/InstCombine/memmove.ll
index fb20dbc873c3a936d8dd2aef1b83c7be19c21e50..5ee9c90bb9ec9dcd64780e207dc0dcd860f1c095 100644 (file)
--- a/test/Transforms/InstCombine/memmove.ll
+++ b/test/Transforms/InstCombine/memmove.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that memmove instructions are properly eliminated.
 ;
-
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'call void %llvm.memmove'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    not grep {call void @llvm.memmove}
 
 %S = internal constant [33 x sbyte] c"panic: restorelist inconsistency\00"
 

diff --git a/test/Transforms/InstCombine/mul.ll b/test/Transforms/InstCombine/mul.ll
index ccec6b894a7afa2086ca8f52ee828c3daf35f9e1..86c52fa55be3951a535130afbdde5302fd91efc4 100644 (file)
--- a/test/Transforms/InstCombine/mul.ll
+++ b/test/Transforms/InstCombine/mul.ll
@@ -1,6 +1,5 @@
 ; This test makes sure that mul instructions are properly eliminated.
 ;
-
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep mul
 
 implementation

diff --git a/test/Transforms/InstCombine/narrow.ll b/test/Transforms/InstCombine/narrow.ll
index bff2b88a5db11eecea7438dcdb97f2157a06cab8..02d7e31b8addc6a8893b5cb22b1000fa0a90ef5f 100644 (file)
--- a/test/Transforms/InstCombine/narrow.ll
+++ b/test/Transforms/InstCombine/narrow.ll
@@ -1,8 +1,7 @@
 ; This file contains various testcases that check to see that instcombine
 ; is narrowing computations when possible.
-
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:    grep 'ret i1 false'
+; RUN:    grep {ret i1 false}
 
 ; test1 - Eliminating the casts in this testcase (by narrowing the AND
 ; operation) allows instcombine to realize the function always returns false.

diff --git a/test/Transforms/InstCombine/or.ll b/test/Transforms/InstCombine/or.ll
index 933f5f006a4ed5a460183adcf46f07f115103be2..14b1a226473a043926433095ca8363bf3e90d6c7 100644 (file)
--- a/test/Transforms/InstCombine/or.ll
+++ b/test/Transforms/InstCombine/or.ll
@@ -1,8 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v xor | not grep 'or '
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    grep -v xor | not grep {or }
 
 implementation
 

diff --git a/test/Transforms/InstCombine/or2.ll b/test/Transforms/InstCombine/or2.ll
index 3745a48a89b4ce887aa957ccfaebff79ddf3d38a..c632a5d22d4076ded528e47da8a560def3ce9530 100644 (file)
--- a/test/Transforms/InstCombine/or2.ll
+++ b/test/Transforms/InstCombine/or2.ll
@@ -1,5 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep and &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep ' or'
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep { or}
 
 define i32 @test1(i32 %b, i32 %c, i32 %d) {
         %tmp3 = and i32 %c, %b

diff --git a/test/Transforms/InstCombine/phi.ll b/test/Transforms/InstCombine/phi.ll
index 44841b76431f0b128c7dadaa50dbf733c3175a2e..1fab649d5e9b64e2143447c33edbbca051ae22fc 100644 (file)
--- a/test/Transforms/InstCombine/phi.ll
+++ b/test/Transforms/InstCombine/phi.ll
@@ -1,7 +1,5 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep phi
 
 implementation

diff --git a/test/Transforms/InstCombine/rem.ll b/test/Transforms/InstCombine/rem.ll
index 00705aa4750e462ed977ecce8aa0a66e56d895f6..62740f028f0fc86bc16db063aa652029e10f6dbf 100644 (file)
--- a/test/Transforms/InstCombine/rem.ll
+++ b/test/Transforms/InstCombine/rem.ll
@@ -1,6 +1,5 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep rem
 
 implementation

diff --git a/test/Transforms/InstCombine/select.ll b/test/Transforms/InstCombine/select.ll
index a9dd75d9eadff15c94992addca02d1e76d1b13e6..5b3b8bcce1eeb12337b6f3c27ef2c0f581bb6521 100644 (file)
--- a/test/Transforms/InstCombine/select.ll
+++ b/test/Transforms/InstCombine/select.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep select &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    not grep select
 
 implementation
 

diff --git a/test/Transforms/InstCombine/set.ll b/test/Transforms/InstCombine/set.ll
index b6ab54392e9bfd1b55046fa870242047658b72a6..51cffbeba9745bdb1d2015b4ed947f4cd861db36 100644 (file)
--- a/test/Transforms/InstCombine/set.ll
+++ b/test/Transforms/InstCombine/set.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep icmp
+; END.
 
 %X = uninitialized global int
 

diff --git a/test/Transforms/InstCombine/setcc-cast-cast.ll b/test/Transforms/InstCombine/setcc-cast-cast.ll
index a25fa0c37d4840171b1ff8423907060239158187..903f0b4917139d627592b68917cd528cf79ee041 100644 (file)
--- a/test/Transforms/InstCombine/setcc-cast-cast.ll
+++ b/test/Transforms/InstCombine/setcc-cast-cast.ll
@@ -1,7 +1,10 @@
 ; This test case was reduced from MultiSource/Applications/hbd. It makes sure
 ; that folding doesn't happen in case a zext is applied where a sext should have
 ; been when a setcc is used with two casts.
-; RUN: llvm-upgrade < %s | llvm-as | llc -instcombine | llvm-dis | not grep 'br bool false'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    not grep {br bool false}
+; END.
+
 int %bug(ubyte %inbuff) {
 entry:
        %tmp = bitcast ubyte %inbuff to sbyte   ; <sbyte> [#uses=1]

diff --git a/test/Transforms/InstCombine/setcc-strength-reduce.ll b/test/Transforms/InstCombine/setcc-strength-reduce.ll
index d38c6686d0ba6058fefab57dc1e7b59add1b2382..b5ea83707d4f73c2488b9dd891c748144edd2445 100644 (file)
--- a/test/Transforms/InstCombine/setcc-strength-reduce.ll
+++ b/test/Transforms/InstCombine/setcc-strength-reduce.ll
@@ -2,8 +2,9 @@
 ; working.  Basically this boils down to converting setlt,gt,le,ge instructions
 ; into equivalent setne,eq instructions.
 ;
-
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v 'icmp eq' | grep -v 'icmp ne' | not grep icmp
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    grep -v {icmp eq} | grep -v {icmp ne} | not grep icmp
+; END.
 
 bool %test1(uint %A) {
        %B = setge uint %A, 1   ; setne %A, 0

diff --git a/test/Transforms/InstCombine/shift-simplify.ll b/test/Transforms/InstCombine/shift-simplify.ll
index 1049b0c01ab831d6dc0fdd0bde7d06612d053088..639c3fae5c6660ca1a76cc7c57b67cc516cea529 100644 (file)
--- 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} | wc -l | grep 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 80a2ac9cae09ef83b6cbae1bace8de2bfa46fa11..f3907729177a03ca948147f15d3bcb0affd3b3ac 100644 (file)
--- a/test/Transforms/InstCombine/shift-sra.ll
+++ b/test/Transforms/InstCombine/shift-sra.ll
@@ -1,6 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:    grep 'lshr i32' | wc -l | grep 2 &&
+; RUN:    grep {lshr i32} | wc -l | grep 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/shift.ll b/test/Transforms/InstCombine/shift.ll
index 28c517018e408e780f94037903ac51e554b4191d..5ce807063d52842dc24a3392104a70edd62e3d55 100644 (file)
--- a/test/Transforms/InstCombine/shift.ll
+++ b/test/Transforms/InstCombine/shift.ll
@@ -1,8 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep sh
+; END.
 
 implementation
 

diff --git a/test/Transforms/InstCombine/signext.ll b/test/Transforms/InstCombine/signext.ll
index 88f7b02c1963ff1a165be266e0612ead74a1ecd3..d754260cf0e230c8c788c18419b91e531a087b55 100644 (file)
--- a/test/Transforms/InstCombine/signext.ll
+++ b/test/Transforms/InstCombine/signext.ll
@@ -1,6 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:    not grep '(and\|xor\|add\|shl\|shr)'
+; RUN:    not grep {(and\|xor\|add\|shl\|shr)}
 
 int %test1(int %x) {
         %tmp.1 = and int %x, 65535              ; <int> [#uses=1]

diff --git a/test/Transforms/InstCombine/sink_instruction.ll b/test/Transforms/InstCombine/sink_instruction.ll
index a45c16163f7dddfd35871ea7a16200dc9bb61d64..93519ffdc0260f2f3f5b8a718f11ad9d4e150bee 100644 (file)
--- a/test/Transforms/InstCombine/sink_instruction.ll
+++ b/test/Transforms/InstCombine/sink_instruction.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | %prcontext div 1 | grep ret
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   %prcontext div 1 | grep ret
 
 ;; This tests that the instructions in the entry blocks are sunk into each
 ;; arm of the 'if'.

diff --git a/test/Transforms/InstCombine/stacksaverestore.ll b/test/Transforms/InstCombine/stacksaverestore.ll
index d9633b5c3bea9d654b8c75638f613e8c323186c5..f9cc9c22a92b0d781027d1719816b8d046151a28 100644 (file)
--- a/test/Transforms/InstCombine/stacksaverestore.ll
+++ b/test/Transforms/InstCombine/stacksaverestore.ll
@@ -1,4 +1,3 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep call
 
 ;; Test that llvm.stackrestore is removed when possible.

diff --git a/test/Transforms/InstCombine/store.ll b/test/Transforms/InstCombine/store.ll
index 2102fec100c52f7e7d260b3cf3a335795a1388dc..0b7d12f547773364d6d9ca1e1a62ceef621eab73 100644 (file)
--- a/test/Transforms/InstCombine/store.ll
+++ b/test/Transforms/InstCombine/store.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v 'store.*,.*null' | not grep store
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   grep -v {store.*,.*null} | not grep store
 
 void %test1(int* %P) {
        store int undef, int* %P

diff --git a/test/Transforms/InstCombine/sub.ll b/test/Transforms/InstCombine/sub.ll
index 5d9cab929af82b098ff905d584617eff404cd90d..dfee31253fa3c53b8fbefc33b3a3e5ee547e8ec8 100644 (file)
--- a/test/Transforms/InstCombine/sub.ll
+++ b/test/Transforms/InstCombine/sub.ll
@@ -1,8 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:   grep -v 'sub i32 %Cok, %Bok' | not grep sub
+; RUN:   grep -v {sub i32 %Cok, %Bok} | not grep sub
 
 implementation
 

diff --git a/test/Transforms/InstCombine/udiv_select_to_select_shift.ll b/test/Transforms/InstCombine/udiv_select_to_select_shift.ll
index 33740d567d30dfa8410ab2b0c3c42c3b0cbab433..fe057410cd804d5f33c624970e304de7c32c1f36 100644 (file)
--- a/test/Transforms/InstCombine/udiv_select_to_select_shift.ll
+++ b/test/Transforms/InstCombine/udiv_select_to_select_shift.ll
@@ -1,10 +1,10 @@
-; This tests that this transform:
+; Test that this transform works:
 ; udiv X, (Select Cond, C1, C2) --> Select Cond, (shr X, C1), (shr X, C2)
 ;
-; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis -f -o %t && \
-; RUN:   grep select %t | wc -l | grep 1 && \
-; RUN:   grep lshr %t | wc -l | grep 2 && \ 
-; RUN:   grep udiv %t | wc -l | grep 0
+; 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
 
 define i64 @test(i64 %X, i1 %Cond ) {
 entry:

diff --git a/test/Transforms/InstCombine/vec_demanded_elts.ll b/test/Transforms/InstCombine/vec_demanded_elts.ll
index 9642ffda56c0c54090920af2d2be9637c5cb2db5..d2c6712935df0453718656f5e5b54874b363d9f2 100644 (file)
--- a/test/Transforms/InstCombine/vec_demanded_elts.ll
+++ b/test/Transforms/InstCombine/vec_demanded_elts.ll
@@ -1,8 +1,14 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'sub float' &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'mul float' &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'insertelement.*0.00' &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'call.*llvm.x86.sse.mul' &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'call.*llvm.x86.sse.sub'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   grep {sub float}
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   grep {mul float}
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   not grep {insertelement.*0.00}
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   not grep {call.*llvm.x86.sse.mul}
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   not grep {call.*llvm.x86.sse.sub}
+; END.
 
 ushort %Convert_sse(float %f) {
 entry:

diff --git a/test/Transforms/InstCombine/vec_insert_to_shuffle.ll b/test/Transforms/InstCombine/vec_insert_to_shuffle.ll
index 0611305beeab0b6546fc95d43e5b2986400bf369..0a6f88c032a5f9aaad5a9b596ea11004e3d75bd0 100644 (file)
--- a/test/Transforms/InstCombine/vec_insert_to_shuffle.ll
+++ b/test/Transforms/InstCombine/vec_insert_to_shuffle.ll
@@ -1,6 +1,9 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep shufflevec | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep insertelement &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep extractelement
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   grep shufflevec | wc -l | grep 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 | \
+; RUN:   not grep extractelement
 
 <4 x float> %test(<4 x float> %tmp, <4 x float> %tmp1) {
        %tmp4 = extractelement <4 x float> %tmp, uint 1         ; <float> [#uses=1]

diff --git a/test/Transforms/InstCombine/vec_insertelt.ll b/test/Transforms/InstCombine/vec_insertelt.ll
index ce75945d432c5fb7f4db5635798cd33857653ac9..9be154b987158877b877fe045178ff64580bde4c 100644 (file)
--- a/test/Transforms/InstCombine/vec_insertelt.ll
+++ b/test/Transforms/InstCombine/vec_insertelt.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep 'ret <4 x i32> %A'
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {ret <4 x i32> %A}
 
 ; PR1286
 define <4 x i32> @test1(<4 x i32> %A) {

diff --git a/test/Transforms/InstCombine/vec_narrow.ll b/test/Transforms/InstCombine/vec_narrow.ll
index 1ad671c50915e1d5c710cece6b90124a041de977..ca94b081d789d36d6fc23d88ab1ff5ff0bb21009 100644 (file)
--- a/test/Transforms/InstCombine/vec_narrow.ll
+++ b/test/Transforms/InstCombine/vec_narrow.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'add float'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   grep {add float}
 
 %V = type <4 x float>
 

diff --git a/test/Transforms/InstCombine/vec_shuffle.ll b/test/Transforms/InstCombine/vec_shuffle.ll
index 1ed1e693b881d7afe139bb36ba91a671e7e8e044..3d65b630e535d1c3a80067e7977cdac3baa39d45 100644 (file)
--- a/test/Transforms/InstCombine/vec_shuffle.ll
+++ b/test/Transforms/InstCombine/vec_shuffle.ll
@@ -1,4 +1,3 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep vector_shuffle
 
 %T = type <4 x float>

diff --git a/test/Transforms/InstCombine/xor.ll b/test/Transforms/InstCombine/xor.ll
index 4d128c666d38089c01cbb7368cb73e82f07976ed..e2011499ccba2ae1c77829a6f4eb9eb82dc4eb97 100644 (file)
--- a/test/Transforms/InstCombine/xor.ll
+++ b/test/Transforms/InstCombine/xor.ll
@@ -1,8 +1,8 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | not grep 'xor '
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:    not grep {xor }
+; END.
 
 %G1 = global uint 0
 %G2 = global uint 0

diff --git a/test/Transforms/InstCombine/xor2.ll b/test/Transforms/InstCombine/xor2.ll
index 9b6a3fef6989a66b13b0d3cda9c08f8d8cfa88b8..efb3146c68bfc58a967ab143cf9eb765d8cad0b4 100644 (file)
--- a/test/Transforms/InstCombine/xor2.ll
+++ b/test/Transforms/InstCombine/xor2.ll
@@ -1,8 +1,6 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
-; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'xor '
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep {xor }
 
 ; PR1253
 define i1 @test0(i32 %A) {

diff --git a/test/Transforms/InstCombine/zeroext-and-reduce.ll b/test/Transforms/InstCombine/zeroext-and-reduce.ll
index a863d55d4c5068421255965c92e805e6781bee8e..aac8c3bd7fa7b22ddfac8c6777b922e2085d1a3d 100644 (file)
--- a/test/Transforms/InstCombine/zeroext-and-reduce.ll
+++ b/test/Transforms/InstCombine/zeroext-and-reduce.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
-; RUN:   grep 'and i32 %Y, 8'
+; RUN:   grep {and i32 %Y, 8}
 
 int %test1(ubyte %X) {
         %Y = cast ubyte %X to int

diff --git a/test/Transforms/InstCombine/zext.ll b/test/Transforms/InstCombine/zext.ll
index 7835fe690b2de21e899f7938a2ef9b3465b93b3d..cd1f1f827bd6c56c2cfb43b2ecb92d4dcba82272 100644 (file)
--- a/test/Transforms/InstCombine/zext.ll
+++ b/test/Transforms/InstCombine/zext.ll
@@ -1,6 +1,6 @@
 ; Tests to make sure elimination of casts is working correctly
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | notcast '' '%c1.*'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN:   notcast {} {%c1.*}
 
 long %test_sext_zext(short %A) {
     %c1 = zext short %A to uint