diff --git a/llvm/test/Transforms/IndVarSimplify/loop_evaluate_2.ll b/llvm/test/Transforms/IndVarSimplify/loop_evaluate_2.ll index 9dbb69f38ab64..616052aa0a68e 100644 --- a/llvm/test/Transforms/IndVarSimplify/loop_evaluate_2.ll +++ b/llvm/test/Transforms/IndVarSimplify/loop_evaluate_2.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -indvars -loop-deletion -simplifycfg -simplifycfg-require-and-preserve-domtree=1 | opt -analyze -loops -enable-new-pm=0 | FileCheck %s +; RUN: opt < %s -passes='loop(loop-deletion),simplifycfg' -simplifycfg-require-and-preserve-domtree=1 | opt -passes='print' -disable-output 2>&1 | FileCheck %s ; PR1179 ; CHECK-NOT: Loop Containing diff --git a/llvm/test/Transforms/IndVarSimplify/shrunk-constant.ll b/llvm/test/Transforms/IndVarSimplify/shrunk-constant.ll index cd8720cb4b38b..baa30134ff7ea 100644 --- a/llvm/test/Transforms/IndVarSimplify/shrunk-constant.ll +++ b/llvm/test/Transforms/IndVarSimplify/shrunk-constant.ll @@ -1,4 +1,3 @@ -; RUN: opt < %s -scalar-evolution -analyze -enable-new-pm=0 | FileCheck %s ; RUN: opt < %s -passes='print' 2>&1 | FileCheck %s ; CHECK: --> (1 + (zext i4 {-8,+,-8}<%loop> to i32)) diff --git a/llvm/test/Transforms/InstCombine/infinite-loop-postdom.ll b/llvm/test/Transforms/InstCombine/infinite-loop-postdom.ll index 006936f2c24e4..07175f052f40b 100644 --- a/llvm/test/Transforms/InstCombine/infinite-loop-postdom.ll +++ b/llvm/test/Transforms/InstCombine/infinite-loop-postdom.ll @@ -1,5 +1,4 @@ -; RUN: opt < %s -disable-output -branch-prob -instcombine -block-freq -verify-dom-info -; RUN: opt < %s -postdomtree -analyze -enable-new-pm=0 | FileCheck --check-prefixes=CHECK-POSTDOM %s +; RUN: opt < %s -disable-output -instcombine -verify-dom-info ; RUN: opt < %s -passes='print' 2>&1 | FileCheck --check-prefixes=CHECK-POSTDOM %s ; Demonstrate that Predicate Canonicalization (InstCombine) does not invalidate PostDomTree diff --git a/llvm/test/Transforms/LICM/update-scev.ll b/llvm/test/Transforms/LICM/update-scev.ll index 0f54f191eec14..d9ee51cd0b5e6 100644 --- a/llvm/test/Transforms/LICM/update-scev.ll +++ b/llvm/test/Transforms/LICM/update-scev.ll @@ -1,5 +1,4 @@ -; RUN: opt -S -licm < %s | FileCheck %s --check-prefix=IR-AFTER-TRANSFORM -; RUN: opt -analyze -scalar-evolution -licm -scalar-evolution -enable-new-pm=0 < %s | FileCheck %s --check-prefix=SCEV-EXPRS +; RUN: opt -S -passes=licm < %s | FileCheck %s --check-prefix=IR-AFTER-TRANSFORM ; RUN: opt -passes='print,loop-mssa(licm),print' -disable-output < %s 2>&1 | FileCheck %s --check-prefix=SCEV-EXPRS declare void @clobber() diff --git a/llvm/test/Transforms/LoopDeletion/2017-07-11-incremental-dt.ll b/llvm/test/Transforms/LoopDeletion/2017-07-11-incremental-dt.ll index ad8b8b4c6c483..6c54a2a2ce17a 100644 --- a/llvm/test/Transforms/LoopDeletion/2017-07-11-incremental-dt.ll +++ b/llvm/test/Transforms/LoopDeletion/2017-07-11-incremental-dt.ll @@ -1,7 +1,4 @@ -; RUN: opt < %s -loop-deletion -S -; RUN: opt < %s -loop-deletion -analyze -domtree 2>&1 -enable-new-pm=0 | FileCheck -check-prefix=DT %s -; RUN: opt < %s -passes='loop(loop-deletion),print' 2>&1 | FileCheck -check-prefix=DT %s -; RUN: opt < %s -loop-deletion -verify-dom-info +; RUN: opt < %s -passes='loop(loop-deletion),print' -verify-dom-info 2>&1 | FileCheck -check-prefix=DT %s ; CHECK: for.body ; CHECK-NOT: for.cond1 diff --git a/llvm/test/Transforms/LoopDeletion/update-scev.ll b/llvm/test/Transforms/LoopDeletion/update-scev.ll index a6107b5270858..56cc263ba1fbd 100644 --- a/llvm/test/Transforms/LoopDeletion/update-scev.ll +++ b/llvm/test/Transforms/LoopDeletion/update-scev.ll @@ -1,7 +1,5 @@ -; RUN: opt -S -analyze -scalar-evolution -loop-deletion -scalar-evolution -verify-scev < %s -enable-new-pm=0 | FileCheck %s --check-prefix=SCEV-EXPRS ; RUN: opt -S -passes='print,loop-deletion,print' -verify-scev < %s 2>&1 | FileCheck %s --check-prefix=SCEV-EXPRS -; RUN: opt -S -loop-deletion < %s | FileCheck %s --check-prefix=IR-AFTER-TRANSFORM -; RUN: opt -S -indvars -loop-deletion -indvars < %s | FileCheck %s --check-prefix=ORIGINAL-CRASH +; RUN: opt -S -passes=loop-deletion < %s | FileCheck %s --check-prefix=IR-AFTER-TRANSFORM ; Checking for a crash. Loop-deletion would change the loop ; disposition of an instruction, but not update SCEV. @@ -11,7 +9,6 @@ target triple = "x86_64-apple-macosx10.11.0" define void @pr27570() { ; IR-AFTER-TRANSFORM-LABEL: @pr27570( -; ORIGINAL-CRASH: @pr27570( entry: br label %for.cond diff --git a/llvm/test/Transforms/LoopDistribute/basic-with-memchecks.ll b/llvm/test/Transforms/LoopDistribute/basic-with-memchecks.ll index 50f2143a494e3..35a0f75808d2d 100644 --- a/llvm/test/Transforms/LoopDistribute/basic-with-memchecks.ll +++ b/llvm/test/Transforms/LoopDistribute/basic-with-memchecks.ll @@ -1,16 +1,12 @@ -; RUN: opt -basic-aa -loop-distribute -enable-loop-distribute -verify-loop-info -verify-dom-info -S \ +; RUN: opt -aa-pipeline=basic-aa -passes=loop-distribute -enable-loop-distribute -verify-loop-info -verify-dom-info -S \ ; RUN: < %s | FileCheck %s -; RUN: opt -basic-aa -loop-distribute -enable-loop-distribute -loop-vectorize -force-vector-width=4 \ +; RUN: opt -aa-pipeline=basic-aa -passes='loop-distribute,loop-vectorize' -enable-loop-distribute -force-vector-width=4 \ ; RUN: -verify-loop-info -verify-dom-info -S < %s | \ ; RUN: FileCheck --check-prefix=VECTORIZE %s -; RUN: opt -basic-aa -loop-distribute -enable-loop-distribute -verify-loop-info -verify-dom-info \ -; RUN: -loop-accesses -analyze < %s -enable-new-pm=0 | FileCheck %s --check-prefix=ANALYSIS - -; TODO: the following changes the order loop-access printing prints loops, remove legacy RUN and change after NPM switch -; TODO: opt -aa-pipeline=basic-aa -passes='loop-distribute,print-access-info' -enable-loop-distribute \ -; TODO: -verify-loop-info -verify-dom-info -disable-output < %s 2>&1 | FileCheck %s --check-prefix=ANALYSIS +; RUN: opt -aa-pipeline=basic-aa -passes='loop-distribute,print-access-info' -enable-loop-distribute \ +; RUN: -verify-loop-info -verify-dom-info -disable-output < %s 2>&1 | FileCheck %s --check-prefix=ANALYSIS ; The memcheck version of basic.ll. We should distribute and vectorize the ; second part of this loop with 5 memchecks (A+1 x {C, D, E} + C x {A, B}) diff --git a/llvm/test/Transforms/LoopDistribute/basic.ll b/llvm/test/Transforms/LoopDistribute/basic.ll index 85795eed155d7..36c9d844ffc00 100644 --- a/llvm/test/Transforms/LoopDistribute/basic.ll +++ b/llvm/test/Transforms/LoopDistribute/basic.ll @@ -1,14 +1,10 @@ -; RUN: opt -basic-aa -loop-distribute -enable-loop-distribute -verify-loop-info -verify-dom-info -S \ +; RUN: opt -aa-pipeline=basic-aa -passes=loop-distribute -enable-loop-distribute -verify-loop-info -verify-dom-info -S \ ; RUN: < %s | FileCheck %s -; RUN: opt -basic-aa -loop-distribute -enable-loop-distribute -verify-loop-info -verify-dom-info \ -; RUN: -loop-accesses -analyze < %s -enable-new-pm=0 | FileCheck %s --check-prefix=ANALYSIS +; RUN: opt -aa-pipeline=basic-aa -passes='loop-distribute,loop(print-access-info)' -enable-loop-distribute \ +; RUN: -verify-loop-info -verify-dom-info -disable-output < %s 2>&1 | FileCheck %s --check-prefix=ANALYSIS -; TODO: the following changes the order loop-access printing prints loops, remove legacy RUN and change after NPM switch -; TODO: opt -aa-pipeline=basic-aa -passes='loop-distribute,print-access-info' -enable-loop-distribute \ -; TODO: -verify-loop-info -verify-dom-info -disable-output < %s 2>&1 | FileCheck %s --check-prefix=ANALYSIS - -; RUN: opt -basic-aa -loop-distribute -enable-loop-distribute -loop-vectorize -force-vector-width=4 -S \ +; RUN: opt -aa-pipeline=basic-aa -passes=loop-distribute,loop-vectorize -enable-loop-distribute -force-vector-width=4 -S \ ; RUN: < %s | FileCheck %s --check-prefix=VECTORIZE ; We should distribute this loop into a safe (2nd statement) and unsafe loop @@ -46,10 +42,10 @@ entry: ; CHECK: for.end: -; ANALYSIS: for.body: -; ANALYSIS-NEXT: Memory dependences are safe{{$}} ; ANALYSIS: for.body.ldist1: ; ANALYSIS-NEXT: Report: unsafe dependent memory operations in loop +; ANALYSIS: for.body: +; ANALYSIS-NEXT: Memory dependences are safe{{$}} ; VECTORIZE: mul <4 x i32> @@ -116,11 +112,11 @@ entry: ; CHECK: for.end: +; ANALYSIS: for.body.ldist1: +; ANALYSIS-NEXT: Report: unsafe dependent memory operations in loop ; ANALYSIS: for.body: ; ANALYSIS-NEXT: Has convergent operation in loop ; ANALYSIS-NEXT: Report: cannot add control dependency to convergent operation -; ANALYSIS: for.body.ldist1: -; ANALYSIS-NEXT: Report: unsafe dependent memory operations in loop ; convergent instruction happens to block vectorization ; VECTORIZE: call i32 @llvm.convergent diff --git a/llvm/test/Transforms/LoopSimplify/preserve-scev.ll b/llvm/test/Transforms/LoopSimplify/preserve-scev.ll index 275a54005a1f3..8aa4ce2e93bf5 100644 --- a/llvm/test/Transforms/LoopSimplify/preserve-scev.ll +++ b/llvm/test/Transforms/LoopSimplify/preserve-scev.ll @@ -1,4 +1,3 @@ -; RUN: opt -S < %s -analyze -scalar-evolution -loop-simplify -scalar-evolution -enable-new-pm=0 | FileCheck %s ; RUN: opt -S < %s -passes='print,loop-simplify,print' 2>&1 | FileCheck %s ; Provide legal integer types. diff --git a/llvm/test/Transforms/PhaseOrdering/scev-custom-dl.ll b/llvm/test/Transforms/PhaseOrdering/scev-custom-dl.ll index 07aca83eecdf6..3b8393f10b594 100644 --- a/llvm/test/Transforms/PhaseOrdering/scev-custom-dl.ll +++ b/llvm/test/Transforms/PhaseOrdering/scev-custom-dl.ll @@ -1,4 +1,3 @@ -; RUN: opt -O3 -S -analyze -scalar-evolution < %s -enable-new-pm=0 | FileCheck %s ; RUN: opt -passes='default,print' -S < %s 2>&1 | FileCheck %s target datalayout = "e-m:m-p:40:64:64:32-i32:32-i16:16-i8:8-n32" diff --git a/llvm/test/Transforms/PhaseOrdering/scev.ll b/llvm/test/Transforms/PhaseOrdering/scev.ll index 683b989d938f4..3a789cff7f4ca 100644 --- a/llvm/test/Transforms/PhaseOrdering/scev.ll +++ b/llvm/test/Transforms/PhaseOrdering/scev.ll @@ -1,4 +1,3 @@ -; RUN: opt -O3 -S -analyze -scalar-evolution < %s -enable-new-pm=0 | FileCheck %s ; RUN: opt -passes='default,print' -S < %s 2>&1 | FileCheck %s ; ; This file contains phase ordering tests for scalar evolution. diff --git a/llvm/test/Transforms/SampleProfile/branch.ll b/llvm/test/Transforms/SampleProfile/branch.ll index dcf61588d54bd..a65e3bb04ab57 100644 --- a/llvm/test/Transforms/SampleProfile/branch.ll +++ b/llvm/test/Transforms/SampleProfile/branch.ll @@ -1,4 +1,3 @@ -; RUN: opt < %s -sample-profile -sample-profile-file=%S/Inputs/branch.prof | opt -analyze -branch-prob -enable-new-pm=0 | FileCheck %s ; RUN: opt < %s -passes=sample-profile -sample-profile-file=%S/Inputs/branch.prof | opt -passes='print' -disable-output 2>&1 | FileCheck %s ; RUN: opt < %s -passes=sample-profile -sample-profile-file=%S/Inputs/branch.prof -overwrite-existing-weights=1 | opt -passes='print' -disable-output 2>&1 | FileCheck %s --check-prefix=OVW diff --git a/llvm/test/Transforms/SampleProfile/calls.ll b/llvm/test/Transforms/SampleProfile/calls.ll index ecd188fcaf0e2..db61b72c1d2b3 100644 --- a/llvm/test/Transforms/SampleProfile/calls.ll +++ b/llvm/test/Transforms/SampleProfile/calls.ll @@ -1,4 +1,3 @@ -; RUN: opt < %s -instcombine -sample-profile -sample-profile-file=%S/Inputs/calls.prof | opt -analyze -branch-prob -enable-new-pm=0 | FileCheck %s ; RUN: opt < %s -passes="function(instcombine),sample-profile" -sample-profile-file=%S/Inputs/calls.prof | opt -passes='print' -disable-output 2>&1 | FileCheck %s ; Original C++ test case diff --git a/llvm/test/Transforms/SampleProfile/discriminator.ll b/llvm/test/Transforms/SampleProfile/discriminator.ll index 7e2d23ef018cf..b644d9ae45da7 100644 --- a/llvm/test/Transforms/SampleProfile/discriminator.ll +++ b/llvm/test/Transforms/SampleProfile/discriminator.ll @@ -1,4 +1,3 @@ -; RUN: opt < %s -sample-profile -sample-profile-file=%S/Inputs/discriminator.prof | opt -analyze -branch-prob -enable-new-pm=0 | FileCheck %s ; RUN: opt < %s -passes=sample-profile -sample-profile-file=%S/Inputs/discriminator.prof | opt -passes='print' -disable-output 2>&1 | FileCheck %s ; Original code diff --git a/llvm/test/Transforms/SampleProfile/fnptr.ll b/llvm/test/Transforms/SampleProfile/fnptr.ll index 94925b4a91706..1b3a8527c1eb2 100644 --- a/llvm/test/Transforms/SampleProfile/fnptr.ll +++ b/llvm/test/Transforms/SampleProfile/fnptr.ll @@ -2,9 +2,6 @@ ; formats. This checks that we produce the same profile annotations regardless ; of the profile format. ; -; RUN: opt < %s -sample-profile -sample-profile-file=%S/Inputs/fnptr.prof | opt -analyze -branch-prob -enable-new-pm=0 | FileCheck %s -; RUN: opt < %s -sample-profile -sample-profile-file=%S/Inputs/fnptr.binprof | opt -analyze -branch-prob -enable-new-pm=0| FileCheck %s - ; RUN: opt < %s -passes=sample-profile -sample-profile-file=%S/Inputs/fnptr.prof | opt -passes='print' -disable-output 2>&1 | FileCheck %s ; RUN: opt < %s -passes=sample-profile -sample-profile-file=%S/Inputs/fnptr.binprof | opt -passes='print' -disable-output 2>&1 | FileCheck %s diff --git a/llvm/test/Transforms/SampleProfile/fsafdo_test.ll b/llvm/test/Transforms/SampleProfile/fsafdo_test.ll index eb836f7dd62c7..19d78ecd98d84 100644 --- a/llvm/test/Transforms/SampleProfile/fsafdo_test.ll +++ b/llvm/test/Transforms/SampleProfile/fsafdo_test.ll @@ -1,5 +1,5 @@ -; RUN: opt < %s -sample-profile -sample-profile-file=%S/Inputs/fsafdo.extbinary.afdo | opt -analyze -branch-prob -enable-new-pm=0 | FileCheck %s -; RUN: opt < %s -sample-profile -profile-isfs -sample-profile-file=%S/Inputs/fsafdo.prof | opt -analyze -branch-prob -enable-new-pm=0 | FileCheck %s +; RUN: opt < %s -passes=sample-profile -sample-profile-file=%S/Inputs/fsafdo.extbinary.afdo | opt -passes='print' -disable-output 2>&1 | FileCheck %s +; RUN: opt < %s -passes=sample-profile -profile-isfs -sample-profile-file=%S/Inputs/fsafdo.prof | opt -passes='print' -disable-output 2>&1 | FileCheck %s target triple = "x86_64-unknown-linux-gnu" diff --git a/llvm/test/Transforms/SampleProfile/offset.ll b/llvm/test/Transforms/SampleProfile/offset.ll index b537b24360977..1a8b8973ecf1a 100644 --- a/llvm/test/Transforms/SampleProfile/offset.ll +++ b/llvm/test/Transforms/SampleProfile/offset.ll @@ -1,4 +1,3 @@ -; RUN: opt < %s -sample-profile -sample-profile-file=%S/Inputs/offset.prof | opt -analyze -branch-prob -enable-new-pm=0 | FileCheck %s ; RUN: opt < %s -passes=sample-profile -sample-profile-file=%S/Inputs/offset.prof | opt -passes='print' -disable-output 2>&1 | FileCheck %s ; Original C++ code for this test case: diff --git a/llvm/test/Transforms/SampleProfile/profile-correlation-irreducible-loops.ll b/llvm/test/Transforms/SampleProfile/profile-correlation-irreducible-loops.ll index 3db1804e5b0cc..6f40a2b69170f 100644 --- a/llvm/test/Transforms/SampleProfile/profile-correlation-irreducible-loops.ll +++ b/llvm/test/Transforms/SampleProfile/profile-correlation-irreducible-loops.ll @@ -1,6 +1,6 @@ -; RUN: opt < %s -passes=sample-profile -sample-profile-file=%S/Inputs/profile-correlation-irreducible-loops.prof | opt -analyze -block-freq -enable-new-pm=0 -use-iterative-bfi-inference | FileCheck %s +; RUN: opt < %s -passes=sample-profile -sample-profile-file=%S/Inputs/profile-correlation-irreducible-loops.prof | opt -passes='print' -disable-output -use-iterative-bfi-inference 2>&1 | FileCheck %s ; RUN: opt < %s -passes=sample-profile -sample-profile-file=%S/Inputs/profile-correlation-irreducible-loops.prof -S | FileCheck %s --check-prefix=CHECK2 -; RUN: opt < %s -analyze -block-freq -enable-new-pm=0 -use-iterative-bfi-inference | FileCheck %s --check-prefix=CHECK3 +; RUN: opt < %s -passes='print' -use-iterative-bfi-inference -disable-output 2>&1 | FileCheck %s --check-prefix=CHECK3 ; The C++ code for this test case is from c-parse.c in 403.gcc (SPEC2006) ; The problem with BFI for the test is solved by applying iterative inference. diff --git a/llvm/test/Transforms/SampleProfile/propagate.ll b/llvm/test/Transforms/SampleProfile/propagate.ll index 74a6a700a8e5e..a24b9c106d6c4 100644 --- a/llvm/test/Transforms/SampleProfile/propagate.ll +++ b/llvm/test/Transforms/SampleProfile/propagate.ll @@ -1,4 +1,3 @@ -; RUN: opt < %s -sample-profile -sample-profile-file=%S/Inputs/propagate.prof | opt -analyze -branch-prob -enable-new-pm=0 | FileCheck %s ; RUN: opt < %s -passes=sample-profile -sample-profile-file=%S/Inputs/propagate.prof | opt -passes='print' -disable-output 2>&1 | FileCheck %s ; Original C++ code for this test case: diff --git a/llvm/test/Transforms/Util/PredicateInfo/ordering.ll b/llvm/test/Transforms/Util/PredicateInfo/ordering.ll index 519168a58b425..994ea49e1ba11 100644 --- a/llvm/test/Transforms/Util/PredicateInfo/ordering.ll +++ b/llvm/test/Transforms/Util/PredicateInfo/ordering.ll @@ -1,5 +1,5 @@ ; REQUIRES: assert -; RUN: opt -print-predicateinfo -analyze -debug < %s 2>&1 | FileCheck %s +; RUN: opt -passes=print-predicateinfo -debug < %s 2>&1 | FileCheck %s declare void @use(i32)