commit 72a13d2476706227a6ae42001631b1e5ac4db956
author Dan Gohman <gohman@apple.com> Tue Sep 08 22:34:10 2009 +0000
committer Dan Gohman <gohman@apple.com> Tue Sep 08 22:34:10 2009 +0000
tree 074e63d84183790a2ce3abb2eb33c643cea972eb
parent e6a80ced1c4b024eef35a4a8036c1541fdaf89be

Use opt -S instead of piping bitcode output through llvm-dis.

llvm-svn: 81257

llvm/test/Transforms/InstCombine/2002-05-14-SubFailure.ll

diff --git a/llvm/test/Transforms/InstCombine/2002-05-14-SubFailure.ll b/llvm/test/Transforms/InstCombine/2002-05-14-SubFailure.ll
index 5d7911d..95dcbf9 100644
--- a/llvm/test/Transforms/InstCombine/2002-05-14-SubFailure.ll
+++ b/llvm/test/Transforms/InstCombine/2002-05-14-SubFailure.ll
@@ -1,6 +1,6 @@
 ; Instcombine was missing a test that caused it to make illegal transformations
 ; sometimes.  In this case, it transforms the sub into an add:
-; RUN: opt %s -instcombine | llvm-dis | grep sub
+; RUN: opt %s -instcombine -S | grep sub
 ;
 define i32 @test(i32 %i, i32 %j) {
         %A = mul i32 %i, %j

llvm/test/Transforms/InstCombine/2002-08-02-CastTest.ll

diff --git a/llvm/test/Transforms/InstCombine/2002-08-02-CastTest.ll b/llvm/test/Transforms/InstCombine/2002-08-02-CastTest.ll
index 67c8a4f..5835d47 100644
--- a/llvm/test/Transforms/InstCombine/2002-08-02-CastTest.ll
+++ b/llvm/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: opt %s -instcombine | llvm-dis | grep %c
+; RUN: opt %s -instcombine -S | grep %c
 ;
 define i64 @test3(i64 %A) {
         %c1 = trunc i64 %A to i8                ; <i8> [#uses=1]

llvm/test/Transforms/InstCombine/2002-12-05-MissedConstProp.ll

diff --git a/llvm/test/Transforms/InstCombine/2002-12-05-MissedConstProp.ll b/llvm/test/Transforms/InstCombine/2002-12-05-MissedConstProp.ll
index 8f4ba2b..b06aaf9 100644
--- a/llvm/test/Transforms/InstCombine/2002-12-05-MissedConstProp.ll
+++ b/llvm/test/Transforms/InstCombine/2002-12-05-MissedConstProp.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep add
+; RUN: opt %s -instcombine -S | not grep add
 
 define i32 @test(i32 %A) {
         %A.neg = sub i32 0, %A          ; <i32> [#uses=1]

llvm/test/Transforms/InstCombine/2003-05-26-CastMiscompile.ll

diff --git a/llvm/test/Transforms/InstCombine/2003-05-26-CastMiscompile.ll b/llvm/test/Transforms/InstCombine/2003-05-26-CastMiscompile.ll
index b75fc0e..21a7a8e 100644
--- a/llvm/test/Transforms/InstCombine/2003-05-26-CastMiscompile.ll
+++ b/llvm/test/Transforms/InstCombine/2003-05-26-CastMiscompile.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep 4294967295
+; RUN: opt %s -instcombine -S | grep 4294967295
 
 define i64 @test(i64 %Val) {
         %tmp.3 = trunc i64 %Val to i32          ; <i32> [#uses=1]

llvm/test/Transforms/InstCombine/2003-09-09-VolatileLoadElim.ll

diff --git a/llvm/test/Transforms/InstCombine/2003-09-09-VolatileLoadElim.ll b/llvm/test/Transforms/InstCombine/2003-09-09-VolatileLoadElim.ll
index 1adb2082..6f63837 100644
--- a/llvm/test/Transforms/InstCombine/2003-09-09-VolatileLoadElim.ll
+++ b/llvm/test/Transforms/InstCombine/2003-09-09-VolatileLoadElim.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep load
+; RUN: opt %s -instcombine -S | grep load
 
 define void @test(i32* %P) {
         ; Dead but not deletable!

llvm/test/Transforms/InstCombine/2003-11-03-VarargsCallBug.ll

diff --git a/llvm/test/Transforms/InstCombine/2003-11-03-VarargsCallBug.ll b/llvm/test/Transforms/InstCombine/2003-11-03-VarargsCallBug.ll
index 45aaf1a..ce608f9 100644
--- a/llvm/test/Transforms/InstCombine/2003-11-03-VarargsCallBug.ll
+++ b/llvm/test/Transforms/InstCombine/2003-11-03-VarargsCallBug.ll
@@ -1,5 +1,5 @@
 ; The cast in this testcase is not eliminable on a 32-bit target!
-; RUN: opt %s -instcombine | llvm-dis | grep inttoptr
+; RUN: opt %s -instcombine -S | grep inttoptr
 
 target datalayout = "e-p:32:32"
 

llvm/test/Transforms/InstCombine/2003-11-13-ConstExprCastCall.ll

diff --git a/llvm/test/Transforms/InstCombine/2003-11-13-ConstExprCastCall.ll b/llvm/test/Transforms/InstCombine/2003-11-13-ConstExprCastCall.ll
index f35f59f..f529b24 100644
--- a/llvm/test/Transforms/InstCombine/2003-11-13-ConstExprCastCall.ll
+++ b/llvm/test/Transforms/InstCombine/2003-11-13-ConstExprCastCall.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep call | notcast
+; RUN: opt %s -instcombine -S | grep call | notcast
 
 declare void @free(i8*)
 

llvm/test/Transforms/InstCombine/2004-02-23-ShiftShiftOverflow.ll

diff --git a/llvm/test/Transforms/InstCombine/2004-02-23-ShiftShiftOverflow.ll b/llvm/test/Transforms/InstCombine/2004-02-23-ShiftShiftOverflow.ll
index 6e4a3ad..b0a4d89 100644
--- a/llvm/test/Transforms/InstCombine/2004-02-23-ShiftShiftOverflow.ll
+++ b/llvm/test/Transforms/InstCombine/2004-02-23-ShiftShiftOverflow.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep 34
+; RUN: opt %s -instcombine -S | not grep 34
 
 define i32 @test(i32 %X) {
         ; Do not fold into shr X, 34, as this uses undefined behavior!

llvm/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll

diff --git a/llvm/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll b/llvm/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll
index 4bcebde..759096a 100644
--- a/llvm/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll
+++ b/llvm/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:    grep {ret i1 false}
 
 define i1 @test(i1 %V) {

llvm/test/Transforms/InstCombine/2004-09-20-BadLoadCombine.ll

diff --git a/llvm/test/Transforms/InstCombine/2004-09-20-BadLoadCombine.ll b/llvm/test/Transforms/InstCombine/2004-09-20-BadLoadCombine.ll
index 498da27..48a440f 100644
--- a/llvm/test/Transforms/InstCombine/2004-09-20-BadLoadCombine.ll
+++ b/llvm/test/Transforms/InstCombine/2004-09-20-BadLoadCombine.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine -mem2reg | llvm-dis | \
+; RUN: opt %s -instcombine -mem2reg -S | \
 ; RUN:   not grep {i32 1}
 
 ; When propagating the load through the select, make sure that the load is

llvm/test/Transforms/InstCombine/2004-09-28-BadShiftAndSetCC.ll

diff --git a/llvm/test/Transforms/InstCombine/2004-09-28-BadShiftAndSetCC.ll b/llvm/test/Transforms/InstCombine/2004-09-28-BadShiftAndSetCC.ll
index 9f8e7b5..86b29d6 100644
--- a/llvm/test/Transforms/InstCombine/2004-09-28-BadShiftAndSetCC.ll
+++ b/llvm/test/Transforms/InstCombine/2004-09-28-BadShiftAndSetCC.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep -- -65536
+; RUN: opt %s -instcombine -S | not grep -- -65536
 
 define i1 @test(i32 %tmp.124) {
         %tmp.125 = shl i32 %tmp.124, 8          ; <i32> [#uses=1]

llvm/test/Transforms/InstCombine/2004-11-22-Missed-and-fold.ll

diff --git a/llvm/test/Transforms/InstCombine/2004-11-22-Missed-and-fold.ll b/llvm/test/Transforms/InstCombine/2004-11-22-Missed-and-fold.ll
index fe4a2ef..730fdc2 100644
--- a/llvm/test/Transforms/InstCombine/2004-11-22-Missed-and-fold.ll
+++ b/llvm/test/Transforms/InstCombine/2004-11-22-Missed-and-fold.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep and
+; RUN: opt < %s -instcombine -S | not grep and
 
 define i8 @test21(i8 %A) {
         ;; sign extend

llvm/test/Transforms/InstCombine/2004-11-27-SetCCForCastLargerAndConstant.ll

diff --git a/llvm/test/Transforms/InstCombine/2004-11-27-SetCCForCastLargerAndConstant.ll b/llvm/test/Transforms/InstCombine/2004-11-27-SetCCForCastLargerAndConstant.ll
index 53bb496..6218cf6 100644
--- a/llvm/test/Transforms/InstCombine/2004-11-27-SetCCForCastLargerAndConstant.ll
+++ b/llvm/test/Transforms/InstCombine/2004-11-27-SetCCForCastLargerAndConstant.ll
@@ -9,7 +9,7 @@
 ; be eliminated. In many cases the setCC is also eliminated based on the
 ; constant value and the range of the casted value.
 ;
-; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | \
+; RUN: llvm-as %s -o - | opt -instcombine -S | \
 ; RUN:    notcast .*int
 ; END.
 define i1 @lt_signed_to_large_unsigned(i8 %SB) {

llvm/test/Transforms/InstCombine/2005-03-04-ShiftOverflow.ll

diff --git a/llvm/test/Transforms/InstCombine/2005-03-04-ShiftOverflow.ll b/llvm/test/Transforms/InstCombine/2005-03-04-ShiftOverflow.ll
index f8e8201..ad3c552 100644
--- a/llvm/test/Transforms/InstCombine/2005-03-04-ShiftOverflow.ll
+++ b/llvm/test/Transforms/InstCombine/2005-03-04-ShiftOverflow.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:   not grep {ret i1 false}
 
 define i1 @test(i64 %tmp.169) {

llvm/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll

diff --git a/llvm/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll b/llvm/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll
index dd53d31..79ce58b 100644
--- a/llvm/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll
+++ b/llvm/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:   grep {ret i1 true}
 ; PR586
 

llvm/test/Transforms/InstCombine/2006-02-13-DemandedMiscompile.ll

diff --git a/llvm/test/Transforms/InstCombine/2006-02-13-DemandedMiscompile.ll b/llvm/test/Transforms/InstCombine/2006-02-13-DemandedMiscompile.ll
index 710cc30..ca4aa57 100644
--- a/llvm/test/Transforms/InstCombine/2006-02-13-DemandedMiscompile.ll
+++ b/llvm/test/Transforms/InstCombine/2006-02-13-DemandedMiscompile.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:   not grep undef
 
 define i32 @test(i8 %A) {

llvm/test/Transforms/InstCombine/2006-04-28-ShiftShiftLongLong.ll

diff --git a/llvm/test/Transforms/InstCombine/2006-04-28-ShiftShiftLongLong.ll b/llvm/test/Transforms/InstCombine/2006-04-28-ShiftShiftLongLong.ll
index 81ee113..6d829ed 100644
--- a/llvm/test/Transforms/InstCombine/2006-04-28-ShiftShiftLongLong.ll
+++ b/llvm/test/Transforms/InstCombine/2006-04-28-ShiftShiftLongLong.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -instcombine | llvm-dis | grep shl
-; RUN: opt %s -instcombine | llvm-dis | notcast
+; RUN: opt %s -instcombine -S | grep shl
+; RUN: opt %s -instcombine -S | notcast
 
 ; This cannot be turned into a sign extending cast!
 

llvm/test/Transforms/InstCombine/2006-09-15-CastToBool.ll

diff --git a/llvm/test/Transforms/InstCombine/2006-09-15-CastToBool.ll b/llvm/test/Transforms/InstCombine/2006-09-15-CastToBool.ll
index 5278e8d..71d1739 100644
--- a/llvm/test/Transforms/InstCombine/2006-09-15-CastToBool.ll
+++ b/llvm/test/Transforms/InstCombine/2006-09-15-CastToBool.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep and
+; RUN: opt %s -instcombine -S | grep and
 ; PR913
 
 define i32 @test(i32* %tmp1) {

llvm/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll

diff --git a/llvm/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll b/llvm/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll
index 4ca3dc1..1cccf54 100644
--- a/llvm/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll
+++ b/llvm/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst-2.ll
@@ -1,5 +1,5 @@
 ; The optimizer should be able to remove cast operation here.
-; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | \
+; RUN: llvm-as %s -o - | opt -instcombine -S | \
 ; RUN:    not grep sext.*i32
 
 define i1 @eq_signed_to_small_unsigned(i8 %SB) {

llvm/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll

diff --git a/llvm/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll b/llvm/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll
index 8678a85..294ca46 100644
--- a/llvm/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll
+++ b/llvm/test/Transforms/InstCombine/2006-10-19-SignedToUnsignedCastAndConst.ll
@@ -1,6 +1,6 @@
 ; This test case is reduced from llvmAsmParser.cpp
 ; The optimizer should not remove the cast here.
-; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | \
+; RUN: llvm-as %s -o - | opt -instcombine -S | \
 ; RUN:    grep sext.*i32
 
 

llvm/test/Transforms/InstCombine/2006-10-20-mask.ll

diff --git a/llvm/test/Transforms/InstCombine/2006-10-20-mask.ll b/llvm/test/Transforms/InstCombine/2006-10-20-mask.ll
index a5864f1..f981263 100644
--- a/llvm/test/Transforms/InstCombine/2006-10-20-mask.ll
+++ b/llvm/test/Transforms/InstCombine/2006-10-20-mask.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | \
+; RUN: llvm-as %s -o - | opt -instcombine -S | \
 ; RUN:    grep and
 
 define i64 @foo(i64 %tmp, i64 %tmp2) {

llvm/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll

diff --git a/llvm/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll b/llvm/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll
index b6e250a..ba0248c 100644
--- a/llvm/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll
+++ b/llvm/test/Transforms/InstCombine/2006-10-26-VectorReassoc.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:   grep mul | count 2
 
 define <4 x float> @test(<4 x float> %V) {

llvm/test/Transforms/InstCombine/2006-11-03-Memmove64.ll

diff --git a/llvm/test/Transforms/InstCombine/2006-11-03-Memmove64.ll b/llvm/test/Transforms/InstCombine/2006-11-03-Memmove64.ll
index b3d5913..10a08dd 100644
--- a/llvm/test/Transforms/InstCombine/2006-11-03-Memmove64.ll
+++ b/llvm/test/Transforms/InstCombine/2006-11-03-Memmove64.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:    not grep memmove.i32
 ; Instcombine was trying to turn this into a memmove.i32
 

llvm/test/Transforms/InstCombine/2006-11-10-ashr-miscompile.ll

diff --git a/llvm/test/Transforms/InstCombine/2006-11-10-ashr-miscompile.ll b/llvm/test/Transforms/InstCombine/2006-11-10-ashr-miscompile.ll
index a64f3ca..9bf19ba 100644
--- a/llvm/test/Transforms/InstCombine/2006-11-10-ashr-miscompile.ll
+++ b/llvm/test/Transforms/InstCombine/2006-11-10-ashr-miscompile.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep lshr
+; RUN: opt %s -instcombine -S | grep lshr
 ; Verify this is not turned into -1.
 
 define i32 @test(i8 %amt) {

llvm/test/Transforms/InstCombine/2006-11-27-XorBug.ll

diff --git a/llvm/test/Transforms/InstCombine/2006-11-27-XorBug.ll b/llvm/test/Transforms/InstCombine/2006-11-27-XorBug.ll
index 958151c..ba33186 100644
--- a/llvm/test/Transforms/InstCombine/2006-11-27-XorBug.ll
+++ b/llvm/test/Transforms/InstCombine/2006-11-27-XorBug.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -instcombine | llvm-dis | grep and.*32
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | grep and.*32
+; RUN: opt %s -instcombine -S | \
 ; RUN:    not grep or.*153
 ; PR1014
 

llvm/test/Transforms/InstCombine/2006-12-01-BadFPVectorXform.ll

diff --git a/llvm/test/Transforms/InstCombine/2006-12-01-BadFPVectorXform.ll b/llvm/test/Transforms/InstCombine/2006-12-01-BadFPVectorXform.ll
index 9fca668..8d38f93 100644
--- a/llvm/test/Transforms/InstCombine/2006-12-01-BadFPVectorXform.ll
+++ b/llvm/test/Transforms/InstCombine/2006-12-01-BadFPVectorXform.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -instcombine | llvm-dis | grep sub
-; RUN: opt %s -instcombine | llvm-dis | grep add
+; RUN: opt %s -instcombine -S | grep sub
+; RUN: opt %s -instcombine -S | grep add
 
 define <4 x float> @test(<4 x float> %tmp26, <4 x float> %tmp53) {
         ; (X+Y)-Y != X for fp vectors.

llvm/test/Transforms/InstCombine/2006-12-05-fp-to-int-ext.ll

diff --git a/llvm/test/Transforms/InstCombine/2006-12-05-fp-to-int-ext.ll b/llvm/test/Transforms/InstCombine/2006-12-05-fp-to-int-ext.ll
index bcea0e9..08399bf 100644
--- a/llvm/test/Transforms/InstCombine/2006-12-05-fp-to-int-ext.ll
+++ b/llvm/test/Transforms/InstCombine/2006-12-05-fp-to-int-ext.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep zext
+; RUN: opt %s -instcombine -S | grep zext
 
 ; Never merge these two conversions, even though it's possible: this is
 ; significantly more expensive than the two conversions on some targets

llvm/test/Transforms/InstCombine/2006-12-08-ICmp-Combining.ll

diff --git a/llvm/test/Transforms/InstCombine/2006-12-08-ICmp-Combining.ll b/llvm/test/Transforms/InstCombine/2006-12-08-ICmp-Combining.ll
index 0d3dd34..ad86199 100644
--- a/llvm/test/Transforms/InstCombine/2006-12-08-ICmp-Combining.ll
+++ b/llvm/test/Transforms/InstCombine/2006-12-08-ICmp-Combining.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:    grep {%bothcond =}
 
 define i1 @Doit_bb(i32 %i.0) {

llvm/test/Transforms/InstCombine/2006-12-08-Phi-ICmp-Op-Fold.ll

diff --git a/llvm/test/Transforms/InstCombine/2006-12-08-Phi-ICmp-Op-Fold.ll b/llvm/test/Transforms/InstCombine/2006-12-08-Phi-ICmp-Op-Fold.ll
index 071998f..c71d7b6 100644
--- a/llvm/test/Transforms/InstCombine/2006-12-08-Phi-ICmp-Op-Fold.ll
+++ b/llvm/test/Transforms/InstCombine/2006-12-08-Phi-ICmp-Op-Fold.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:   grep {icmp sgt}
 ; END.
 target datalayout = "e-p:32:32"

llvm/test/Transforms/InstCombine/2006-12-08-Select-ICmp.ll

diff --git a/llvm/test/Transforms/InstCombine/2006-12-08-Select-ICmp.ll b/llvm/test/Transforms/InstCombine/2006-12-08-Select-ICmp.ll
index 8309a9f..ab97e08 100644
--- a/llvm/test/Transforms/InstCombine/2006-12-08-Select-ICmp.ll
+++ b/llvm/test/Transforms/InstCombine/2006-12-08-Select-ICmp.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep select
+; RUN: opt %s -instcombine -S | grep select
 ; END.
 
 target datalayout = "e-p:32:32"

llvm/test/Transforms/InstCombine/2006-12-15-Range-Test.ll

diff --git a/llvm/test/Transforms/InstCombine/2006-12-15-Range-Test.ll b/llvm/test/Transforms/InstCombine/2006-12-15-Range-Test.ll
index 5fec3d4..0233d96 100644
--- a/llvm/test/Transforms/InstCombine/2006-12-15-Range-Test.ll
+++ b/llvm/test/Transforms/InstCombine/2006-12-15-Range-Test.ll
@@ -1,6 +1,6 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:   grep icmp | count 1
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:   grep {icmp ugt} | count 1
 ; END.
 

llvm/test/Transforms/InstCombine/2007-01-13-ExtCompareMiscompile.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-01-13-ExtCompareMiscompile.ll b/llvm/test/Transforms/InstCombine/2007-01-13-ExtCompareMiscompile.ll
index 7ae7e96..01c6301 100644
--- a/llvm/test/Transforms/InstCombine/2007-01-13-ExtCompareMiscompile.ll
+++ b/llvm/test/Transforms/InstCombine/2007-01-13-ExtCompareMiscompile.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {icmp ugt}
+; RUN: opt %s -instcombine -S | grep {icmp ugt}
 ; PR1107
 ; PR1940
 

llvm/test/Transforms/InstCombine/2007-01-14-FcmpSelf.ll

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

llvm/test/Transforms/InstCombine/2007-01-27-AndICmp.ll

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

llvm/test/Transforms/InstCombine/2007-02-01-LoadSinkAlloca.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-02-01-LoadSinkAlloca.ll b/llvm/test/Transforms/InstCombine/2007-02-01-LoadSinkAlloca.ll
index 4ab6036..78c5e3d 100644
--- a/llvm/test/Transforms/InstCombine/2007-02-01-LoadSinkAlloca.ll
+++ b/llvm/test/Transforms/InstCombine/2007-02-01-LoadSinkAlloca.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -instcombine -mem2reg | llvm-dis | grep {%A = alloca} 
-; RUN: opt %s -instcombine -mem2reg | llvm-dis | \
+; RUN: opt %s -instcombine -mem2reg -S | grep {%A = alloca} 
+; RUN: opt %s -instcombine -mem2reg -S | \
 ; RUN:    not grep {%B = alloca}
 ; END.
 

llvm/test/Transforms/InstCombine/2007-02-07-PointerCast.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-02-07-PointerCast.ll b/llvm/test/Transforms/InstCombine/2007-02-07-PointerCast.ll
index f86eb15..da31204 100644
--- a/llvm/test/Transforms/InstCombine/2007-02-07-PointerCast.ll
+++ b/llvm/test/Transforms/InstCombine/2007-02-07-PointerCast.ll
@@ -1,4 +1,4 @@
-;RUN: opt %s -instcombine | llvm-dis | grep zext
+;RUN: opt %s -instcombine -S | 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 

llvm/test/Transforms/InstCombine/2007-02-23-PhiFoldInfLoop.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-02-23-PhiFoldInfLoop.ll b/llvm/test/Transforms/InstCombine/2007-02-23-PhiFoldInfLoop.ll
index 19410ec..c16d54c 100644
--- a/llvm/test/Transforms/InstCombine/2007-02-23-PhiFoldInfLoop.ll
+++ b/llvm/test/Transforms/InstCombine/2007-02-23-PhiFoldInfLoop.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep ret
+; RUN: opt %s -instcombine -S | grep ret
 ; PR1217
 
 target datalayout = "e-p:32:32"

llvm/test/Transforms/InstCombine/2007-03-13-CompareMerge.ll

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

llvm/test/Transforms/InstCombine/2007-03-19-BadTruncChangePR1261.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-03-19-BadTruncChangePR1261.ll b/llvm/test/Transforms/InstCombine/2007-03-19-BadTruncChangePR1261.ll
index da58dec..a72f1f2 100644
--- a/llvm/test/Transforms/InstCombine/2007-03-19-BadTruncChangePR1261.ll
+++ b/llvm/test/Transforms/InstCombine/2007-03-19-BadTruncChangePR1261.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | grep zext
+; RUN: llvm-as %s -o - | opt -instcombine -S | grep zext
 ; PR1261. 
 
 define i16 @test(i31 %zzz) {

llvm/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll b/llvm/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll
index c8dafd1..d670a7e 100644
--- a/llvm/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll
+++ b/llvm/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 -S | 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]

llvm/test/Transforms/InstCombine/2007-03-25-BadShiftMask.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-03-25-BadShiftMask.ll b/llvm/test/Transforms/InstCombine/2007-03-25-BadShiftMask.ll
index 1e26af3..90e22a4 100644
--- a/llvm/test/Transforms/InstCombine/2007-03-25-BadShiftMask.ll
+++ b/llvm/test/Transforms/InstCombine/2007-03-25-BadShiftMask.ll
@@ -1,5 +1,5 @@
 ; PR1271
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:    grep {icmp eq i32 .tmp.*, 2146435072}
 %struct..0anon = type { i32, i32 }
 %struct..1anon = type { double }

llvm/test/Transforms/InstCombine/2007-03-25-DoubleShift.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-03-25-DoubleShift.ll b/llvm/test/Transforms/InstCombine/2007-03-25-DoubleShift.ll
index 92a7899..fec9331 100644
--- a/llvm/test/Transforms/InstCombine/2007-03-25-DoubleShift.ll
+++ b/llvm/test/Transforms/InstCombine/2007-03-25-DoubleShift.ll
@@ -1,5 +1,5 @@
 ; PR1271
-; RUN: opt %s -instcombine | llvm-dis | grep and
+; RUN: opt %s -instcombine -S | grep and
 define i1 @test(i32 %tmp13) {
 entry:
 	%tmp14 = shl i32 %tmp13, 12		; <i32> [#uses=1]

llvm/test/Transforms/InstCombine/2007-03-26-BadShiftMask.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-03-26-BadShiftMask.ll b/llvm/test/Transforms/InstCombine/2007-03-26-BadShiftMask.ll
index a32358e..8489102 100644
--- a/llvm/test/Transforms/InstCombine/2007-03-26-BadShiftMask.ll
+++ b/llvm/test/Transforms/InstCombine/2007-03-26-BadShiftMask.ll
@@ -1,5 +1,5 @@
 ; PR1271
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:    grep {ashr i32 %.mp137, 2}
 ; END.
 

llvm/test/Transforms/InstCombine/2007-03-27-PR1280.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-03-27-PR1280.ll b/llvm/test/Transforms/InstCombine/2007-03-27-PR1280.ll
index 5e21214..a5ac78e 100644
--- a/llvm/test/Transforms/InstCombine/2007-03-27-PR1280.ll
+++ b/llvm/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: opt %s -instcombine | llvm-dis | grep {add i49.*-8388608}
+; RUN: opt %s -instcombine -S | grep {add i49.*-8388608}
 
 define i49 @test5(i49 %x) {
         ;; If we have ADD(XOR(AND(X, 0xFF), 0x80), 0xF..F80), it's a sext.

llvm/test/Transforms/InstCombine/2007-04-04-BadFoldBitcastIntoMalloc.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-04-04-BadFoldBitcastIntoMalloc.ll b/llvm/test/Transforms/InstCombine/2007-04-04-BadFoldBitcastIntoMalloc.ll
index e48949c..cfaff18 100644
--- a/llvm/test/Transforms/InstCombine/2007-04-04-BadFoldBitcastIntoMalloc.ll
+++ b/llvm/test/Transforms/InstCombine/2007-04-04-BadFoldBitcastIntoMalloc.ll
@@ -2,7 +2,7 @@
 ; a malloc messes up the element count, causing an extra 4GB to be allocated on
 ; 64-bit targets.
 ;
-; RUN: opt %s -instcombine | llvm-dis | not grep {= add }
+; RUN: opt %s -instcombine -S | 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"

llvm/test/Transforms/InstCombine/2007-05-18-CastFoldBug.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-05-18-CastFoldBug.ll b/llvm/test/Transforms/InstCombine/2007-05-18-CastFoldBug.ll
index ea86cbc..a73a073 100644
--- a/llvm/test/Transforms/InstCombine/2007-05-18-CastFoldBug.ll
+++ b/llvm/test/Transforms/InstCombine/2007-05-18-CastFoldBug.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {call.*sret}
+; RUN: opt %s -instcombine -S | grep {call.*sret}
 ; Make sure instcombine doesn't drop the sret attribute.
 
 define void @blah(i16* %tmp10) {

llvm/test/Transforms/InstCombine/2007-06-06-AshrSignBit.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-06-06-AshrSignBit.ll b/llvm/test/Transforms/InstCombine/2007-06-06-AshrSignBit.ll
index b06d0b3..b214900 100644
--- a/llvm/test/Transforms/InstCombine/2007-06-06-AshrSignBit.ll
+++ b/llvm/test/Transforms/InstCombine/2007-06-06-AshrSignBit.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {ashr}
+; RUN: opt %s -instcombine -S | grep {ashr}
 ; PR1499
 
 define void @av_cmp_q_cond_true(i32* %retval, i32* %tmp9, i64* %tmp10) {

llvm/test/Transforms/InstCombine/2007-06-21-DivCompareMiscomp.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-06-21-DivCompareMiscomp.ll b/llvm/test/Transforms/InstCombine/2007-06-21-DivCompareMiscomp.ll
index 03d6bc8..fa79790 100644
--- a/llvm/test/Transforms/InstCombine/2007-06-21-DivCompareMiscomp.ll
+++ b/llvm/test/Transforms/InstCombine/2007-06-21-DivCompareMiscomp.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {ret i1 true}
+; RUN: opt %s -instcombine -S | grep {ret i1 true}
 ; rdar://5278853
 
 define i1 @test(i32 %tmp468) {

llvm/test/Transforms/InstCombine/2007-09-10-AliasConstFold.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-09-10-AliasConstFold.ll b/llvm/test/Transforms/InstCombine/2007-09-10-AliasConstFold.ll
index 771ed45..bcd5a287 100644
--- a/llvm/test/Transforms/InstCombine/2007-09-10-AliasConstFold.ll
+++ b/llvm/test/Transforms/InstCombine/2007-09-10-AliasConstFold.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep icmp
+; RUN: opt %s -instcombine -S | grep icmp
 ; PR1646
 
 @__gthrw_pthread_cancel = alias weak i32 (i32)* @pthread_cancel		; <i32 (i32)*> [#uses=1]

llvm/test/Transforms/InstCombine/2007-09-11-Trampoline.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-09-11-Trampoline.ll b/llvm/test/Transforms/InstCombine/2007-09-11-Trampoline.ll
index 7e098c3..16d523b 100644
--- a/llvm/test/Transforms/InstCombine/2007-09-11-Trampoline.ll
+++ b/llvm/test/Transforms/InstCombine/2007-09-11-Trampoline.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {call i32 @f}
+; RUN: opt %s -instcombine -S | grep {call i32 @f}
 
 	%struct.FRAME.nest = type { i32, i32 (i32)* }
 	%struct.__builtin_trampoline = type { [10 x i8] }

llvm/test/Transforms/InstCombine/2007-09-17-AliasConstFold2.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-09-17-AliasConstFold2.ll b/llvm/test/Transforms/InstCombine/2007-09-17-AliasConstFold2.ll
index 614a6f0..7fa691f 100644
--- a/llvm/test/Transforms/InstCombine/2007-09-17-AliasConstFold2.ll
+++ b/llvm/test/Transforms/InstCombine/2007-09-17-AliasConstFold2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep icmp
+; RUN: opt %s -instcombine -S | grep icmp
 ; PR1678
 
 @A = alias weak void ()* @B		; <void ()*> [#uses=1]

llvm/test/Transforms/InstCombine/2007-10-10-EliminateMemCpy.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-10-10-EliminateMemCpy.ll b/llvm/test/Transforms/InstCombine/2007-10-10-EliminateMemCpy.ll
index 4baf222..c64cb22 100644
--- a/llvm/test/Transforms/InstCombine/2007-10-10-EliminateMemCpy.ll
+++ b/llvm/test/Transforms/InstCombine/2007-10-10-EliminateMemCpy.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep call
-; RUN: opt %s -std-compile-opts | llvm-dis | not grep xyz
+; RUN: opt %s -instcombine -S | not grep call
+; RUN: opt %s -std-compile-opts -S | not grep xyz
 
 @.str = internal constant [4 x i8] c"xyz\00"		; <[4 x i8]*> [#uses=1]
 

llvm/test/Transforms/InstCombine/2007-10-28-stacksave.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-10-28-stacksave.ll b/llvm/test/Transforms/InstCombine/2007-10-28-stacksave.ll
index e7a5d05..6790a2e 100644
--- a/llvm/test/Transforms/InstCombine/2007-10-28-stacksave.ll
+++ b/llvm/test/Transforms/InstCombine/2007-10-28-stacksave.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {call.*stacksave}
+; RUN: opt %s -instcombine -S | grep {call.*stacksave}
 ; PR1745
 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-f80:128:128"
 target triple = "i686-apple-darwin8"

llvm/test/Transforms/InstCombine/2007-11-15-CompareMiscomp.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-11-15-CompareMiscomp.ll b/llvm/test/Transforms/InstCombine/2007-11-15-CompareMiscomp.ll
index fa0d4d6..051b5f4 100644
--- a/llvm/test/Transforms/InstCombine/2007-11-15-CompareMiscomp.ll
+++ b/llvm/test/Transforms/InstCombine/2007-11-15-CompareMiscomp.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {icmp eq i32 %In, 1}
+; RUN: opt %s -instcombine -S | grep {icmp eq i32 %In, 1}
 ; PR1800
 
 define i1 @test(i32 %In) {

llvm/test/Transforms/InstCombine/2007-11-25-CompatibleAttributes.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-11-25-CompatibleAttributes.ll b/llvm/test/Transforms/InstCombine/2007-11-25-CompatibleAttributes.ll
index 6a12bf7..c904d00 100644
--- a/llvm/test/Transforms/InstCombine/2007-11-25-CompatibleAttributes.ll
+++ b/llvm/test/Transforms/InstCombine/2007-11-25-CompatibleAttributes.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep bitcast
+; RUN: opt %s -instcombine -S | not grep bitcast
 ; PR1716
 
 @.str = internal constant [4 x i8] c"%d\0A\00"		; <[4 x i8]*> [#uses=1]

llvm/test/Transforms/InstCombine/2007-12-10-ConstFoldCompare.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-12-10-ConstFoldCompare.ll b/llvm/test/Transforms/InstCombine/2007-12-10-ConstFoldCompare.ll
index 2143caa..29a82f3 100644
--- a/llvm/test/Transforms/InstCombine/2007-12-10-ConstFoldCompare.ll
+++ b/llvm/test/Transforms/InstCombine/2007-12-10-ConstFoldCompare.ll
@@ -1,6 +1,6 @@
 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-f80:32:32"
 target triple = "i686-pc-linux-gnu"
-; RUN: opt %s -instcombine | llvm-dis | not grep {ret i1 0}
+; RUN: opt %s -instcombine -S | not grep {ret i1 0}
 ; PR1850
 
 define i1 @test() {

llvm/test/Transforms/InstCombine/2007-12-12-GEPScale.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-12-12-GEPScale.ll b/llvm/test/Transforms/InstCombine/2007-12-12-GEPScale.ll
index 9b59b25..dae18ae 100644
--- a/llvm/test/Transforms/InstCombine/2007-12-12-GEPScale.ll
+++ b/llvm/test/Transforms/InstCombine/2007-12-12-GEPScale.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep 1431655764
+; RUN: opt %s -instcombine -S | not grep 1431655764
 
 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-f80:32:32"
 

llvm/test/Transforms/InstCombine/2007-12-16-AsmNoUnwind.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-12-16-AsmNoUnwind.ll b/llvm/test/Transforms/InstCombine/2007-12-16-AsmNoUnwind.ll
index 1474573..f422925 100644
--- a/llvm/test/Transforms/InstCombine/2007-12-16-AsmNoUnwind.ll
+++ b/llvm/test/Transforms/InstCombine/2007-12-16-AsmNoUnwind.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep nounwind
+; RUN: opt %s -instcombine -S | grep nounwind
 
 define void @bar() {
 entry:

llvm/test/Transforms/InstCombine/2007-12-18-AddSelCmpSub.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-12-18-AddSelCmpSub.ll b/llvm/test/Transforms/InstCombine/2007-12-18-AddSelCmpSub.ll
index a198393..7e1f3dc 100644
--- a/llvm/test/Transforms/InstCombine/2007-12-18-AddSelCmpSub.ll
+++ b/llvm/test/Transforms/InstCombine/2007-12-18-AddSelCmpSub.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {add} | count 1
+; RUN: opt %s -instcombine -S | grep {add} | count 1
 
 define i32 @foo(i32 %a) {
 entry:

llvm/test/Transforms/InstCombine/2007-12-28-IcmpSub2.ll

diff --git a/llvm/test/Transforms/InstCombine/2007-12-28-IcmpSub2.ll b/llvm/test/Transforms/InstCombine/2007-12-28-IcmpSub2.ll
index 5788ef5..0fa3c66 100644
--- a/llvm/test/Transforms/InstCombine/2007-12-28-IcmpSub2.ll
+++ b/llvm/test/Transforms/InstCombine/2007-12-28-IcmpSub2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -mem2reg -instcombine | llvm-dis | grep "ret i32 1" | count 8
+; RUN: opt %s -mem2reg -instcombine -S | grep "ret i32 1" | count 8
 
 define i32 @test1() {
 entry:

llvm/test/Transforms/InstCombine/2008-01-06-BitCastAttributes.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-01-06-BitCastAttributes.ll b/llvm/test/Transforms/InstCombine/2008-01-06-BitCastAttributes.ll
index 5ef3832..d01c404 100644
--- a/llvm/test/Transforms/InstCombine/2008-01-06-BitCastAttributes.ll
+++ b/llvm/test/Transforms/InstCombine/2008-01-06-BitCastAttributes.ll
@@ -1,5 +1,5 @@
 ; Ignore stderr, we expect warnings there
-; RUN: opt %s -instcombine 2> /dev/null | llvm-dis | not grep bitcast
+; RUN: opt %s -instcombine 2> /dev/null -S | not grep bitcast
 
 define void @a() {
 	ret void

llvm/test/Transforms/InstCombine/2008-01-06-VoidCast.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-01-06-VoidCast.ll b/llvm/test/Transforms/InstCombine/2008-01-06-VoidCast.ll
index 7a95ddb..d31d4ac 100644
--- a/llvm/test/Transforms/InstCombine/2008-01-06-VoidCast.ll
+++ b/llvm/test/Transforms/InstCombine/2008-01-06-VoidCast.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep bitcast
+; RUN: opt %s -instcombine -S | not grep bitcast
 
 define void @f(i16 %y) {
 	ret void

llvm/test/Transforms/InstCombine/2008-01-13-AndCmpCmp.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-01-13-AndCmpCmp.ll b/llvm/test/Transforms/InstCombine/2008-01-13-AndCmpCmp.ll
index 6e93101..a823210 100644
--- a/llvm/test/Transforms/InstCombine/2008-01-13-AndCmpCmp.ll
+++ b/llvm/test/Transforms/InstCombine/2008-01-13-AndCmpCmp.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep and
+; RUN: opt %s -instcombine -S | grep and
 ; PR1907
 
 define i1 @test(i32 %c84.17) {

llvm/test/Transforms/InstCombine/2008-01-13-NoBitCastAttributes.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-01-13-NoBitCastAttributes.ll b/llvm/test/Transforms/InstCombine/2008-01-13-NoBitCastAttributes.ll
index 7ede10b..b573f8a 100644
--- a/llvm/test/Transforms/InstCombine/2008-01-13-NoBitCastAttributes.ll
+++ b/llvm/test/Transforms/InstCombine/2008-01-13-NoBitCastAttributes.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep bitcast | count 2
+; RUN: opt %s -instcombine -S | grep bitcast | count 2
 
 define i32 @b(i32* inreg  %x) signext  {
 	ret i32 0

llvm/test/Transforms/InstCombine/2008-01-14-VarArgTrampoline.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-01-14-VarArgTrampoline.ll b/llvm/test/Transforms/InstCombine/2008-01-14-VarArgTrampoline.ll
index b73c416..dabd2e6 100644
--- a/llvm/test/Transforms/InstCombine/2008-01-14-VarArgTrampoline.ll
+++ b/llvm/test/Transforms/InstCombine/2008-01-14-VarArgTrampoline.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep zeroext
+; RUN: opt %s -instcombine -S | grep zeroext
 
 	%struct.FRAME.nest = type { i32, i32 (...)* }
 	%struct.__builtin_trampoline = type { [10 x i8] }

llvm/test/Transforms/InstCombine/2008-01-21-MismatchedCastAndCompare.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-01-21-MismatchedCastAndCompare.ll b/llvm/test/Transforms/InstCombine/2008-01-21-MismatchedCastAndCompare.ll
index 39915cc..a49853d 100644
--- a/llvm/test/Transforms/InstCombine/2008-01-21-MismatchedCastAndCompare.ll
+++ b/llvm/test/Transforms/InstCombine/2008-01-21-MismatchedCastAndCompare.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -instcombine | llvm-dis | notcast
-; RUN: opt %s -instcombine | llvm-dis | not grep {icmp s}
+; RUN: opt %s -instcombine -S | notcast
+; RUN: opt %s -instcombine -S | not grep {icmp s}
 ; PR1940
 
 define i1 @test1(i8 %A, i8 %B) {

llvm/test/Transforms/InstCombine/2008-01-21-MulTrunc.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-01-21-MulTrunc.ll b/llvm/test/Transforms/InstCombine/2008-01-21-MulTrunc.ll
index b8f4946..5defb65 100644
--- a/llvm/test/Transforms/InstCombine/2008-01-21-MulTrunc.ll
+++ b/llvm/test/Transforms/InstCombine/2008-01-21-MulTrunc.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | notcast
+; RUN: opt %s -instcombine -S | notcast
 
 define i16 @test1(i16 %a) {
         %tmp = zext i16 %a to i32               ; <i32> [#uses=2]

llvm/test/Transforms/InstCombine/2008-01-27-FloatSelect.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-01-27-FloatSelect.ll b/llvm/test/Transforms/InstCombine/2008-01-27-FloatSelect.ll
index b69f20f..0684d20 100644
--- a/llvm/test/Transforms/InstCombine/2008-01-27-FloatSelect.ll
+++ b/llvm/test/Transforms/InstCombine/2008-01-27-FloatSelect.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep select
+; RUN: opt %s -instcombine -S | grep select
 
 define double @fold(i1 %a, double %b) {
 %s = select i1 %a, double 0., double 1.

llvm/test/Transforms/InstCombine/2008-01-29-AddICmp.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-01-29-AddICmp.ll b/llvm/test/Transforms/InstCombine/2008-01-29-AddICmp.ll
index a805226..0c98435 100644
--- a/llvm/test/Transforms/InstCombine/2008-01-29-AddICmp.ll
+++ b/llvm/test/Transforms/InstCombine/2008-01-29-AddICmp.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep {a.off}
+; RUN: opt %s -instcombine -S | not grep {a.off}
 ; PR1949
 
 define i1 @test1(i32 %a) {

llvm/test/Transforms/InstCombine/2008-02-13-MulURem.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-02-13-MulURem.ll b/llvm/test/Transforms/InstCombine/2008-02-13-MulURem.ll
index e129c08..c10128e 100644
--- a/llvm/test/Transforms/InstCombine/2008-02-13-MulURem.ll
+++ b/llvm/test/Transforms/InstCombine/2008-02-13-MulURem.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep rem
+; RUN: opt %s -instcombine -S | grep rem
 ; PR1933
 
 define i32 @fold(i32 %a) {

llvm/test/Transforms/InstCombine/2008-02-16-SDivOverflow.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-02-16-SDivOverflow.ll b/llvm/test/Transforms/InstCombine/2008-02-16-SDivOverflow.ll
index 65c7351..f6ba64d 100644
--- a/llvm/test/Transforms/InstCombine/2008-02-16-SDivOverflow.ll
+++ b/llvm/test/Transforms/InstCombine/2008-02-16-SDivOverflow.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {ret i.* 0} | count 2
+; RUN: opt %s -instcombine -S | grep {ret i.* 0} | count 2
 ; PR2048
 
 define i32 @i(i32 %a) {

llvm/test/Transforms/InstCombine/2008-02-16-SDivOverflow2.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-02-16-SDivOverflow2.ll b/llvm/test/Transforms/InstCombine/2008-02-16-SDivOverflow2.ll
index 5b3a7ac..706a82a 100644
--- a/llvm/test/Transforms/InstCombine/2008-02-16-SDivOverflow2.ll
+++ b/llvm/test/Transforms/InstCombine/2008-02-16-SDivOverflow2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {sdiv i8 \%a, 9}
+; RUN: opt %s -instcombine -S | grep {sdiv i8 \%a, 9}
 ; PR2048
 
 define i8 @i(i8 %a) {

llvm/test/Transforms/InstCombine/2008-02-23-MulSub.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-02-23-MulSub.ll b/llvm/test/Transforms/InstCombine/2008-02-23-MulSub.ll
index a4cf99e..a89e83b 100644
--- a/llvm/test/Transforms/InstCombine/2008-02-23-MulSub.ll
+++ b/llvm/test/Transforms/InstCombine/2008-02-23-MulSub.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep mul
+; RUN: opt %s -instcombine -S | not grep mul
 
 define i26 @test(i26 %a) nounwind  {
 entry:

llvm/test/Transforms/InstCombine/2008-03-13-IntToPtr.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-03-13-IntToPtr.ll b/llvm/test/Transforms/InstCombine/2008-03-13-IntToPtr.ll
index 442d364..8bdfac7 100644
--- a/llvm/test/Transforms/InstCombine/2008-03-13-IntToPtr.ll
+++ b/llvm/test/Transforms/InstCombine/2008-03-13-IntToPtr.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {16} | count 1
+; RUN: opt %s -instcombine -S | grep {16} | count 1
 
 define i8* @bork(i8** %qux) {
   %tmp275 = load i8** %qux, align 1

llvm/test/Transforms/InstCombine/2008-04-22-ByValBitcast.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-04-22-ByValBitcast.ll b/llvm/test/Transforms/InstCombine/2008-04-22-ByValBitcast.ll
index a836276..47b9d50 100644
--- a/llvm/test/Transforms/InstCombine/2008-04-22-ByValBitcast.ll
+++ b/llvm/test/Transforms/InstCombine/2008-04-22-ByValBitcast.ll
@@ -1,6 +1,6 @@
 ;; The bitcast cannot be eliminated because byval arguments need
 ;; the correct type, or at least a type of the correct size.
-; RUN: opt %s -instcombine | llvm-dis | grep bitcast
+; RUN: opt %s -instcombine -S | grep bitcast
 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-f80:128:128"
 target triple = "i386-apple-darwin9"
 	%struct.NSRect = type { [4 x float] }

llvm/test/Transforms/InstCombine/2008-04-28-VolatileStore.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-04-28-VolatileStore.ll b/llvm/test/Transforms/InstCombine/2008-04-28-VolatileStore.ll
index bca0753..e7d2d93 100644
--- a/llvm/test/Transforms/InstCombine/2008-04-28-VolatileStore.ll
+++ b/llvm/test/Transforms/InstCombine/2008-04-28-VolatileStore.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {volatile store}
+; RUN: opt %s -instcombine -S | grep {volatile store}
 
 define void @test() {
 	%votf = alloca <4 x float>		; <<4 x float>*> [#uses=1]

llvm/test/Transforms/InstCombine/2008-04-29-VolatileLoadDontMerge.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-04-29-VolatileLoadDontMerge.ll b/llvm/test/Transforms/InstCombine/2008-04-29-VolatileLoadDontMerge.ll
index 8ac2662..469492b 100644
--- a/llvm/test/Transforms/InstCombine/2008-04-29-VolatileLoadDontMerge.ll
+++ b/llvm/test/Transforms/InstCombine/2008-04-29-VolatileLoadDontMerge.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {volatile load} | count 2
+; RUN: opt %s -instcombine -S | grep {volatile load} | 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-f80:128:128"
 target triple = "i386-apple-darwin8"
 @g_1 = internal global i32 0		; <i32*> [#uses=3]

llvm/test/Transforms/InstCombine/2008-04-29-VolatileLoadMerge.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-04-29-VolatileLoadMerge.ll b/llvm/test/Transforms/InstCombine/2008-04-29-VolatileLoadMerge.ll
index dec764a..7ca62ba 100644
--- a/llvm/test/Transforms/InstCombine/2008-04-29-VolatileLoadMerge.ll
+++ b/llvm/test/Transforms/InstCombine/2008-04-29-VolatileLoadMerge.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {volatile load} | count 2
+; RUN: opt %s -instcombine -S | grep {volatile load} | count 2
 ; PR2262
 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-f80:128:128"
 target triple = "i386-apple-darwin8"

llvm/test/Transforms/InstCombine/2008-05-08-LiveStoreDelete.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-05-08-LiveStoreDelete.ll b/llvm/test/Transforms/InstCombine/2008-05-08-LiveStoreDelete.ll
index 006c0f3..2b2e2aa 100644
--- a/llvm/test/Transforms/InstCombine/2008-05-08-LiveStoreDelete.ll
+++ b/llvm/test/Transforms/InstCombine/2008-05-08-LiveStoreDelete.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {store i8} | count 3
+; RUN: opt %s -instcombine -S | grep {store i8} | count 3
 ; PR2297
 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-f80:128:128"
 target triple = "i386-apple-darwin8"

llvm/test/Transforms/InstCombine/2008-05-18-FoldIntToPtr.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-05-18-FoldIntToPtr.ll b/llvm/test/Transforms/InstCombine/2008-05-18-FoldIntToPtr.ll
index 194bcc6..8e508d0 100644
--- a/llvm/test/Transforms/InstCombine/2008-05-18-FoldIntToPtr.ll
+++ b/llvm/test/Transforms/InstCombine/2008-05-18-FoldIntToPtr.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {ret i1 false} | count 2
+; RUN: opt %s -instcombine -S | grep {ret i1 false} | count 2
 ; PR2329
 
 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-f80:32:32"

llvm/test/Transforms/InstCombine/2008-05-22-NegValVector.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-05-22-NegValVector.ll b/llvm/test/Transforms/InstCombine/2008-05-22-NegValVector.ll
index 9db2549..94e63c8 100644
--- a/llvm/test/Transforms/InstCombine/2008-05-22-NegValVector.ll
+++ b/llvm/test/Transforms/InstCombine/2008-05-22-NegValVector.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep sub
+; RUN: opt %s -instcombine -S | not grep sub
 
 define <3 x i8> @f(<3 x i8> %a) {
   %A = sub <3 x i8> zeroinitializer, %a

llvm/test/Transforms/InstCombine/2008-05-23-CompareFold.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-05-23-CompareFold.ll b/llvm/test/Transforms/InstCombine/2008-05-23-CompareFold.ll
index 25a7503..f61fb25 100644
--- a/llvm/test/Transforms/InstCombine/2008-05-23-CompareFold.ll
+++ b/llvm/test/Transforms/InstCombine/2008-05-23-CompareFold.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {ret i1 false}
+; RUN: opt %s -instcombine -S | grep {ret i1 false}
 ; PR2359
 define i1 @f(i8* %x) {
 entry:

llvm/test/Transforms/InstCombine/2008-05-31-AddBool.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-05-31-AddBool.ll b/llvm/test/Transforms/InstCombine/2008-05-31-AddBool.ll
index db6bbaa..9cbf050 100644
--- a/llvm/test/Transforms/InstCombine/2008-05-31-AddBool.ll
+++ b/llvm/test/Transforms/InstCombine/2008-05-31-AddBool.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {xor}
+; RUN: opt %s -instcombine -S | grep {xor}
 ; PR2389
 
 define i1 @test(i1 %a, i1 %b) {

llvm/test/Transforms/InstCombine/2008-05-31-Bools.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-05-31-Bools.ll b/llvm/test/Transforms/InstCombine/2008-05-31-Bools.ll
index 929e301..b87136a 100644
--- a/llvm/test/Transforms/InstCombine/2008-05-31-Bools.ll
+++ b/llvm/test/Transforms/InstCombine/2008-05-31-Bools.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis > %t
+; RUN: opt %s -instcombine -S > %t
 ; RUN: grep {xor} %t
 ; RUN: grep {and} %t
 ; RUN: not grep {div} %t

llvm/test/Transforms/InstCombine/2008-06-08-ICmpPHI.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-06-08-ICmpPHI.ll b/llvm/test/Transforms/InstCombine/2008-06-08-ICmpPHI.ll
index 8f45f67..e6214ab 100644
--- a/llvm/test/Transforms/InstCombine/2008-06-08-ICmpPHI.ll
+++ b/llvm/test/Transforms/InstCombine/2008-06-08-ICmpPHI.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {phi i32} | count 2
+; RUN: opt %s -instcombine -S | grep {phi i32} | count 2
 
 define void @test() nounwind  {
 entry:

llvm/test/Transforms/InstCombine/2008-06-13-InfiniteLoopStore.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-06-13-InfiniteLoopStore.ll b/llvm/test/Transforms/InstCombine/2008-06-13-InfiniteLoopStore.ll
index a7fdcf7..5440c36 100644
--- a/llvm/test/Transforms/InstCombine/2008-06-13-InfiniteLoopStore.ll
+++ b/llvm/test/Transforms/InstCombine/2008-06-13-InfiniteLoopStore.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {store i32} | count 2
+; RUN: opt %s -instcombine -S | grep {store i32} | count 2
 
 @g_139 = global i32 0           ; <i32*> [#uses=2]
 

llvm/test/Transforms/InstCombine/2008-06-13-ReadOnlyCallStore.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-06-13-ReadOnlyCallStore.ll b/llvm/test/Transforms/InstCombine/2008-06-13-ReadOnlyCallStore.ll
index 4758489..9b32b00 100644
--- a/llvm/test/Transforms/InstCombine/2008-06-13-ReadOnlyCallStore.ll
+++ b/llvm/test/Transforms/InstCombine/2008-06-13-ReadOnlyCallStore.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {store i8} | count 2
+; RUN: opt %s -instcombine -S | grep {store i8} | count 2
 
 define i32 @a(i8* %s) nounwind  {
 entry:

llvm/test/Transforms/InstCombine/2008-06-19-UncondLoad.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-06-19-UncondLoad.ll b/llvm/test/Transforms/InstCombine/2008-06-19-UncondLoad.ll
index 9216726..4307baa 100644
--- a/llvm/test/Transforms/InstCombine/2008-06-19-UncondLoad.ll
+++ b/llvm/test/Transforms/InstCombine/2008-06-19-UncondLoad.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep load | count 3
+; RUN: opt %s -instcombine -S | grep load | count 3
 ; PR2471
 
 declare i32 @x(i32*)

llvm/test/Transforms/InstCombine/2008-06-21-CompareMiscomp.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-06-21-CompareMiscomp.ll b/llvm/test/Transforms/InstCombine/2008-06-21-CompareMiscomp.ll
index d91d5c6..d88ff16 100644
--- a/llvm/test/Transforms/InstCombine/2008-06-21-CompareMiscomp.ll
+++ b/llvm/test/Transforms/InstCombine/2008-06-21-CompareMiscomp.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {icmp eq i32 %In, 15}
+; RUN: opt %s -instcombine -S | grep {icmp eq i32 %In, 15}
 ; PR2479
 ; (See also PR1800.)
 

llvm/test/Transforms/InstCombine/2008-06-24-StackRestore.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-06-24-StackRestore.ll b/llvm/test/Transforms/InstCombine/2008-06-24-StackRestore.ll
index 54e6332d..fa91cf1 100644
--- a/llvm/test/Transforms/InstCombine/2008-06-24-StackRestore.ll
+++ b/llvm/test/Transforms/InstCombine/2008-06-24-StackRestore.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {call.*llvm.stackrestore}
+; RUN: opt %s -instcombine -S | grep {call.*llvm.stackrestore}
 ; PR2488
 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-f80:32:32"
 target triple = "i386-pc-linux-gnu"

llvm/test/Transforms/InstCombine/2008-07-08-AndICmp.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-07-08-AndICmp.ll b/llvm/test/Transforms/InstCombine/2008-07-08-AndICmp.ll
index 11d8ec2..4244b4b 100644
--- a/llvm/test/Transforms/InstCombine/2008-07-08-AndICmp.ll
+++ b/llvm/test/Transforms/InstCombine/2008-07-08-AndICmp.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep icmp | count 1
+; RUN: opt %s -instcombine -S | grep icmp | count 1
 ; PR2330
 
 define i1 @foo(i32 %a, i32 %b) nounwind {

llvm/test/Transforms/InstCombine/2008-07-08-ShiftOneAndOne.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-07-08-ShiftOneAndOne.ll b/llvm/test/Transforms/InstCombine/2008-07-08-ShiftOneAndOne.ll
index 30d58f6..2bb22ee 100644
--- a/llvm/test/Transforms/InstCombine/2008-07-08-ShiftOneAndOne.ll
+++ b/llvm/test/Transforms/InstCombine/2008-07-08-ShiftOneAndOne.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {icmp ne i32 \%a}
+; RUN: opt %s -instcombine -S | grep {icmp ne i32 \%a}
 ; PR2330
 
 define i1 @foo(i32 %a) nounwind  {

llvm/test/Transforms/InstCombine/2008-07-08-SubAnd.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-07-08-SubAnd.ll b/llvm/test/Transforms/InstCombine/2008-07-08-SubAnd.ll
index 090e457..299891f 100644
--- a/llvm/test/Transforms/InstCombine/2008-07-08-SubAnd.ll
+++ b/llvm/test/Transforms/InstCombine/2008-07-08-SubAnd.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep -v {i32 8}
+; RUN: opt %s -instcombine -S | grep -v {i32 8}
 ; PR2330
 
 define i32 @a(i32 %a) nounwind  {

llvm/test/Transforms/InstCombine/2008-07-08-VolatileLoadMerge.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-07-08-VolatileLoadMerge.ll b/llvm/test/Transforms/InstCombine/2008-07-08-VolatileLoadMerge.ll
index e41f649..9361371 100644
--- a/llvm/test/Transforms/InstCombine/2008-07-08-VolatileLoadMerge.ll
+++ b/llvm/test/Transforms/InstCombine/2008-07-08-VolatileLoadMerge.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {volatile load} | count 2
+; RUN: opt %s -instcombine -S | grep {volatile load} | count 2
 ; PR2496
 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-f80:128:128"
 target triple = "i386-apple-darwin8"

llvm/test/Transforms/InstCombine/2008-07-09-SubAndError.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-07-09-SubAndError.ll b/llvm/test/Transforms/InstCombine/2008-07-09-SubAndError.ll
index 0e4da61..b60d190 100644
--- a/llvm/test/Transforms/InstCombine/2008-07-09-SubAndError.ll
+++ b/llvm/test/Transforms/InstCombine/2008-07-09-SubAndError.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep {sub i32 0}
+; RUN: opt %s -instcombine -S | not grep {sub i32 0}
 ; PR2330
 
 define i32 @foo(i32 %a) nounwind {

llvm/test/Transforms/InstCombine/2008-07-10-CastSextBool.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-07-10-CastSextBool.ll b/llvm/test/Transforms/InstCombine/2008-07-10-CastSextBool.ll
index b066e2f..2c18a53 100644
--- a/llvm/test/Transforms/InstCombine/2008-07-10-CastSextBool.ll
+++ b/llvm/test/Transforms/InstCombine/2008-07-10-CastSextBool.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {%C = xor i1 %A, true}
-; RUN: opt %s -instcombine | llvm-dis | grep {ret i1 false}
+; RUN: opt %s -instcombine -S | grep {%C = xor i1 %A, true}
+; RUN: opt %s -instcombine -S | grep {ret i1 false}
 ; PR2539
 
 define i1 @test1(i1 %A) {

llvm/test/Transforms/InstCombine/2008-07-10-ICmpBinOp.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-07-10-ICmpBinOp.ll b/llvm/test/Transforms/InstCombine/2008-07-10-ICmpBinOp.ll
index ae92a00..20c7760 100644
--- a/llvm/test/Transforms/InstCombine/2008-07-10-ICmpBinOp.ll
+++ b/llvm/test/Transforms/InstCombine/2008-07-10-ICmpBinOp.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep add
-; RUN: opt %s -instcombine | llvm-dis | not grep mul
+; RUN: opt %s -instcombine -S | not grep add
+; RUN: opt %s -instcombine -S | not grep mul
 ; PR2330
 
 define i1 @f(i32 %x, i32 %y) nounwind {

llvm/test/Transforms/InstCombine/2008-07-11-RemAnd.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-07-11-RemAnd.ll b/llvm/test/Transforms/InstCombine/2008-07-11-RemAnd.ll
index 771c7ff..34b604e 100644
--- a/llvm/test/Transforms/InstCombine/2008-07-11-RemAnd.ll
+++ b/llvm/test/Transforms/InstCombine/2008-07-11-RemAnd.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep rem
+; RUN: opt %s -instcombine -S | not grep rem
 ; PR2330
 
 define i32 @a(i32 %b) nounwind  {

llvm/test/Transforms/InstCombine/2008-07-13-DivZero.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-07-13-DivZero.ll b/llvm/test/Transforms/InstCombine/2008-07-13-DivZero.ll
index 6c0a3b1..77ca9c6 100644
--- a/llvm/test/Transforms/InstCombine/2008-07-13-DivZero.ll
+++ b/llvm/test/Transforms/InstCombine/2008-07-13-DivZero.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {lshr.*3}
-; RUN: opt %s -instcombine | llvm-dis | grep {call .*%cond}
+; RUN: opt %s -instcombine -S | grep {lshr.*3}
+; RUN: opt %s -instcombine -S | grep {call .*%cond}
 ; PR2506
 
 ; We can simplify the operand of udiv to '8', but not the operand to the

llvm/test/Transforms/InstCombine/2008-07-16-fsub.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-07-16-fsub.ll b/llvm/test/Transforms/InstCombine/2008-07-16-fsub.ll
index 350f97e..fad21f1 100644
--- a/llvm/test/Transforms/InstCombine/2008-07-16-fsub.ll
+++ b/llvm/test/Transforms/InstCombine/2008-07-16-fsub.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep sub
+; RUN: opt %s -instcombine -S | grep sub
 ; PR2553
 
 define double @test(double %X) nounwind {

llvm/test/Transforms/InstCombine/2008-07-16-sse2_storel_dq.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-07-16-sse2_storel_dq.ll b/llvm/test/Transforms/InstCombine/2008-07-16-sse2_storel_dq.ll
index e700e93..8922635 100644
--- a/llvm/test/Transforms/InstCombine/2008-07-16-sse2_storel_dq.ll
+++ b/llvm/test/Transforms/InstCombine/2008-07-16-sse2_storel_dq.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep {store }
+; RUN: opt %s -instcombine -S | not grep {store }
 ; PR2296
 
 @G = common global double 0.000000e+00, align 16

llvm/test/Transforms/InstCombine/2008-08-05-And.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-08-05-And.ll b/llvm/test/Transforms/InstCombine/2008-08-05-And.ll
index 07b8343..9773c2d 100644
--- a/llvm/test/Transforms/InstCombine/2008-08-05-And.ll
+++ b/llvm/test/Transforms/InstCombine/2008-08-05-And.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep or
+; RUN: opt < %s -instcombine -S | not grep or
 ; PR2629
 
 define void @f(i8* %x) nounwind  {

llvm/test/Transforms/InstCombine/2008-08-17-ICmpXorSignbit.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-08-17-ICmpXorSignbit.ll b/llvm/test/Transforms/InstCombine/2008-08-17-ICmpXorSignbit.ll
index 5f5f545..4359c0a 100644
--- a/llvm/test/Transforms/InstCombine/2008-08-17-ICmpXorSignbit.ll
+++ b/llvm/test/Transforms/InstCombine/2008-08-17-ICmpXorSignbit.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep xor
+; RUN: opt %s -instcombine -S | not grep xor
 
 define i1 @test1(i8 %x, i8 %y) {
   %X = xor i8 %x, 128

llvm/test/Transforms/InstCombine/2008-09-29-FoldingOr.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-09-29-FoldingOr.ll b/llvm/test/Transforms/InstCombine/2008-09-29-FoldingOr.ll
index b341587..44429ae 100644
--- a/llvm/test/Transforms/InstCombine/2008-09-29-FoldingOr.ll
+++ b/llvm/test/Transforms/InstCombine/2008-09-29-FoldingOr.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {or i1}
+; RUN: opt %s -instcombine -S | grep {or i1}
 ; PR2844
 
 define i32 @test(i32 %p_74) {

llvm/test/Transforms/InstCombine/2008-10-11-DivCompareFold.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-10-11-DivCompareFold.ll b/llvm/test/Transforms/InstCombine/2008-10-11-DivCompareFold.ll
index 3feb035..5962252 100644
--- a/llvm/test/Transforms/InstCombine/2008-10-11-DivCompareFold.ll
+++ b/llvm/test/Transforms/InstCombine/2008-10-11-DivCompareFold.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {ret i1 false}
+; RUN: opt %s -instcombine -S | grep {ret i1 false}
 ; PR2697
 
 define i1 @x(i32 %x) nounwind {

llvm/test/Transforms/InstCombine/2008-11-01-SRemDemandedBits.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-11-01-SRemDemandedBits.ll b/llvm/test/Transforms/InstCombine/2008-11-01-SRemDemandedBits.ll
index bfe429a..8125834 100644
--- a/llvm/test/Transforms/InstCombine/2008-11-01-SRemDemandedBits.ll
+++ b/llvm/test/Transforms/InstCombine/2008-11-01-SRemDemandedBits.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {ret i1 true}
+; RUN: opt %s -instcombine -S | grep {ret i1 true}
 ; PR2993
 
 define i1 @foo(i32 %x) {

llvm/test/Transforms/InstCombine/2008-11-08-FCmp.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-11-08-FCmp.ll b/llvm/test/Transforms/InstCombine/2008-11-08-FCmp.ll
index 260ded7..517d30f 100644
--- a/llvm/test/Transforms/InstCombine/2008-11-08-FCmp.ll
+++ b/llvm/test/Transforms/InstCombine/2008-11-08-FCmp.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis > %t
+; RUN: opt %s -instcombine -S > %t
 ; RUN: grep {icmp eq} %t
 ; RUN: grep {ret i1 false} %t | count 2
 ; RUN: grep {ret i1 true} %t | count 2

llvm/test/Transforms/InstCombine/2008-11-20-DivMulRem.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-11-20-DivMulRem.ll b/llvm/test/Transforms/InstCombine/2008-11-20-DivMulRem.ll
index ae1cb04..94859cc 100644
--- a/llvm/test/Transforms/InstCombine/2008-11-20-DivMulRem.ll
+++ b/llvm/test/Transforms/InstCombine/2008-11-20-DivMulRem.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis > %t
+; RUN: opt %s -instcombine -S > %t
 ; RUN: grep urem %t | count 3
 ; RUN: grep srem %t | count 1
 ; RUN: grep sub %t | count 2

llvm/test/Transforms/InstCombine/2008-11-27-IDivVector.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-11-27-IDivVector.ll b/llvm/test/Transforms/InstCombine/2008-11-27-IDivVector.ll
index 5eba641..12855b8 100644
--- a/llvm/test/Transforms/InstCombine/2008-11-27-IDivVector.ll
+++ b/llvm/test/Transforms/InstCombine/2008-11-27-IDivVector.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep div
+; RUN: opt %s -instcombine -S | not grep div
 
 define <2 x i8> @f(<2 x i8> %x) {
   %A = udiv <2 x i8> %x, <i8 1, i8 1>

llvm/test/Transforms/InstCombine/2008-11-27-MultiplyIntVec.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-11-27-MultiplyIntVec.ll b/llvm/test/Transforms/InstCombine/2008-11-27-MultiplyIntVec.ll
index 326cb1b..a2578a8 100644
--- a/llvm/test/Transforms/InstCombine/2008-11-27-MultiplyIntVec.ll
+++ b/llvm/test/Transforms/InstCombine/2008-11-27-MultiplyIntVec.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep mul
+; RUN: opt %s -instcombine -S | not grep mul
 
 define <2 x i8> @f(<2 x i8> %x) {
   %A = mul <2 x i8> %x, <i8 1, i8 1>

llvm/test/Transforms/InstCombine/2008-11-27-UDivNegative.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-11-27-UDivNegative.ll b/llvm/test/Transforms/InstCombine/2008-11-27-UDivNegative.ll
index 3974923..a50e1e8 100644
--- a/llvm/test/Transforms/InstCombine/2008-11-27-UDivNegative.ll
+++ b/llvm/test/Transforms/InstCombine/2008-11-27-UDivNegative.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep div
+; RUN: opt %s -instcombine -S | not grep div
 
 define i8 @test(i8 %x) readnone nounwind {
   %A = udiv i8 %x, 250

llvm/test/Transforms/InstCombine/2008-12-17-SRemNegConstVec.ll

diff --git a/llvm/test/Transforms/InstCombine/2008-12-17-SRemNegConstVec.ll b/llvm/test/Transforms/InstCombine/2008-12-17-SRemNegConstVec.ll
index 9221257..46c9ff2 100644
--- a/llvm/test/Transforms/InstCombine/2008-12-17-SRemNegConstVec.ll
+++ b/llvm/test/Transforms/InstCombine/2008-12-17-SRemNegConstVec.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {i8 2, i8 2}
+; RUN: opt %s -instcombine -S | grep {i8 2, i8 2}
 ; PR2756
 
 define <2 x i8> @foo(<2 x i8> %x) {

llvm/test/Transforms/InstCombine/2009-01-08-AlignAlloca.ll

diff --git a/llvm/test/Transforms/InstCombine/2009-01-08-AlignAlloca.ll b/llvm/test/Transforms/InstCombine/2009-01-08-AlignAlloca.ll
index f421de2..ab8c7a5 100644
--- a/llvm/test/Transforms/InstCombine/2009-01-08-AlignAlloca.ll
+++ b/llvm/test/Transforms/InstCombine/2009-01-08-AlignAlloca.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis > %t
+; RUN: opt %s -instcombine -S > %t
 ; RUN: grep {, align 4} %t | count 3
 ; RUN: grep {, align 8} %t | count 3
 ; rdar://6480438

llvm/test/Transforms/InstCombine/2009-01-16-PointerAddrSpace.ll

diff --git a/llvm/test/Transforms/InstCombine/2009-01-16-PointerAddrSpace.ll b/llvm/test/Transforms/InstCombine/2009-01-16-PointerAddrSpace.ll
index a6b190d..75bdb1e 100644
--- a/llvm/test/Transforms/InstCombine/2009-01-16-PointerAddrSpace.ll
+++ b/llvm/test/Transforms/InstCombine/2009-01-16-PointerAddrSpace.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {store.*addrspace(1)}
+; RUN: opt %s -instcombine -S | grep {store.*addrspace(1)}
 ; PR3335
 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-f80:128:128"
 target triple = "i386-apple-darwin9.6"

llvm/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll

diff --git a/llvm/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll b/llvm/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll
index 982caec..7ab0e3e 100644
--- a/llvm/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll
+++ b/llvm/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll
@@ -1,7 +1,7 @@
-; RUN: opt %s -simplifycfg -instcombine | llvm-dis | grep 0x7FF8000000000000 | count 7
-; RUN: opt %s -simplifycfg -instcombine | llvm-dis | grep 0x7FF00000FFFFFFFF | count 5
-; RUN: opt %s -simplifycfg -instcombine | llvm-dis | grep {0\\.0} | count 3
-; RUN: opt %s -simplifycfg -instcombine | llvm-dis | grep {3\\.5} | count 1
+; RUN: opt %s -simplifycfg -instcombine -S | grep 0x7FF8000000000000 | count 7
+; RUN: opt %s -simplifycfg -instcombine -S | grep 0x7FF00000FFFFFFFF | count 5
+; RUN: opt %s -simplifycfg -instcombine -S | grep {0\\.0} | count 3
+; RUN: opt %s -simplifycfg -instcombine -S | grep {3\\.5} | count 1
 ;
 
 ; ModuleID = 'apf.c'

llvm/test/Transforms/InstCombine/2009-01-19-fmod-constant-float.ll

diff --git a/llvm/test/Transforms/InstCombine/2009-01-19-fmod-constant-float.ll b/llvm/test/Transforms/InstCombine/2009-01-19-fmod-constant-float.ll
index 455279c..1f4b2d2 100644
--- a/llvm/test/Transforms/InstCombine/2009-01-19-fmod-constant-float.ll
+++ b/llvm/test/Transforms/InstCombine/2009-01-19-fmod-constant-float.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -simplifycfg -instcombine | llvm-dis | grep 0x3FB99999A0000000 | count 2
-; RUN: opt %s -simplifycfg -instcombine | llvm-dis | grep 0xBFB99999A0000000 | count 2
+; RUN: opt %s -simplifycfg -instcombine -S | grep 0x3FB99999A0000000 | count 2
+; RUN: opt %s -simplifycfg -instcombine -S | grep 0xBFB99999A0000000 | count 2
 ; check constant folding for 'frem'.  PR 3316.
 
 ; ModuleID = 'tt.c'

llvm/test/Transforms/InstCombine/2009-01-31-Pressure.ll

diff --git a/llvm/test/Transforms/InstCombine/2009-01-31-Pressure.ll b/llvm/test/Transforms/InstCombine/2009-01-31-Pressure.ll
index 9455525..36bfb41 100644
--- a/llvm/test/Transforms/InstCombine/2009-01-31-Pressure.ll
+++ b/llvm/test/Transforms/InstCombine/2009-01-31-Pressure.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {%B = add i8 %b, %x}
+; RUN: opt %s -instcombine -S | grep {%B = add i8 %b, %x}
 ; PR2698
 
 declare void @use1(i1)

llvm/test/Transforms/InstCombine/2009-02-20-InstCombine-SROA.ll

diff --git a/llvm/test/Transforms/InstCombine/2009-02-20-InstCombine-SROA.ll b/llvm/test/Transforms/InstCombine/2009-02-20-InstCombine-SROA.ll
index 728bde5..d4c98b5 100644
--- a/llvm/test/Transforms/InstCombine/2009-02-20-InstCombine-SROA.ll
+++ b/llvm/test/Transforms/InstCombine/2009-02-20-InstCombine-SROA.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine -scalarrepl | llvm-dis | not grep { = alloca}
+; RUN: opt %s -instcombine -scalarrepl -S | not grep { = alloca}
 ; rdar://6417724
 ; Instcombine shouldn't do anything to this function that prevents promoting the allocas inside it.
 

llvm/test/Transforms/InstCombine/2009-02-21-LoadCST.ll

diff --git a/llvm/test/Transforms/InstCombine/2009-02-21-LoadCST.ll b/llvm/test/Transforms/InstCombine/2009-02-21-LoadCST.ll
index 76bc69f..9c77a69 100644
--- a/llvm/test/Transforms/InstCombine/2009-02-21-LoadCST.ll
+++ b/llvm/test/Transforms/InstCombine/2009-02-21-LoadCST.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {ret i32 3679669}
+; RUN: opt %s -instcombine -S | grep {ret i32 3679669}
 ; PR3595
 
 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-f80:32:32"

llvm/test/Transforms/InstCombine/2009-03-20-AShrOverShift.ll

diff --git a/llvm/test/Transforms/InstCombine/2009-03-20-AShrOverShift.ll b/llvm/test/Transforms/InstCombine/2009-03-20-AShrOverShift.ll
index 1f207c2..6b21296 100644
--- a/llvm/test/Transforms/InstCombine/2009-03-20-AShrOverShift.ll
+++ b/llvm/test/Transforms/InstCombine/2009-03-20-AShrOverShift.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {ashr i32 %val, 31}
+; RUN: opt %s -instcombine -S | grep {ashr i32 %val, 31}
 ; PR3851
 
 define i32 @foo2(i32 %val) nounwind {

llvm/test/Transforms/InstCombine/2009-04-07-MulPromoteToI96.ll

diff --git a/llvm/test/Transforms/InstCombine/2009-04-07-MulPromoteToI96.ll b/llvm/test/Transforms/InstCombine/2009-04-07-MulPromoteToI96.ll
index 88663f3..417cc4e 100644
--- a/llvm/test/Transforms/InstCombine/2009-04-07-MulPromoteToI96.ll
+++ b/llvm/test/Transforms/InstCombine/2009-04-07-MulPromoteToI96.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {mul i64}
+; RUN: opt %s -instcombine -S | grep {mul i64}
 ; rdar://6762288
 
 ; Instcombine should not promote the mul to i96 because it is definitely

llvm/test/Transforms/InstCombine/2009-05-23-FCmpToICmp.ll

diff --git a/llvm/test/Transforms/InstCombine/2009-05-23-FCmpToICmp.ll b/llvm/test/Transforms/InstCombine/2009-05-23-FCmpToICmp.ll
index 8137875..dcbf5cc 100644
--- a/llvm/test/Transforms/InstCombine/2009-05-23-FCmpToICmp.ll
+++ b/llvm/test/Transforms/InstCombine/2009-05-23-FCmpToICmp.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep cmp
+; RUN: opt %s -instcombine -S | not grep cmp
 ; rdar://6903175
 
 define i1 @f0(i32 *%a) nounwind {

llvm/test/Transforms/InstCombine/2009-06-11-StoreAddrSpace.ll

diff --git a/llvm/test/Transforms/InstCombine/2009-06-11-StoreAddrSpace.ll b/llvm/test/Transforms/InstCombine/2009-06-11-StoreAddrSpace.ll
index 7db92a2..cce14e9 100644
--- a/llvm/test/Transforms/InstCombine/2009-06-11-StoreAddrSpace.ll
+++ b/llvm/test/Transforms/InstCombine/2009-06-11-StoreAddrSpace.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {store i32 0,}
+; RUN: opt %s -instcombine -S | grep {store i32 0,}
 ; PR4366
 
 define void @a() {

llvm/test/Transforms/InstCombine/2009-06-16-SRemDemandedBits.ll

diff --git a/llvm/test/Transforms/InstCombine/2009-06-16-SRemDemandedBits.ll b/llvm/test/Transforms/InstCombine/2009-06-16-SRemDemandedBits.ll
index 30119d4..5b959d7 100644
--- a/llvm/test/Transforms/InstCombine/2009-06-16-SRemDemandedBits.ll
+++ b/llvm/test/Transforms/InstCombine/2009-06-16-SRemDemandedBits.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep srem
+; RUN: opt %s -instcombine -S | grep srem
 ; PR3439
 
 define i32 @a(i32 %x) nounwind {

llvm/test/Transforms/InstCombine/CPP_min_max.ll

diff --git a/llvm/test/Transforms/InstCombine/CPP_min_max.ll b/llvm/test/Transforms/InstCombine/CPP_min_max.ll
index 5d400b7..d1e39b8 100644
--- a/llvm/test/Transforms/InstCombine/CPP_min_max.ll
+++ b/llvm/test/Transforms/InstCombine/CPP_min_max.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:   grep select | not grep {i32\\*}
 
 ; This testcase corresponds to PR362, which notices that this horrible code

llvm/test/Transforms/InstCombine/IntPtrCast.ll

diff --git a/llvm/test/Transforms/InstCombine/IntPtrCast.ll b/llvm/test/Transforms/InstCombine/IntPtrCast.ll
index be050fc..5a997e0 100644
--- a/llvm/test/Transforms/InstCombine/IntPtrCast.ll
+++ b/llvm/test/Transforms/InstCombine/IntPtrCast.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | notcast
+; RUN: opt %s -instcombine -S | notcast
 target datalayout = "e-p:32:32"
 
 define i32* @test(i32* %P) {

llvm/test/Transforms/InstCombine/JavaCompare.ll

diff --git a/llvm/test/Transforms/InstCombine/JavaCompare.ll b/llvm/test/Transforms/InstCombine/JavaCompare.ll
index 7b5dbb2..bb38ad4 100644
--- a/llvm/test/Transforms/InstCombine/JavaCompare.ll
+++ b/llvm/test/Transforms/InstCombine/JavaCompare.ll
@@ -1,7 +1,7 @@
 ; 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: opt %s -instcombine | llvm-dis | grep {%c3 = icmp sle i32 %A, %B}
+; RUN: opt %s -instcombine -S | grep {%c3 = icmp sle i32 %A, %B}
 
 define i1 @le(i32 %A, i32 %B) {
         %c1 = icmp sgt i32 %A, %B               ; <i1> [#uses=1]

llvm/test/Transforms/InstCombine/add-shrink.ll

diff --git a/llvm/test/Transforms/InstCombine/add-shrink.ll b/llvm/test/Transforms/InstCombine/add-shrink.ll
index bd428cf..b0ad522 100644
--- a/llvm/test/Transforms/InstCombine/add-shrink.ll
+++ b/llvm/test/Transforms/InstCombine/add-shrink.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {add i32}
-; RUN: opt %s -instcombine | llvm-dis | grep sext | count 1
+; RUN: opt %s -instcombine -S | grep {add i32}
+; RUN: opt %s -instcombine -S | grep sext | count 1
 
 ; Should only have one sext and the add should be i32 instead of i64.
 

llvm/test/Transforms/InstCombine/add-sitofp.ll

diff --git a/llvm/test/Transforms/InstCombine/add-sitofp.ll b/llvm/test/Transforms/InstCombine/add-sitofp.ll
index d3e44c2..b2befdd 100644
--- a/llvm/test/Transforms/InstCombine/add-sitofp.ll
+++ b/llvm/test/Transforms/InstCombine/add-sitofp.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {add i32}
+; RUN: opt %s -instcombine -S | grep {add i32}
 
 define double @x(i32 %a, i32 %b) nounwind {
   %m = lshr i32 %a, 24

llvm/test/Transforms/InstCombine/add.ll

diff --git a/llvm/test/Transforms/InstCombine/add.ll b/llvm/test/Transforms/InstCombine/add.ll
index c20d6b7..4719809 100644
--- a/llvm/test/Transforms/InstCombine/add.ll
+++ b/llvm/test/Transforms/InstCombine/add.ll
@@ -1,6 +1,6 @@
 ; This test makes sure that add instructions are properly eliminated.
 
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt < %s -instcombine -S | \
 ; RUN:    grep -v OK | not grep add
 
 define i32 @test1(i32 %A) {

llvm/test/Transforms/InstCombine/add2.ll

diff --git a/llvm/test/Transforms/InstCombine/add2.ll b/llvm/test/Transforms/InstCombine/add2.ll
index 3469abc..1cbdd3a 100644
--- a/llvm/test/Transforms/InstCombine/add2.ll
+++ b/llvm/test/Transforms/InstCombine/add2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep add
+; RUN: opt < %s -instcombine -S | not grep add
 
 define i64 @test1(i64 %A, i32 %B) {
         %tmp12 = zext i32 %B to i64

llvm/test/Transforms/InstCombine/add3.ll

diff --git a/llvm/test/Transforms/InstCombine/add3.ll b/llvm/test/Transforms/InstCombine/add3.ll
index d4c2684..d95ab5d 100644
--- a/llvm/test/Transforms/InstCombine/add3.ll
+++ b/llvm/test/Transforms/InstCombine/add3.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep inttoptr | count 2
+; RUN: opt %s -instcombine -S | grep inttoptr | count 2
 
 ;; Target triple for gep raising case below.
 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-f80:128:128"

llvm/test/Transforms/InstCombine/addnegneg.ll

diff --git a/llvm/test/Transforms/InstCombine/addnegneg.ll b/llvm/test/Transforms/InstCombine/addnegneg.ll
index f113915..0f39d71 100644
--- a/llvm/test/Transforms/InstCombine/addnegneg.ll
+++ b/llvm/test/Transforms/InstCombine/addnegneg.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep { sub } | count 1
+; RUN: opt %s -instcombine -S | grep { sub } | count 1
 ; PR2047
 
 define i32 @l(i32 %a, i32 %b, i32 %c, i32 %d) {

llvm/test/Transforms/InstCombine/adjust-for-sminmax.ll

diff --git a/llvm/test/Transforms/InstCombine/adjust-for-sminmax.ll b/llvm/test/Transforms/InstCombine/adjust-for-sminmax.ll
index 01dc3d7..afe2f8f 100644
--- a/llvm/test/Transforms/InstCombine/adjust-for-sminmax.ll
+++ b/llvm/test/Transforms/InstCombine/adjust-for-sminmax.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {icmp s\[lg\]t i32 %n, 0} | count 16
+; RUN: opt %s -instcombine -S | grep {icmp s\[lg\]t i32 %n, 0} | count 16
 
 ; Instcombine should recognize that this code can be adjusted
 ; to fit the canonical smax/smin pattern.

llvm/test/Transforms/InstCombine/align-2d-gep.ll

diff --git a/llvm/test/Transforms/InstCombine/align-2d-gep.ll b/llvm/test/Transforms/InstCombine/align-2d-gep.ll
index d29f834..b5d25d3 100644
--- a/llvm/test/Transforms/InstCombine/align-2d-gep.ll
+++ b/llvm/test/Transforms/InstCombine/align-2d-gep.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {align 16} | count 1
+; RUN: opt %s -instcombine -S | grep {align 16} | count 1
 
 ; A multi-dimensional array in a nested loop doing vector stores that
 ; aren't yet aligned. Instcombine can understand the addressing in the

llvm/test/Transforms/InstCombine/align-addr.ll

diff --git a/llvm/test/Transforms/InstCombine/align-addr.ll b/llvm/test/Transforms/InstCombine/align-addr.ll
index 3ce5ca3..da2faab 100644
--- a/llvm/test/Transforms/InstCombine/align-addr.ll
+++ b/llvm/test/Transforms/InstCombine/align-addr.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {align 16} | count 1
+; RUN: opt %s -instcombine -S | grep {align 16} | count 1
 
 ; Instcombine should be able to prove vector alignment in the
 ; presence of a few mild address computation tricks.

llvm/test/Transforms/InstCombine/align-external.ll

diff --git a/llvm/test/Transforms/InstCombine/align-external.ll b/llvm/test/Transforms/InstCombine/align-external.ll
index 9304bbe..025d54e 100644
--- a/llvm/test/Transforms/InstCombine/align-external.ll
+++ b/llvm/test/Transforms/InstCombine/align-external.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | FileCheck %s
+; RUN: opt %s -instcombine -S | FileCheck %s
 
 ; Don't assume that external global variables have their preferred
 ; alignment. They may only have the ABI minimum alignment.

llvm/test/Transforms/InstCombine/align-inc.ll

diff --git a/llvm/test/Transforms/InstCombine/align-inc.ll b/llvm/test/Transforms/InstCombine/align-inc.ll
index fb2deb2..545da15 100644
--- a/llvm/test/Transforms/InstCombine/align-inc.ll
+++ b/llvm/test/Transforms/InstCombine/align-inc.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {GLOBAL.*align 16}
-; RUN: opt %s -instcombine | llvm-dis | grep {tmp = load}
+; RUN: opt %s -instcombine -S | grep {GLOBAL.*align 16}
+; RUN: opt %s -instcombine -S | grep {tmp = load}
 
 @GLOBAL = internal global [4 x i32] zeroinitializer
 

llvm/test/Transforms/InstCombine/alloca.ll

diff --git a/llvm/test/Transforms/InstCombine/alloca.ll b/llvm/test/Transforms/InstCombine/alloca.ll
index 4c497b0..13d664d 100644
--- a/llvm/test/Transforms/InstCombine/alloca.ll
+++ b/llvm/test/Transforms/InstCombine/alloca.ll
@@ -1,6 +1,6 @@
 ; Zero byte allocas should be deleted.
 
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt < %s -instcombine -S | \
 ; RUN:   not grep alloca
 ; END.
 

llvm/test/Transforms/InstCombine/and-compare.ll

diff --git a/llvm/test/Transforms/InstCombine/and-compare.ll b/llvm/test/Transforms/InstCombine/and-compare.ll
index 97a3f17..c30a245 100644
--- a/llvm/test/Transforms/InstCombine/and-compare.ll
+++ b/llvm/test/Transforms/InstCombine/and-compare.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt < %s -instcombine -S | \
 ; RUN:    grep and | count 1
 
 ; Should be optimized to one and.

llvm/test/Transforms/InstCombine/and-fcmp.ll

diff --git a/llvm/test/Transforms/InstCombine/and-fcmp.ll b/llvm/test/Transforms/InstCombine/and-fcmp.ll
index 26a1970..91868d1 100644
--- a/llvm/test/Transforms/InstCombine/and-fcmp.ll
+++ b/llvm/test/Transforms/InstCombine/and-fcmp.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -instcombine | llvm-dis | grep fcmp | count 3
-; RUN: opt %s -instcombine | llvm-dis | grep ret | grep 0
+; RUN: opt < %s -instcombine -S | grep fcmp | count 3
+; RUN: opt < %s -instcombine -S | grep ret | grep 0
 
 define zeroext i8 @t1(float %x, float %y) nounwind {
        %a = fcmp ueq float %x, %y

llvm/test/Transforms/InstCombine/and-not-or.ll

diff --git a/llvm/test/Transforms/InstCombine/and-not-or.ll b/llvm/test/Transforms/InstCombine/and-not-or.ll
index ff56f47..9dce7b4 100644
--- a/llvm/test/Transforms/InstCombine/and-not-or.ll
+++ b/llvm/test/Transforms/InstCombine/and-not-or.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {and i32 %x, %y} | count 4
-; RUN: opt %s -instcombine | llvm-dis | not grep {or}
+; RUN: opt < %s -instcombine -S | grep {and i32 %x, %y} | count 4
+; RUN: opt < %s -instcombine -S | not grep {or}
 
 define i32 @func1(i32 %x, i32 %y) nounwind {
 entry:

llvm/test/Transforms/InstCombine/and-or-and.ll

diff --git a/llvm/test/Transforms/InstCombine/and-or-and.ll b/llvm/test/Transforms/InstCombine/and-or-and.ll
index 9a6ac3a..8f2a130 100644
--- a/llvm/test/Transforms/InstCombine/and-or-and.ll
+++ b/llvm/test/Transforms/InstCombine/and-or-and.ll
@@ -9,7 +9,7 @@
 ;
 ; Which corresponds to test1.
 
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:   not grep {or }
 
 define i32 @test1(i32 %X, i32 %Y) {

llvm/test/Transforms/InstCombine/and-or-not.ll

diff --git a/llvm/test/Transforms/InstCombine/and-or-not.ll b/llvm/test/Transforms/InstCombine/and-or-not.ll
index 76f3209..37ec3bc 100644
--- a/llvm/test/Transforms/InstCombine/and-or-not.ll
+++ b/llvm/test/Transforms/InstCombine/and-or-not.ll
@@ -1,6 +1,6 @@
-; RUN: opt %s -instcombine | llvm-dis | grep xor | count 4
-; RUN: opt %s -instcombine | llvm-dis | not grep and
-; RUN: opt %s -instcombine | llvm-dis | not grep { or}
+; RUN: opt < %s -instcombine -S | grep xor | count 4
+; RUN: opt < %s -instcombine -S | not grep and
+; RUN: opt < %s -instcombine -S | not grep { or}
 
 ; PR1510
 

llvm/test/Transforms/InstCombine/and-or.ll

diff --git a/llvm/test/Transforms/InstCombine/and-or.ll b/llvm/test/Transforms/InstCombine/and-or.ll
index 5aa53fd..fe770f7 100644
--- a/llvm/test/Transforms/InstCombine/and-or.ll
+++ b/llvm/test/Transforms/InstCombine/and-or.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {and i32 %a, 1} | count 4
-; RUN: opt %s -instcombine | llvm-dis | grep {or i32 %0, %b} | count 4
+; RUN: opt %s -instcombine -S | grep {and i32 %a, 1} | count 4
+; RUN: opt %s -instcombine -S | grep {or i32 %0, %b} | count 4
 
 
 define i32 @func1(i32 %a, i32 %b) nounwind readnone {

llvm/test/Transforms/InstCombine/and-xor-merge.ll

diff --git a/llvm/test/Transforms/InstCombine/and-xor-merge.ll b/llvm/test/Transforms/InstCombine/and-xor-merge.ll
index 5472b04..e432a9a 100644
--- a/llvm/test/Transforms/InstCombine/and-xor-merge.ll
+++ b/llvm/test/Transforms/InstCombine/and-xor-merge.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -instcombine | llvm-dis | grep and | count 1
-; RUN: opt %s -instcombine | llvm-dis | grep xor | count 2
+; RUN: opt < %s -instcombine -S | grep and | count 1
+; RUN: opt < %s -instcombine -S | grep xor | count 2
 
 ; (x&z) ^ (y&z) -> (x^y)&z
 define i32 @test1(i32 %x, i32 %y, i32 %z) {

llvm/test/Transforms/InstCombine/and.ll

diff --git a/llvm/test/Transforms/InstCombine/and.ll b/llvm/test/Transforms/InstCombine/and.ll
index c5cdf72..8492df9 100644
--- a/llvm/test/Transforms/InstCombine/and.ll
+++ b/llvm/test/Transforms/InstCombine/and.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: opt %s -instcombine | llvm-dis | not grep and
+; RUN: opt < %s -instcombine -S | not grep and
 
 define i32 @test1(i32 %A) {
         ; zero result

llvm/test/Transforms/InstCombine/and2.ll

diff --git a/llvm/test/Transforms/InstCombine/and2.ll b/llvm/test/Transforms/InstCombine/and2.ll
index 012fa25..0af9bfa 100644
--- a/llvm/test/Transforms/InstCombine/and2.ll
+++ b/llvm/test/Transforms/InstCombine/and2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep and
+; RUN: opt < %s -instcombine -S | not grep and
 
 
 ; PR1738

llvm/test/Transforms/InstCombine/apint-add1.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-add1.ll b/llvm/test/Transforms/InstCombine/apint-add1.ll
index 3dcff56..02f1baf 100644
--- a/llvm/test/Transforms/InstCombine/apint-add1.ll
+++ b/llvm/test/Transforms/InstCombine/apint-add1.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that add instructions are properly eliminated.
 ; This test is for Integer BitWidth <= 64 && BitWidth % 8 != 0.
 
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt < %s -instcombine -S | \
 ; RUN:    grep -v OK | not grep add
 
 

llvm/test/Transforms/InstCombine/apint-add2.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-add2.ll b/llvm/test/Transforms/InstCombine/apint-add2.ll
index f34b6ae..913a70f 100644
--- a/llvm/test/Transforms/InstCombine/apint-add2.ll
+++ b/llvm/test/Transforms/InstCombine/apint-add2.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that add instructions are properly eliminated.
 ; This test is for Integer BitWidth > 64 && BitWidth <= 1024.
 
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt < %s -instcombine -S | \
 ; RUN:    grep -v OK | not grep add
 ; END.
 

llvm/test/Transforms/InstCombine/apint-and-compare.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-and-compare.ll b/llvm/test/Transforms/InstCombine/apint-and-compare.ll
index 61a117b..53e591e 100644
--- a/llvm/test/Transforms/InstCombine/apint-and-compare.ll
+++ b/llvm/test/Transforms/InstCombine/apint-and-compare.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep and | count 2
+; RUN: opt < %s -instcombine -S | grep and | count 2
 
 ; Should be optimized to one and.
 define i1 @test1(i33 %a, i33 %b) {

llvm/test/Transforms/InstCombine/apint-and-or-and.ll

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

llvm/test/Transforms/InstCombine/apint-and-xor-merge.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-and-xor-merge.ll b/llvm/test/Transforms/InstCombine/apint-and-xor-merge.ll
index d46cf6e..8adffde 100644
--- a/llvm/test/Transforms/InstCombine/apint-and-xor-merge.ll
+++ b/llvm/test/Transforms/InstCombine/apint-and-xor-merge.ll
@@ -1,8 +1,8 @@
 ; This test case checks that the merge of and/xor can work on arbitrary
 ; precision integers.
 
-; RUN: opt %s -instcombine | llvm-dis | grep and | count 1
-; RUN: opt %s -instcombine | llvm-dis | grep xor | count 2
+; RUN: opt < %s -instcombine -S | grep and | count 1
+; RUN: opt < %s -instcombine -S | grep xor | count 2
 
 ; (x &z ) ^ (y & z) -> (x ^ y) & z
 define i57 @test1(i57 %x, i57 %y, i57 %z) {

llvm/test/Transforms/InstCombine/apint-and1.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-and1.ll b/llvm/test/Transforms/InstCombine/apint-and1.ll
index deaa471..9fcdee5 100644
--- a/llvm/test/Transforms/InstCombine/apint-and1.ll
+++ b/llvm/test/Transforms/InstCombine/apint-and1.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that and instructions are properly eliminated.
 ; This test is for Integer BitWidth <= 64 && BitWidth % 8 != 0.
 
-; RUN: opt %s -instcombine | llvm-dis | not grep {and }
+; RUN: opt %s -instcombine -S | not grep {and }
 ; END.
 
 define i39 @test0(i39 %A) {

llvm/test/Transforms/InstCombine/apint-and2.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-and2.ll b/llvm/test/Transforms/InstCombine/apint-and2.ll
index 9ae0b5d..16afb7b 100644
--- a/llvm/test/Transforms/InstCombine/apint-and2.ll
+++ b/llvm/test/Transforms/InstCombine/apint-and2.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that and instructions are properly eliminated.
 ; This test is for Integer BitWidth > 64 && BitWidth <= 1024.
 
-; RUN: opt %s -instcombine | llvm-dis | not grep {and }
+; RUN: opt %s -instcombine -S | not grep {and }
 ; END.
 
 

llvm/test/Transforms/InstCombine/apint-call-cast-target.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-call-cast-target.ll b/llvm/test/Transforms/InstCombine/apint-call-cast-target.ll
index bcaef2d..ca2440c 100644
--- a/llvm/test/Transforms/InstCombine/apint-call-cast-target.ll
+++ b/llvm/test/Transforms/InstCombine/apint-call-cast-target.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep call | not grep bitcast
+; RUN: opt %s -instcombine -S | grep call | not grep bitcast
 
 target datalayout = "e-p:32:32"
 target triple = "i686-pc-linux-gnu"

llvm/test/Transforms/InstCombine/apint-cast-and-cast.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-cast-and-cast.ll b/llvm/test/Transforms/InstCombine/apint-cast-and-cast.ll
index 35948eb..6dc7309 100644
--- a/llvm/test/Transforms/InstCombine/apint-cast-and-cast.ll
+++ b/llvm/test/Transforms/InstCombine/apint-cast-and-cast.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep bitcast
+; RUN: opt %s -instcombine -S | not grep bitcast
 
 define i19 @test1(i43 %val) {
   %t1 = bitcast i43 %val to i43 

llvm/test/Transforms/InstCombine/apint-cast-cast-to-and.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-cast-cast-to-and.ll b/llvm/test/Transforms/InstCombine/apint-cast-cast-to-and.ll
index 1e7ac10..ccd0306 100644
--- a/llvm/test/Transforms/InstCombine/apint-cast-cast-to-and.ll
+++ b/llvm/test/Transforms/InstCombine/apint-cast-cast-to-and.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep i41
+; RUN: opt %s -instcombine -S | not grep i41
 
 define i61 @test1(i61 %X) {
         %Y = trunc i61 %X to i41 ;; Turn i61o an AND

llvm/test/Transforms/InstCombine/apint-cast.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-cast.ll b/llvm/test/Transforms/InstCombine/apint-cast.ll
index 83640f0..6fad557 100644
--- a/llvm/test/Transforms/InstCombine/apint-cast.ll
+++ b/llvm/test/Transforms/InstCombine/apint-cast.ll
@@ -1,5 +1,5 @@
 ; Tests to make sure elimination of casts is working correctly
-; RUN: opt %s -instcombine | llvm-dis | notcast
+; RUN: opt < %s -instcombine -S | notcast
 
 define i17 @test1(i17 %a) {
         %tmp = zext i17 %a to i37               ; <i37> [#uses=2]

llvm/test/Transforms/InstCombine/apint-div1.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-div1.ll b/llvm/test/Transforms/InstCombine/apint-div1.ll
index b1ec5ab..68aadac 100644
--- a/llvm/test/Transforms/InstCombine/apint-div1.ll
+++ b/llvm/test/Transforms/InstCombine/apint-div1.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that div instructions are properly eliminated.
 ; This test is for Integer BitWidth < 64 && BitWidth % 2 != 0.
 ;
-; RUN: opt %s -instcombine | llvm-dis | not grep div
+; RUN: opt < %s -instcombine -S | not grep div
 
 
 define i33 @test1(i33 %X) {

llvm/test/Transforms/InstCombine/apint-div2.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-div2.ll b/llvm/test/Transforms/InstCombine/apint-div2.ll
index 41b28b0..2d7ac78 100644
--- a/llvm/test/Transforms/InstCombine/apint-div2.ll
+++ b/llvm/test/Transforms/InstCombine/apint-div2.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that div instructions are properly eliminated.
 ; This test is for Integer BitWidth >= 64 && BitWidth <= 1024.
 ;
-; RUN: opt %s -instcombine | llvm-dis | not grep div
+; RUN: opt < %s -instcombine -S | not grep div
 
 
 define i333 @test1(i333 %X) {

llvm/test/Transforms/InstCombine/apint-elim-logicalops.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-elim-logicalops.ll b/llvm/test/Transforms/InstCombine/apint-elim-logicalops.ll
index b3bef0b..c507375 100644
--- a/llvm/test/Transforms/InstCombine/apint-elim-logicalops.ll
+++ b/llvm/test/Transforms/InstCombine/apint-elim-logicalops.ll
@@ -1,6 +1,6 @@
 ; Test that elimination of logical operators works with 
 ; arbitrary precision integers.
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:    not grep {(and\|xor\|add\|shl\|shr)}
 ; END.
 

llvm/test/Transforms/InstCombine/apint-mul1.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-mul1.ll b/llvm/test/Transforms/InstCombine/apint-mul1.ll
index d35f03c..6a5b3e7 100644
--- a/llvm/test/Transforms/InstCombine/apint-mul1.ll
+++ b/llvm/test/Transforms/InstCombine/apint-mul1.ll
@@ -2,7 +2,7 @@
 ; This test is for Integer BitWidth < 64 && BitWidth % 2 != 0.
 ;
 
-; RUN: opt %s -instcombine | llvm-dis | not grep mul
+; RUN: opt < %s -instcombine -S | not grep mul
 
 
 define i17 @test1(i17 %X) {

llvm/test/Transforms/InstCombine/apint-mul2.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-mul2.ll b/llvm/test/Transforms/InstCombine/apint-mul2.ll
index b99e2a5..558d2fb 100644
--- a/llvm/test/Transforms/InstCombine/apint-mul2.ll
+++ b/llvm/test/Transforms/InstCombine/apint-mul2.ll
@@ -2,7 +2,7 @@
 ; This test is for Integer BitWidth >= 64 && BitWidth % 2 >= 1024.
 ;
 
-; RUN: opt %s -instcombine | llvm-dis | not grep mul
+; RUN: opt < %s -instcombine -S | not grep mul
 
 
 define i177 @test1(i177 %X) {

llvm/test/Transforms/InstCombine/apint-not.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-not.ll b/llvm/test/Transforms/InstCombine/apint-not.ll
index 2051543..49af162 100644
--- a/llvm/test/Transforms/InstCombine/apint-not.ll
+++ b/llvm/test/Transforms/InstCombine/apint-not.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that the xor instructions are properly eliminated
 ; when arbitrary precision integers are used.
 
-; RUN: opt %s -instcombine | llvm-dis | not grep xor
+; RUN: opt %s -instcombine -S | not grep xor
 
 define i33 @test1(i33 %A) {
 	%B = xor i33 %A, -1

llvm/test/Transforms/InstCombine/apint-or1.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-or1.ll b/llvm/test/Transforms/InstCombine/apint-or1.ll
index d5d2e7a..d4f87ac 100644
--- a/llvm/test/Transforms/InstCombine/apint-or1.ll
+++ b/llvm/test/Transforms/InstCombine/apint-or1.ll
@@ -2,7 +2,7 @@
 ; This test is for Integer BitWidth <= 64 && BitWidth % 2 != 0.
 ;
 
-; RUN: opt %s -instcombine | llvm-dis | not grep or
+; RUN: opt < %s -instcombine -S | not grep or
 
 
 define i7 @test0(i7 %X) {

llvm/test/Transforms/InstCombine/apint-or2.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-or2.ll b/llvm/test/Transforms/InstCombine/apint-or2.ll
index a38b59e..d7de255 100644
--- a/llvm/test/Transforms/InstCombine/apint-or2.ll
+++ b/llvm/test/Transforms/InstCombine/apint-or2.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that or instructions are properly eliminated.
 ; This test is for Integer BitWidth > 64 && BitWidth <= 1024.
 ;
-; RUN: opt %s -instcombine | llvm-dis | not grep or
+; RUN: opt < %s -instcombine -S | not grep or
 
 
 define i777 @test0(i777 %X) {

llvm/test/Transforms/InstCombine/apint-rem1.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-rem1.ll b/llvm/test/Transforms/InstCombine/apint-rem1.ll
index 6564b68..030facc 100644
--- a/llvm/test/Transforms/InstCombine/apint-rem1.ll
+++ b/llvm/test/Transforms/InstCombine/apint-rem1.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ; This test is for Integer BitWidth < 64 && BitWidth % 2 != 0.
 ;
-; RUN: opt %s -instcombine | llvm-dis | not grep rem
+; RUN: opt < %s -instcombine -S | not grep rem
 
 
 define i33 @test1(i33 %A) {

llvm/test/Transforms/InstCombine/apint-rem2.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-rem2.ll b/llvm/test/Transforms/InstCombine/apint-rem2.ll
index fb290cc..9bfc4cd 100644
--- a/llvm/test/Transforms/InstCombine/apint-rem2.ll
+++ b/llvm/test/Transforms/InstCombine/apint-rem2.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ; This test is for Integer BitWidth >= 64 && BitWidth <= 1024.
 ;
-; RUN: opt %s -instcombine | llvm-dis | not grep rem
+; RUN: opt < %s -instcombine -S | not grep rem
 
 
 define i333 @test1(i333 %A) {

llvm/test/Transforms/InstCombine/apint-select.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-select.ll b/llvm/test/Transforms/InstCombine/apint-select.ll
index 3b47425..f2ea601 100644
--- a/llvm/test/Transforms/InstCombine/apint-select.ll
+++ b/llvm/test/Transforms/InstCombine/apint-select.ll
@@ -1,6 +1,6 @@
 ; This test makes sure that these instructions are properly eliminated.
 
-; RUN: opt %s -instcombine | llvm-dis | not grep select
+; RUN: opt < %s -instcombine -S | not grep select
 
 
 define i41 @test1(i1 %C) {

llvm/test/Transforms/InstCombine/apint-shift-simplify.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-shift-simplify.ll b/llvm/test/Transforms/InstCombine/apint-shift-simplify.ll
index 1abe505..421069a 100644
--- a/llvm/test/Transforms/InstCombine/apint-shift-simplify.ll
+++ b/llvm/test/Transforms/InstCombine/apint-shift-simplify.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:    egrep {shl|lshr|ashr} | count 3
 
 define i41 @test0(i41 %A, i41 %B, i41 %C) {

llvm/test/Transforms/InstCombine/apint-shift.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-shift.ll b/llvm/test/Transforms/InstCombine/apint-shift.ll
index c2ee1d3..6573b5b 100644
--- a/llvm/test/Transforms/InstCombine/apint-shift.ll
+++ b/llvm/test/Transforms/InstCombine/apint-shift.ll
@@ -1,6 +1,6 @@
 ; This test makes sure that shit instructions are properly eliminated
 ; even with arbitrary precision integers.
-; RUN: opt %s -instcombine | llvm-dis | not grep sh
+; RUN: opt < %s -instcombine -S | not grep sh
 ; END.
 
 define i47 @test1(i47 %A) {

llvm/test/Transforms/InstCombine/apint-shl-trunc.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-shl-trunc.ll b/llvm/test/Transforms/InstCombine/apint-shl-trunc.ll
index dd8576a..be9720d 100644
--- a/llvm/test/Transforms/InstCombine/apint-shl-trunc.ll
+++ b/llvm/test/Transforms/InstCombine/apint-shl-trunc.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep shl
+; RUN: opt %s -instcombine -S | grep shl
 ; END.
 
 define i1 @test0(i39 %X, i39 %A) {

llvm/test/Transforms/InstCombine/apint-sub.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-sub.ll b/llvm/test/Transforms/InstCombine/apint-sub.ll
index 5b92f1d..8b9ff14 100644
--- a/llvm/test/Transforms/InstCombine/apint-sub.ll
+++ b/llvm/test/Transforms/InstCombine/apint-sub.ll
@@ -2,7 +2,7 @@
 ; even with arbitrary precision integers.
 ;
 
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt < %s -instcombine -S | \
 ; RUN:   grep -v {sub i19 %Cok, %Bok} | grep -v {sub i25 0, %Aok} | not grep sub
 ; END.
 

llvm/test/Transforms/InstCombine/apint-xor1.ll

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

llvm/test/Transforms/InstCombine/apint-xor2.ll

diff --git a/llvm/test/Transforms/InstCombine/apint-xor2.ll b/llvm/test/Transforms/InstCombine/apint-xor2.ll
index 60e0ac6..b622747 100644
--- a/llvm/test/Transforms/InstCombine/apint-xor2.ll
+++ b/llvm/test/Transforms/InstCombine/apint-xor2.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that xor instructions are properly eliminated.
 ; This test is for Integer BitWidth > 64 && BitWidth <= 1024.
 
-; RUN: opt %s -instcombine | llvm-dis | not grep {xor }
+; RUN: opt %s -instcombine -S | not grep {xor }
 ; END.
 
 

llvm/test/Transforms/InstCombine/apint-zext1.ll

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

llvm/test/Transforms/InstCombine/apint-zext2.ll

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

llvm/test/Transforms/InstCombine/ashr-nop.ll

diff --git a/llvm/test/Transforms/InstCombine/ashr-nop.ll b/llvm/test/Transforms/InstCombine/ashr-nop.ll
index 3fa07b0..870ede3 100644
--- a/llvm/test/Transforms/InstCombine/ashr-nop.ll
+++ b/llvm/test/Transforms/InstCombine/ashr-nop.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep ashr
+; RUN: opt < %s -instcombine -S | not grep ashr
 
 define i32 @foo(i32 %x) {
   %o = and i32 %x, 1

llvm/test/Transforms/InstCombine/binop-cast.ll

diff --git a/llvm/test/Transforms/InstCombine/binop-cast.ll b/llvm/test/Transforms/InstCombine/binop-cast.ll
index eb34a12..ee43fe0 100644
--- a/llvm/test/Transforms/InstCombine/binop-cast.ll
+++ b/llvm/test/Transforms/InstCombine/binop-cast.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | notcast
+; RUN: opt < %s -instcombine -S | notcast
 
 define i32 @testAdd(i32 %X, i32 %Y) {
 	%tmp = add i32 %X, %Y

llvm/test/Transforms/InstCombine/bit-tracking.ll

diff --git a/llvm/test/Transforms/InstCombine/bit-tracking.ll b/llvm/test/Transforms/InstCombine/bit-tracking.ll
index 7363e38..d375bdf 100644
--- a/llvm/test/Transforms/InstCombine/bit-tracking.ll
+++ b/llvm/test/Transforms/InstCombine/bit-tracking.ll
@@ -1,6 +1,6 @@
 ; This file contains various testcases that require tracking whether bits are
 ; set or cleared by various instructions.
-; RUN: opt %s -instcombine -instcombine | llvm-dis |\
+; RUN: opt %s -instcombine -instcombine -S |\
 ; RUN:   not grep %ELIM
 
 ; Reduce down to a single XOR

llvm/test/Transforms/InstCombine/bitcast-scalar-to-vector.ll

diff --git a/llvm/test/Transforms/InstCombine/bitcast-scalar-to-vector.ll b/llvm/test/Transforms/InstCombine/bitcast-scalar-to-vector.ll
index 3acee53..1448fc6 100644
--- a/llvm/test/Transforms/InstCombine/bitcast-scalar-to-vector.ll
+++ b/llvm/test/Transforms/InstCombine/bitcast-scalar-to-vector.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {ret i32 0}
+; RUN: opt %s -instcombine -S | grep {ret i32 0}
 ; PR4487
 
 ; Bitcasts between vectors and scalars are valid, despite being ill-advised.

llvm/test/Transforms/InstCombine/bitcast-vec-canon.ll

diff --git a/llvm/test/Transforms/InstCombine/bitcast-vec-canon.ll b/llvm/test/Transforms/InstCombine/bitcast-vec-canon.ll
index 0e85753..194fdea 100644
--- a/llvm/test/Transforms/InstCombine/bitcast-vec-canon.ll
+++ b/llvm/test/Transforms/InstCombine/bitcast-vec-canon.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep element | count 4
+; RUN: opt %s -instcombine -S | grep element | count 4
 
 define double @a(<1 x i64> %y) {
   %c = bitcast <1 x i64> %y to double

llvm/test/Transforms/InstCombine/bitcast-vector-fold.ll

diff --git a/llvm/test/Transforms/InstCombine/bitcast-vector-fold.ll b/llvm/test/Transforms/InstCombine/bitcast-vector-fold.ll
index d24368d..8feec22 100644
--- a/llvm/test/Transforms/InstCombine/bitcast-vector-fold.ll
+++ b/llvm/test/Transforms/InstCombine/bitcast-vector-fold.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep bitcast
+; RUN: opt < %s -instcombine -S | not grep bitcast
 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-f80:128:128"
 target triple = "i686-apple-darwin8"
 

llvm/test/Transforms/InstCombine/bitcount.ll

diff --git a/llvm/test/Transforms/InstCombine/bitcount.ll b/llvm/test/Transforms/InstCombine/bitcount.ll
index 0a616b6..3c10120 100644
--- a/llvm/test/Transforms/InstCombine/bitcount.ll
+++ b/llvm/test/Transforms/InstCombine/bitcount.ll
@@ -1,6 +1,6 @@
 ; Tests to make sure bit counts of constants are folded
-; RUN: opt %s -instcombine | llvm-dis | grep {ret i32 19}
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | grep {ret i32 19}
+; RUN: opt %s -instcombine -S | \
 ; RUN:   grep -v declare | not grep llvm.ct
 
 declare i31 @llvm.ctpop.i31(i31 %val) 

llvm/test/Transforms/InstCombine/bittest.ll

diff --git a/llvm/test/Transforms/InstCombine/bittest.ll b/llvm/test/Transforms/InstCombine/bittest.ll
index 7b73dea..c4819f8 100644
--- a/llvm/test/Transforms/InstCombine/bittest.ll
+++ b/llvm/test/Transforms/InstCombine/bittest.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine -simplifycfg | llvm-dis |\
+; RUN: opt %s -instcombine -simplifycfg -S |\
 ; RUN:    not grep {call void @abort}
 
 @b_rec.0 = external global i32          ; <i32*> [#uses=2]

llvm/test/Transforms/InstCombine/bswap-fold.ll

diff --git a/llvm/test/Transforms/InstCombine/bswap-fold.ll b/llvm/test/Transforms/InstCombine/bswap-fold.ll
index 6e6006a..35b23e8 100644
--- a/llvm/test/Transforms/InstCombine/bswap-fold.ll
+++ b/llvm/test/Transforms/InstCombine/bswap-fold.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -instcombine | llvm-dis | grep ret | count 6
-; RUN: opt %s -instcombine | llvm-dis | not grep call.*bswap
+; RUN: opt %s -instcombine -S | grep ret | count 6
+; RUN: opt %s -instcombine -S | not grep call.*bswap
 
 define i1 @test1(i16 %tmp2) {
         %tmp10 = call i16 @llvm.bswap.i16( i16 %tmp2 )          ; <i16> [#uses=1]

llvm/test/Transforms/InstCombine/bswap.ll

diff --git a/llvm/test/Transforms/InstCombine/bswap.ll b/llvm/test/Transforms/InstCombine/bswap.ll
index 896a332..8428e6b 100644
--- a/llvm/test/Transforms/InstCombine/bswap.ll
+++ b/llvm/test/Transforms/InstCombine/bswap.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:    grep {call.*llvm.bswap} | count 6
 
 define i32 @test1(i32 %i) {

llvm/test/Transforms/InstCombine/call-cast-target.ll

diff --git a/llvm/test/Transforms/InstCombine/call-cast-target.ll b/llvm/test/Transforms/InstCombine/call-cast-target.ll
index 59794e5..9610ea92 100644
--- a/llvm/test/Transforms/InstCombine/call-cast-target.ll
+++ b/llvm/test/Transforms/InstCombine/call-cast-target.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:   grep call | not grep bitcast
 
 target datalayout = "e-p:32:32"

llvm/test/Transforms/InstCombine/call.ll

diff --git a/llvm/test/Transforms/InstCombine/call.ll b/llvm/test/Transforms/InstCombine/call.ll
index 00518fc..03d9a6a 100644
--- a/llvm/test/Transforms/InstCombine/call.ll
+++ b/llvm/test/Transforms/InstCombine/call.ll
@@ -1,5 +1,5 @@
 ; Ignore stderr, we expect warnings there
-; RUN: opt %s -instcombine 2> /dev/null | llvm-dis | \
+; RUN: opt %s -instcombine 2> /dev/null -S | \
 ; RUN:    grep call | notcast
 ; END.
 

llvm/test/Transforms/InstCombine/canonicalize_branch.ll

diff --git a/llvm/test/Transforms/InstCombine/canonicalize_branch.ll b/llvm/test/Transforms/InstCombine/canonicalize_branch.ll
index 874cd4e..1a9e966 100644
--- a/llvm/test/Transforms/InstCombine/canonicalize_branch.ll
+++ b/llvm/test/Transforms/InstCombine/canonicalize_branch.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:    not grep {icmp ne\|icmp ule\|icmp uge}
 
 define i32 @test1(i32 %X, i32 %Y) {

llvm/test/Transforms/InstCombine/cast-and-cast.ll

diff --git a/llvm/test/Transforms/InstCombine/cast-and-cast.ll b/llvm/test/Transforms/InstCombine/cast-and-cast.ll
index 0494320..8ac649f 100644
--- a/llvm/test/Transforms/InstCombine/cast-and-cast.ll
+++ b/llvm/test/Transforms/InstCombine/cast-and-cast.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:   not grep bitcast
 
 define i1 @test1(i32 %val) {

llvm/test/Transforms/InstCombine/cast-cast-to-and.ll

diff --git a/llvm/test/Transforms/InstCombine/cast-cast-to-and.ll b/llvm/test/Transforms/InstCombine/cast-cast-to-and.ll
index 8f4e5d8..521e9b4 100644
--- a/llvm/test/Transforms/InstCombine/cast-cast-to-and.ll
+++ b/llvm/test/Transforms/InstCombine/cast-cast-to-and.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:   not grep i8 
 
 define i32 @test1(i32 %X) {

llvm/test/Transforms/InstCombine/cast-load-gep.ll

diff --git a/llvm/test/Transforms/InstCombine/cast-load-gep.ll b/llvm/test/Transforms/InstCombine/cast-load-gep.ll
index 722f30a..0f90bd5 100644
--- a/llvm/test/Transforms/InstCombine/cast-load-gep.ll
+++ b/llvm/test/Transforms/InstCombine/cast-load-gep.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine -globaldce | llvm-dis | \
+; RUN: opt %s -instcombine -globaldce -S | \
 ; RUN:   not grep Array
 
 ; Pulling the cast out of the load allows us to eliminate the load, and then 

llvm/test/Transforms/InstCombine/cast-malloc.ll

diff --git a/llvm/test/Transforms/InstCombine/cast-malloc.ll b/llvm/test/Transforms/InstCombine/cast-malloc.ll
index 2091d4f..8e1c6b9 100644
--- a/llvm/test/Transforms/InstCombine/cast-malloc.ll
+++ b/llvm/test/Transforms/InstCombine/cast-malloc.ll
@@ -1,5 +1,5 @@
 ; test that casted mallocs get converted to malloc of the right type
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:    not grep bitcast
 
 ; The target datalayout is important for this test case. We have to tell 

llvm/test/Transforms/InstCombine/cast-mul-select.ll

diff --git a/llvm/test/Transforms/InstCombine/cast-mul-select.ll b/llvm/test/Transforms/InstCombine/cast-mul-select.ll
index 937b06b..7c59e2d 100644
--- a/llvm/test/Transforms/InstCombine/cast-mul-select.ll
+++ b/llvm/test/Transforms/InstCombine/cast-mul-select.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | notcast
+; RUN: opt < %s -instcombine -S | notcast
 
 define i32 @mul(i32 %x, i32 %y) {
   %A = trunc i32 %x to i8

llvm/test/Transforms/InstCombine/cast-propagate.ll

diff --git a/llvm/test/Transforms/InstCombine/cast-propagate.ll b/llvm/test/Transforms/InstCombine/cast-propagate.ll
index 178c340..87acb45 100644
--- a/llvm/test/Transforms/InstCombine/cast-propagate.ll
+++ b/llvm/test/Transforms/InstCombine/cast-propagate.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine -mem2reg | llvm-dis | \
+; RUN: opt %s -instcombine -mem2reg -S | \
 ; RUN:    not grep load
 
 define i32 @test1(i32* %P) {

llvm/test/Transforms/InstCombine/cast-set.ll

diff --git a/llvm/test/Transforms/InstCombine/cast-set.ll b/llvm/test/Transforms/InstCombine/cast-set.ll
index 8db7dc3..ed920b9 100644
--- a/llvm/test/Transforms/InstCombine/cast-set.ll
+++ b/llvm/test/Transforms/InstCombine/cast-set.ll
@@ -1,7 +1,7 @@
 ; This tests for various complex cast elimination cases instcombine should
 ; handle.
 
-; RUN: opt %s -instcombine | llvm-dis | notcast
+; RUN: opt < %s -instcombine -S | notcast
 
 define i1 @test1(i32 %X) {
         %A = bitcast i32 %X to i32              ; <i32> [#uses=1]

llvm/test/Transforms/InstCombine/cast-sext-zext.ll

diff --git a/llvm/test/Transforms/InstCombine/cast-sext-zext.ll b/llvm/test/Transforms/InstCombine/cast-sext-zext.ll
index fd5e40e..79bd5aa 100644
--- a/llvm/test/Transforms/InstCombine/cast-sext-zext.ll
+++ b/llvm/test/Transforms/InstCombine/cast-sext-zext.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep sext
+; RUN: opt %s -instcombine -S | not grep sext
 ; XFAIL: *
 
 define zeroext i16 @t(i8 zeroext %on_off, i16* nocapture %puls) nounwind readonly {

llvm/test/Transforms/InstCombine/cast.ll

diff --git a/llvm/test/Transforms/InstCombine/cast.ll b/llvm/test/Transforms/InstCombine/cast.ll
index 9458b98..048106d 100644
--- a/llvm/test/Transforms/InstCombine/cast.ll
+++ b/llvm/test/Transforms/InstCombine/cast.ll
@@ -1,5 +1,5 @@
 ; Tests to make sure elimination of casts is working correctly
-; RUN: opt %s -instcombine | llvm-dis | grep %c | notcast
+; RUN: opt %s -instcombine -S | grep %c | notcast
 
 @inbuf = external global [32832 x i8]           ; <[32832 x i8]*> [#uses=1]
 

llvm/test/Transforms/InstCombine/cast2.ll

diff --git a/llvm/test/Transforms/InstCombine/cast2.ll b/llvm/test/Transforms/InstCombine/cast2.ll
index f0e5539..80366bd 100644
--- a/llvm/test/Transforms/InstCombine/cast2.ll
+++ b/llvm/test/Transforms/InstCombine/cast2.ll
@@ -1,5 +1,5 @@
 ; Tests to make sure elimination of casts is working correctly
-; RUN: opt %s -instcombine | llvm-dis | notcast
+; RUN: opt < %s -instcombine -S | notcast
 
 define i16 @test1(i16 %a) {
         %tmp = zext i16 %a to i32               ; <i32> [#uses=2]

llvm/test/Transforms/InstCombine/cast3.ll

diff --git a/llvm/test/Transforms/InstCombine/cast3.ll b/llvm/test/Transforms/InstCombine/cast3.ll
index 7ba7b02..c911948 100644
--- a/llvm/test/Transforms/InstCombine/cast3.ll
+++ b/llvm/test/Transforms/InstCombine/cast3.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep getelementptr
+; RUN: opt %s -instcombine -S | not grep getelementptr
 ; PR2831
 
 ; Don't raise arbitrary inttoptr+arithmetic+ptrtoint to getelementptr.

llvm/test/Transforms/InstCombine/cast_ld_addr_space.ll

diff --git a/llvm/test/Transforms/InstCombine/cast_ld_addr_space.ll b/llvm/test/Transforms/InstCombine/cast_ld_addr_space.ll
index 7a57bbe..3ae2580 100644
--- a/llvm/test/Transforms/InstCombine/cast_ld_addr_space.ll
+++ b/llvm/test/Transforms/InstCombine/cast_ld_addr_space.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep bitcast | count 1
+; RUN: opt %s -instcombine -S | grep bitcast | count 1
 
 ; InstCombine can not 'load (cast P)' -> cast (load P)' if the cast changes
 ; the address space.

llvm/test/Transforms/InstCombine/cast_ptr.ll

diff --git a/llvm/test/Transforms/InstCombine/cast_ptr.ll b/llvm/test/Transforms/InstCombine/cast_ptr.ll
index 06ccf72..c1bf81c 100644
--- a/llvm/test/Transforms/InstCombine/cast_ptr.ll
+++ b/llvm/test/Transforms/InstCombine/cast_ptr.ll
@@ -1,5 +1,5 @@
 ; Tests to make sure elimination of casts is working correctly
-; RUN: opt %s -instcombine | llvm-dis | FileCheck %s
+; RUN: opt %s -instcombine -S | FileCheck %s
 
 target datalayout = "p:32:32"
 

llvm/test/Transforms/InstCombine/constant-fold-gep.ll

diff --git a/llvm/test/Transforms/InstCombine/constant-fold-gep.ll b/llvm/test/Transforms/InstCombine/constant-fold-gep.ll
index 449bca0..953f204 100644
--- a/llvm/test/Transforms/InstCombine/constant-fold-gep.ll
+++ b/llvm/test/Transforms/InstCombine/constant-fold-gep.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | FileCheck %s
+; RUN: opt %s -instcombine -S | FileCheck %s
 
 ; Constant folding should fix notionally out-of-bounds indices
 ; and add inbounds keywords.

llvm/test/Transforms/InstCombine/constant-fold-ptr-casts.ll

diff --git a/llvm/test/Transforms/InstCombine/constant-fold-ptr-casts.ll b/llvm/test/Transforms/InstCombine/constant-fold-ptr-casts.ll
index 906099b..8550d65 100644
--- a/llvm/test/Transforms/InstCombine/constant-fold-ptr-casts.ll
+++ b/llvm/test/Transforms/InstCombine/constant-fold-ptr-casts.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {ret i32 2143034560}
+; RUN: opt %s -instcombine -S | grep {ret i32 2143034560}
 
 ; Instcombine should be able to completely fold this code.
 

llvm/test/Transforms/InstCombine/dce-iterate.ll

diff --git a/llvm/test/Transforms/InstCombine/dce-iterate.ll b/llvm/test/Transforms/InstCombine/dce-iterate.ll
index 4713c38..f1c136b 100644
--- a/llvm/test/Transforms/InstCombine/dce-iterate.ll
+++ b/llvm/test/Transforms/InstCombine/dce-iterate.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {ret double .sy}
+; RUN: opt %s -instcombine -S | grep {ret double .sy}
 
 define internal double @ScaleObjectAdd(double %sx, double %sy, double %sz) nounwind {
 entry:

llvm/test/Transforms/InstCombine/deadcode.ll

diff --git a/llvm/test/Transforms/InstCombine/deadcode.ll b/llvm/test/Transforms/InstCombine/deadcode.ll
index af2e964..8f1158b 100644
--- a/llvm/test/Transforms/InstCombine/deadcode.ll
+++ b/llvm/test/Transforms/InstCombine/deadcode.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {ret i32 %A}
-; RUN: opt %s -die | llvm-dis | not grep call.*llvm.stacksave
+; RUN: opt %s -instcombine -S | grep {ret i32 %A}
+; RUN: opt %s -die -S | not grep call.*llvm.stacksave
 
 define i32 @test(i32 %A) {
 	%X = or i1 false, false		

llvm/test/Transforms/InstCombine/div-cmp-overflow.ll

diff --git a/llvm/test/Transforms/InstCombine/div-cmp-overflow.ll b/llvm/test/Transforms/InstCombine/div-cmp-overflow.ll
index 006f1d6..8b91e24 100644
--- a/llvm/test/Transforms/InstCombine/div-cmp-overflow.ll
+++ b/llvm/test/Transforms/InstCombine/div-cmp-overflow.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep sdiv
+; RUN: opt %s -instcombine -S | not grep sdiv
 ; PR2740
 
 define i1 @func_75(i32 %i2) nounwind {

llvm/test/Transforms/InstCombine/div.ll

diff --git a/llvm/test/Transforms/InstCombine/div.ll b/llvm/test/Transforms/InstCombine/div.ll
index 542fccf..0d13980 100644
--- a/llvm/test/Transforms/InstCombine/div.ll
+++ b/llvm/test/Transforms/InstCombine/div.ll
@@ -1,6 +1,6 @@
 ; This test makes sure that div instructions are properly eliminated.
 
-; RUN: opt %s -instcombine | llvm-dis | not grep div
+; RUN: opt < %s -instcombine -S | not grep div
 
 define i32 @test1(i32 %A) {
         %B = sdiv i32 %A, 1             ; <i32> [#uses=1]

llvm/test/Transforms/InstCombine/enforce-known-alignment.ll

diff --git a/llvm/test/Transforms/InstCombine/enforce-known-alignment.ll b/llvm/test/Transforms/InstCombine/enforce-known-alignment.ll
index 1b88b2b..89b01f5 100644
--- a/llvm/test/Transforms/InstCombine/enforce-known-alignment.ll
+++ b/llvm/test/Transforms/InstCombine/enforce-known-alignment.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep alloca | grep {align 16}
+; RUN: opt %s -instcombine -S | grep alloca | grep {align 16}
 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-f80:128:128"
 target triple = "i386-apple-darwin9.6"
 

llvm/test/Transforms/InstCombine/exact-sdiv.ll

diff --git a/llvm/test/Transforms/InstCombine/exact-sdiv.ll b/llvm/test/Transforms/InstCombine/exact-sdiv.ll
index 4b8b1ae..698e658 100644
--- a/llvm/test/Transforms/InstCombine/exact-sdiv.ll
+++ b/llvm/test/Transforms/InstCombine/exact-sdiv.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | FileCheck %s
+; RUN: opt %s -instcombine -S | FileCheck %s
 
 ; CHECK: define i32 @foo
 ; CHECK: sdiv i32 %x, 8

llvm/test/Transforms/InstCombine/extractvalue.ll

diff --git a/llvm/test/Transforms/InstCombine/extractvalue.ll b/llvm/test/Transforms/InstCombine/extractvalue.ll
index a64ece4e..875f860 100644
--- a/llvm/test/Transforms/InstCombine/extractvalue.ll
+++ b/llvm/test/Transforms/InstCombine/extractvalue.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep extractvalue
+; RUN: opt < %s -instcombine -S | not grep extractvalue
 
 ; Instcombine should fold various combinations of insertvalue and extractvalue
 ; together

llvm/test/Transforms/InstCombine/fold-bin-operand.ll

diff --git a/llvm/test/Transforms/InstCombine/fold-bin-operand.ll b/llvm/test/Transforms/InstCombine/fold-bin-operand.ll
index 23af69e..263088e 100644
--- a/llvm/test/Transforms/InstCombine/fold-bin-operand.ll
+++ b/llvm/test/Transforms/InstCombine/fold-bin-operand.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep icmp
+; RUN: opt %s -instcombine -S | not grep icmp
 
 define i1 @f(i1 %x) {
 	%b = and i1 %x, icmp eq (i8* inttoptr (i32 1 to i8*), i8* inttoptr (i32 2 to i8*))

llvm/test/Transforms/InstCombine/fold-vector-zero.ll

diff --git a/llvm/test/Transforms/InstCombine/fold-vector-zero.ll b/llvm/test/Transforms/InstCombine/fold-vector-zero.ll
index 2e1b524..dc25156 100644
--- a/llvm/test/Transforms/InstCombine/fold-vector-zero.ll
+++ b/llvm/test/Transforms/InstCombine/fold-vector-zero.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep zeroinitializer
+; RUN: opt %s -instcombine -S | not grep zeroinitializer
 
 define void @foo(i64 %A, i64 %B) {
 bb8:

llvm/test/Transforms/InstCombine/fp-ret-bitcast.ll

diff --git a/llvm/test/Transforms/InstCombine/fp-ret-bitcast.ll b/llvm/test/Transforms/InstCombine/fp-ret-bitcast.ll
index 69ff5fa..866908295 100644
--- a/llvm/test/Transforms/InstCombine/fp-ret-bitcast.ll
+++ b/llvm/test/Transforms/InstCombine/fp-ret-bitcast.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:    grep {call float bitcast} | count 1
 	%struct.NSObject = type { %struct.objc_class* }
  	%struct.NSArray = type { %struct.NSObject }

llvm/test/Transforms/InstCombine/fpcast.ll

diff --git a/llvm/test/Transforms/InstCombine/fpcast.ll b/llvm/test/Transforms/InstCombine/fpcast.ll
index 7f25092..5d0f55b 100644
--- a/llvm/test/Transforms/InstCombine/fpcast.ll
+++ b/llvm/test/Transforms/InstCombine/fpcast.ll
@@ -1,6 +1,6 @@
 ; Test some floating point casting cases
-; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | notcast
-; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | \
+; RUN: llvm-as %s -o - | opt -instcombine -S | notcast
+; RUN: llvm-as %s -o - | opt -instcombine -S | \
 ; RUN:   egrep {ret i8 \(-1\)\|\(255\)}
 
 define i8 @test1() {

llvm/test/Transforms/InstCombine/fpextend.ll

diff --git a/llvm/test/Transforms/InstCombine/fpextend.ll b/llvm/test/Transforms/InstCombine/fpextend.ll
index 19d4f61..70e0c62 100644
--- a/llvm/test/Transforms/InstCombine/fpextend.ll
+++ b/llvm/test/Transforms/InstCombine/fpextend.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep fpext
+; RUN: opt < %s -instcombine -S | not grep fpext
 @X = external global float 
 @Y = external global float
 

llvm/test/Transforms/InstCombine/fsub-fsub.ll

diff --git a/llvm/test/Transforms/InstCombine/fsub-fsub.ll b/llvm/test/Transforms/InstCombine/fsub-fsub.ll
index 95d6087..94ebf09 100644
--- a/llvm/test/Transforms/InstCombine/fsub-fsub.ll
+++ b/llvm/test/Transforms/InstCombine/fsub-fsub.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep fsub | count 2
+; RUN: opt < %s -instcombine -S | grep fsub | count 2
 ; PR4374
 
 define float @func(float %a, float %b) nounwind {

llvm/test/Transforms/InstCombine/getelementptr.ll

diff --git a/llvm/test/Transforms/InstCombine/getelementptr.ll b/llvm/test/Transforms/InstCombine/getelementptr.ll
index ff4ff74..aa39752 100644
--- a/llvm/test/Transforms/InstCombine/getelementptr.ll
+++ b/llvm/test/Transforms/InstCombine/getelementptr.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | FileCheck %s
+; RUN: opt %s -instcombine -S | FileCheck %s
 
 target datalayout = "e-p:64:64"
 %intstruct = type { i32 }

llvm/test/Transforms/InstCombine/hoist_instr.ll

diff --git a/llvm/test/Transforms/InstCombine/hoist_instr.ll b/llvm/test/Transforms/InstCombine/hoist_instr.ll
index 3217d05..d60363e 100644
--- a/llvm/test/Transforms/InstCombine/hoist_instr.ll
+++ b/llvm/test/Transforms/InstCombine/hoist_instr.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | FileCheck %s
+; RUN: opt %s -instcombine -S | FileCheck %s
 
 ;; This tests that the div is hoisted into the then block.
 define i32 @foo(i1 %C, i32 %A, i32 %B) {

llvm/test/Transforms/InstCombine/icmp.ll

diff --git a/llvm/test/Transforms/InstCombine/icmp.ll b/llvm/test/Transforms/InstCombine/icmp.ll
index 02845cc..3b6f8c5 100644
--- a/llvm/test/Transforms/InstCombine/icmp.ll
+++ b/llvm/test/Transforms/InstCombine/icmp.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep icmp
+; RUN: opt < %s -instcombine -S | not grep icmp
 
 define i32 @test1(i32 %X) {
 entry:

llvm/test/Transforms/InstCombine/known_align.ll

diff --git a/llvm/test/Transforms/InstCombine/known_align.ll b/llvm/test/Transforms/InstCombine/known_align.ll
index 78d1d4e..91fcc0c 100644
--- a/llvm/test/Transforms/InstCombine/known_align.ll
+++ b/llvm/test/Transforms/InstCombine/known_align.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {align 1}
+; RUN: opt %s -instcombine -S | grep {align 1}
 ; END.
 
 	%struct.p = type <{ i8, i32 }>

llvm/test/Transforms/InstCombine/load.ll

diff --git a/llvm/test/Transforms/InstCombine/load.ll b/llvm/test/Transforms/InstCombine/load.ll
index 59d7bb3..6d068f5 100644
--- a/llvm/test/Transforms/InstCombine/load.ll
+++ b/llvm/test/Transforms/InstCombine/load.ll
@@ -1,6 +1,6 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-; RUN: opt %s -instcombine | llvm-dis | not grep load
+; RUN: opt < %s -instcombine -S | not grep load
 
 @X = constant i32 42		; <i32*> [#uses=2]
 @X2 = constant i32 47		; <i32*> [#uses=1]

llvm/test/Transforms/InstCombine/load2.ll

diff --git a/llvm/test/Transforms/InstCombine/load2.ll b/llvm/test/Transforms/InstCombine/load2.ll
index 1465efd..611b0fb 100644
--- a/llvm/test/Transforms/InstCombine/load2.ll
+++ b/llvm/test/Transforms/InstCombine/load2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep load
+; RUN: opt < %s -instcombine -S | not grep load
 
 @GLOBAL = internal constant [4 x i32] zeroinitializer
 

llvm/test/Transforms/InstCombine/load3.ll

diff --git a/llvm/test/Transforms/InstCombine/load3.ll b/llvm/test/Transforms/InstCombine/load3.ll
index 77fdd04..9c87316 100644
--- a/llvm/test/Transforms/InstCombine/load3.ll
+++ b/llvm/test/Transforms/InstCombine/load3.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep load | count 1
+; RUN: opt < %s -instcombine -S | grep load | count 1
 
 ; Instcombine should be able to do trivial CSE of loads.
 

llvm/test/Transforms/InstCombine/loadstore-alignment.ll

diff --git a/llvm/test/Transforms/InstCombine/loadstore-alignment.ll b/llvm/test/Transforms/InstCombine/loadstore-alignment.ll
index a2fcbb0..368b300 100644
--- a/llvm/test/Transforms/InstCombine/loadstore-alignment.ll
+++ b/llvm/test/Transforms/InstCombine/loadstore-alignment.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {, align 16} | count 14
+; RUN: opt %s -instcombine -S | grep {, align 16} | count 14
 
 @x = external global <2 x i64>, align 16
 @xx = external global [13 x <2 x i64>], align 16

llvm/test/Transforms/InstCombine/logical-select.ll

diff --git a/llvm/test/Transforms/InstCombine/logical-select.ll b/llvm/test/Transforms/InstCombine/logical-select.ll
index 93e4866..ece8bc3 100644
--- a/llvm/test/Transforms/InstCombine/logical-select.ll
+++ b/llvm/test/Transforms/InstCombine/logical-select.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis > %t
+; RUN: opt < %s -instcombine -S > %t
 ; RUN: grep select %t | count 5
 ; RUN: not grep and %t
 ; RUN: not grep or %t

llvm/test/Transforms/InstCombine/lshr-phi.ll

diff --git a/llvm/test/Transforms/InstCombine/lshr-phi.ll b/llvm/test/Transforms/InstCombine/lshr-phi.ll
index 3a5ccc3..76a113f 100644
--- a/llvm/test/Transforms/InstCombine/lshr-phi.ll
+++ b/llvm/test/Transforms/InstCombine/lshr-phi.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis > %t
+; RUN: opt < %s -instcombine -S > %t
 ; RUN: not grep lshr %t
 ; RUN: grep add %t | count 1
 

llvm/test/Transforms/InstCombine/malloc-free-delete.ll

diff --git a/llvm/test/Transforms/InstCombine/malloc-free-delete.ll b/llvm/test/Transforms/InstCombine/malloc-free-delete.ll
index 482084b..2ed5ec6 100644
--- a/llvm/test/Transforms/InstCombine/malloc-free-delete.ll
+++ b/llvm/test/Transforms/InstCombine/malloc-free-delete.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {ret i32 0}
-; RUN: opt %s -instcombine | llvm-dis | not grep malloc
+; RUN: opt < %s -instcombine -S | grep {ret i32 0}
+; RUN: opt < %s -instcombine -S | not grep malloc
 ; PR1201
 define i32 @main(i32 %argc, i8** %argv) {
         %c_19 = alloca i8*              ; <i8**> [#uses=2]

llvm/test/Transforms/InstCombine/malloc.ll

diff --git a/llvm/test/Transforms/InstCombine/malloc.ll b/llvm/test/Transforms/InstCombine/malloc.ll
index d844ce5..88a003a 100644
--- a/llvm/test/Transforms/InstCombine/malloc.ll
+++ b/llvm/test/Transforms/InstCombine/malloc.ll
@@ -1,5 +1,5 @@
 ; test that malloc's with a constant argument are promoted to array allocations
-; RUN: opt %s -instcombine | llvm-dis | grep getelementptr
+; RUN: opt %s -instcombine -S | grep getelementptr
 
 define i32* @test() {
 	%X = malloc i32, i32 4

llvm/test/Transforms/InstCombine/malloc2.ll

diff --git a/llvm/test/Transforms/InstCombine/malloc2.ll b/llvm/test/Transforms/InstCombine/malloc2.ll
index 3275311..102422e 100644
--- a/llvm/test/Transforms/InstCombine/malloc2.ll
+++ b/llvm/test/Transforms/InstCombine/malloc2.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {ret i32 0}
-; RUN: opt %s -instcombine | llvm-dis | not grep malloc
+; RUN: opt < %s -instcombine -S | grep {ret i32 0}
+; RUN: opt < %s -instcombine -S | not grep malloc
 ; PR1313
 
 define i32 @test1(i32 %argc, i8* %argv, i8* %envp) {

llvm/test/Transforms/InstCombine/malloc3.ll

diff --git a/llvm/test/Transforms/InstCombine/malloc3.ll b/llvm/test/Transforms/InstCombine/malloc3.ll
index c09b492..d95ed83 100644
--- a/llvm/test/Transforms/InstCombine/malloc3.ll
+++ b/llvm/test/Transforms/InstCombine/malloc3.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {malloc.*struct.foo} | count 2
+; RUN: opt %s -instcombine -S | grep {malloc.*struct.foo} | count 2
 ; PR1728
 
 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-f80:128:128"

llvm/test/Transforms/InstCombine/memcpy-to-load.ll

diff --git a/llvm/test/Transforms/InstCombine/memcpy-to-load.ll b/llvm/test/Transforms/InstCombine/memcpy-to-load.ll
index aeaf058..4817a25 100644
--- a/llvm/test/Transforms/InstCombine/memcpy-to-load.ll
+++ b/llvm/test/Transforms/InstCombine/memcpy-to-load.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {load double}
+; RUN: opt %s -instcombine -S | grep {load double}
 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-f80:128:128"
 target triple = "i686-apple-darwin8"
 

llvm/test/Transforms/InstCombine/memmove.ll

diff --git a/llvm/test/Transforms/InstCombine/memmove.ll b/llvm/test/Transforms/InstCombine/memmove.ll
index 6c3c687..e8939fa 100644
--- a/llvm/test/Transforms/InstCombine/memmove.ll
+++ b/llvm/test/Transforms/InstCombine/memmove.ll
@@ -1,6 +1,6 @@
 ; This test makes sure that memmove instructions are properly eliminated.
 ;
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:    not grep {call void @llvm.memmove}
 
 @S = internal constant [33 x i8] c"panic: restorelist inconsistency\00"		; <[33 x i8]*> [#uses=1]

llvm/test/Transforms/InstCombine/memset.ll

diff --git a/llvm/test/Transforms/InstCombine/memset.ll b/llvm/test/Transforms/InstCombine/memset.ll
index 57d0825..99f6c49 100644
--- a/llvm/test/Transforms/InstCombine/memset.ll
+++ b/llvm/test/Transforms/InstCombine/memset.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep {call.*llvm.memset}
+; RUN: opt %s -instcombine -S | not grep {call.*llvm.memset}
 
 declare void @llvm.memset.i32(i8*, i8, i32, i32)
 

llvm/test/Transforms/InstCombine/mul-masked-bits.ll

diff --git a/llvm/test/Transforms/InstCombine/mul-masked-bits.ll b/llvm/test/Transforms/InstCombine/mul-masked-bits.ll
index 88c4065..d8bcfaf 100644
--- a/llvm/test/Transforms/InstCombine/mul-masked-bits.ll
+++ b/llvm/test/Transforms/InstCombine/mul-masked-bits.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep ashr
+; RUN: opt %s -instcombine -S | grep ashr
 
 define i32 @foo(i32 %x, i32 %y) {
   %a = and i32 %x, 7

llvm/test/Transforms/InstCombine/mul.ll

diff --git a/llvm/test/Transforms/InstCombine/mul.ll b/llvm/test/Transforms/InstCombine/mul.ll
index f334780..7d8593a 100644
--- a/llvm/test/Transforms/InstCombine/mul.ll
+++ b/llvm/test/Transforms/InstCombine/mul.ll
@@ -1,5 +1,5 @@
 ; This test makes sure that mul instructions are properly eliminated.
-; RUN: opt %s -instcombine | llvm-dis | not grep mul
+; RUN: opt < %s -instcombine -S | not grep mul
 
 define i32 @test1(i32 %A) {
         %B = mul i32 %A, 1              ; <i32> [#uses=1]

llvm/test/Transforms/InstCombine/multi-use-or.ll

diff --git a/llvm/test/Transforms/InstCombine/multi-use-or.ll b/llvm/test/Transforms/InstCombine/multi-use-or.ll
index 4d84a85..6357e46 100644
--- a/llvm/test/Transforms/InstCombine/multi-use-or.ll
+++ b/llvm/test/Transforms/InstCombine/multi-use-or.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {add double .sx, .sy}
+; RUN: opt %s -instcombine -S | grep {add double .sx, .sy}
 ; The 'or' has multiple uses, make sure that this doesn't prevent instcombine
 ; from propagating the extends to the truncs.
 

llvm/test/Transforms/InstCombine/narrow.ll

diff --git a/llvm/test/Transforms/InstCombine/narrow.ll b/llvm/test/Transforms/InstCombine/narrow.ll
index 420a5ca..ebe20db 100644
--- a/llvm/test/Transforms/InstCombine/narrow.ll
+++ b/llvm/test/Transforms/InstCombine/narrow.ll
@@ -1,6 +1,6 @@
 ; This file contains various testcases that check to see that instcombine
 ; is narrowing computations when possible.
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:    grep {ret i1 false}
 
 ; test1 - Eliminating the casts in this testcase (by narrowing the AND

llvm/test/Transforms/InstCombine/not-fcmp.ll

diff --git a/llvm/test/Transforms/InstCombine/not-fcmp.ll b/llvm/test/Transforms/InstCombine/not-fcmp.ll
index 5c9837a..57440f6 100644
--- a/llvm/test/Transforms/InstCombine/not-fcmp.ll
+++ b/llvm/test/Transforms/InstCombine/not-fcmp.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep "fcmp uge"
+; RUN: opt %s -instcombine -S | grep "fcmp uge"
 ; PR1570
 
 define i1 @f(float %X, float %Y) {

llvm/test/Transforms/InstCombine/not.ll

diff --git a/llvm/test/Transforms/InstCombine/not.ll b/llvm/test/Transforms/InstCombine/not.ll
index ee3d725..0442ebb 100644
--- a/llvm/test/Transforms/InstCombine/not.ll
+++ b/llvm/test/Transforms/InstCombine/not.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
 
-; RUN: opt %s -instcombine | llvm-dis | not grep xor
+; RUN: opt %s -instcombine -S | not grep xor
 
 define i32 @test1(i32 %A) {
         %B = xor i32 %A, -1             ; <i32> [#uses=1]

llvm/test/Transforms/InstCombine/nothrow.ll

diff --git a/llvm/test/Transforms/InstCombine/nothrow.ll b/llvm/test/Transforms/InstCombine/nothrow.ll
index ab385ba..e2a35e4 100644
--- a/llvm/test/Transforms/InstCombine/nothrow.ll
+++ b/llvm/test/Transforms/InstCombine/nothrow.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep call
+; RUN: opt %s -instcombine -S | not grep call
 ; rdar://6880732
 declare double @t1(i32) readonly
 

llvm/test/Transforms/InstCombine/nsw.ll

diff --git a/llvm/test/Transforms/InstCombine/nsw.ll b/llvm/test/Transforms/InstCombine/nsw.ll
index afe6e35..3662df0 100644
--- a/llvm/test/Transforms/InstCombine/nsw.ll
+++ b/llvm/test/Transforms/InstCombine/nsw.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | FileCheck %s
+; RUN: opt %s -instcombine -S | FileCheck %s
 
 ; CHECK: define i32 @foo
 ; %y = sub i32 0, %x

llvm/test/Transforms/InstCombine/odr-linkage.ll

diff --git a/llvm/test/Transforms/InstCombine/odr-linkage.ll b/llvm/test/Transforms/InstCombine/odr-linkage.ll
index 72cf701..e72576b 100644
--- a/llvm/test/Transforms/InstCombine/odr-linkage.ll
+++ b/llvm/test/Transforms/InstCombine/odr-linkage.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {ret i32 10}
+; RUN: opt %s -instcombine -S | grep {ret i32 10}
 
 @g1 = available_externally constant i32 1
 @g2 = linkonce_odr constant i32 2

llvm/test/Transforms/InstCombine/or-fcmp.ll

diff --git a/llvm/test/Transforms/InstCombine/or-fcmp.ll b/llvm/test/Transforms/InstCombine/or-fcmp.ll
index 2672f38..9692bfc 100644
--- a/llvm/test/Transforms/InstCombine/or-fcmp.ll
+++ b/llvm/test/Transforms/InstCombine/or-fcmp.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -instcombine | llvm-dis | grep fcmp | count 3
-; RUN: opt %s -instcombine | llvm-dis | grep ret | grep 1
+; RUN: opt < %s -instcombine -S | grep fcmp | count 3
+; RUN: opt < %s -instcombine -S | grep ret | grep 1
 
 define zeroext i8 @t1(float %x, float %y) nounwind {
        %a = fcmp ueq float %x, %y             ; <i1> [#uses=1]

llvm/test/Transforms/InstCombine/or-to-xor.ll

diff --git a/llvm/test/Transforms/InstCombine/or-to-xor.ll b/llvm/test/Transforms/InstCombine/or-to-xor.ll
index a7588d1..7cab543 100644
--- a/llvm/test/Transforms/InstCombine/or-to-xor.ll
+++ b/llvm/test/Transforms/InstCombine/or-to-xor.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {xor i32 %a, %b} | count 4
-; RUN: opt %s -instcombine | llvm-dis | not grep {and}
+; RUN: opt %s -instcombine -S | grep {xor i32 %a, %b} | count 4
+; RUN: opt %s -instcombine -S | not grep {and}
 
 define i32 @func1(i32 %a, i32 %b) nounwind readnone {
 entry:

llvm/test/Transforms/InstCombine/or.ll

diff --git a/llvm/test/Transforms/InstCombine/or.ll b/llvm/test/Transforms/InstCombine/or.ll
index 9bfc38f..1911234 100644
--- a/llvm/test/Transforms/InstCombine/or.ll
+++ b/llvm/test/Transforms/InstCombine/or.ll
@@ -1,6 +1,6 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:    grep -v xor | not grep {or }
 ; END.
 

llvm/test/Transforms/InstCombine/or2.ll

diff --git a/llvm/test/Transforms/InstCombine/or2.ll b/llvm/test/Transforms/InstCombine/or2.ll
index 64fa834..0a5666f 100644
--- a/llvm/test/Transforms/InstCombine/or2.ll
+++ b/llvm/test/Transforms/InstCombine/or2.ll
@@ -1,6 +1,6 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-; RUN: opt %s -instcombine | llvm-dis | grep -v xor | not grep {or }
+; RUN: opt %s -instcombine -S | grep -v xor | not grep {or }
 
 ; PR1738
 define i1 @test1(double %X, double %Y) {

llvm/test/Transforms/InstCombine/phi-merge.ll

diff --git a/llvm/test/Transforms/InstCombine/phi-merge.ll b/llvm/test/Transforms/InstCombine/phi-merge.ll
index 6deaa79..490ecde 100644
--- a/llvm/test/Transforms/InstCombine/phi-merge.ll
+++ b/llvm/test/Transforms/InstCombine/phi-merge.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep {phi i32}
+; RUN: opt %s -instcombine -S | not grep {phi i32}
 ; PR1777
 
 declare i1 @rrr()

llvm/test/Transforms/InstCombine/phi.ll

diff --git a/llvm/test/Transforms/InstCombine/phi.ll b/llvm/test/Transforms/InstCombine/phi.ll
index ec34cec..24eca72 100644
--- a/llvm/test/Transforms/InstCombine/phi.ll
+++ b/llvm/test/Transforms/InstCombine/phi.ll
@@ -1,6 +1,6 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-; RUN: opt %s -instcombine | llvm-dis | not grep phi
+; RUN: opt < %s -instcombine -S | not grep phi
 
 define i32 @test1(i32 %A, i1 %b) {
 BB0:

llvm/test/Transforms/InstCombine/pr2645-0.ll

diff --git a/llvm/test/Transforms/InstCombine/pr2645-0.ll b/llvm/test/Transforms/InstCombine/pr2645-0.ll
index d158a17..56adb83 100644
--- a/llvm/test/Transforms/InstCombine/pr2645-0.ll
+++ b/llvm/test/Transforms/InstCombine/pr2645-0.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {insertelement <4 x float> undef}
+; RUN: opt %s -instcombine -S | grep {insertelement <4 x float> undef}
 
 ; Instcombine should be able to prove that none of the
 ; insertelement's first operand's elements are needed.

llvm/test/Transforms/InstCombine/pr2645-1.ll

diff --git a/llvm/test/Transforms/InstCombine/pr2645-1.ll b/llvm/test/Transforms/InstCombine/pr2645-1.ll
index 5783ad7..2972f60 100644
--- a/llvm/test/Transforms/InstCombine/pr2645-1.ll
+++ b/llvm/test/Transforms/InstCombine/pr2645-1.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep shufflevector
+; RUN: opt %s -instcombine -S | grep shufflevector
 ; PR2645
 
 ; instcombine shouldn't delete the shufflevector.

llvm/test/Transforms/InstCombine/preserve-sminmax.ll

diff --git a/llvm/test/Transforms/InstCombine/preserve-sminmax.ll b/llvm/test/Transforms/InstCombine/preserve-sminmax.ll
index d8e9e4c..df4ed8d 100644
--- a/llvm/test/Transforms/InstCombine/preserve-sminmax.ll
+++ b/llvm/test/Transforms/InstCombine/preserve-sminmax.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep { i32 \[%\]sd, \[\[:alnum:\]\]* \\?1\\>} | count 4
+; RUN: opt %s -instcombine -S | grep { i32 \[%\]sd, \[\[:alnum:\]\]* \\?1\\>} | count 4
 
 ; Instcombine normally would fold the sdiv into the comparison,
 ; making "icmp slt i32 %h, 2", but in this case the sdiv has

llvm/test/Transforms/InstCombine/ptr-int-cast.ll

diff --git a/llvm/test/Transforms/InstCombine/ptr-int-cast.ll b/llvm/test/Transforms/InstCombine/ptr-int-cast.ll
index 78b813f..781b2ff 100644
--- a/llvm/test/Transforms/InstCombine/ptr-int-cast.ll
+++ b/llvm/test/Transforms/InstCombine/ptr-int-cast.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis > %t
+; RUN: opt %s -instcombine -S > %t
 
 define i1 @test1(i32 *%x) nounwind {
 entry:

llvm/test/Transforms/InstCombine/rem.ll

diff --git a/llvm/test/Transforms/InstCombine/rem.ll b/llvm/test/Transforms/InstCombine/rem.ll
index 39a68e2..bac248e 100644
--- a/llvm/test/Transforms/InstCombine/rem.ll
+++ b/llvm/test/Transforms/InstCombine/rem.ll
@@ -1,6 +1,6 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-; RUN: opt %s -instcombine | llvm-dis | not grep rem
+; RUN: opt < %s -instcombine -S | not grep rem
 ; END.
 
 define i32 @test1(i32 %A) {

llvm/test/Transforms/InstCombine/sdiv-1.ll

diff --git a/llvm/test/Transforms/InstCombine/sdiv-1.ll b/llvm/test/Transforms/InstCombine/sdiv-1.ll
index 26aa24c..b62dff2 100644
--- a/llvm/test/Transforms/InstCombine/sdiv-1.ll
+++ b/llvm/test/Transforms/InstCombine/sdiv-1.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine -inline | llvm-dis | not grep '-715827882'
+; RUN: opt %s -instcombine -inline -S | not grep '-715827882'
 ; PR3142
 
 define i32 @a(i32 %X) nounwind readnone {

llvm/test/Transforms/InstCombine/sdiv-shift.ll

diff --git a/llvm/test/Transforms/InstCombine/sdiv-shift.ll b/llvm/test/Transforms/InstCombine/sdiv-shift.ll
index 1aa628b..f4d2b36 100644
--- a/llvm/test/Transforms/InstCombine/sdiv-shift.ll
+++ b/llvm/test/Transforms/InstCombine/sdiv-shift.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep div
+; RUN: opt < %s -instcombine -S | not grep div
 
 define i32 @a(i16 zeroext %x, i32 %y) nounwind {
 entry:

llvm/test/Transforms/InstCombine/select-2.ll

diff --git a/llvm/test/Transforms/InstCombine/select-2.ll b/llvm/test/Transforms/InstCombine/select-2.ll
index 1a4e0b2..a76addc 100644
--- a/llvm/test/Transforms/InstCombine/select-2.ll
+++ b/llvm/test/Transforms/InstCombine/select-2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep select | count 2
+; RUN: opt < %s -instcombine -S | grep select | count 2
 
 ; Make sure instcombine don't fold select into operands. We don't want to emit
 ; select of two integers unless it's selecting 0 / 1.

llvm/test/Transforms/InstCombine/select-load-call.ll

diff --git a/llvm/test/Transforms/InstCombine/select-load-call.ll b/llvm/test/Transforms/InstCombine/select-load-call.ll
index c3d1b93..c134030 100644
--- a/llvm/test/Transforms/InstCombine/select-load-call.ll
+++ b/llvm/test/Transforms/InstCombine/select-load-call.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {ret i32 1}
+; RUN: opt %s -instcombine -S | grep {ret i32 1}
 
 declare void @test2()
 

llvm/test/Transforms/InstCombine/select.ll

diff --git a/llvm/test/Transforms/InstCombine/select.ll b/llvm/test/Transforms/InstCombine/select.ll
index e3d0712..22fe57f 100644
--- a/llvm/test/Transforms/InstCombine/select.ll
+++ b/llvm/test/Transforms/InstCombine/select.ll
@@ -1,7 +1,7 @@
 ; This test makes sure that these instructions are properly eliminated.
 ; PR1822
 
-; RUN: opt %s -instcombine | llvm-dis | not grep select
+; RUN: opt < %s -instcombine -S | not grep select
 
 define i32 @test1(i32 %A, i32 %B) {
         %C = select i1 false, i32 %A, i32 %B            ; <i32> [#uses=1]

llvm/test/Transforms/InstCombine/set.ll

diff --git a/llvm/test/Transforms/InstCombine/set.ll b/llvm/test/Transforms/InstCombine/set.ll
index 7c7b13e..39cb00a 100644
--- a/llvm/test/Transforms/InstCombine/set.ll
+++ b/llvm/test/Transforms/InstCombine/set.ll
@@ -1,6 +1,6 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-; RUN: opt %s -instcombine | llvm-dis | not grep icmp
+; RUN: opt %s -instcombine -S | not grep icmp
 ; END.
 	
 @X = external global i32                ; <i32*> [#uses=2]

llvm/test/Transforms/InstCombine/setcc-cast-cast.ll

diff --git a/llvm/test/Transforms/InstCombine/setcc-cast-cast.ll b/llvm/test/Transforms/InstCombine/setcc-cast-cast.ll
index 00a9536..9e24eca 100644
--- a/llvm/test/Transforms/InstCombine/setcc-cast-cast.ll
+++ b/llvm/test/Transforms/InstCombine/setcc-cast-cast.ll
@@ -1,7 +1,7 @@
 ; 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: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:    not grep {br i1 false}
 ; END.
 

llvm/test/Transforms/InstCombine/setcc-strength-reduce.ll

diff --git a/llvm/test/Transforms/InstCombine/setcc-strength-reduce.ll b/llvm/test/Transforms/InstCombine/setcc-strength-reduce.ll
index ce55827..fde8b2e 100644
--- a/llvm/test/Transforms/InstCombine/setcc-strength-reduce.ll
+++ b/llvm/test/Transforms/InstCombine/setcc-strength-reduce.ll
@@ -2,7 +2,7 @@
 ; working.  Basically this boils down to converting setlt,gt,le,ge instructions
 ; into equivalent setne,eq instructions.
 ;
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:    grep -v {icmp eq} | grep -v {icmp ne} | not grep icmp
 ; END.
 

llvm/test/Transforms/InstCombine/sext-misc.ll

diff --git a/llvm/test/Transforms/InstCombine/sext-misc.ll b/llvm/test/Transforms/InstCombine/sext-misc.ll
index 49a0f0d..107bba6 100644
--- a/llvm/test/Transforms/InstCombine/sext-misc.ll
+++ b/llvm/test/Transforms/InstCombine/sext-misc.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep sext
+; RUN: opt < %s -instcombine -S | not grep sext
 
 declare i32 @llvm.ctpop.i32(i32)
 declare i32 @llvm.ctlz.i32(i32)

llvm/test/Transforms/InstCombine/shift-simplify.ll

diff --git a/llvm/test/Transforms/InstCombine/shift-simplify.ll b/llvm/test/Transforms/InstCombine/shift-simplify.ll
index 76911ec..b18414d 100644
--- a/llvm/test/Transforms/InstCombine/shift-simplify.ll
+++ b/llvm/test/Transforms/InstCombine/shift-simplify.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:    egrep {shl|lshr|ashr} | count 3
 
 define i32 @test0(i32 %A, i32 %B, i32 %C) {

llvm/test/Transforms/InstCombine/shift-sra.ll

diff --git a/llvm/test/Transforms/InstCombine/shift-sra.ll b/llvm/test/Transforms/InstCombine/shift-sra.ll
index 4ac9253..f4c73a0 100644
--- a/llvm/test/Transforms/InstCombine/shift-sra.ll
+++ b/llvm/test/Transforms/InstCombine/shift-sra.ll
@@ -1,6 +1,6 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:    grep {lshr i32} | count 2
-; RUN: opt %s -instcombine | llvm-dis | not grep ashr
+; RUN: opt %s -instcombine -S | not grep ashr
 
 
 define i32 @test1(i32 %X, i8 %A) {

llvm/test/Transforms/InstCombine/shift-trunc-shift.ll

diff --git a/llvm/test/Transforms/InstCombine/shift-trunc-shift.ll b/llvm/test/Transforms/InstCombine/shift-trunc-shift.ll
index 12f73e5..f4f4ce9 100644
--- a/llvm/test/Transforms/InstCombine/shift-trunc-shift.ll
+++ b/llvm/test/Transforms/InstCombine/shift-trunc-shift.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep lshr.*63
+; RUN: opt %s -instcombine -S | grep lshr.*63
 
 define i32 @t1(i64 %d18) {
 entry:

llvm/test/Transforms/InstCombine/shift.ll

diff --git a/llvm/test/Transforms/InstCombine/shift.ll b/llvm/test/Transforms/InstCombine/shift.ll
index 358765c..f09c025 100644
--- a/llvm/test/Transforms/InstCombine/shift.ll
+++ b/llvm/test/Transforms/InstCombine/shift.ll
@@ -1,6 +1,6 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-; RUN: opt %s -instcombine | llvm-dis | not grep sh
+; RUN: opt < %s -instcombine -S | not grep sh
 ; END.
 
 define i32 @test1(i32 %A) {

llvm/test/Transforms/InstCombine/shl-trunc.ll

diff --git a/llvm/test/Transforms/InstCombine/shl-trunc.ll b/llvm/test/Transforms/InstCombine/shl-trunc.ll
index 6d2e6b5..08569d3 100644
--- a/llvm/test/Transforms/InstCombine/shl-trunc.ll
+++ b/llvm/test/Transforms/InstCombine/shl-trunc.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep shl
+; RUN: opt %s -instcombine -S | grep shl
 
 define i1 @test(i32 %X, i8 %A) {
         %shift.upgrd.1 = zext i8 %A to i32              ; <i32> [#uses=1]

llvm/test/Transforms/InstCombine/shufflemask-undef.ll

diff --git a/llvm/test/Transforms/InstCombine/shufflemask-undef.ll b/llvm/test/Transforms/InstCombine/shufflemask-undef.ll
index 9ee1aa8..d7a6bc6 100644
--- a/llvm/test/Transforms/InstCombine/shufflemask-undef.ll
+++ b/llvm/test/Transforms/InstCombine/shufflemask-undef.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep {shufflevector.\*i32 8}
+; RUN: opt %s -instcombine -S | not grep {shufflevector.\*i32 8}
 
 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-f80:128:128"
 target triple = "i386-apple-darwin9"

llvm/test/Transforms/InstCombine/shufflevec-constant.ll

diff --git a/llvm/test/Transforms/InstCombine/shufflevec-constant.ll b/llvm/test/Transforms/InstCombine/shufflevec-constant.ll
index 2100e5d..b37be59 100644
--- a/llvm/test/Transforms/InstCombine/shufflevec-constant.ll
+++ b/llvm/test/Transforms/InstCombine/shufflevec-constant.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep "2 x float"
+; RUN: opt %s -instcombine -S | grep "2 x float"
 
 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-f80:128:128"
 target triple = "i386-apple-darwin9"

llvm/test/Transforms/InstCombine/signed-comparison.ll

diff --git a/llvm/test/Transforms/InstCombine/signed-comparison.ll b/llvm/test/Transforms/InstCombine/signed-comparison.ll
index 2a2739b..8a16b7e 100644
--- a/llvm/test/Transforms/InstCombine/signed-comparison.ll
+++ b/llvm/test/Transforms/InstCombine/signed-comparison.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis > %t
+; RUN: opt %s -instcombine -S > %t
 ; RUN: not grep zext %t
 ; RUN: not grep slt %t
 ; RUN: grep {icmp ult} %t

llvm/test/Transforms/InstCombine/signext.ll

diff --git a/llvm/test/Transforms/InstCombine/signext.ll b/llvm/test/Transforms/InstCombine/signext.ll
index 17a45b6..d67a04a 100644
--- a/llvm/test/Transforms/InstCombine/signext.ll
+++ b/llvm/test/Transforms/InstCombine/signext.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:    not grep {(and\|xor\|add\|shl\|shr)}
 ; END.
 

llvm/test/Transforms/InstCombine/sink_instruction.ll

diff --git a/llvm/test/Transforms/InstCombine/sink_instruction.ll b/llvm/test/Transforms/InstCombine/sink_instruction.ll
index 8d4381a..c46d210 100644
--- a/llvm/test/Transforms/InstCombine/sink_instruction.ll
+++ b/llvm/test/Transforms/InstCombine/sink_instruction.ll
@@ -1,4 +1,4 @@
-; RUN: opt -instcombine %s | llvm-dis | FileCheck %s
+; RUN: opt -instcombine %s -S | FileCheck %s
 
 ;; This tests that the instructions in the entry blocks are sunk into each
 ;; arm of the 'if'.

llvm/test/Transforms/InstCombine/sitofp.ll

diff --git a/llvm/test/Transforms/InstCombine/sitofp.ll b/llvm/test/Transforms/InstCombine/sitofp.ll
index 799666f..bd31b89 100644
--- a/llvm/test/Transforms/InstCombine/sitofp.ll
+++ b/llvm/test/Transforms/InstCombine/sitofp.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep itofp
+; RUN: opt < %s -instcombine -S | not grep itofp
 
 define i1 @test1(i8 %A) {
   %B = sitofp i8 %A to double

llvm/test/Transforms/InstCombine/srem-simplify-bug.ll

diff --git a/llvm/test/Transforms/InstCombine/srem-simplify-bug.ll b/llvm/test/Transforms/InstCombine/srem-simplify-bug.ll
index bd6428b..3afbbe2 100644
--- a/llvm/test/Transforms/InstCombine/srem-simplify-bug.ll
+++ b/llvm/test/Transforms/InstCombine/srem-simplify-bug.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {ret i1 false}
+; RUN: opt %s -instcombine -S | grep {ret i1 false}
 ; PR2276
 
 define i1 @f(i32 %x) {

llvm/test/Transforms/InstCombine/srem.ll

diff --git a/llvm/test/Transforms/InstCombine/srem.ll b/llvm/test/Transforms/InstCombine/srem.ll
index 49fdbf3..32aa957 100644
--- a/llvm/test/Transforms/InstCombine/srem.ll
+++ b/llvm/test/Transforms/InstCombine/srem.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep srem
+; RUN: opt %s -instcombine -S | grep srem
 
 define i64 @foo(i64 %x1, i64 %y2) {
 	%r = sdiv i64 %x1, %y2

llvm/test/Transforms/InstCombine/stack-overalign.ll

diff --git a/llvm/test/Transforms/InstCombine/stack-overalign.ll b/llvm/test/Transforms/InstCombine/stack-overalign.ll
index 54a9c2c..f221544 100644
--- a/llvm/test/Transforms/InstCombine/stack-overalign.ll
+++ b/llvm/test/Transforms/InstCombine/stack-overalign.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {align 32} | count 1
+; RUN: opt %s -instcombine -S | grep {align 32} | count 1
 
 ; It's tempting to have an instcombine in which the src pointer of a
 ; memcpy is aligned up to the alignment of the destination, however

llvm/test/Transforms/InstCombine/stacksaverestore.ll

diff --git a/llvm/test/Transforms/InstCombine/stacksaverestore.ll b/llvm/test/Transforms/InstCombine/stacksaverestore.ll
index 348ec3f..c86f884 100644
--- a/llvm/test/Transforms/InstCombine/stacksaverestore.ll
+++ b/llvm/test/Transforms/InstCombine/stacksaverestore.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {call.*stackrestore} | count 1
+; RUN: opt %s -instcombine -S | grep {call.*stackrestore} | count 1
 
 declare i8* @llvm.stacksave()
 declare void @llvm.stackrestore(i8*)

llvm/test/Transforms/InstCombine/store-merge.ll

diff --git a/llvm/test/Transforms/InstCombine/store-merge.ll b/llvm/test/Transforms/InstCombine/store-merge.ll
index db45541..e334c90 100644
--- a/llvm/test/Transforms/InstCombine/store-merge.ll
+++ b/llvm/test/Transforms/InstCombine/store-merge.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:    grep {ret i32 %.toremerge} | count 2
 ;; Simple sinking tests
 

llvm/test/Transforms/InstCombine/store.ll

diff --git a/llvm/test/Transforms/InstCombine/store.ll b/llvm/test/Transforms/InstCombine/store.ll
index e31aa6d..d6f916d 100644
--- a/llvm/test/Transforms/InstCombine/store.ll
+++ b/llvm/test/Transforms/InstCombine/store.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt < %s -instcombine -S | \
 ; RUN:   grep -v {store.*,.*null} | not grep store
 
 define void @test1(i32* %P) {

llvm/test/Transforms/InstCombine/sub.ll

diff --git a/llvm/test/Transforms/InstCombine/sub.ll b/llvm/test/Transforms/InstCombine/sub.ll
index e3cb2bc..bd7a700 100644
--- a/llvm/test/Transforms/InstCombine/sub.ll
+++ b/llvm/test/Transforms/InstCombine/sub.ll
@@ -1,6 +1,6 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt < %s -instcombine -S | \
 ; RUN:   grep -v {sub i32 %Cok, %Bok} | grep -v {sub i32 0, %Aok} | not grep sub
 
 define i32 @test1(i32 %A) {

llvm/test/Transforms/InstCombine/trunc-mask-ext.ll

diff --git a/llvm/test/Transforms/InstCombine/trunc-mask-ext.ll b/llvm/test/Transforms/InstCombine/trunc-mask-ext.ll
index 37146ed..666ce36 100644
--- a/llvm/test/Transforms/InstCombine/trunc-mask-ext.ll
+++ b/llvm/test/Transforms/InstCombine/trunc-mask-ext.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis > %t
+; RUN: opt %s -instcombine -S > %t
 ; RUN: not grep zext %t
 ; RUN: not grep sext %t
 

llvm/test/Transforms/InstCombine/udiv-simplify-bug-0.ll

diff --git a/llvm/test/Transforms/InstCombine/udiv-simplify-bug-0.ll b/llvm/test/Transforms/InstCombine/udiv-simplify-bug-0.ll
index a65ee90..c649955 100644
--- a/llvm/test/Transforms/InstCombine/udiv-simplify-bug-0.ll
+++ b/llvm/test/Transforms/InstCombine/udiv-simplify-bug-0.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {ret i64 0} | count 2
+; RUN: opt %s -instcombine -S | grep {ret i64 0} | count 2
 
 define i64 @foo(i32 %x) nounwind {
   %y = lshr i32 %x, 1

llvm/test/Transforms/InstCombine/udiv-simplify-bug-1.ll

diff --git a/llvm/test/Transforms/InstCombine/udiv-simplify-bug-1.ll b/llvm/test/Transforms/InstCombine/udiv-simplify-bug-1.ll
index b7c48f4..d95e8f8 100644
--- a/llvm/test/Transforms/InstCombine/udiv-simplify-bug-1.ll
+++ b/llvm/test/Transforms/InstCombine/udiv-simplify-bug-1.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis > %t1.ll
+; RUN: opt < %s -instcombine -S > %t1.ll
 ; RUN: grep udiv %t1.ll | count 2
 ; RUN: grep zext %t1.ll | count 2
 ; PR2274

llvm/test/Transforms/InstCombine/udivrem-change-width.ll

diff --git a/llvm/test/Transforms/InstCombine/udivrem-change-width.ll b/llvm/test/Transforms/InstCombine/udivrem-change-width.ll
index eb7a69a..475a19a 100644
--- a/llvm/test/Transforms/InstCombine/udivrem-change-width.ll
+++ b/llvm/test/Transforms/InstCombine/udivrem-change-width.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep zext
+; RUN: opt %s -instcombine -S | not grep zext
 ; PR4548
 
 define i8 @udiv_i8(i8 %a, i8 %b) nounwind {

llvm/test/Transforms/InstCombine/urem-simplify-bug.ll

diff --git a/llvm/test/Transforms/InstCombine/urem-simplify-bug.ll b/llvm/test/Transforms/InstCombine/urem-simplify-bug.ll
index f41dfa9..f6c9df2 100644
--- a/llvm/test/Transforms/InstCombine/urem-simplify-bug.ll
+++ b/llvm/test/Transforms/InstCombine/urem-simplify-bug.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {= or i32 %x, -5 }
+; RUN: opt %s -instcombine -S | grep {= or i32 %x, -5 }
 
 @.str = internal constant [5 x i8] c"foo\0A\00"		; <[5 x i8]*> [#uses=1]
 @.str1 = internal constant [5 x i8] c"bar\0A\00"		; <[5 x i8]*> [#uses=1]

llvm/test/Transforms/InstCombine/urem.ll

diff --git a/llvm/test/Transforms/InstCombine/urem.ll b/llvm/test/Transforms/InstCombine/urem.ll
index c1993de..6ecbbc6 100644
--- a/llvm/test/Transforms/InstCombine/urem.ll
+++ b/llvm/test/Transforms/InstCombine/urem.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep urem
+; RUN: opt %s -instcombine -S | grep urem
 
 define i64 @rem_unsigned(i64 %x1, i64 %y2) {
 	%r = udiv i64 %x1, %y2

llvm/test/Transforms/InstCombine/vec_demanded_elts-2.ll

diff --git a/llvm/test/Transforms/InstCombine/vec_demanded_elts-2.ll b/llvm/test/Transforms/InstCombine/vec_demanded_elts-2.ll
index d2a3fd7..978c162 100644
--- a/llvm/test/Transforms/InstCombine/vec_demanded_elts-2.ll
+++ b/llvm/test/Transforms/InstCombine/vec_demanded_elts-2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep extractelement
+; RUN: opt %s -instcombine -S | not grep extractelement
 
 define void @get_image() nounwind {
 entry:

llvm/test/Transforms/InstCombine/vec_demanded_elts-3.ll

diff --git a/llvm/test/Transforms/InstCombine/vec_demanded_elts-3.ll b/llvm/test/Transforms/InstCombine/vec_demanded_elts-3.ll
index baa5ce2..4e42e66 100644
--- a/llvm/test/Transforms/InstCombine/vec_demanded_elts-3.ll
+++ b/llvm/test/Transforms/InstCombine/vec_demanded_elts-3.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep load
+; RUN: opt %s -instcombine -S | not grep load
 ; PR4340
 
 define void @vac(<4 x float>* nocapture %a) nounwind {

llvm/test/Transforms/InstCombine/vec_demanded_elts.ll

diff --git a/llvm/test/Transforms/InstCombine/vec_demanded_elts.ll b/llvm/test/Transforms/InstCombine/vec_demanded_elts.ll
index 7ea46a5..62ea02a 100644
--- a/llvm/test/Transforms/InstCombine/vec_demanded_elts.ll
+++ b/llvm/test/Transforms/InstCombine/vec_demanded_elts.ll
@@ -1,12 +1,12 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:   grep {fadd float}
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:   grep {fmul float}
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:   not grep {insertelement.*0.00}
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:   not grep {call.*llvm.x86.sse.mul}
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:   not grep {call.*llvm.x86.sse.sub}
 ; END.
 

llvm/test/Transforms/InstCombine/vec_extract_elt.ll

diff --git a/llvm/test/Transforms/InstCombine/vec_extract_elt.ll b/llvm/test/Transforms/InstCombine/vec_extract_elt.ll
index 1f2335b..5a078f1 100644
--- a/llvm/test/Transforms/InstCombine/vec_extract_elt.ll
+++ b/llvm/test/Transforms/InstCombine/vec_extract_elt.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep extractelement
+; RUN: opt %s -instcombine -S | not grep extractelement
 
 define i32 @test(float %f) {
         %tmp7 = insertelement <4 x float> undef, float %f, i32 0                ; <<4 x float>> [#uses=1]

llvm/test/Transforms/InstCombine/vec_insert_to_shuffle.ll

diff --git a/llvm/test/Transforms/InstCombine/vec_insert_to_shuffle.ll b/llvm/test/Transforms/InstCombine/vec_insert_to_shuffle.ll
index fc46428..34c89d8 100644
--- a/llvm/test/Transforms/InstCombine/vec_insert_to_shuffle.ll
+++ b/llvm/test/Transforms/InstCombine/vec_insert_to_shuffle.ll
@@ -1,8 +1,8 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:   grep shufflevec | count 1
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:   not grep insertelement
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:   not grep extractelement
 ; END.
 

llvm/test/Transforms/InstCombine/vec_insertelt.ll

diff --git a/llvm/test/Transforms/InstCombine/vec_insertelt.ll b/llvm/test/Transforms/InstCombine/vec_insertelt.ll
index 79fce2f..2ebf3ff 100644
--- a/llvm/test/Transforms/InstCombine/vec_insertelt.ll
+++ b/llvm/test/Transforms/InstCombine/vec_insertelt.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {ret <4 x i32> %A}
+; RUN: opt %s -instcombine -S | grep {ret <4 x i32> %A}
 
 ; PR1286
 define <4 x i32> @test1(<4 x i32> %A) {

llvm/test/Transforms/InstCombine/vec_narrow.ll

diff --git a/llvm/test/Transforms/InstCombine/vec_narrow.ll b/llvm/test/Transforms/InstCombine/vec_narrow.ll
index f54c6e4..fcb64c7 100644
--- a/llvm/test/Transforms/InstCombine/vec_narrow.ll
+++ b/llvm/test/Transforms/InstCombine/vec_narrow.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:   grep {add float}
 
         %V = type <4 x float>

llvm/test/Transforms/InstCombine/vec_shuffle.ll

diff --git a/llvm/test/Transforms/InstCombine/vec_shuffle.ll b/llvm/test/Transforms/InstCombine/vec_shuffle.ll
index 510a6c5..24930c3 100644
--- a/llvm/test/Transforms/InstCombine/vec_shuffle.ll
+++ b/llvm/test/Transforms/InstCombine/vec_shuffle.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep vector_shuffle
+; RUN: opt %s -instcombine -S | not grep vector_shuffle
 ; END.
 
 %T = type <4 x float>

llvm/test/Transforms/InstCombine/vec_shuffle2.ll

diff --git a/llvm/test/Transforms/InstCombine/vec_shuffle2.ll b/llvm/test/Transforms/InstCombine/vec_shuffle2.ll
index 6da526c..2e53665 100644
--- a/llvm/test/Transforms/InstCombine/vec_shuffle2.ll
+++ b/llvm/test/Transforms/InstCombine/vec_shuffle2.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep undef | count 1
+; RUN: opt %s -instcombine -S | grep undef | count 1
 ; END.
 
 ; Test fold of two shuffles where the first shuffle vectors inputs are a

llvm/test/Transforms/InstCombine/vector-casts.ll

diff --git a/llvm/test/Transforms/InstCombine/vector-casts.ll b/llvm/test/Transforms/InstCombine/vector-casts.ll
index 0044837..8baa934 100644
--- a/llvm/test/Transforms/InstCombine/vector-casts.ll
+++ b/llvm/test/Transforms/InstCombine/vector-casts.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | FileCheck %s
+; RUN: opt %s -instcombine -S | FileCheck %s
 
 ; This turns into a&1 != 0
 define <2 x i1> @test1(<2 x i64> %a) {

llvm/test/Transforms/InstCombine/vector-srem.ll

diff --git a/llvm/test/Transforms/InstCombine/vector-srem.ll b/llvm/test/Transforms/InstCombine/vector-srem.ll
index 6d317ac..0a7c677 100644
--- a/llvm/test/Transforms/InstCombine/vector-srem.ll
+++ b/llvm/test/Transforms/InstCombine/vector-srem.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {srem <4 x i32>}
+; RUN: opt %s -instcombine -S | grep {srem <4 x i32>}
 
 define <4 x i32> @foo(<4 x i32> %t, <4 x i32> %u)
 {

llvm/test/Transforms/InstCombine/volatile_store.ll

diff --git a/llvm/test/Transforms/InstCombine/volatile_store.ll b/llvm/test/Transforms/InstCombine/volatile_store.ll
index 30ef8cb..c9f3c53 100644
--- a/llvm/test/Transforms/InstCombine/volatile_store.ll
+++ b/llvm/test/Transforms/InstCombine/volatile_store.ll
@@ -1,5 +1,5 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {volatile store}
-; RUN: opt %s -instcombine | llvm-dis | grep {volatile load}
+; RUN: opt %s -instcombine -S | grep {volatile store}
+; RUN: opt %s -instcombine -S | grep {volatile load}
 
 @x = weak global i32 0		; <i32*> [#uses=2]
 

llvm/test/Transforms/InstCombine/xor-demorgans.ll

diff --git a/llvm/test/Transforms/InstCombine/xor-demorgans.ll b/llvm/test/Transforms/InstCombine/xor-demorgans.ll
index 34b60bf..6b5b2a2 100644
--- a/llvm/test/Transforms/InstCombine/xor-demorgans.ll
+++ b/llvm/test/Transforms/InstCombine/xor-demorgans.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep {= or}
+; RUN: opt %s -instcombine -S | not grep {= or}
 ; PR3266
 ; XFAIL: *
 

llvm/test/Transforms/InstCombine/xor-undef.ll

diff --git a/llvm/test/Transforms/InstCombine/xor-undef.ll b/llvm/test/Transforms/InstCombine/xor-undef.ll
index de34168..8616a42 100644
--- a/llvm/test/Transforms/InstCombine/xor-undef.ll
+++ b/llvm/test/Transforms/InstCombine/xor-undef.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep zeroinitializer
+; RUN: opt %s -instcombine -S | grep zeroinitializer
 
 define <2 x i64> @f() {
 	%tmp = xor <2 x i64> undef, undef

llvm/test/Transforms/InstCombine/xor.ll

diff --git a/llvm/test/Transforms/InstCombine/xor.ll b/llvm/test/Transforms/InstCombine/xor.ll
index 2456f03..e5dfa5b 100644
--- a/llvm/test/Transforms/InstCombine/xor.ll
+++ b/llvm/test/Transforms/InstCombine/xor.ll
@@ -1,6 +1,6 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:    not grep {xor }
 ; END.
 @G1 = global i32 0		; <i32*> [#uses=1]

llvm/test/Transforms/InstCombine/xor2.ll

diff --git a/llvm/test/Transforms/InstCombine/xor2.ll b/llvm/test/Transforms/InstCombine/xor2.ll
index 821a562..424d1b1 100644
--- a/llvm/test/Transforms/InstCombine/xor2.ll
+++ b/llvm/test/Transforms/InstCombine/xor2.ll
@@ -1,6 +1,6 @@
 ; This test makes sure that these instructions are properly eliminated.
 ;
-; RUN: opt %s -instcombine | llvm-dis | not grep {xor }
+; RUN: opt %s -instcombine -S | not grep {xor }
 
 ; PR1253
 define i1 @test0(i32 %A) {

llvm/test/Transforms/InstCombine/zero-point-zero-add.ll

diff --git a/llvm/test/Transforms/InstCombine/zero-point-zero-add.ll b/llvm/test/Transforms/InstCombine/zero-point-zero-add.ll
index 9f38cad..b01a713 100644
--- a/llvm/test/Transforms/InstCombine/zero-point-zero-add.ll
+++ b/llvm/test/Transforms/InstCombine/zero-point-zero-add.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep 0.0 | count 1
+; RUN: opt %s -instcombine -S | grep 0.0 | count 1
 
 declare double @abs(double)
 

llvm/test/Transforms/InstCombine/zeroext-and-reduce.ll

diff --git a/llvm/test/Transforms/InstCombine/zeroext-and-reduce.ll b/llvm/test/Transforms/InstCombine/zeroext-and-reduce.ll
index 715edec..cdbb7b1 100644
--- a/llvm/test/Transforms/InstCombine/zeroext-and-reduce.ll
+++ b/llvm/test/Transforms/InstCombine/zeroext-and-reduce.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:   grep {and i32 %Y, 8}
 
 define i32 @test1(i8 %X) {

llvm/test/Transforms/InstCombine/zext-bool-add-sub.ll

diff --git a/llvm/test/Transforms/InstCombine/zext-bool-add-sub.ll b/llvm/test/Transforms/InstCombine/zext-bool-add-sub.ll
index c1b9d14..1164273 100644
--- a/llvm/test/Transforms/InstCombine/zext-bool-add-sub.ll
+++ b/llvm/test/Transforms/InstCombine/zext-bool-add-sub.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | not grep zext
+; RUN: opt < %s -instcombine -S | not grep zext
 
 define i32 @a(i1 %x) {
 entry:

llvm/test/Transforms/InstCombine/zext-fold.ll

diff --git a/llvm/test/Transforms/InstCombine/zext-fold.ll b/llvm/test/Transforms/InstCombine/zext-fold.ll
index 9597ad3..008c5d0 100644
--- a/llvm/test/Transforms/InstCombine/zext-fold.ll
+++ b/llvm/test/Transforms/InstCombine/zext-fold.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep {zext } | count 1
+; RUN: opt %s -instcombine -S | grep {zext } | count 1
 ; PR1570
 
 define i32 @test2(float %X, float %Y) {

llvm/test/Transforms/InstCombine/zext-or-icmp.ll

diff --git a/llvm/test/Transforms/InstCombine/zext-or-icmp.ll b/llvm/test/Transforms/InstCombine/zext-or-icmp.ll
index dfd1099..969c301 100644
--- a/llvm/test/Transforms/InstCombine/zext-or-icmp.ll
+++ b/llvm/test/Transforms/InstCombine/zext-or-icmp.ll
@@ -1,4 +1,4 @@
-; RUN: opt %s -instcombine | llvm-dis | grep icmp | count 1
+; RUN: opt < %s -instcombine -S | grep icmp | count 1
 
 	%struct.FooBar = type <{ i8, i8, [2 x i8], i8, i8, i8, i8, i16, i16, [4 x i8], [8 x %struct.Rock] }>
 	%struct.Rock = type { i16, i16 }

llvm/test/Transforms/InstCombine/zext.ll

diff --git a/llvm/test/Transforms/InstCombine/zext.ll b/llvm/test/Transforms/InstCombine/zext.ll
index e005a86..c926a65 100644
--- a/llvm/test/Transforms/InstCombine/zext.ll
+++ b/llvm/test/Transforms/InstCombine/zext.ll
@@ -1,5 +1,5 @@
 ; Tests to make sure elimination of casts is working correctly
-; RUN: opt %s -instcombine | llvm-dis | \
+; RUN: opt %s -instcombine -S | \
 ; RUN:   notcast {} {%c1.*}
 
 define i64 @test_sext_zext(i16 %A) {