diff --git a/llvm/lib/Analysis/ScalarEvolution.cpp b/llvm/lib/Analysis/ScalarEvolution.cpp --- a/llvm/lib/Analysis/ScalarEvolution.cpp +++ b/llvm/lib/Analysis/ScalarEvolution.cpp @@ -11937,6 +11937,11 @@ PreservedAnalyses ScalarEvolutionPrinterPass::run(Function &F, FunctionAnalysisManager &AM) { + // For compatibility with opt's -analyze feature under legacy pass manager + // which was not ported to NPM. This keeps tests using + // update_analyze_test_checks.py working. + OS << "Printing analysis 'Scalar Evolution Analysis' for function '" + << F.getName() << "':\n"; AM.getResult(F).print(OS); return PreservedAnalyses::all(); } diff --git a/llvm/test/Analysis/ScalarEvolution/2007-07-15-NegativeStride.ll b/llvm/test/Analysis/ScalarEvolution/2007-07-15-NegativeStride.ll --- a/llvm/test/Analysis/ScalarEvolution/2007-07-15-NegativeStride.ll +++ b/llvm/test/Analysis/ScalarEvolution/2007-07-15-NegativeStride.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution -scalar-evolution-max-iterations=0 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution -scalar-evolution-max-iterations=0 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" -scalar-evolution-max-iterations=0 2>&1 | FileCheck %s ; PR1533 @array = weak global [101 x i32] zeroinitializer, align 32 ; <[100 x i32]*> [#uses=1] diff --git a/llvm/test/Analysis/ScalarEvolution/2007-08-06-Unsigned.ll b/llvm/test/Analysis/ScalarEvolution/2007-08-06-Unsigned.ll --- a/llvm/test/Analysis/ScalarEvolution/2007-08-06-Unsigned.ll +++ b/llvm/test/Analysis/ScalarEvolution/2007-08-06-Unsigned.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -scalar-evolution -analyze | FileCheck %s +; RUN: opt < %s -scalar-evolution -analyze -enable-new-pm=0 | FileCheck %s +; RUN: opt < %s "-passes=print" -disable-output 2>&1 | FileCheck %s ; PR1597 ; CHECK: Loop %bb: backedge-taken count is (-1 + (-1 * %x) + %y) diff --git a/llvm/test/Analysis/ScalarEvolution/2007-09-27-LargeStepping.ll b/llvm/test/Analysis/ScalarEvolution/2007-09-27-LargeStepping.ll --- a/llvm/test/Analysis/ScalarEvolution/2007-09-27-LargeStepping.ll +++ b/llvm/test/Analysis/ScalarEvolution/2007-09-27-LargeStepping.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution -scalar-evolution-max-iterations=0 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution -scalar-evolution-max-iterations=0 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" -scalar-evolution-max-iterations=0 2>&1 | FileCheck %s ; PR1706 ; CHECK: backedge-taken count is 13 diff --git a/llvm/test/Analysis/ScalarEvolution/2007-11-18-OrInstruction.ll b/llvm/test/Analysis/ScalarEvolution/2007-11-18-OrInstruction.ll --- a/llvm/test/Analysis/ScalarEvolution/2007-11-18-OrInstruction.ll +++ b/llvm/test/Analysis/ScalarEvolution/2007-11-18-OrInstruction.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; PR1810 define void @fun() { diff --git a/llvm/test/Analysis/ScalarEvolution/2008-02-11-ReversedCondition.ll b/llvm/test/Analysis/ScalarEvolution/2008-02-11-ReversedCondition.ll --- a/llvm/test/Analysis/ScalarEvolution/2008-02-11-ReversedCondition.ll +++ b/llvm/test/Analysis/ScalarEvolution/2008-02-11-ReversedCondition.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -scalar-evolution -analyze | FileCheck %s +; RUN: opt < %s -scalar-evolution -analyze -enable-new-pm=0 | FileCheck %s +; RUN: opt < %s "-passes=print" -disable-output 2>&1 | FileCheck %s ; CHECK: Loop %header: backedge-taken count is (0 smax %n) diff --git a/llvm/test/Analysis/ScalarEvolution/2008-02-12-SMAXTripCount.ll b/llvm/test/Analysis/ScalarEvolution/2008-02-12-SMAXTripCount.ll --- a/llvm/test/Analysis/ScalarEvolution/2008-02-12-SMAXTripCount.ll +++ b/llvm/test/Analysis/ScalarEvolution/2008-02-12-SMAXTripCount.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -scalar-evolution -analyze | FileCheck %s +; RUN: opt < %s -scalar-evolution -analyze -enable-new-pm=0 | FileCheck %s +; RUN: opt < %s "-passes=print" -disable-output 2>&1 | FileCheck %s ; PR2002 ; CHECK: Loop %loop: backedge-taken count is (100 + (-100 smax %n)) diff --git a/llvm/test/Analysis/ScalarEvolution/2008-02-15-UMax.ll b/llvm/test/Analysis/ScalarEvolution/2008-02-15-UMax.ll --- a/llvm/test/Analysis/ScalarEvolution/2008-02-15-UMax.ll +++ b/llvm/test/Analysis/ScalarEvolution/2008-02-15-UMax.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; PR2003 ; CHECK: umax diff --git a/llvm/test/Analysis/ScalarEvolution/2008-05-25-NegativeStepToZero.ll b/llvm/test/Analysis/ScalarEvolution/2008-05-25-NegativeStepToZero.ll --- a/llvm/test/Analysis/ScalarEvolution/2008-05-25-NegativeStepToZero.ll +++ b/llvm/test/Analysis/ScalarEvolution/2008-05-25-NegativeStepToZero.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution -scalar-evolution-max-iterations=0 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution -scalar-evolution-max-iterations=0 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" -scalar-evolution-max-iterations=0 2>&1 | FileCheck %s ; PR2364 ; CHECK: backedge-taken count is 61 diff --git a/llvm/test/Analysis/ScalarEvolution/2008-06-12-BinomialInt64.ll b/llvm/test/Analysis/ScalarEvolution/2008-06-12-BinomialInt64.ll --- a/llvm/test/Analysis/ScalarEvolution/2008-06-12-BinomialInt64.ll +++ b/llvm/test/Analysis/ScalarEvolution/2008-06-12-BinomialInt64.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution 2>/dev/null +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution 2>/dev/null +; RUN: opt < %s -disable-output "-passes=print" 2>/dev/null ; PR2433 define i32 @main1(i32 %argc, i8** %argv) nounwind { diff --git a/llvm/test/Analysis/ScalarEvolution/2008-07-12-UnneededSelect1.ll b/llvm/test/Analysis/ScalarEvolution/2008-07-12-UnneededSelect1.ll --- a/llvm/test/Analysis/ScalarEvolution/2008-07-12-UnneededSelect1.ll +++ b/llvm/test/Analysis/ScalarEvolution/2008-07-12-UnneededSelect1.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution 2>&1 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution 2>&1 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 2>&1 | FileCheck %s ; PR2261 ; CHECK: Printing analysis 'Scalar Evolution Analysis' for function 'foo' diff --git a/llvm/test/Analysis/ScalarEvolution/2008-07-12-UnneededSelect2.ll b/llvm/test/Analysis/ScalarEvolution/2008-07-12-UnneededSelect2.ll --- a/llvm/test/Analysis/ScalarEvolution/2008-07-12-UnneededSelect2.ll +++ b/llvm/test/Analysis/ScalarEvolution/2008-07-12-UnneededSelect2.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution 2>&1 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution 2>&1 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 2>&1 | FileCheck %s ; PR2070 ; CHECK: Printing analysis 'Scalar Evolution Analysis' for function 'a' diff --git a/llvm/test/Analysis/ScalarEvolution/2008-07-19-InfiniteLoop.ll b/llvm/test/Analysis/ScalarEvolution/2008-07-19-InfiniteLoop.ll --- a/llvm/test/Analysis/ScalarEvolution/2008-07-19-InfiniteLoop.ll +++ b/llvm/test/Analysis/ScalarEvolution/2008-07-19-InfiniteLoop.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution -scalar-evolution-max-iterations=0 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution -scalar-evolution-max-iterations=0 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" -scalar-evolution-max-iterations=0 2>&1 | FileCheck %s ; PR2088 ; CHECK: Unpredictable diff --git a/llvm/test/Analysis/ScalarEvolution/2008-07-19-WrappingIV.ll b/llvm/test/Analysis/ScalarEvolution/2008-07-19-WrappingIV.ll --- a/llvm/test/Analysis/ScalarEvolution/2008-07-19-WrappingIV.ll +++ b/llvm/test/Analysis/ScalarEvolution/2008-07-19-WrappingIV.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution -scalar-evolution-max-iterations=0 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution -scalar-evolution-max-iterations=0 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" -scalar-evolution-max-iterations=0 2>&1 | FileCheck %s ; PR2088 ; CHECK: backedge-taken count is 113 diff --git a/llvm/test/Analysis/ScalarEvolution/2008-07-29-SGTTripCount.ll b/llvm/test/Analysis/ScalarEvolution/2008-07-29-SGTTripCount.ll --- a/llvm/test/Analysis/ScalarEvolution/2008-07-29-SGTTripCount.ll +++ b/llvm/test/Analysis/ScalarEvolution/2008-07-29-SGTTripCount.ll @@ -1,5 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution \ -; RUN: -scalar-evolution-max-iterations=0 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution -scalar-evolution-max-iterations=0 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" -scalar-evolution-max-iterations=0 2>&1 | FileCheck %s ; PR2607 define i32 @_Z1aj(i32 %j) nounwind { diff --git a/llvm/test/Analysis/ScalarEvolution/2008-07-29-SMinExpr.ll b/llvm/test/Analysis/ScalarEvolution/2008-07-29-SMinExpr.ll --- a/llvm/test/Analysis/ScalarEvolution/2008-07-29-SMinExpr.ll +++ b/llvm/test/Analysis/ScalarEvolution/2008-07-29-SMinExpr.ll @@ -1,5 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution \ -; RUN: -scalar-evolution-max-iterations=0 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution -scalar-evolution-max-iterations=0 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" -scalar-evolution-max-iterations=0 2>&1 | FileCheck %s ; PR2607 define i32 @b(i32 %x, i32 %y) nounwind { diff --git a/llvm/test/Analysis/ScalarEvolution/2008-08-04-IVOverflow.ll b/llvm/test/Analysis/ScalarEvolution/2008-08-04-IVOverflow.ll --- a/llvm/test/Analysis/ScalarEvolution/2008-08-04-IVOverflow.ll +++ b/llvm/test/Analysis/ScalarEvolution/2008-08-04-IVOverflow.ll @@ -1,5 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution \ -; RUN: -scalar-evolution-max-iterations=0 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution -scalar-evolution-max-iterations=0 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" -scalar-evolution-max-iterations=0 2>&1 | FileCheck %s ; PR2621 define i32 @a() nounwind { diff --git a/llvm/test/Analysis/ScalarEvolution/2008-08-04-LongAddRec.ll b/llvm/test/Analysis/ScalarEvolution/2008-08-04-LongAddRec.ll --- a/llvm/test/Analysis/ScalarEvolution/2008-08-04-LongAddRec.ll +++ b/llvm/test/Analysis/ScalarEvolution/2008-08-04-LongAddRec.ll @@ -1,5 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution \ -; RUN: -scalar-evolution-max-iterations=0 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution -scalar-evolution-max-iterations=0 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" -scalar-evolution-max-iterations=0 2>&1 | FileCheck %s ; PR2621 define i32 @a() nounwind { diff --git a/llvm/test/Analysis/ScalarEvolution/2008-11-02-QuadraticCrash.ll b/llvm/test/Analysis/ScalarEvolution/2008-11-02-QuadraticCrash.ll --- a/llvm/test/Analysis/ScalarEvolution/2008-11-02-QuadraticCrash.ll +++ b/llvm/test/Analysis/ScalarEvolution/2008-11-02-QuadraticCrash.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution +; RUN: opt < %s -disable-output -scalar-evolution ; PR1827 declare void @use(i32) diff --git a/llvm/test/Analysis/ScalarEvolution/2008-11-15-CubicOOM.ll b/llvm/test/Analysis/ScalarEvolution/2008-11-15-CubicOOM.ll --- a/llvm/test/Analysis/ScalarEvolution/2008-11-15-CubicOOM.ll +++ b/llvm/test/Analysis/ScalarEvolution/2008-11-15-CubicOOM.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution +; RUN: opt < %s -disable-output -scalar-evolution ; PR2602 define i32 @a() nounwind { diff --git a/llvm/test/Analysis/ScalarEvolution/2008-11-18-LessThanOrEqual.ll b/llvm/test/Analysis/ScalarEvolution/2008-11-18-LessThanOrEqual.ll --- a/llvm/test/Analysis/ScalarEvolution/2008-11-18-LessThanOrEqual.ll +++ b/llvm/test/Analysis/ScalarEvolution/2008-11-18-LessThanOrEqual.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution 2>&1 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution 2>&1 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 2>&1 | FileCheck %s ; CHECK: Loop %bb: backedge-taken count is (7 + (-1 * %argc)) diff --git a/llvm/test/Analysis/ScalarEvolution/2008-11-18-Stride1.ll b/llvm/test/Analysis/ScalarEvolution/2008-11-18-Stride1.ll --- a/llvm/test/Analysis/ScalarEvolution/2008-11-18-Stride1.ll +++ b/llvm/test/Analysis/ScalarEvolution/2008-11-18-Stride1.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; CHECK: Loop %bb: backedge-taken count is ((-5 + %x) /u 3) ; CHECK: Loop %bb: max backedge-taken count is 1431655764 diff --git a/llvm/test/Analysis/ScalarEvolution/2008-11-18-Stride2.ll b/llvm/test/Analysis/ScalarEvolution/2008-11-18-Stride2.ll --- a/llvm/test/Analysis/ScalarEvolution/2008-11-18-Stride2.ll +++ b/llvm/test/Analysis/ScalarEvolution/2008-11-18-Stride2.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution 2>&1 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution 2>&1 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 2>&1 | FileCheck %s ; CHECK: Loop %bb: backedge-taken count is ((999 + (-1 * %x)) /u 3) ; CHECK: Loop %bb: max backedge-taken count is 334 diff --git a/llvm/test/Analysis/ScalarEvolution/2008-12-08-FiniteSGE.ll b/llvm/test/Analysis/ScalarEvolution/2008-12-08-FiniteSGE.ll --- a/llvm/test/Analysis/ScalarEvolution/2008-12-08-FiniteSGE.ll +++ b/llvm/test/Analysis/ScalarEvolution/2008-12-08-FiniteSGE.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; CHECK: backedge-taken count is 255 diff --git a/llvm/test/Analysis/ScalarEvolution/2008-12-11-SMaxOverflow.ll b/llvm/test/Analysis/ScalarEvolution/2008-12-11-SMaxOverflow.ll --- a/llvm/test/Analysis/ScalarEvolution/2008-12-11-SMaxOverflow.ll +++ b/llvm/test/Analysis/ScalarEvolution/2008-12-11-SMaxOverflow.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; CHECK: @f ; CHECK: Loop %bb16.preheader: backedge-taken count is (-1 + %c.idx.val) diff --git a/llvm/test/Analysis/ScalarEvolution/2008-12-14-StrideAndSigned.ll b/llvm/test/Analysis/ScalarEvolution/2008-12-14-StrideAndSigned.ll --- a/llvm/test/Analysis/ScalarEvolution/2008-12-14-StrideAndSigned.ll +++ b/llvm/test/Analysis/ScalarEvolution/2008-12-14-StrideAndSigned.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution 2>&1 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution 2>&1 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 2>&1 | FileCheck %s ; XFAIL: * ; CHECK: (((-1 * %i0) + (100005 smax %i0)) /u 5) diff --git a/llvm/test/Analysis/ScalarEvolution/2008-12-15-DontUseSDiv.ll b/llvm/test/Analysis/ScalarEvolution/2008-12-15-DontUseSDiv.ll --- a/llvm/test/Analysis/ScalarEvolution/2008-12-15-DontUseSDiv.ll +++ b/llvm/test/Analysis/ScalarEvolution/2008-12-15-DontUseSDiv.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution 2>&1 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution 2>&1 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 2>&1 | FileCheck %s ; CHECK: /u 5 diff --git a/llvm/test/Analysis/ScalarEvolution/2009-01-02-SignedNegativeStride.ll b/llvm/test/Analysis/ScalarEvolution/2009-01-02-SignedNegativeStride.ll --- a/llvm/test/Analysis/ScalarEvolution/2009-01-02-SignedNegativeStride.ll +++ b/llvm/test/Analysis/ScalarEvolution/2009-01-02-SignedNegativeStride.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; PR3275 ; CHECK: Printing analysis 'Scalar Evolution Analysis' for function 'func_15' diff --git a/llvm/test/Analysis/ScalarEvolution/2009-04-22-TruncCast.ll b/llvm/test/Analysis/ScalarEvolution/2009-04-22-TruncCast.ll --- a/llvm/test/Analysis/ScalarEvolution/2009-04-22-TruncCast.ll +++ b/llvm/test/Analysis/ScalarEvolution/2009-04-22-TruncCast.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; CHECK: Printing analysis 'Scalar Evolution Analysis' for function 'test1' ; CHECK-NOT: (trunc i{{.*}}ext diff --git a/llvm/test/Analysis/ScalarEvolution/2009-05-09-PointerEdgeCount.ll b/llvm/test/Analysis/ScalarEvolution/2009-05-09-PointerEdgeCount.ll --- a/llvm/test/Analysis/ScalarEvolution/2009-05-09-PointerEdgeCount.ll +++ b/llvm/test/Analysis/ScalarEvolution/2009-05-09-PointerEdgeCount.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; PR3171 ; CHECK: count is 2 diff --git a/llvm/test/Analysis/ScalarEvolution/2009-07-04-GroupConstantsWidthMismatch.ll b/llvm/test/Analysis/ScalarEvolution/2009-07-04-GroupConstantsWidthMismatch.ll --- a/llvm/test/Analysis/ScalarEvolution/2009-07-04-GroupConstantsWidthMismatch.ll +++ b/llvm/test/Analysis/ScalarEvolution/2009-07-04-GroupConstantsWidthMismatch.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution +; RUN: opt < %s -disable-output -scalar-evolution ; PR4501 define void @test() { diff --git a/llvm/test/Analysis/ScalarEvolution/2010-09-03-RequiredTransitive.ll b/llvm/test/Analysis/ScalarEvolution/2010-09-03-RequiredTransitive.ll --- a/llvm/test/Analysis/ScalarEvolution/2010-09-03-RequiredTransitive.ll +++ b/llvm/test/Analysis/ScalarEvolution/2010-09-03-RequiredTransitive.ll @@ -1,4 +1,5 @@ -; RUN: opt -indvars -scalar-evolution -analyze < %s | FileCheck %s +; RUN: opt -indvars -scalar-evolution -analyze -enable-new-pm=0 < %s | FileCheck %s +; RUN: opt "-passes=loop(indvars),print" -disable-output < %s 2>&1 | FileCheck %s ; This test checks if the SCEV analysis is printed out at all. ; It failed once as the RequiredTransitive option was not implemented ; correctly. diff --git a/llvm/test/Analysis/ScalarEvolution/2011-04-26-FoldAddRec.ll b/llvm/test/Analysis/ScalarEvolution/2011-04-26-FoldAddRec.ll --- a/llvm/test/Analysis/ScalarEvolution/2011-04-26-FoldAddRec.ll +++ b/llvm/test/Analysis/ScalarEvolution/2011-04-26-FoldAddRec.ll @@ -1,5 +1,7 @@ -; RUN: opt < %s -analyze -iv-users +; RUN: opt < %s -analyze -enable-new-pm=0 -iv-users +; RUN: opt < %s -disable-output -iv-users ; RUN: opt < %s -passes='print' +>>>>>>> 46eacc99307... [SCEV] Fix ScalarEvolution tests under NPM ; PR9633: Tests that SCEV handles the mul.i2 recurrence being folded to ; constant zero. diff --git a/llvm/test/Analysis/ScalarEvolution/2011-10-04-ConstEvolve.ll b/llvm/test/Analysis/ScalarEvolution/2011-10-04-ConstEvolve.ll --- a/llvm/test/Analysis/ScalarEvolution/2011-10-04-ConstEvolve.ll +++ b/llvm/test/Analysis/ScalarEvolution/2011-10-04-ConstEvolve.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; Exercise getConstantEvolvingPHIOperands on an interesting loop. ; This should complete in milliseconds, not minutes. diff --git a/llvm/test/Analysis/ScalarEvolution/SolveQuadraticEquation.ll b/llvm/test/Analysis/ScalarEvolution/SolveQuadraticEquation.ll --- a/llvm/test/Analysis/ScalarEvolution/SolveQuadraticEquation.ll +++ b/llvm/test/Analysis/ScalarEvolution/SolveQuadraticEquation.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution -scalar-evolution-max-iterations=0 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution -scalar-evolution-max-iterations=0 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" -scalar-evolution-max-iterations=0 2>&1 | FileCheck %s ; PR1101 diff --git a/llvm/test/Analysis/ScalarEvolution/ZeroStep.ll b/llvm/test/Analysis/ScalarEvolution/ZeroStep.ll --- a/llvm/test/Analysis/ScalarEvolution/ZeroStep.ll +++ b/llvm/test/Analysis/ScalarEvolution/ZeroStep.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s -o - -S | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s -o - -S | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s -o - -S 2>&1 | FileCheck %s target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.9.0" diff --git a/llvm/test/Analysis/ScalarEvolution/add-expr-pointer-operand-sorting.ll b/llvm/test/Analysis/ScalarEvolution/add-expr-pointer-operand-sorting.ll --- a/llvm/test/Analysis/ScalarEvolution/add-expr-pointer-operand-sorting.ll +++ b/llvm/test/Analysis/ScalarEvolution/add-expr-pointer-operand-sorting.ll @@ -1,5 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py -; RUN: opt < %s -S -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -S -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -S -disable-output "-passes=print" 2>&1 | FileCheck %s ; Reduced from test-suite/MultiSource/Benchmarks/MiBench/office-ispell/correct.c ; getelementptr, obviously, takes pointer as it's base, and returns a pointer. diff --git a/llvm/test/Analysis/ScalarEvolution/add-like-or.ll b/llvm/test/Analysis/ScalarEvolution/add-like-or.ll --- a/llvm/test/Analysis/ScalarEvolution/add-like-or.ll +++ b/llvm/test/Analysis/ScalarEvolution/add-like-or.ll @@ -1,5 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py -; RUN: opt < %s -S -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -S -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -S -disable-output "-passes=print" 2>&1 | FileCheck %s define i8 @or-of-constant-with-no-common-bits-set(i8 %x, i8 %y) { ; CHECK-LABEL: 'or-of-constant-with-no-common-bits-set' diff --git a/llvm/test/Analysis/ScalarEvolution/and-xor.ll b/llvm/test/Analysis/ScalarEvolution/and-xor.ll --- a/llvm/test/Analysis/ScalarEvolution/and-xor.ll +++ b/llvm/test/Analysis/ScalarEvolution/and-xor.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -scalar-evolution -analyze | FileCheck %s +; RUN: opt < %s -scalar-evolution -analyze -enable-new-pm=0 | FileCheck %s +; RUN: opt < %s "-passes=print" -disable-output 2>&1 | FileCheck %s ; CHECK-LABEL: @test1 ; CHECK: --> (zext diff --git a/llvm/test/Analysis/ScalarEvolution/avoid-assume-hang.ll b/llvm/test/Analysis/ScalarEvolution/avoid-assume-hang.ll --- a/llvm/test/Analysis/ScalarEvolution/avoid-assume-hang.ll +++ b/llvm/test/Analysis/ScalarEvolution/avoid-assume-hang.ll @@ -1,4 +1,5 @@ -; RUN: opt %s -always-inline | opt -analyze -scalar-evolution +; RUN: opt %s -always-inline | opt -analyze -enable-new-pm=0 -scalar-evolution +; RUN: opt %s -always-inline 2>&1 | opt -disable-output -scalar-evolution ; There was optimization bug in ScalarEvolution, that causes too long ; compute time and stack overflow crash. @@ -136,4 +137,4 @@ exit: ret void -} \ No newline at end of file +} diff --git a/llvm/test/Analysis/ScalarEvolution/avoid-infinite-recursion-0.ll b/llvm/test/Analysis/ScalarEvolution/avoid-infinite-recursion-0.ll --- a/llvm/test/Analysis/ScalarEvolution/avoid-infinite-recursion-0.ll +++ b/llvm/test/Analysis/ScalarEvolution/avoid-infinite-recursion-0.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution +; RUN: opt < %s -disable-output -scalar-evolution ; PR4537 ; ModuleID = 'b.bc' diff --git a/llvm/test/Analysis/ScalarEvolution/avoid-smax-0.ll b/llvm/test/Analysis/ScalarEvolution/avoid-smax-0.ll --- a/llvm/test/Analysis/ScalarEvolution/avoid-smax-0.ll +++ b/llvm/test/Analysis/ScalarEvolution/avoid-smax-0.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -scalar-evolution -analyze | FileCheck %s +; RUN: opt < %s -scalar-evolution -analyze -enable-new-pm=0 | FileCheck %s +; RUN: opt < %s "-passes=print" -disable-output 2>&1 | FileCheck %s ; CHECK: Loop %bb3: backedge-taken count is (-1 + %n) diff --git a/llvm/test/Analysis/ScalarEvolution/avoid-smax-1.ll b/llvm/test/Analysis/ScalarEvolution/avoid-smax-1.ll --- a/llvm/test/Analysis/ScalarEvolution/avoid-smax-1.ll +++ b/llvm/test/Analysis/ScalarEvolution/avoid-smax-1.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution -S | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution -S | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" -S 2>&1 | FileCheck %s ; Indvars should be able to find the trip count for the bb6 loop ; without using a maximum calculation (icmp, select) because it should diff --git a/llvm/test/Analysis/ScalarEvolution/binomial-explision.ll b/llvm/test/Analysis/ScalarEvolution/binomial-explision.ll --- a/llvm/test/Analysis/ScalarEvolution/binomial-explision.ll +++ b/llvm/test/Analysis/ScalarEvolution/binomial-explision.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128-ni:1" diff --git a/llvm/test/Analysis/ScalarEvolution/constant_condition.ll b/llvm/test/Analysis/ScalarEvolution/constant_condition.ll --- a/llvm/test/Analysis/ScalarEvolution/constant_condition.ll +++ b/llvm/test/Analysis/ScalarEvolution/constant_condition.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s define i32 @branch_true(i32 %x, i32 %y) { ; CHECK-LABEL: Classifying expressions for: @branch_true diff --git a/llvm/test/Analysis/ScalarEvolution/different-loops-recs.ll b/llvm/test/Analysis/ScalarEvolution/different-loops-recs.ll --- a/llvm/test/Analysis/ScalarEvolution/different-loops-recs.ll +++ b/llvm/test/Analysis/ScalarEvolution/different-loops-recs.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s ; This test set ensures that we can correctly operate with recurrencies from ; different loops. diff --git a/llvm/test/Analysis/ScalarEvolution/div-overflow.ll b/llvm/test/Analysis/ScalarEvolution/div-overflow.ll --- a/llvm/test/Analysis/ScalarEvolution/div-overflow.ll +++ b/llvm/test/Analysis/ScalarEvolution/div-overflow.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -scalar-evolution -analyze | FileCheck %s +; RUN: opt < %s -scalar-evolution -analyze -enable-new-pm=0 | FileCheck %s +; RUN: opt < %s "-passes=print" -disable-output 2>&1 | FileCheck %s ; CHECK: --> ((-128 * %a) /u -128) diff --git a/llvm/test/Analysis/ScalarEvolution/do-loop.ll b/llvm/test/Analysis/ScalarEvolution/do-loop.ll --- a/llvm/test/Analysis/ScalarEvolution/do-loop.ll +++ b/llvm/test/Analysis/ScalarEvolution/do-loop.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; PR1614 ; CHECK: smax diff --git a/llvm/test/Analysis/ScalarEvolution/exact-exit-count-more-precise.ll b/llvm/test/Analysis/ScalarEvolution/exact-exit-count-more-precise.ll --- a/llvm/test/Analysis/ScalarEvolution/exact-exit-count-more-precise.ll +++ b/llvm/test/Analysis/ScalarEvolution/exact-exit-count-more-precise.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" %s 2>&1 | FileCheck %s target triple = "x86_64-unknown-linux-gnu" diff --git a/llvm/test/Analysis/ScalarEvolution/exact_iter_count.ll b/llvm/test/Analysis/ScalarEvolution/exact_iter_count.ll --- a/llvm/test/Analysis/ScalarEvolution/exact_iter_count.ll +++ b/llvm/test/Analysis/ScalarEvolution/exact_iter_count.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -scalar-evolution -analyze | FileCheck %s +; RUN: opt < %s -scalar-evolution -analyze -enable-new-pm=0 | FileCheck %s +; RUN: opt < %s "-passes=print" -disable-output 2>&1 | FileCheck %s ; One side exit dominating the latch, exact backedge taken count is known. define void @test_01() { diff --git a/llvm/test/Analysis/ScalarEvolution/exhaustive-trip-counts.ll b/llvm/test/Analysis/ScalarEvolution/exhaustive-trip-counts.ll --- a/llvm/test/Analysis/ScalarEvolution/exhaustive-trip-counts.ll +++ b/llvm/test/Analysis/ScalarEvolution/exhaustive-trip-counts.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/llvm/test/Analysis/ScalarEvolution/exponential-behavior.ll b/llvm/test/Analysis/ScalarEvolution/exponential-behavior.ll --- a/llvm/test/Analysis/ScalarEvolution/exponential-behavior.ll +++ b/llvm/test/Analysis/ScalarEvolution/exponential-behavior.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s ; CHECK: Printing analysis 'Scalar Evolution Analysis' for function 'f': diff --git a/llvm/test/Analysis/ScalarEvolution/extract-highbits-sameconstmask.ll b/llvm/test/Analysis/ScalarEvolution/extract-highbits-sameconstmask.ll --- a/llvm/test/Analysis/ScalarEvolution/extract-highbits-sameconstmask.ll +++ b/llvm/test/Analysis/ScalarEvolution/extract-highbits-sameconstmask.ll @@ -1,5 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py -; RUN: opt -S -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -S -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -S -disable-output "-passes=print" < %s 2>&1 | FileCheck %s ; The obvious case. define i32 @div(i32 %val) nounwind { diff --git a/llvm/test/Analysis/ScalarEvolution/extract-highbits-variablemask.ll b/llvm/test/Analysis/ScalarEvolution/extract-highbits-variablemask.ll --- a/llvm/test/Analysis/ScalarEvolution/extract-highbits-variablemask.ll +++ b/llvm/test/Analysis/ScalarEvolution/extract-highbits-variablemask.ll @@ -1,5 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py -; RUN: opt -S -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -S -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -S -disable-output "-passes=print" < %s 2>&1 | FileCheck %s ; These testcases aren't *identical* but they have the same/similar meaning. diff --git a/llvm/test/Analysis/ScalarEvolution/extract-lowbits-sameconstmask.ll b/llvm/test/Analysis/ScalarEvolution/extract-lowbits-sameconstmask.ll --- a/llvm/test/Analysis/ScalarEvolution/extract-lowbits-sameconstmask.ll +++ b/llvm/test/Analysis/ScalarEvolution/extract-lowbits-sameconstmask.ll @@ -1,5 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py -; RUN: opt -S -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -S -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -S -disable-output "-passes=print" < %s 2>&1 | FileCheck %s ; The obvious case. define i32 @mul(i32 %val) nounwind { diff --git a/llvm/test/Analysis/ScalarEvolution/extract-lowbits-variablemask.ll b/llvm/test/Analysis/ScalarEvolution/extract-lowbits-variablemask.ll --- a/llvm/test/Analysis/ScalarEvolution/extract-lowbits-variablemask.ll +++ b/llvm/test/Analysis/ScalarEvolution/extract-lowbits-variablemask.ll @@ -1,5 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py -; RUN: opt -S -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -S -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -S -disable-output "-passes=print" < %s 2>&1 | FileCheck %s ; These testcases aren't *identical* but they have the same/similar meaning. diff --git a/llvm/test/Analysis/ScalarEvolution/flags-from-poison-dbg.ll b/llvm/test/Analysis/ScalarEvolution/flags-from-poison-dbg.ll --- a/llvm/test/Analysis/ScalarEvolution/flags-from-poison-dbg.ll +++ b/llvm/test/Analysis/ScalarEvolution/flags-from-poison-dbg.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s ; Make sure poison value tracking works in the presence of @llvm.dbg ; intrinsics. Unfortunately, I was not able to reduce this file diff --git a/llvm/test/Analysis/ScalarEvolution/flags-from-poison.ll b/llvm/test/Analysis/ScalarEvolution/flags-from-poison.ll --- a/llvm/test/Analysis/ScalarEvolution/flags-from-poison.ll +++ b/llvm/test/Analysis/ScalarEvolution/flags-from-poison.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -S -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -S -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -S -disable-output "-passes=print" 2>&1 | FileCheck %s ; Positive and negative tests for inferring flags like nsw from ; reasoning about how a poison value from overflow would trigger diff --git a/llvm/test/Analysis/ScalarEvolution/flattened-0.ll b/llvm/test/Analysis/ScalarEvolution/flattened-0.ll --- a/llvm/test/Analysis/ScalarEvolution/flattened-0.ll +++ b/llvm/test/Analysis/ScalarEvolution/flattened-0.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -scalar-evolution -analyze | FileCheck %s +; RUN: opt < %s -scalar-evolution -analyze -enable-new-pm=0 | FileCheck %s +; RUN: opt < %s "-passes=print" -disable-output 2>&1 | FileCheck %s define void @foo([7 x i8]* %a) { ; CHECK-LABEL: @foo diff --git a/llvm/test/Analysis/ScalarEvolution/fold.ll b/llvm/test/Analysis/ScalarEvolution/fold.ll --- a/llvm/test/Analysis/ScalarEvolution/fold.ll +++ b/llvm/test/Analysis/ScalarEvolution/fold.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution -S < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution -S < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" -S < %s 2>&1 | FileCheck %s define i16 @test1(i8 %x) { %A = zext i8 %x to i12 diff --git a/llvm/test/Analysis/ScalarEvolution/how-far-to-zero.ll b/llvm/test/Analysis/ScalarEvolution/how-far-to-zero.ll --- a/llvm/test/Analysis/ScalarEvolution/how-far-to-zero.ll +++ b/llvm/test/Analysis/ScalarEvolution/how-far-to-zero.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; PR13228 define void @f() nounwind uwtable readnone { diff --git a/llvm/test/Analysis/ScalarEvolution/huge_expression_limit.ll b/llvm/test/Analysis/ScalarEvolution/huge_expression_limit.ll --- a/llvm/test/Analysis/ScalarEvolution/huge_expression_limit.ll +++ b/llvm/test/Analysis/ScalarEvolution/huge_expression_limit.ll @@ -1,5 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py -; RUN: opt < %s -analyze -scalar-evolution -scalar-evolution-huge-expr-threshold=1 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution -scalar-evolution-huge-expr-threshold=1 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" -scalar-evolution-huge-expr-threshold=1 2>&1 | FileCheck %s define void @test(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f) { ; CHECK-LABEL: 'test' diff --git a/llvm/test/Analysis/ScalarEvolution/implied-via-division.ll b/llvm/test/Analysis/ScalarEvolution/implied-via-division.ll --- a/llvm/test/Analysis/ScalarEvolution/implied-via-division.ll +++ b/llvm/test/Analysis/ScalarEvolution/implied-via-division.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s declare void @llvm.experimental.guard(i1, ...) diff --git a/llvm/test/Analysis/ScalarEvolution/incorrect-nsw.ll b/llvm/test/Analysis/ScalarEvolution/incorrect-nsw.ll --- a/llvm/test/Analysis/ScalarEvolution/incorrect-nsw.ll +++ b/llvm/test/Analysis/ScalarEvolution/incorrect-nsw.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print,print" < %s 2>&1 | FileCheck %s define void @bad.nsw() { ; CHECK-LABEL: Classifying expressions for: @bad.nsw diff --git a/llvm/test/Analysis/ScalarEvolution/increasing-or-decreasing-iv.ll b/llvm/test/Analysis/ScalarEvolution/increasing-or-decreasing-iv.ll --- a/llvm/test/Analysis/ScalarEvolution/increasing-or-decreasing-iv.ll +++ b/llvm/test/Analysis/ScalarEvolution/increasing-or-decreasing-iv.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s define void @f0(i1 %c) { ; CHECK-LABEL: Classifying expressions for: @f0 diff --git a/llvm/test/Analysis/ScalarEvolution/infer-prestart-no-wrap.ll b/llvm/test/Analysis/ScalarEvolution/infer-prestart-no-wrap.ll --- a/llvm/test/Analysis/ScalarEvolution/infer-prestart-no-wrap.ll +++ b/llvm/test/Analysis/ScalarEvolution/infer-prestart-no-wrap.ll @@ -1,4 +1,5 @@ -; ; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; ; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; ; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s define void @infer.sext.0(i1* %c, i32 %start, i32* %buf) { ; CHECK-LABEL: Classifying expressions for: @infer.sext.0 diff --git a/llvm/test/Analysis/ScalarEvolution/inner-loop-by-latch-cond-unknown.ll b/llvm/test/Analysis/ScalarEvolution/inner-loop-by-latch-cond-unknown.ll --- a/llvm/test/Analysis/ScalarEvolution/inner-loop-by-latch-cond-unknown.ll +++ b/llvm/test/Analysis/ScalarEvolution/inner-loop-by-latch-cond-unknown.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -iv-users -S | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -iv-users -S | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" -S 2>&1 | FileCheck %s ; This is a regression test for the commit rL327362. diff --git a/llvm/test/Analysis/ScalarEvolution/limit-depth.ll b/llvm/test/Analysis/ScalarEvolution/limit-depth.ll --- a/llvm/test/Analysis/ScalarEvolution/limit-depth.ll +++ b/llvm/test/Analysis/ScalarEvolution/limit-depth.ll @@ -1,4 +1,5 @@ -; RUN: opt -scalar-evolution-max-arith-depth=0 -scalar-evolution-max-cast-depth=0 -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -scalar-evolution-max-arith-depth=0 -scalar-evolution-max-cast-depth=0 -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -scalar-evolution-max-arith-depth=0 -scalar-evolution-max-cast-depth=0 -disable-output "-passes=print" < %s 2>&1 | FileCheck %s ; Check that depth set to 0 prevents getAddExpr and getMulExpr from making ; transformations in SCEV. We expect the result to be very straightforward. diff --git a/llvm/test/Analysis/ScalarEvolution/load-with-range-metadata.ll b/llvm/test/Analysis/ScalarEvolution/load-with-range-metadata.ll --- a/llvm/test/Analysis/ScalarEvolution/load-with-range-metadata.ll +++ b/llvm/test/Analysis/ScalarEvolution/load-with-range-metadata.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s define i32 @slt_trip_count_with_range(i32 *%ptr0, i32 *%ptr1) { ; CHECK-LABEL: slt_trip_count_with_range diff --git a/llvm/test/Analysis/ScalarEvolution/load.ll b/llvm/test/Analysis/ScalarEvolution/load.ll --- a/llvm/test/Analysis/ScalarEvolution/load.ll +++ b/llvm/test/Analysis/ScalarEvolution/load.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s 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-n8:16:32" target triple = "i386-pc-linux-gnu" diff --git a/llvm/test/Analysis/ScalarEvolution/lshr-shl-differentconstmask.ll b/llvm/test/Analysis/ScalarEvolution/lshr-shl-differentconstmask.ll --- a/llvm/test/Analysis/ScalarEvolution/lshr-shl-differentconstmask.ll +++ b/llvm/test/Analysis/ScalarEvolution/lshr-shl-differentconstmask.ll @@ -1,5 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py -; RUN: opt -S -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -S -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -S -disable-output "-passes=print" < %s 2>&1 | FileCheck %s ; The obvious case. define i32 @udiv_biggerLshr(i32 %val) nounwind { diff --git a/llvm/test/Analysis/ScalarEvolution/max-addops-inline.ll b/llvm/test/Analysis/ScalarEvolution/max-addops-inline.ll --- a/llvm/test/Analysis/ScalarEvolution/max-addops-inline.ll +++ b/llvm/test/Analysis/ScalarEvolution/max-addops-inline.ll @@ -1,5 +1,7 @@ -; RUN: opt -analyze -scalar-evolution -scev-addops-inline-threshold=1 < %s | FileCheck --check-prefix=CHECK1 %s -; RUN: opt -analyze -scalar-evolution -scev-addops-inline-threshold=10 < %s | FileCheck --check-prefix=CHECK10 %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution -scev-addops-inline-threshold=1 < %s | FileCheck --check-prefix=CHECK1 %s +; RUN: opt -disable-output "-passes=print" -scev-addops-inline-threshold=1 < %s 2>&1 | FileCheck --check-prefix=CHECK1 %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution -scev-addops-inline-threshold=10 < %s | FileCheck --check-prefix=CHECK10 %s +; RUN: opt -disable-output "-passes=print" -scev-addops-inline-threshold=10 < %s 2>&1 | FileCheck --check-prefix=CHECK10 %s define i32 @foo(i64 %p0, i32 %p1) { ; CHECK1: %add2 = add nsw i32 %mul1, %add diff --git a/llvm/test/Analysis/ScalarEvolution/max-addrec-size.ll b/llvm/test/Analysis/ScalarEvolution/max-addrec-size.ll --- a/llvm/test/Analysis/ScalarEvolution/max-addrec-size.ll +++ b/llvm/test/Analysis/ScalarEvolution/max-addrec-size.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution -scalar-evolution-max-add-rec-size=3 < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution -scalar-evolution-max-add-rec-size=3 < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" -scalar-evolution-max-add-rec-size=3 < %s 2>&1 | FileCheck %s ; Show that we are able to avoid creation of huge SCEVs by capping the max ; AddRec size. diff --git a/llvm/test/Analysis/ScalarEvolution/max-be-count-not-constant.ll b/llvm/test/Analysis/ScalarEvolution/max-be-count-not-constant.ll --- a/llvm/test/Analysis/ScalarEvolution/max-be-count-not-constant.ll +++ b/llvm/test/Analysis/ScalarEvolution/max-be-count-not-constant.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/llvm/test/Analysis/ScalarEvolution/max-expr-cache.ll b/llvm/test/Analysis/ScalarEvolution/max-expr-cache.ll --- a/llvm/test/Analysis/ScalarEvolution/max-expr-cache.ll +++ b/llvm/test/Analysis/ScalarEvolution/max-expr-cache.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; SCEV would take a long time to compute SCEV expressions for this IR. If SCEV ; finishes in < 1 second then the bug is fixed. diff --git a/llvm/test/Analysis/ScalarEvolution/max-mulops-inline.ll b/llvm/test/Analysis/ScalarEvolution/max-mulops-inline.ll --- a/llvm/test/Analysis/ScalarEvolution/max-mulops-inline.ll +++ b/llvm/test/Analysis/ScalarEvolution/max-mulops-inline.ll @@ -1,5 +1,7 @@ -; RUN: opt -analyze -scalar-evolution -scev-mulops-inline-threshold=1 < %s | FileCheck --check-prefix=CHECK1 %s -; RUN: opt -analyze -scalar-evolution -scev-mulops-inline-threshold=10 < %s | FileCheck --check-prefix=CHECK10 %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution -scev-mulops-inline-threshold=1 < %s | FileCheck --check-prefix=CHECK1 %s +; RUN: opt -disable-output "-passes=print" -scev-mulops-inline-threshold=1 < %s 2>&1 | FileCheck --check-prefix=CHECK1 %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution -scev-mulops-inline-threshold=10 < %s | FileCheck --check-prefix=CHECK10 %s +; RUN: opt -disable-output "-passes=print" -scev-mulops-inline-threshold=10 < %s 2>&1 | FileCheck --check-prefix=CHECK10 %s target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/llvm/test/Analysis/ScalarEvolution/max-trip-count-address-space.ll b/llvm/test/Analysis/ScalarEvolution/max-trip-count-address-space.ll --- a/llvm/test/Analysis/ScalarEvolution/max-trip-count-address-space.ll +++ b/llvm/test/Analysis/ScalarEvolution/max-trip-count-address-space.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; ScalarEvolution should be able to understand the loop and eliminate the casts. diff --git a/llvm/test/Analysis/ScalarEvolution/max-trip-count.ll b/llvm/test/Analysis/ScalarEvolution/max-trip-count.ll --- a/llvm/test/Analysis/ScalarEvolution/max-trip-count.ll +++ b/llvm/test/Analysis/ScalarEvolution/max-trip-count.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; ScalarEvolution should be able to understand the loop and eliminate the casts. diff --git a/llvm/test/Analysis/ScalarEvolution/merge-add-rec-many-inputs.ll b/llvm/test/Analysis/ScalarEvolution/merge-add-rec-many-inputs.ll --- a/llvm/test/Analysis/ScalarEvolution/merge-add-rec-many-inputs.ll +++ b/llvm/test/Analysis/ScalarEvolution/merge-add-rec-many-inputs.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; Check that isImpliedViaMerge wouldn't crash when trying to prove ; SCEVUnknown and AddRec with phi having many inputs diff --git a/llvm/test/Analysis/ScalarEvolution/min-max-exprs.ll b/llvm/test/Analysis/ScalarEvolution/min-max-exprs.ll --- a/llvm/test/Analysis/ScalarEvolution/min-max-exprs.ll +++ b/llvm/test/Analysis/ScalarEvolution/min-max-exprs.ll @@ -1,4 +1,5 @@ -; RUN: opt -scalar-evolution -analyze < %s | FileCheck %s +; RUN: opt -scalar-evolution -analyze -enable-new-pm=0 < %s | FileCheck %s +; RUN: opt "-passes=print" -disable-output < %s 2>&1 | FileCheck %s ; ; This checks if the min and max expressions are properly recognized by ; ScalarEvolution even though they the ICmpInst and SelectInst have different diff --git a/llvm/test/Analysis/ScalarEvolution/no-wrap-add-exprs.ll b/llvm/test/Analysis/ScalarEvolution/no-wrap-add-exprs.ll --- a/llvm/test/Analysis/ScalarEvolution/no-wrap-add-exprs.ll +++ b/llvm/test/Analysis/ScalarEvolution/no-wrap-add-exprs.ll @@ -1,4 +1,5 @@ -; RUN: opt -S -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -S -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -S -disable-output "-passes=print" < %s 2>&1 | FileCheck %s !0 = !{i8 0, i8 127} diff --git a/llvm/test/Analysis/ScalarEvolution/no-wrap-unknown-becount.ll b/llvm/test/Analysis/ScalarEvolution/no-wrap-unknown-becount.ll --- a/llvm/test/Analysis/ScalarEvolution/no-wrap-unknown-becount.ll +++ b/llvm/test/Analysis/ScalarEvolution/no-wrap-unknown-becount.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s declare void @llvm.experimental.guard(i1, ...) declare void @llvm.assume(i1) diff --git a/llvm/test/Analysis/ScalarEvolution/non-IV-phi.ll b/llvm/test/Analysis/ScalarEvolution/non-IV-phi.ll --- a/llvm/test/Analysis/ScalarEvolution/non-IV-phi.ll +++ b/llvm/test/Analysis/ScalarEvolution/non-IV-phi.ll @@ -1,4 +1,5 @@ -; RUN: opt -scalar-evolution -analyze < %s | FileCheck %s +; RUN: opt -scalar-evolution -analyze -enable-new-pm=0 < %s | FileCheck %s +; RUN: opt "-passes=print" -disable-output < %s 2>&1 | FileCheck %s define void @test1(i8 %t, i32 %len) { ; CHECK-LABEL: test1 diff --git a/llvm/test/Analysis/ScalarEvolution/nowrap-preinc-limits.ll b/llvm/test/Analysis/ScalarEvolution/nowrap-preinc-limits.ll --- a/llvm/test/Analysis/ScalarEvolution/nowrap-preinc-limits.ll +++ b/llvm/test/Analysis/ScalarEvolution/nowrap-preinc-limits.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s define void @f(i1* %condition) { ; CHECK-LABEL: Classifying expressions for: @f diff --git a/llvm/test/Analysis/ScalarEvolution/nsw-offset-assume.ll b/llvm/test/Analysis/ScalarEvolution/nsw-offset-assume.ll --- a/llvm/test/Analysis/ScalarEvolution/nsw-offset-assume.ll +++ b/llvm/test/Analysis/ScalarEvolution/nsw-offset-assume.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -S -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -S -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -S -disable-output "-passes=print" 2>&1 | FileCheck %s ; ScalarEvolution should be able to fold away the sign-extensions ; on this loop with a primary induction variable incremented with diff --git a/llvm/test/Analysis/ScalarEvolution/nsw-offset.ll b/llvm/test/Analysis/ScalarEvolution/nsw-offset.ll --- a/llvm/test/Analysis/ScalarEvolution/nsw-offset.ll +++ b/llvm/test/Analysis/ScalarEvolution/nsw-offset.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -S -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -S -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -S -disable-output "-passes=print" 2>&1 | FileCheck %s ; ScalarEvolution should be able to fold away the sign-extensions ; on this loop with a primary induction variable incremented with diff --git a/llvm/test/Analysis/ScalarEvolution/nsw.ll b/llvm/test/Analysis/ScalarEvolution/nsw.ll --- a/llvm/test/Analysis/ScalarEvolution/nsw.ll +++ b/llvm/test/Analysis/ScalarEvolution/nsw.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; The addrecs in this loop are analyzable only by using nsw information. diff --git a/llvm/test/Analysis/ScalarEvolution/overflow-intrinsics-trip-count.ll b/llvm/test/Analysis/ScalarEvolution/overflow-intrinsics-trip-count.ll --- a/llvm/test/Analysis/ScalarEvolution/overflow-intrinsics-trip-count.ll +++ b/llvm/test/Analysis/ScalarEvolution/overflow-intrinsics-trip-count.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s declare { i16, i1 } @llvm.sadd.with.overflow.i16(i16, i16) nounwind readnone declare { i16, i1 } @llvm.uadd.with.overflow.i16(i16, i16) nounwind readnone diff --git a/llvm/test/Analysis/ScalarEvolution/overflow-intrinsics.ll b/llvm/test/Analysis/ScalarEvolution/overflow-intrinsics.ll --- a/llvm/test/Analysis/ScalarEvolution/overflow-intrinsics.ll +++ b/llvm/test/Analysis/ScalarEvolution/overflow-intrinsics.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/llvm/test/Analysis/ScalarEvolution/pointer-sign-bits.ll b/llvm/test/Analysis/ScalarEvolution/pointer-sign-bits.ll --- a/llvm/test/Analysis/ScalarEvolution/pointer-sign-bits.ll +++ b/llvm/test/Analysis/ScalarEvolution/pointer-sign-bits.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution +; RUN: opt < %s -disable-output -scalar-evolution 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" %JavaObject = type { [0 x i32 (...)*]*, i8* } diff --git a/llvm/test/Analysis/ScalarEvolution/pr22179.ll b/llvm/test/Analysis/ScalarEvolution/pr22179.ll --- a/llvm/test/Analysis/ScalarEvolution/pr22179.ll +++ b/llvm/test/Analysis/ScalarEvolution/pr22179.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s %struct.anon = type { i8 } %struct.S = type { i32 } diff --git a/llvm/test/Analysis/ScalarEvolution/pr22641.ll b/llvm/test/Analysis/ScalarEvolution/pr22641.ll --- a/llvm/test/Analysis/ScalarEvolution/pr22641.ll +++ b/llvm/test/Analysis/ScalarEvolution/pr22641.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s define i1 @main(i16 %a) { ; CHECK-LABEL: Classifying expressions for: @main diff --git a/llvm/test/Analysis/ScalarEvolution/pr24757.ll b/llvm/test/Analysis/ScalarEvolution/pr24757.ll --- a/llvm/test/Analysis/ScalarEvolution/pr24757.ll +++ b/llvm/test/Analysis/ScalarEvolution/pr24757.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s ; CHECK: Loop %bb1: backedge-taken count is ((2 * %a.promoted) /u 2) diff --git a/llvm/test/Analysis/ScalarEvolution/pr25369.ll b/llvm/test/Analysis/ScalarEvolution/pr25369.ll --- a/llvm/test/Analysis/ScalarEvolution/pr25369.ll +++ b/llvm/test/Analysis/ScalarEvolution/pr25369.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/llvm/test/Analysis/ScalarEvolution/pr27315.ll b/llvm/test/Analysis/ScalarEvolution/pr27315.ll --- a/llvm/test/Analysis/ScalarEvolution/pr27315.ll +++ b/llvm/test/Analysis/ScalarEvolution/pr27315.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s declare i1 @use(i64) diff --git a/llvm/test/Analysis/ScalarEvolution/pr34538.ll b/llvm/test/Analysis/ScalarEvolution/pr34538.ll --- a/llvm/test/Analysis/ScalarEvolution/pr34538.ll +++ b/llvm/test/Analysis/ScalarEvolution/pr34538.ll @@ -1,5 +1,7 @@ -; RUN: opt -scalar-evolution -loop-deletion -simplifycfg -analyze < %s | FileCheck %s --check-prefix=CHECK-ANALYSIS-1 -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s --check-prefix=CHECK-ANALYSIS-2 +; RUN: opt -scalar-evolution -loop-deletion -simplifycfg -analyze -enable-new-pm=0 < %s | FileCheck %s --check-prefix=CHECK-ANALYSIS-1 +; RUN: opt "-passes=print,loop(loop-deletion),simplifycfg" -disable-output < %s 2>&1 | FileCheck %s --check-prefix=CHECK-ANALYSIS-1 +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s --check-prefix=CHECK-ANALYSIS-2 +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s --check-prefix=CHECK-ANALYSIS-2 define i32 @pr34538() local_unnamed_addr #0 { ; CHECK-ANALYSIS-1: Loop %do.body: backedge-taken count is 10000 diff --git a/llvm/test/Analysis/ScalarEvolution/pr40420.ll b/llvm/test/Analysis/ScalarEvolution/pr40420.ll --- a/llvm/test/Analysis/ScalarEvolution/pr40420.ll +++ b/llvm/test/Analysis/ScalarEvolution/pr40420.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution 2>&1 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution 2>&1 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 2>&1 | FileCheck %s ; REQUIRES: asserts define void @test(i8 %tmp6) { diff --git a/llvm/test/Analysis/ScalarEvolution/predicated-trip-count.ll b/llvm/test/Analysis/ScalarEvolution/predicated-trip-count.ll --- a/llvm/test/Analysis/ScalarEvolution/predicated-trip-count.ll +++ b/llvm/test/Analysis/ScalarEvolution/predicated-trip-count.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" diff --git a/llvm/test/Analysis/ScalarEvolution/range-signedness.ll b/llvm/test/Analysis/ScalarEvolution/range-signedness.ll --- a/llvm/test/Analysis/ScalarEvolution/range-signedness.ll +++ b/llvm/test/Analysis/ScalarEvolution/range-signedness.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s define void @x(i1* %cond) { ; CHECK-LABEL: Classifying expressions for: @x diff --git a/llvm/test/Analysis/ScalarEvolution/range_nw_flag.ll b/llvm/test/Analysis/ScalarEvolution/range_nw_flag.ll --- a/llvm/test/Analysis/ScalarEvolution/range_nw_flag.ll +++ b/llvm/test/Analysis/ScalarEvolution/range_nw_flag.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -S -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -S -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -S -disable-output "-passes=print" 2>&1 | FileCheck %s ; copied from flags-from-poison.ll ; CHECK-LABEL: @test-add-nuw diff --git a/llvm/test/Analysis/ScalarEvolution/returned.ll b/llvm/test/Analysis/ScalarEvolution/returned.ll --- a/llvm/test/Analysis/ScalarEvolution/returned.ll +++ b/llvm/test/Analysis/ScalarEvolution/returned.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -S -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -S -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -S -disable-output "-passes=print" 2>&1 | FileCheck %s target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128" define i8* @foo(i32 %no, i8* nocapture %d) nounwind { diff --git a/llvm/test/Analysis/ScalarEvolution/scalable-vector.ll b/llvm/test/Analysis/ScalarEvolution/scalable-vector.ll --- a/llvm/test/Analysis/ScalarEvolution/scalable-vector.ll +++ b/llvm/test/Analysis/ScalarEvolution/scalable-vector.ll @@ -1,4 +1,5 @@ -; RUN: opt -scalar-evolution -analyze < %s | FileCheck %s +; RUN: opt -scalar-evolution -analyze -enable-new-pm=0 < %s | FileCheck %s +; RUN: opt "-passes=print" -disable-output < %s 2>&1 | FileCheck %s ; CHECK: %1 = getelementptr , * null, i32 3 ; CHECK: --> (3 * sizeof()) U: [0,-15) S: [-9223372036854775808,9223372036854775793) diff --git a/llvm/test/Analysis/ScalarEvolution/scev-dispositions.ll b/llvm/test/Analysis/ScalarEvolution/scev-dispositions.ll --- a/llvm/test/Analysis/ScalarEvolution/scev-dispositions.ll +++ b/llvm/test/Analysis/ScalarEvolution/scev-dispositions.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s define void @single_loop(i32* %buf, i32 %start) { ; CHECK-LABEL: Classifying expressions for: @single_loop diff --git a/llvm/test/Analysis/ScalarEvolution/scev-prestart-nowrap.ll b/llvm/test/Analysis/ScalarEvolution/scev-prestart-nowrap.ll --- a/llvm/test/Analysis/ScalarEvolution/scev-prestart-nowrap.ll +++ b/llvm/test/Analysis/ScalarEvolution/scev-prestart-nowrap.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s ; An example run where SCEV(%postinc)->getStart() may overflow: ; diff --git a/llvm/test/Analysis/ScalarEvolution/sdiv.ll b/llvm/test/Analysis/ScalarEvolution/sdiv.ll --- a/llvm/test/Analysis/ScalarEvolution/sdiv.ll +++ b/llvm/test/Analysis/ScalarEvolution/sdiv.ll @@ -1,5 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py -; RUN: opt < %s -scalar-evolution -analyze | FileCheck %s +; RUN: opt < %s -scalar-evolution -analyze -enable-new-pm=0 | FileCheck %s +; RUN: opt < %s "-passes=print" -disable-output 2>&1 | FileCheck %s target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/llvm/test/Analysis/ScalarEvolution/sext-inreg.ll b/llvm/test/Analysis/ScalarEvolution/sext-inreg.ll --- a/llvm/test/Analysis/ScalarEvolution/sext-inreg.ll +++ b/llvm/test/Analysis/ScalarEvolution/sext-inreg.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s 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" diff --git a/llvm/test/Analysis/ScalarEvolution/sext-iv-0.ll b/llvm/test/Analysis/ScalarEvolution/sext-iv-0.ll --- a/llvm/test/Analysis/ScalarEvolution/sext-iv-0.ll +++ b/llvm/test/Analysis/ScalarEvolution/sext-iv-0.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -scalar-evolution -analyze | FileCheck %s +; RUN: opt < %s -scalar-evolution -analyze -enable-new-pm=0 | FileCheck %s +; RUN: opt < %s "-passes=print" -disable-output 2>&1 | FileCheck %s ; Convert (sext {-128,+,1}) to {sext(-128),+,sext(1)}, since the ; trip count is within range where this is safe. diff --git a/llvm/test/Analysis/ScalarEvolution/sext-iv-1.ll b/llvm/test/Analysis/ScalarEvolution/sext-iv-1.ll --- a/llvm/test/Analysis/ScalarEvolution/sext-iv-1.ll +++ b/llvm/test/Analysis/ScalarEvolution/sext-iv-1.ll @@ -1,5 +1,5 @@ -; RUN: opt < %s -scalar-evolution -analyze \ -; RUN: | FileCheck %s +; RUN: opt < %s -scalar-evolution -analyze -enable-new-pm=0 | FileCheck %s +; RUN: opt < %s "-passes=print" -disable-output 2>&1 | FileCheck %s ; CHECK: --> (sext i{{.}} {{{.*}},+,{{.*}}}<%bb1> to i64) ; CHECK: --> (sext i{{.}} {{{.*}},+,{{.*}}}<%bb1> to i64) diff --git a/llvm/test/Analysis/ScalarEvolution/sext-iv-2.ll b/llvm/test/Analysis/ScalarEvolution/sext-iv-2.ll --- a/llvm/test/Analysis/ScalarEvolution/sext-iv-2.ll +++ b/llvm/test/Analysis/ScalarEvolution/sext-iv-2.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; CHECK: %tmp3 = sext i8 %tmp2 to i32 ; CHECK: --> (sext i8 {0,+,1}<%bb1> to i32){{ U: [^ ]+ S: [^ ]+}}{{ *}}Exits: -1 diff --git a/llvm/test/Analysis/ScalarEvolution/sext-mul.ll b/llvm/test/Analysis/ScalarEvolution/sext-mul.ll --- a/llvm/test/Analysis/ScalarEvolution/sext-mul.ll +++ b/llvm/test/Analysis/ScalarEvolution/sext-mul.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; CHECK: %tmp9 = shl i64 %tmp8, 33 ; CHECK-NEXT: --> {{.*}} Exits: (-8589934592 + (8589934592 * (zext i32 %arg2 to i64))) diff --git a/llvm/test/Analysis/ScalarEvolution/sext-to-zext.ll b/llvm/test/Analysis/ScalarEvolution/sext-to-zext.ll --- a/llvm/test/Analysis/ScalarEvolution/sext-to-zext.ll +++ b/llvm/test/Analysis/ScalarEvolution/sext-to-zext.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s define void @f(i1 %c) { ; CHECK-LABEL: Classifying expressions for: @f diff --git a/llvm/test/Analysis/ScalarEvolution/sext-zero.ll b/llvm/test/Analysis/ScalarEvolution/sext-zero.ll --- a/llvm/test/Analysis/ScalarEvolution/sext-zero.ll +++ b/llvm/test/Analysis/ScalarEvolution/sext-zero.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; CHECK: %tmp9 = shl i64 %tmp8, 33 ; CHECK-NEXT: --> {{.*}} Exits: (-8589934592 + (8589934592 * (zext i32 %arg2 to i64))) diff --git a/llvm/test/Analysis/ScalarEvolution/shift-op.ll b/llvm/test/Analysis/ScalarEvolution/shift-op.ll --- a/llvm/test/Analysis/ScalarEvolution/shift-op.ll +++ b/llvm/test/Analysis/ScalarEvolution/shift-op.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s define void @test0(i32 %init) { ; CHECK-LABEL: Classifying expressions for: @test0 diff --git a/llvm/test/Analysis/ScalarEvolution/shl-lshr-differentconstmask.ll b/llvm/test/Analysis/ScalarEvolution/shl-lshr-differentconstmask.ll --- a/llvm/test/Analysis/ScalarEvolution/shl-lshr-differentconstmask.ll +++ b/llvm/test/Analysis/ScalarEvolution/shl-lshr-differentconstmask.ll @@ -1,5 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py -; RUN: opt -S -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -S -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -S -disable-output "-passes=print" < %s 2>&1 | FileCheck %s ; The obvious case. define i32 @mul_biggerShl(i32 %val) nounwind { diff --git a/llvm/test/Analysis/ScalarEvolution/sle.ll b/llvm/test/Analysis/ScalarEvolution/sle.ll --- a/llvm/test/Analysis/ScalarEvolution/sle.ll +++ b/llvm/test/Analysis/ScalarEvolution/sle.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s ; ScalarEvolution should be able to use nsw information to prove that ; this loop has a finite trip count. diff --git a/llvm/test/Analysis/ScalarEvolution/smax-br-phi-idioms.ll b/llvm/test/Analysis/ScalarEvolution/smax-br-phi-idioms.ll --- a/llvm/test/Analysis/ScalarEvolution/smax-br-phi-idioms.ll +++ b/llvm/test/Analysis/ScalarEvolution/smax-br-phi-idioms.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s define i32 @f0(i32 %x, i32 %y) { ; CHECK-LABEL: Classifying expressions for: @f0 diff --git a/llvm/test/Analysis/ScalarEvolution/smax.ll b/llvm/test/Analysis/ScalarEvolution/smax.ll --- a/llvm/test/Analysis/ScalarEvolution/smax.ll +++ b/llvm/test/Analysis/ScalarEvolution/smax.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; PR1614 ; CHECK: --> (%a smax %b) diff --git a/llvm/test/Analysis/ScalarEvolution/solve-quadratic-i1.ll b/llvm/test/Analysis/ScalarEvolution/solve-quadratic-i1.ll --- a/llvm/test/Analysis/ScalarEvolution/solve-quadratic-i1.ll +++ b/llvm/test/Analysis/ScalarEvolution/solve-quadratic-i1.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s target triple = "x86_64-unknown-linux-gnu" diff --git a/llvm/test/Analysis/ScalarEvolution/solve-quadratic-overflow.ll b/llvm/test/Analysis/ScalarEvolution/solve-quadratic-overflow.ll --- a/llvm/test/Analysis/ScalarEvolution/solve-quadratic-overflow.ll +++ b/llvm/test/Analysis/ScalarEvolution/solve-quadratic-overflow.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution -S < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution -S < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" -S < %s 2>&1 | FileCheck %s ; The exit value from this loop was originally calculated as 0. ; The actual exit condition is 256*256 == 0 (in i16). diff --git a/llvm/test/Analysis/ScalarEvolution/solve-quadratic.ll b/llvm/test/Analysis/ScalarEvolution/solve-quadratic.ll --- a/llvm/test/Analysis/ScalarEvolution/solve-quadratic.ll +++ b/llvm/test/Analysis/ScalarEvolution/solve-quadratic.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution -S -debug-only=scalar-evolution,apint < %s 2>&1 | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution -S -debug-only=scalar-evolution,apint < %s 2>&1 | FileCheck %s +; RUN: opt -disable-output "-passes=print" -S -debug-only=scalar-evolution,apint < %s 2>&1 2>&1 | FileCheck %s ; REQUIRES: asserts ; Use the following template to get a chrec {L,+,M,+,N}. diff --git a/llvm/test/Analysis/ScalarEvolution/srem.ll b/llvm/test/Analysis/ScalarEvolution/srem.ll --- a/llvm/test/Analysis/ScalarEvolution/srem.ll +++ b/llvm/test/Analysis/ScalarEvolution/srem.ll @@ -1,5 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py -; RUN: opt < %s -scalar-evolution -analyze | FileCheck %s +; RUN: opt < %s -scalar-evolution -analyze -enable-new-pm=0 | FileCheck %s +; RUN: opt < %s "-passes=print" -disable-output 2>&1 | FileCheck %s target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/llvm/test/Analysis/ScalarEvolution/strip-injective-zext.ll b/llvm/test/Analysis/ScalarEvolution/strip-injective-zext.ll --- a/llvm/test/Analysis/ScalarEvolution/strip-injective-zext.ll +++ b/llvm/test/Analysis/ScalarEvolution/strip-injective-zext.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s ; The initial SCEV for the backedge count is ; (zext i2 {(trunc i32 (1 + %a1) to i2),+,1}<%b2> to i32). diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count-andor.ll b/llvm/test/Analysis/ScalarEvolution/trip-count-andor.ll --- a/llvm/test/Analysis/ScalarEvolution/trip-count-andor.ll +++ b/llvm/test/Analysis/ScalarEvolution/trip-count-andor.ll @@ -1,5 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py -; RUN: opt < %s -analyze -scalar-evolution -scalar-evolution-classify-expressions=0 2>&1 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution -scalar-evolution-classify-expressions=0 2>&1 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" -scalar-evolution-classify-expressions=0 2>&1 2>&1 | FileCheck %s target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count-pow2.ll b/llvm/test/Analysis/ScalarEvolution/trip-count-pow2.ll --- a/llvm/test/Analysis/ScalarEvolution/trip-count-pow2.ll +++ b/llvm/test/Analysis/ScalarEvolution/trip-count-pow2.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -scalar-evolution -analyze | FileCheck %s +; RUN: opt < %s -scalar-evolution -analyze -enable-new-pm=0 | FileCheck %s +; RUN: opt < %s "-passes=print" -disable-output 2>&1 | FileCheck %s define void @test1(i32 %n) { entry: diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count-switch.ll b/llvm/test/Analysis/ScalarEvolution/trip-count-switch.ll --- a/llvm/test/Analysis/ScalarEvolution/trip-count-switch.ll +++ b/llvm/test/Analysis/ScalarEvolution/trip-count-switch.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s declare void @foo() diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count-unknown-stride.ll b/llvm/test/Analysis/ScalarEvolution/trip-count-unknown-stride.ll --- a/llvm/test/Analysis/ScalarEvolution/trip-count-unknown-stride.ll +++ b/llvm/test/Analysis/ScalarEvolution/trip-count-unknown-stride.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; ScalarEvolution should be able to compute trip count of the loop by proving ; that this is not an infinite loop with side effects. diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count.ll b/llvm/test/Analysis/ScalarEvolution/trip-count.ll --- a/llvm/test/Analysis/ScalarEvolution/trip-count.ll +++ b/llvm/test/Analysis/ScalarEvolution/trip-count.ll @@ -1,5 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py -; RUN: opt < %s -analyze -scalar-evolution -scalar-evolution-max-iterations=0 -scalar-evolution-classify-expressions=0 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution -scalar-evolution-max-iterations=0 -scalar-evolution-classify-expressions=0 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" -scalar-evolution-max-iterations=0 -scalar-evolution-classify-expressions=0 2>&1 | FileCheck %s target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count10.ll b/llvm/test/Analysis/ScalarEvolution/trip-count10.ll --- a/llvm/test/Analysis/ScalarEvolution/trip-count10.ll +++ b/llvm/test/Analysis/ScalarEvolution/trip-count10.ll @@ -1,5 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py -; RUN: opt < %s -analyze -scalar-evolution -scalar-evolution-classify-expressions=0 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution -scalar-evolution-classify-expressions=0 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" -scalar-evolution-classify-expressions=0 2>&1 | FileCheck %s ; Trip counts with trivial exit conditions. diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count11.ll b/llvm/test/Analysis/ScalarEvolution/trip-count11.ll --- a/llvm/test/Analysis/ScalarEvolution/trip-count11.ll +++ b/llvm/test/Analysis/ScalarEvolution/trip-count11.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s target datalayout = "e-p:64:64:64-p1:16:16:16-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count12.ll b/llvm/test/Analysis/ScalarEvolution/trip-count12.ll --- a/llvm/test/Analysis/ScalarEvolution/trip-count12.ll +++ b/llvm/test/Analysis/ScalarEvolution/trip-count12.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; CHECK: Determining loop execution counts for: @test ; CHECK: Loop %for.body: backedge-taken count is ((-2 + %len) /u 2) diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count13.ll b/llvm/test/Analysis/ScalarEvolution/trip-count13.ll --- a/llvm/test/Analysis/ScalarEvolution/trip-count13.ll +++ b/llvm/test/Analysis/ScalarEvolution/trip-count13.ll @@ -1,4 +1,5 @@ -; RUN: opt -S -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -S -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -S -disable-output "-passes=print" < %s 2>&1 | FileCheck %s define void @u_0(i8 %rhs) { ; E.g.: %rhs = 255, %start = 99, backedge taken 156 times diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count14.ll b/llvm/test/Analysis/ScalarEvolution/trip-count14.ll --- a/llvm/test/Analysis/ScalarEvolution/trip-count14.ll +++ b/llvm/test/Analysis/ScalarEvolution/trip-count14.ll @@ -1,4 +1,5 @@ -; RUN: opt -S -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -S -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -S -disable-output "-passes=print" < %s 2>&1 | FileCheck %s define void @s32_max1(i32 %n, i32* %p) { entry: diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count15.ll b/llvm/test/Analysis/ScalarEvolution/trip-count15.ll --- a/llvm/test/Analysis/ScalarEvolution/trip-count15.ll +++ b/llvm/test/Analysis/ScalarEvolution/trip-count15.ll @@ -1,5 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py -; RUN: opt -S -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -S -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -S -disable-output "-passes=print" < %s 2>&1 | FileCheck %s define void @umin_unsigned_check(i64 %n) { ; CHECK-LABEL: 'umin_unsigned_check' diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count2.ll b/llvm/test/Analysis/ScalarEvolution/trip-count2.ll --- a/llvm/test/Analysis/ScalarEvolution/trip-count2.ll +++ b/llvm/test/Analysis/ScalarEvolution/trip-count2.ll @@ -1,5 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py -; RUN: opt < %s -analyze -scalar-evolution -scalar-evolution-classify-expressions=0 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution -scalar-evolution-classify-expressions=0 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" -scalar-evolution-classify-expressions=0 2>&1 | FileCheck %s @A = weak global [1000 x i32] zeroinitializer, align 32 diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count3.ll b/llvm/test/Analysis/ScalarEvolution/trip-count3.ll --- a/llvm/test/Analysis/ScalarEvolution/trip-count3.ll +++ b/llvm/test/Analysis/ScalarEvolution/trip-count3.ll @@ -1,5 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py -; RUN: opt < %s -scalar-evolution -analyze -scalar-evolution-classify-expressions=0 | FileCheck %s +; RUN: opt < %s -scalar-evolution -analyze -enable-new-pm=0 -scalar-evolution-classify-expressions=0 | FileCheck %s +; RUN: opt < %s "-passes=print" -disable-output -scalar-evolution-classify-expressions=0 2>&1 | FileCheck %s ; ScalarEvolution can't compute a trip count because it doesn't know if ; dividing by the stride will have a remainder. This could theoretically diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count4.ll b/llvm/test/Analysis/ScalarEvolution/trip-count4.ll --- a/llvm/test/Analysis/ScalarEvolution/trip-count4.ll +++ b/llvm/test/Analysis/ScalarEvolution/trip-count4.ll @@ -1,5 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py -; RUN: opt < %s -analyze -scalar-evolution -scalar-evolution-classify-expressions=0 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution -scalar-evolution-classify-expressions=0 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" -scalar-evolution-classify-expressions=0 2>&1 | FileCheck %s ; ScalarEvolution should be able to compute a loop exit value for %indvar.i8. diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count5.ll b/llvm/test/Analysis/ScalarEvolution/trip-count5.ll --- a/llvm/test/Analysis/ScalarEvolution/trip-count5.ll +++ b/llvm/test/Analysis/ScalarEvolution/trip-count5.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; ScalarEvolution should be able to compute a maximum trip count ; value sufficient to fold away both sext casts. diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count6.ll b/llvm/test/Analysis/ScalarEvolution/trip-count6.ll --- a/llvm/test/Analysis/ScalarEvolution/trip-count6.ll +++ b/llvm/test/Analysis/ScalarEvolution/trip-count6.ll @@ -1,5 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py -; RUN: opt < %s -analyze -scalar-evolution -scalar-evolution-classify-expressions=0 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution -scalar-evolution-classify-expressions=0 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" -scalar-evolution-classify-expressions=0 2>&1 | FileCheck %s @mode_table = global [4 x i32] zeroinitializer ; <[4 x i32]*> [#uses=1] diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count7.ll b/llvm/test/Analysis/ScalarEvolution/trip-count7.ll --- a/llvm/test/Analysis/ScalarEvolution/trip-count7.ll +++ b/llvm/test/Analysis/ScalarEvolution/trip-count7.ll @@ -1,5 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py -; RUN: opt < %s -analyze -scalar-evolution -scalar-evolution-classify-expressions=0 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution -scalar-evolution-classify-expressions=0 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" -scalar-evolution-classify-expressions=0 2>&1 | FileCheck %s target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128" diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count8.ll b/llvm/test/Analysis/ScalarEvolution/trip-count8.ll --- a/llvm/test/Analysis/ScalarEvolution/trip-count8.ll +++ b/llvm/test/Analysis/ScalarEvolution/trip-count8.ll @@ -1,5 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py -; RUN: opt < %s -analyze -scalar-evolution -scalar-evolution-classify-expressions=0 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution -scalar-evolution-classify-expressions=0 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" -scalar-evolution-classify-expressions=0 2>&1 | FileCheck %s ; PR4599 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128" diff --git a/llvm/test/Analysis/ScalarEvolution/trip-count9.ll b/llvm/test/Analysis/ScalarEvolution/trip-count9.ll --- a/llvm/test/Analysis/ScalarEvolution/trip-count9.ll +++ b/llvm/test/Analysis/ScalarEvolution/trip-count9.ll @@ -1,5 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py -; RUN: opt -analyze -scalar-evolution -S -scalar-evolution-classify-expressions=0 < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution -S -scalar-evolution-classify-expressions=0 < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" -S -scalar-evolution-classify-expressions=0 < %s 2>&1 | FileCheck %s ; Every combination of ; - starting at 0, 1, or %x diff --git a/llvm/test/Analysis/ScalarEvolution/tripmultiple_calculation.ll b/llvm/test/Analysis/ScalarEvolution/tripmultiple_calculation.ll --- a/llvm/test/Analysis/ScalarEvolution/tripmultiple_calculation.ll +++ b/llvm/test/Analysis/ScalarEvolution/tripmultiple_calculation.ll @@ -1,4 +1,5 @@ -; RUN: opt -S -analyze -scalar-evolution < %s 2>&1 | FileCheck %s +; RUN: opt -S -analyze -enable-new-pm=0 -scalar-evolution < %s 2>&1 | FileCheck %s +; RUN: opt -S -disable-output "-passes=print" < %s 2>&1 2>&1 | FileCheck %s ; umin is represented using -1 * umax in scalar evolution. -1 is considered as the ; constant of the multiply expression (-1 * ((-1 + (-1 * %a)) umax (-1 + (-1 * %b)))). diff --git a/llvm/test/Analysis/ScalarEvolution/trunc-simplify.ll b/llvm/test/Analysis/ScalarEvolution/trunc-simplify.ll --- a/llvm/test/Analysis/ScalarEvolution/trunc-simplify.ll +++ b/llvm/test/Analysis/ScalarEvolution/trunc-simplify.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; Check that we convert ; trunc(C * a) -> trunc(C) * trunc(a) diff --git a/llvm/test/Analysis/ScalarEvolution/truncate.ll b/llvm/test/Analysis/ScalarEvolution/truncate.ll --- a/llvm/test/Analysis/ScalarEvolution/truncate.ll +++ b/llvm/test/Analysis/ScalarEvolution/truncate.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution 2>&1 | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution 2>&1 | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 2>&1 | FileCheck %s ; RUN: opt < %s -passes='print' -S 2>&1 | FileCheck %s ; Regression test for assert ScalarEvolution::getTruncateExpr. diff --git a/llvm/test/Analysis/ScalarEvolution/umin-umax-folds.ll b/llvm/test/Analysis/ScalarEvolution/umin-umax-folds.ll --- a/llvm/test/Analysis/ScalarEvolution/umin-umax-folds.ll +++ b/llvm/test/Analysis/ScalarEvolution/umin-umax-folds.ll @@ -1,5 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s define void @umin_sext_x_zext_x(i32 %len) { ; CHECK-LABEL: 'umin_sext_x_zext_x' diff --git a/llvm/test/Analysis/ScalarEvolution/undefined.ll b/llvm/test/Analysis/ScalarEvolution/undefined.ll --- a/llvm/test/Analysis/ScalarEvolution/undefined.ll +++ b/llvm/test/Analysis/ScalarEvolution/undefined.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s ; ScalarEvolution shouldn't attempt to interpret expressions which have ; undefined results. diff --git a/llvm/test/Analysis/ScalarEvolution/unknown_phis.ll b/llvm/test/Analysis/ScalarEvolution/unknown_phis.ll --- a/llvm/test/Analysis/ScalarEvolution/unknown_phis.ll +++ b/llvm/test/Analysis/ScalarEvolution/unknown_phis.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s define void @merge_values_with_ranges(i32 *%a_len_ptr, i32 *%b_len_ptr, i1 %unknown_cond) { diff --git a/llvm/test/Analysis/ScalarEvolution/unreachable-code.ll b/llvm/test/Analysis/ScalarEvolution/unreachable-code.ll --- a/llvm/test/Analysis/ScalarEvolution/unreachable-code.ll +++ b/llvm/test/Analysis/ScalarEvolution/unreachable-code.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; CHECK: %t = add i64 %t, 1 ; CHECK: --> undef diff --git a/llvm/test/Analysis/ScalarEvolution/unsimplified-loop.ll b/llvm/test/Analysis/ScalarEvolution/unsimplified-loop.ll --- a/llvm/test/Analysis/ScalarEvolution/unsimplified-loop.ll +++ b/llvm/test/Analysis/ScalarEvolution/unsimplified-loop.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s ; This loop has no preheader, multiple backedges, etc., but ScalarEvolution ; should still be able to analyze it. diff --git a/llvm/test/Analysis/ScalarEvolution/urem-0.ll b/llvm/test/Analysis/ScalarEvolution/urem-0.ll --- a/llvm/test/Analysis/ScalarEvolution/urem-0.ll +++ b/llvm/test/Analysis/ScalarEvolution/urem-0.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -scalar-evolution -analyze | FileCheck %s +; RUN: opt < %s -scalar-evolution -analyze -enable-new-pm=0 | FileCheck %s +; RUN: opt < %s "-passes=print" -disable-output 2>&1 | FileCheck %s define i8 @foo(i8 %a) { ; CHECK-LABEL: @foo diff --git a/llvm/test/Analysis/ScalarEvolution/widenable-condition.ll b/llvm/test/Analysis/ScalarEvolution/widenable-condition.ll --- a/llvm/test/Analysis/ScalarEvolution/widenable-condition.ll +++ b/llvm/test/Analysis/ScalarEvolution/widenable-condition.ll @@ -1,5 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py -; RUN: opt -analyze -scalar-evolution < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" < %s 2>&1 | FileCheck %s ; The semanics of this example are a bit subtle. The loop is required ; execute some number of times up to 1999. The compiler is free to reduce diff --git a/llvm/test/Analysis/ScalarEvolution/zext-divrem.ll b/llvm/test/Analysis/ScalarEvolution/zext-divrem.ll --- a/llvm/test/Analysis/ScalarEvolution/zext-divrem.ll +++ b/llvm/test/Analysis/ScalarEvolution/zext-divrem.ll @@ -1,4 +1,5 @@ -; RUN: opt -analyze -scalar-evolution -S < %s | FileCheck %s +; RUN: opt -analyze -enable-new-pm=0 -scalar-evolution -S < %s | FileCheck %s +; RUN: opt -disable-output "-passes=print" -S < %s 2>&1 | FileCheck %s define i64 @test1(i32 %a, i32 %b) { ; CHECK-LABEL: @test1 diff --git a/llvm/test/Analysis/ScalarEvolution/zext-mul.ll b/llvm/test/Analysis/ScalarEvolution/zext-mul.ll --- a/llvm/test/Analysis/ScalarEvolution/zext-mul.ll +++ b/llvm/test/Analysis/ScalarEvolution/zext-mul.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; Check that we convert ; zext((a * b)) diff --git a/llvm/test/Analysis/ScalarEvolution/zext-wrap.ll b/llvm/test/Analysis/ScalarEvolution/zext-wrap.ll --- a/llvm/test/Analysis/ScalarEvolution/zext-wrap.ll +++ b/llvm/test/Analysis/ScalarEvolution/zext-wrap.ll @@ -1,4 +1,5 @@ -; RUN: opt < %s -analyze -scalar-evolution | FileCheck %s +; RUN: opt < %s -analyze -enable-new-pm=0 -scalar-evolution | FileCheck %s +; RUN: opt < %s -disable-output "-passes=print" 2>&1 | FileCheck %s ; PR4569 define i16 @main() nounwind {