From 2b34d59858d6fd12b9bab4ac0868998c940e43f6 Mon Sep 17 00:00:00 2001 From: Arthur Eubanks Date: Tue, 21 Mar 2023 10:25:04 -0700 Subject: [PATCH] [test] Change DAG to NEXT in pipeline tests These were made consistent in 951a980dc7aa6. --- llvm/test/Other/new-pm-thinlto-postlink-pgo-defaults.ll | 7 ++----- .../Other/new-pm-thinlto-postlink-samplepgo-defaults.ll | 8 ++------ llvm/test/Other/new-pm-thinlto-prelink-pgo-defaults.ll | 17 +++++++---------- .../Other/new-pm-thinlto-prelink-samplepgo-defaults.ll | 6 ++---- 4 files changed, 13 insertions(+), 25 deletions(-) diff --git a/llvm/test/Other/new-pm-thinlto-postlink-pgo-defaults.ll b/llvm/test/Other/new-pm-thinlto-postlink-pgo-defaults.ll index c1e2fd2..36ce293 100644 --- a/llvm/test/Other/new-pm-thinlto-postlink-pgo-defaults.ll +++ b/llvm/test/Other/new-pm-thinlto-postlink-pgo-defaults.ll @@ -56,11 +56,8 @@ ; CHECK-O-NEXT: Running analysis: TypeBasedAA ; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy ; CHECK-O-NEXT: Running analysis: BlockFrequencyAnalysis on foo -; These next two can appear in any order since they are accessed as parameters -; on the same call to BlockFrequencyInfo::calculate. -; CHECK-OSZ-DAG: Running analysis: LoopAnalysis on foo -; CHECK-OSZ-DAG: Running analysis: BranchProbabilityAnalysis on foo -; CHECK-O123-NEXT: Running analysis: BranchProbabilityAnalysis on foo +; CHECK-O-NEXT: Running analysis: BranchProbabilityAnalysis on foo +; CHECK-OSZ-NEXT: Running analysis: LoopAnalysis on foo ; CHECK-O-NEXT: Running analysis: PostDominatorTreeAnalysis on foo ; CHECK-O-NEXT: Running pass: SimplifyCFGPass ; CHECK-O-NEXT: Running pass: ModuleInlinerWrapperPass diff --git a/llvm/test/Other/new-pm-thinlto-postlink-samplepgo-defaults.ll b/llvm/test/Other/new-pm-thinlto-postlink-samplepgo-defaults.ll index a65af44..746c4b6 100644 --- a/llvm/test/Other/new-pm-thinlto-postlink-samplepgo-defaults.ll +++ b/llvm/test/Other/new-pm-thinlto-postlink-samplepgo-defaults.ll @@ -64,14 +64,10 @@ ; CHECK-O-NEXT: Running analysis: TypeBasedAA ; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy ; CHECK-O-NEXT: Running analysis: BlockFrequencyAnalysis on foo -; These next two can appear in any order since they are accessed as parameters -; on the same call to BlockFrequencyInfo::calculate. -; CHECK-OSZ-DAG: Running analysis: LoopAnalysis on foo -; CHECK-OSZ-DAG: Running analysis: BranchProbabilityAnalysis on foo -; CHECK-O123-NEXT: Running analysis: BranchProbabilityAnalysis on foo +; CHECK-O-NEXT: Running analysis: BranchProbabilityAnalysis on foo +; CHECK-OSZ-NEXT: Running analysis: LoopAnalysis on foo ; CHECK-O-NEXT: Running analysis: PostDominatorTreeAnalysis on foo ; CHECK-O-NEXT: Running pass: SimplifyCFGPass on foo - ; CHECK-O-NEXT: Running pass: ModuleInlinerWrapperPass ; CHECK-O-NEXT: Running analysis: InlineAdvisorAnalysis ; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}GlobalsAA diff --git a/llvm/test/Other/new-pm-thinlto-prelink-pgo-defaults.ll b/llvm/test/Other/new-pm-thinlto-prelink-pgo-defaults.ll index 7f35a6d..fdaee98 100644 --- a/llvm/test/Other/new-pm-thinlto-prelink-pgo-defaults.ll +++ b/llvm/test/Other/new-pm-thinlto-prelink-pgo-defaults.ll @@ -71,11 +71,10 @@ ; CHECK-O-NEXT: Invalidating analysis: InlineAdvisorAnalysis ; CHECK-O-NEXT: Running pass: GlobalDCEPass ; CHECK-O-NEXT: Running pass: PGOInstrumentationUse -; These next two can appear in any order since they are accessed as parameters -; on the same call to BlockFrequencyInfo::calculate. -; CHECK-O-DAG: Running analysis: BranchProbabilityAnalysis on foo -; CHECK-O-DAG: Running analysis: PostDominatorTreeAnalysis on foo -; CHECK-O-DAG: Running analysis: LoopAnalysis on foo +; CHECK-O-NEXT: Running analysis: ProfileSummaryAnalysis +; CHECK-O-NEXT: Running analysis: BranchProbabilityAnalysis on foo +; CHECK-O-NEXT: Running analysis: LoopAnalysis on foo +; CHECK-O-NEXT: Running analysis: PostDominatorTreeAnalysis on foo ; CHECK-O-NEXT: Running analysis: BlockFrequencyAnalysis on foo ; CHECK-O-NEXT: Invalidating analysis: InnerAnalysisManagerProxy ; CHECK-O-NEXT: Invalidating analysis: LazyCallGraphAnalysis on @@ -122,11 +121,9 @@ ; CHECK-O-NEXT: Running pass: SimplifyCFGPass ; CHECK-O-NEXT: Running pass: InstCombinePass ; CHECK-O-NEXT: Running analysis: BlockFrequencyAnalysis on foo -; These next two can appear in any order since they are accessed as parameters -; on the same call to BlockFrequencyInfo::calculate. -; CHECK-O-DAG: Running analysis: LoopAnalysis on foo -; CHECK-O-DAG: Running analysis: BranchProbabilityAnalysis on foo -; CHECK-O-DAG: Running analysis: PostDominatorTreeAnalysis on foo +; CHECK-O-NEXT: Running analysis: BranchProbabilityAnalysis on foo +; CHECK-O-NEXT: Running analysis: LoopAnalysis on foo +; CHECK-O-NEXT: Running analysis: PostDominatorTreeAnalysis on foo ; CHECK-O3-NEXT: Running pass: AggressiveInstCombinePass ; CHECK-O23SZ-NEXT: Running pass: ConstraintEliminationPass ; CHECK-O1-NEXT: Running pass: LibCallsShrinkWrapPass diff --git a/llvm/test/Other/new-pm-thinlto-prelink-samplepgo-defaults.ll b/llvm/test/Other/new-pm-thinlto-prelink-samplepgo-defaults.ll index de3643b..b187bbc 100644 --- a/llvm/test/Other/new-pm-thinlto-prelink-samplepgo-defaults.ll +++ b/llvm/test/Other/new-pm-thinlto-prelink-samplepgo-defaults.ll @@ -59,10 +59,8 @@ ; CHECK-O-NEXT: Running analysis: TypeBasedAA ; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy ; CHECK-O-NEXT: Running analysis: BlockFrequencyAnalysis on foo -; These next two can appear in any order since they are accessed as parameters -; on the same call to BlockFrequencyInfo::calculate. -; CHECK-O-DAG: Running analysis: LoopAnalysis on foo -; CHECK-O-DAG: Running analysis: BranchProbabilityAnalysis on foo +; CHECK-O-NEXT: Running analysis: BranchProbabilityAnalysis on foo +; CHECK-O-NEXT: Running analysis: LoopAnalysis on foo ; CHECK-O-NEXT: Running analysis: PostDominatorTreeAnalysis on foo ; CHECK-O-NEXT: Running pass: SimplifyCFGPass on foo ; CHECK-O-NEXT: Running pass: ModuleInlinerWrapperPass -- 2.7.4