Skip to content

Commit 2b34d59

Browse files
committed
[test] Change DAG to NEXT in pipeline tests
These were made consistent in 951a980.
1 parent 3854963 commit 2b34d59

4 files changed

+13
-25
lines changed

llvm/test/Other/new-pm-thinlto-postlink-pgo-defaults.ll

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,8 @@
5656
; CHECK-O-NEXT: Running analysis: TypeBasedAA
5757
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy
5858
; CHECK-O-NEXT: Running analysis: BlockFrequencyAnalysis on foo
59-
; These next two can appear in any order since they are accessed as parameters
60-
; on the same call to BlockFrequencyInfo::calculate.
61-
; CHECK-OSZ-DAG: Running analysis: LoopAnalysis on foo
62-
; CHECK-OSZ-DAG: Running analysis: BranchProbabilityAnalysis on foo
63-
; CHECK-O123-NEXT: Running analysis: BranchProbabilityAnalysis on foo
59+
; CHECK-O-NEXT: Running analysis: BranchProbabilityAnalysis on foo
60+
; CHECK-OSZ-NEXT: Running analysis: LoopAnalysis on foo
6461
; CHECK-O-NEXT: Running analysis: PostDominatorTreeAnalysis on foo
6562
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
6663
; CHECK-O-NEXT: Running pass: ModuleInlinerWrapperPass

llvm/test/Other/new-pm-thinlto-postlink-samplepgo-defaults.ll

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,10 @@
6464
; CHECK-O-NEXT: Running analysis: TypeBasedAA
6565
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy
6666
; CHECK-O-NEXT: Running analysis: BlockFrequencyAnalysis on foo
67-
; These next two can appear in any order since they are accessed as parameters
68-
; on the same call to BlockFrequencyInfo::calculate.
69-
; CHECK-OSZ-DAG: Running analysis: LoopAnalysis on foo
70-
; CHECK-OSZ-DAG: Running analysis: BranchProbabilityAnalysis on foo
71-
; CHECK-O123-NEXT: Running analysis: BranchProbabilityAnalysis on foo
67+
; CHECK-O-NEXT: Running analysis: BranchProbabilityAnalysis on foo
68+
; CHECK-OSZ-NEXT: Running analysis: LoopAnalysis on foo
7269
; CHECK-O-NEXT: Running analysis: PostDominatorTreeAnalysis on foo
7370
; CHECK-O-NEXT: Running pass: SimplifyCFGPass on foo
74-
7571
; CHECK-O-NEXT: Running pass: ModuleInlinerWrapperPass
7672
; CHECK-O-NEXT: Running analysis: InlineAdvisorAnalysis
7773
; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}GlobalsAA

llvm/test/Other/new-pm-thinlto-prelink-pgo-defaults.ll

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,10 @@
7171
; CHECK-O-NEXT: Invalidating analysis: InlineAdvisorAnalysis
7272
; CHECK-O-NEXT: Running pass: GlobalDCEPass
7373
; CHECK-O-NEXT: Running pass: PGOInstrumentationUse
74-
; These next two can appear in any order since they are accessed as parameters
75-
; on the same call to BlockFrequencyInfo::calculate.
76-
; CHECK-O-DAG: Running analysis: BranchProbabilityAnalysis on foo
77-
; CHECK-O-DAG: Running analysis: PostDominatorTreeAnalysis on foo
78-
; CHECK-O-DAG: Running analysis: LoopAnalysis on foo
74+
; CHECK-O-NEXT: Running analysis: ProfileSummaryAnalysis
75+
; CHECK-O-NEXT: Running analysis: BranchProbabilityAnalysis on foo
76+
; CHECK-O-NEXT: Running analysis: LoopAnalysis on foo
77+
; CHECK-O-NEXT: Running analysis: PostDominatorTreeAnalysis on foo
7978
; CHECK-O-NEXT: Running analysis: BlockFrequencyAnalysis on foo
8079
; CHECK-O-NEXT: Invalidating analysis: InnerAnalysisManagerProxy
8180
; CHECK-O-NEXT: Invalidating analysis: LazyCallGraphAnalysis on
@@ -122,11 +121,9 @@
122121
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
123122
; CHECK-O-NEXT: Running pass: InstCombinePass
124123
; CHECK-O-NEXT: Running analysis: BlockFrequencyAnalysis on foo
125-
; These next two can appear in any order since they are accessed as parameters
126-
; on the same call to BlockFrequencyInfo::calculate.
127-
; CHECK-O-DAG: Running analysis: LoopAnalysis on foo
128-
; CHECK-O-DAG: Running analysis: BranchProbabilityAnalysis on foo
129-
; CHECK-O-DAG: Running analysis: PostDominatorTreeAnalysis on foo
124+
; CHECK-O-NEXT: Running analysis: BranchProbabilityAnalysis on foo
125+
; CHECK-O-NEXT: Running analysis: LoopAnalysis on foo
126+
; CHECK-O-NEXT: Running analysis: PostDominatorTreeAnalysis on foo
130127
; CHECK-O3-NEXT: Running pass: AggressiveInstCombinePass
131128
; CHECK-O23SZ-NEXT: Running pass: ConstraintEliminationPass
132129
; CHECK-O1-NEXT: Running pass: LibCallsShrinkWrapPass

llvm/test/Other/new-pm-thinlto-prelink-samplepgo-defaults.ll

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,8 @@
5959
; CHECK-O-NEXT: Running analysis: TypeBasedAA
6060
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy
6161
; CHECK-O-NEXT: Running analysis: BlockFrequencyAnalysis on foo
62-
; These next two can appear in any order since they are accessed as parameters
63-
; on the same call to BlockFrequencyInfo::calculate.
64-
; CHECK-O-DAG: Running analysis: LoopAnalysis on foo
65-
; CHECK-O-DAG: Running analysis: BranchProbabilityAnalysis on foo
62+
; CHECK-O-NEXT: Running analysis: BranchProbabilityAnalysis on foo
63+
; CHECK-O-NEXT: Running analysis: LoopAnalysis on foo
6664
; CHECK-O-NEXT: Running analysis: PostDominatorTreeAnalysis on foo
6765
; CHECK-O-NEXT: Running pass: SimplifyCFGPass on foo
6866
; CHECK-O-NEXT: Running pass: ModuleInlinerWrapperPass

0 commit comments

Comments
 (0)