Skip to content

Commit bb2e5f5

Browse files
teresajohnsonteresajohnson
committed
Fix tests for builtbot failures
Should fix most of the buildbot failures from 2af97be, by loosening up the matching on the AnalysisProxy output. Added in --dump-input=fail on the one test that appears to be something different, so I can hopefully debug it better.
1 parent f2bbe8e commit bb2e5f5

5 files changed

+24
-24
lines changed

‎clang/test/CodeGen/thinlto-distributed-newpm.ll

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121
; CHECK-O: Running analysis: PassInstrumentationAnalysis
2222
; CHECK-O: Starting llvm::Module pass manager run.
2323
; CHECK-O: Running pass: WholeProgramDevirtPass
24-
; CHECK-O: Running analysis: InnerAnalysisManagerProxy<llvm::FunctionAnalysisManager, llvm::Module>
24+
; CHECK-O: Running analysis: InnerAnalysisManagerProxy
2525
; CHECK-O: Running pass: LowerTypeTestsPass
2626
; CHECK-O: Invalidating all non-preserved analyses for:
27-
; CHECK-O: Invalidating analysis: InnerAnalysisManagerProxy<llvm::FunctionAnalysisManager, llvm::Module>
27+
; CHECK-O: Invalidating analysis: InnerAnalysisManagerProxy
2828
; CHECK-O: Running pass: ForceFunctionAttrsPass
2929
; CHECK-O: Running pass: PassManager<llvm::Module>
3030
; CHECK-O: Starting llvm::Module pass manager run.
3131
; CHECK-O: Running pass: PGOIndirectCallPromotion
3232
; CHECK-O: Running analysis: ProfileSummaryAnalysis
33-
; CHECK-O: Running analysis: InnerAnalysisManagerProxy<llvm::FunctionAnalysisManager, llvm::Module>
33+
; CHECK-O: Running analysis: InnerAnalysisManagerProxy
3434
; CHECK-O: Running analysis: OptimizationRemarkEmitterAnalysis on main
3535
; CHECK-O: Running analysis: PassInstrumentationAnalysis on main
3636
; CHECK-O: Running pass: InferFunctionAttrsPass
@@ -50,9 +50,9 @@
5050
; CHECK-O: Running pass: CalledValuePropagationPass
5151
; CHECK-O: Running pass: GlobalOptPass
5252
; CHECK-O: Invalidating all non-preserved analyses for:
53-
; CHECK-O: Invalidating analysis: InnerAnalysisManagerProxy<llvm::FunctionAnalysisManager, llvm::Module>
53+
; CHECK-O: Invalidating analysis: InnerAnalysisManagerProxy
5454
; CHECK-O: Running pass: ModuleToFunctionPassAdaptor<llvm::PromotePass>
55-
; CHECK-O: Running analysis: InnerAnalysisManagerProxy<llvm::FunctionAnalysisManager, llvm::Module>
55+
; CHECK-O: Running analysis: InnerAnalysisManagerProxy
5656
; CHECK-O: Running analysis: DominatorTreeAnalysis on main
5757
; CHECK-O: Running analysis: PassInstrumentationAnalysis on main
5858
; CHECK-O: Running analysis: AssumptionAnalysis on main
@@ -66,7 +66,7 @@
6666
; CHECK-O: Running analysis: BasicAA on main
6767
; CHECK-O: Running analysis: ScopedNoAliasAA on main
6868
; CHECK-O: Running analysis: TypeBasedAA on main
69-
; CHECK-O: Running analysis: OuterAnalysisManagerProxy<llvm::ModuleAnalysisManager, llvm::Function> on main
69+
; CHECK-O: Running analysis: OuterAnalysisManagerProxy
7070
; CHECK-O: Running pass: SimplifyCFGPass on main
7171
; CHECK-O: Running analysis: TargetIRAnalysis on main
7272
; CHECK-O: Finished llvm::Function pass manager run.
@@ -75,11 +75,11 @@
7575
; CHECK-O: Running analysis: CallGraphAnalysis
7676
; CHECK-O: Running pass: RequireAnalysisPass<llvm::ProfileSummaryAnalysis, llvm::Module, llvm::AnalysisManager<llvm::Module>>
7777
; CHECK-O: Running pass: ModuleToPostOrderCGSCCPassAdaptor<llvm::DevirtSCCRepeatedPass<llvm::PassManager<LazyCallGraph::SCC, llvm::CGSCCAnalysisManager, llvm::LazyCallGraph &, llvm::CGSCCUpdateResult &> > >
78-
; CHECK-O: Running analysis: InnerAnalysisManagerProxy<llvm::CGSCCAnalysisManager, llvm::Module>
78+
; CHECK-O: Running analysis: InnerAnalysisManagerProxy
7979
; CHECK-O: Running analysis: LazyCallGraphAnalysis
8080
; CHECK-O: Running analysis: FunctionAnalysisManagerCGSCCProxy on (main)
8181
; CHECK-O: Running analysis: PassInstrumentationAnalysis on (main)
82-
; CHECK-O: Running analysis: OuterAnalysisManagerProxy<llvm::ModuleAnalysisManager, LazyCallGraph::SCC, llvm::LazyCallGraph &> on (main)
82+
; CHECK-O: Running analysis: OuterAnalysisManagerProxy
8383
; CHECK-O: Starting CGSCC pass manager run.
8484
; CHECK-O: Running pass: InlinerPass on (main)
8585
; CHECK-O: Running pass: PostOrderFunctionAttrsPass on (main)
@@ -104,7 +104,7 @@
104104
; CHECK-O: Running analysis: BasicAA on main
105105
; CHECK-O: Running analysis: ScopedNoAliasAA on main
106106
; CHECK-O: Running analysis: TypeBasedAA on main
107-
; CHECK-O: Running analysis: OuterAnalysisManagerProxy<llvm::ModuleAnalysisManager, llvm::Function> on main
107+
; CHECK-O: Running analysis: OuterAnalysisManagerProxy
108108
; CHECK-O: Running pass: SpeculativeExecutionPass on main
109109
; CHECK-O: Running pass: JumpThreadingPass on main
110110
; CHECK-O: Running analysis: LazyValueAnalysis on main
@@ -194,7 +194,7 @@
194194
; CHECK-O: Running analysis: ScalarEvolutionAnalysis on main
195195
; CHECK-O: Running analysis: AAManager on main
196196
; CHECK-O: Running analysis: BasicAA on main
197-
; CHECK-O: Running analysis: InnerAnalysisManagerProxy<llvm::LoopAnalysisManager, llvm::Function> on main
197+
; CHECK-O: Running analysis: InnerAnalysisManagerProxy
198198
; CHECK-O: Running pass: LoopVectorizePass on main
199199
; CHECK-O: Running analysis: BlockFrequencyAnalysis on main
200200
; CHECK-O: Running analysis: BranchProbabilityAnalysis on main

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
; Postlink pipelines:
44
; RUN: opt -disable-verify -debug-pass-manager \
55
; RUN: -passes='thinlto<O1>' -S %s 2>&1 \
6-
; RUN: | FileCheck %s --check-prefixes=CHECK-O,CHECK-O1,%llvmcheckext
6+
; RUN: | FileCheck %s --check-prefixes=CHECK-O,CHECK-O1,%llvmcheckext --dump-input=fail
77
; RUN: opt -disable-verify -debug-pass-manager \
88
; RUN: -passes='thinlto<O2>' -S %s 2>&1 \
9-
; RUN: | FileCheck %s --check-prefixes=CHECK-O,CHECK-O2,CHECK-O23SZ,%llvmcheckext
9+
; RUN: | FileCheck %s --check-prefixes=CHECK-O,CHECK-O2,CHECK-O23SZ,%llvmcheckext --dump-input=fail
1010
; RUN: opt -disable-verify -debug-pass-manager -passes-ep-pipeline-start='no-op-module' \
1111
; RUN: -passes='thinlto<O3>' -S %s 2>&1 \
12-
; RUN: | FileCheck %s --check-prefixes=CHECK-O,CHECK-O3,CHECK-O23SZ,%llvmcheckext
12+
; RUN: | FileCheck %s --check-prefixes=CHECK-O,CHECK-O3,CHECK-O23SZ,%llvmcheckext --dump-input=fail
1313
; RUN: opt -disable-verify -debug-pass-manager \
1414
; RUN: -passes='thinlto<Os>' -S %s 2>&1 \
15-
; RUN: | FileCheck %s --check-prefixes=CHECK-O,CHECK-Os,CHECK-O23SZ,%llvmcheckext
15+
; RUN: | FileCheck %s --check-prefixes=CHECK-O,CHECK-Os,CHECK-O23SZ,%llvmcheckext --dump-input=fail
1616
; RUN: opt -disable-verify -debug-pass-manager \
1717
; RUN: -passes='thinlto<Oz>' -S %s 2>&1 \
18-
; RUN: | FileCheck %s --check-prefixes=CHECK-O,CHECK-Oz,CHECK-O23SZ,%llvmcheckext
18+
; RUN: | FileCheck %s --check-prefixes=CHECK-O,CHECK-Oz,CHECK-O23SZ,%llvmcheckext --dump-input=fail
1919
; RUN: opt -disable-verify -debug-pass-manager -new-pm-debug-info-for-profiling \
2020
; RUN: -passes='thinlto<O2>' -S %s 2>&1 \
21-
; RUN: | FileCheck %s --check-prefixes=CHECK-O,CHECK-O2,CHECK-O23SZ,%llvmcheckext
21+
; RUN: | FileCheck %s --check-prefixes=CHECK-O,CHECK-O2,CHECK-O23SZ,%llvmcheckext --dump-input=fail
2222
;
2323
; CHECK-O: Running analysis: PassInstrumentationAnalysis
2424
; CHECK-O-NEXT: Starting llvm::Module pass manager run.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
; CHECK-O-NEXT: Running pass: InstCombinePass on foo
5353
; CHECK-O-NEXT: Running analysis: OptimizationRemarkEmitterAnalysis on foo
5454
; CHECK-O-NEXT: Running analysis: AAManager on foo
55-
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy<llvm::ModuleAnalysisManager, llvm::Function> on foo
55+
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy
5656
; CHECK-O-NEXT: Finished llvm::Function pass manager run.
5757
; CHECK-O-NEXT: Running pass: SampleProfileLoaderPass
5858
; CHECK-O-NEXT: Running analysis: ProfileSummaryAnalysis

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@
6666
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
6767
; CHECK-O-NEXT: Finished llvm::Function pass manager run.
6868
; CHECK-O123-NEXT: Running pass: ModuleToPostOrderCGSCCPassAdaptor<llvm::PassManager<LazyCallGraph::SCC, llvm::CGSCCAnalysisManager, llvm::LazyCallGraph &, llvm::CGSCCUpdateResult &> >
69-
; CHECK-O123-NEXT: Running analysis: InnerAnalysisManagerProxy<llvm::CGSCCAnalysisManager, llvm::Module>
69+
; CHECK-O123-NEXT: Running analysis: InnerAnalysisManagerProxy
7070
; CHECK-O123-NEXT: Running analysis: LazyCallGraphAnalysis
7171
; CHECK-O123-NEXT: Running analysis: FunctionAnalysisManagerCGSCCProxy on (foo)
7272
; CHECK-O123-NEXT: Running analysis: PassInstrumentationAnalysis on (foo)
73-
; CHECK-O123-NEXT: Running analysis: OuterAnalysisManagerProxy<llvm::ModuleAnalysisManager, LazyCallGraph::SCC, llvm::LazyCallGraph &> on (foo)
73+
; CHECK-O123-NEXT: Running analysis: OuterAnalysisManagerProxy
7474
; CHECK-O123-NEXT: Starting CGSCC pass manager run.
7575
; CHECK-O123-NEXT: Running pass: InlinerPass on (foo)
7676
; CHECK-O123-NEXT: Running pass: CGSCCToFunctionPassAdaptor<llvm::PassManager<llvm::Function> > on (foo)
@@ -82,12 +82,12 @@
8282
; CHECK-O-NEXT: Running analysis: LoopAnalysis on foo
8383
; CHECK-O-NEXT: Running analysis: BlockFrequencyAnalysis on foo
8484
; CHECK-O-NEXT: Invalidating all non-preserved analyses for:
85-
; CHECK-O-NEXT: Invalidating analysis: InnerAnalysisManagerProxy<llvm::FunctionAnalysisManager, llvm::Module> on
85+
; CHECK-O-NEXT: Invalidating analysis: InnerAnalysisManagerProxy
8686
; CHECK-O123-NEXT: Invalidating analysis: LazyCallGraphAnalysis on
87-
; CHECK-O123-NEXT: Invalidating analysis: InnerAnalysisManagerProxy<llvm::CGSCCAnalysisManager, llvm::Module> on
87+
; CHECK-O123-NEXT: Invalidating analysis: InnerAnalysisManagerProxy
8888
; CHECK-O-NEXT: Running pass: RequireAnalysisPass<llvm::ProfileSummaryAnalysis, llvm::Module, llvm::AnalysisManager<llvm::Module>> on
8989
; CHECK-O-NEXT: Running pass: PGOIndirectCallPromotion on
90-
; CHECK-O-NEXT: Running analysis: InnerAnalysisManagerProxy<llvm::FunctionAnalysisManager, llvm::Module> on
90+
; CHECK-O-NEXT: Running analysis: InnerAnalysisManagerProxy
9191
; CHECK-O-NEXT: Running analysis: OptimizationRemarkEmitterAnalysis on foo
9292
; CHECK-O-NEXT: Running analysis: PassInstrumentationAnalysis on foo
9393
; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}GlobalsAA
@@ -125,7 +125,7 @@
125125
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
126126
; CHECK-O3-NEXT: Running pass: AggressiveInstCombinePass
127127
; CHECK-O-NEXT: Running pass: InstCombinePass
128-
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy<llvm::ModuleAnalysisManager, llvm::Function> on foo
128+
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy
129129
; CHECK-O-NEXT: Running analysis: BlockFrequencyAnalysis on foo
130130
; CHECK-O-NEXT: Running analysis: BranchProbabilityAnalysis on foo
131131
; CHECK-O-NEXT: Running analysis: LoopAnalysis on foo

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
; CHECK-O-NEXT: Running pass: InstCombinePass on foo
5454
; CHECK-O-NEXT: Running analysis: OptimizationRemarkEmitterAnalysis on foo
5555
; CHECK-O-NEXT: Running analysis: AAManager on foo
56-
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy<llvm::ModuleAnalysisManager, llvm::Function> on foo
56+
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy
5757
; CHECK-O-NEXT: Finished llvm::Function pass manager run.
5858
; CHECK-O-NEXT: Running pass: SampleProfileLoaderPass
5959
; CHECK-O-NEXT: Running analysis: ProfileSummaryAnalysis

0 commit comments

Comments
 (0)