[test] Remove legacy PM tests in llvm/test/Other

Differential Revision: https://reviews.llvm.org/D109180

1 files changed, 40 insertions, 58 deletions

diff --git a/llvm/test/Other/time-passes.ll b/llvm/test/Other/time-passes.ll
index 8032ce5fd50d..852c583fddfc 100644
--- a/llvm/test/Other/time-passes.ll
+++ b/llvm/test/Other/time-passes.ll
@@ -1,75 +1,57 @@
-; RUN: opt -enable-new-pm=0 < %s -disable-output -instcombine -instcombine -licm -time-passes 2>&1 | FileCheck %s --check-prefix=TIME --check-prefix=TIME-LEGACY
-; RUN: opt -enable-new-pm=0 < %s -disable-output -instcombine -instcombine -licm -licm -time-passes 2>&1 | FileCheck %s --check-prefix=TIME --check-prefix=TIME-LEGACY --check-prefix=TIME-DOUBLE-LICM-LEGACY
 ; RUN: opt < %s -disable-output -passes='default<O2>' -time-passes 2>&1 | FileCheck %s --check-prefix=TIME
 ;
 ; For new pass manager, check that -time-passes-per-run emit one report for each pass run.
-; RUN: opt < %s -disable-output -passes='instcombine,instcombine,loop-mssa(licm)' -time-passes-per-run 2>&1 | FileCheck %s --check-prefix=TIME --check-prefix=TIME-NEW
-; RUN: opt < %s -disable-output -passes='instcombine,loop-mssa(licm),instcombine,loop-mssa(licm)' -time-passes-per-run 2>&1 | FileCheck %s --check-prefix=TIME --check-prefix=TIME-NEW -check-prefix=TIME-DOUBLE-LICM-NEW
+; RUN: opt < %s -disable-output -passes='instcombine,instcombine,loop-mssa(licm)' -time-passes-per-run 2>&1 | FileCheck %s --check-prefix=TIME --check-prefix=TIME-PER-RUN
+; RUN: opt < %s -disable-output -passes='instcombine,loop-mssa(licm),instcombine,loop-mssa(licm)' -time-passes-per-run 2>&1 | FileCheck %s --check-prefix=TIME --check-prefix=TIME-PER-RUN -check-prefix=TIME-DOUBLE-LICM
 ;
 ; For new pass manager, check that -time-passes emit one report for each pass.
-; RUN: opt < %s -disable-output -passes='instcombine,instcombine,loop-mssa(licm)' -time-passes 2>&1 | FileCheck %s --check-prefixes=TIME,TIME-NEW-PER-PASS
-; RUN: opt < %s -disable-output -passes='instcombine,loop-mssa(licm),instcombine,loop-mssa(licm)' -time-passes 2>&1 | FileCheck %s --check-prefixes=TIME,TIME-NEW-PER-PASS
+; RUN: opt < %s -disable-output -passes='instcombine,instcombine,loop-mssa(licm)' -time-passes 2>&1 | FileCheck %s --check-prefixes=TIME,TIME-PER-PASS
+; RUN: opt < %s -disable-output -passes='instcombine,loop-mssa(licm),instcombine,loop-mssa(licm)' -time-passes 2>&1 | FileCheck %s --check-prefixes=TIME,TIME-PER-PASS
 ;
-; The following 4 test runs verify -info-output-file interaction (default goes to stderr, '-' goes to stdout).
-; RUN: opt -enable-new-pm=0 < %s -disable-output -O2 -time-passes -info-output-file='-' 2>/dev/null | FileCheck %s --check-prefix=TIME
+; The following 2 test runs verify -info-output-file interaction (default goes to stderr, '-' goes to stdout).
 ; RUN: opt < %s -disable-output -passes='default<O2>' -time-passes -info-output-file='-' 2>/dev/null | FileCheck %s --check-prefix=TIME
 ;
-; RUN: rm -f %t; opt < %s -disable-output -O2 -time-passes -info-output-file=%t
-; RUN:   cat %t | FileCheck %s --check-prefix=TIME
-;
 ; RUN: rm -f %t; opt < %s -disable-output -passes='default<O2>' -time-passes -info-output-file=%t
 ; RUN:   cat %t | FileCheck %s --check-prefix=TIME
 ;
 ; TIME: Pass execution timing report
 ; TIME: Total Execution Time:
 ; TIME: Name
-; TIME-LEGACY-DAG:   Combine redundant instructions{{$}}
-; TIME-LEGACY-DAG:   Combine redundant instructions #2
-; TIME-LEGACY-DAG:   Loop Invariant Code Motion{{$}}
-; TIME-DOUBLE-LICM-LEGACY-DAG: Loop Invariant Code Motion #2
-; TIME-LEGACY-DAG:   Scalar Evolution Analysis
-; TIME-LEGACY-DAG:   Loop-Closed SSA Form Pass
-; TIME-LEGACY-DAG:   LCSSA Verifier
-; TIME-LEGACY-DAG:   Canonicalize natural loops
-; TIME-LEGACY-DAG:   Natural Loop Information
-; TIME-LEGACY-DAG:   Dominator Tree Construction
-; TIME-LEGACY-DAG:   Module Verifier
-; TIME-LEGACY-DAG:   Target Library Information
-; TIME-NEW-DAG:      InstCombinePass #1
-; TIME-NEW-DAG:      InstCombinePass #2
-; TIME-NEW-DAG:      InstCombinePass #3
-; TIME-NEW-DAG:      InstCombinePass #4
-; TIME-NEW-DAG:      LICMPass #1
-; TIME-NEW-DAG:      LICMPass #2
-; TIME-NEW-DAG:      LICMPass #3
-; TIME-DOUBLE-LICM-NEW-DAG:      LICMPass #4
-; TIME-DOUBLE-LICM-NEW-DAG:      LICMPass #5
-; TIME-DOUBLE-LICM-NEW-DAG:      LICMPass #6
-; TIME-NEW-DAG:      LCSSAPass
-; TIME-NEW-DAG:      LoopSimplifyPass
-; TIME-NEW-DAG:      ScalarEvolutionAnalysis
-; TIME-NEW-DAG:      LoopAnalysis
-; TIME-NEW-DAG:      VerifierPass
-; TIME-NEW-DAG:      DominatorTreeAnalysis
-; TIME-NEW-DAG:      TargetLibraryAnalysis
-; TIME-NEW-PER-PASS-DAG:   InstCombinePass
-; TIME-NEW-PER-PASS-DAG:   LICMPass
-; TIME-NEW-PER-PASS-DAG:   LCSSAPass
-; TIME-NEW-PER-PASS-DAG:   LoopSimplifyPass
-; TIME-NEW-PER-PASS-DAG:   ScalarEvolutionAnalysis
-; TIME-NEW-PER-PASS-DAG:   LoopAnalysis
-; TIME-NEW-PER-PASS-DAG:   VerifierPass
-; TIME-NEW-PER-PASS-DAG:   DominatorTreeAnalysis
-; TIME-NEW-PER-PASS-DAG:   TargetLibraryAnalysis
-; TIME-NEW-PER-PASS-NOT:   InstCombinePass #
-; TIME-NEW-PER-PASS-NOT:   LICMPass #
-; TIME-NEW-PER-PASS-NOT:   LCSSAPass #
-; TIME-NEW-PER-PASS-NOT:   LoopSimplifyPass #
-; TIME-NEW-PER-PASS-NOT:   ScalarEvolutionAnalysis #
-; TIME-NEW-PER-PASS-NOT:   LoopAnalysis #
-; TIME-NEW-PER-PASS-NOT:   VerifierPass #
-; TIME-NEW-PER-PASS-NOT:   DominatorTreeAnalysis #
-; TIME-NEW-PER-PASS-NOT:   TargetLibraryAnalysis #
+; TIME-PER-RUN-DAG:      InstCombinePass #1
+; TIME-PER-RUN-DAG:      InstCombinePass #2
+; TIME-PER-RUN-DAG:      InstCombinePass #3
+; TIME-PER-RUN-DAG:      InstCombinePass #4
+; TIME-PER-RUN-DAG:      LICMPass #1
+; TIME-PER-RUN-DAG:      LICMPass #2
+; TIME-PER-RUN-DAG:      LICMPass #3
+; TIME-DOUBLE-LICM-DAG:      LICMPass #4
+; TIME-DOUBLE-LICM-DAG:      LICMPass #5
+; TIME-DOUBLE-LICM-DAG:      LICMPass #6
+; TIME-PER_RUN-DAG:      LCSSAPass
+; TIME-PER_RUN-DAG:      LoopSimplifyPass
+; TIME-PER_RUN-DAG:      ScalarEvolutionAnalysis
+; TIME-PER_RUN-DAG:      LoopAnalysis
+; TIME-PER_RUN-DAG:      VerifierPass
+; TIME-PER_RUN-DAG:      DominatorTreeAnalysis
+; TIME-PER_RUN-DAG:      TargetLibraryAnalysis
+; TIME-PER-PASS-DAG:   InstCombinePass
+; TIME-PER-PASS-DAG:   LICMPass
+; TIME-PER-PASS-DAG:   LCSSAPass
+; TIME-PER-PASS-DAG:   LoopSimplifyPass
+; TIME-PER-PASS-DAG:   ScalarEvolutionAnalysis
+; TIME-PER-PASS-DAG:   LoopAnalysis
+; TIME-PER-PASS-DAG:   VerifierPass
+; TIME-PER-PASS-DAG:   DominatorTreeAnalysis
+; TIME-PER-PASS-DAG:   TargetLibraryAnalysis
+; TIME-PER-PASS-NOT:   InstCombinePass #
+; TIME-PER-PASS-NOT:   LICMPass #
+; TIME-PER-PASS-NOT:   LCSSAPass #
+; TIME-PER-PASS-NOT:   LoopSimplifyPass #
+; TIME-PER-PASS-NOT:   ScalarEvolutionAnalysis #
+; TIME-PER-PASS-NOT:   LoopAnalysis #
+; TIME-PER-PASS-NOT:   VerifierPass #
+; TIME-PER-PASS-NOT:   DominatorTreeAnalysis #
+; TIME-PER-PASS-NOT:   TargetLibraryAnalysis #
 ; TIME: Total{{$}}
 
 define i32 @foo() {