Skip to content

Commit 7aed43b

Browse files
teresajohnsonteresajohnson
committed
Hopefully last fix for bot failures
Hopefully final bot fix for last few failures from 2af97be. Looks like sometimes the "llvm::" preceeding objects get printed in the debug pass manager output and sometimes they don't. Replace with wildcard matching.
1 parent fb79ef5 commit 7aed43b

File tree

5 files changed

+137
-137
lines changed

5 files changed

+137
-137
lines changed

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

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,23 @@
1919
; RUN: -o %t.native.o -x ir %t.o 2>&1 | FileCheck -check-prefixes=CHECK-O,CHECK-O3 %s
2020

2121
; CHECK-O: Running analysis: PassInstrumentationAnalysis
22-
; CHECK-O: Starting llvm::Module pass manager run.
22+
; CHECK-O: Starting {{.*}}Module pass manager run.
2323
; CHECK-O: Running pass: WholeProgramDevirtPass
2424
; CHECK-O: Running analysis: InnerAnalysisManagerProxy
2525
; CHECK-O: Running pass: LowerTypeTestsPass
2626
; CHECK-O: Invalidating all non-preserved analyses for:
2727
; CHECK-O: Invalidating analysis: InnerAnalysisManagerProxy
2828
; CHECK-O: Running pass: ForceFunctionAttrsPass
29-
; CHECK-O: Running pass: PassManager<llvm::Module>
30-
; CHECK-O: Starting llvm::Module pass manager run.
29+
; CHECK-O: Running pass: PassManager<{{.*}}Module>
30+
; CHECK-O: Starting {{.*}}Module pass manager run.
3131
; CHECK-O: Running pass: PGOIndirectCallPromotion
3232
; CHECK-O: Running analysis: ProfileSummaryAnalysis
3333
; 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
37-
; CHECK-O: Running pass: ModuleToFunctionPassAdaptor<llvm::PassManager<llvm::Function> >
38-
; CHECK-O: Starting llvm::Function pass manager run.
37+
; CHECK-O: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PassManager<{{.*}}Function> >
38+
; CHECK-O: Starting {{.*}}Function pass manager run.
3939
; CHECK-O: Running pass: SimplifyCFGPass on main
4040
; CHECK-O: Running analysis: TargetIRAnalysis on main
4141
; CHECK-O: Running analysis: AssumptionAnalysis on main
@@ -45,20 +45,20 @@
4545
; CHECK-O: Running analysis: TargetLibraryAnalysis on main
4646
; CHECK-O: Running pass: LowerExpectIntrinsicPass on main
4747
; CHECK-O3: Running pass: CallSiteSplittingPass on main
48-
; CHECK-O: Finished llvm::Function pass manager run.
48+
; CHECK-O: Finished {{.*}}Function pass manager run.
4949
; CHECK-O: Running pass: IPSCCPPass
5050
; CHECK-O: Running pass: CalledValuePropagationPass
5151
; CHECK-O: Running pass: GlobalOptPass
5252
; CHECK-O: Invalidating all non-preserved analyses for:
5353
; CHECK-O: Invalidating analysis: InnerAnalysisManagerProxy
54-
; CHECK-O: Running pass: ModuleToFunctionPassAdaptor<llvm::PromotePass>
54+
; CHECK-O: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PromotePass>
5555
; 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
5959
; CHECK-O: Running pass: DeadArgumentEliminationPass
60-
; CHECK-O: Running pass: ModuleToFunctionPassAdaptor<llvm::PassManager<llvm::Function> >
61-
; CHECK-O: Starting llvm::Function pass manager run.
60+
; CHECK-O: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PassManager<{{.*}}Function> >
61+
; CHECK-O: Starting {{.*}}Function pass manager run.
6262
; CHECK-O: Running pass: InstCombinePass on main
6363
; CHECK-O: Running analysis: TargetLibraryAnalysis on main
6464
; CHECK-O: Running analysis: OptimizationRemarkEmitterAnalysis on main
@@ -69,12 +69,12 @@
6969
; CHECK-O: Running analysis: OuterAnalysisManagerProxy
7070
; CHECK-O: Running pass: SimplifyCFGPass on main
7171
; CHECK-O: Running analysis: TargetIRAnalysis on main
72-
; CHECK-O: Finished llvm::Function pass manager run.
73-
; CHECK-O: Running pass: RequireAnalysisPass<llvm::GlobalsAA
72+
; CHECK-O: Finished {{.*}}Function pass manager run.
73+
; CHECK-O: Running pass: RequireAnalysisPass<{{.*}}GlobalsAA
7474
; CHECK-O: Running analysis: GlobalsAA
7575
; CHECK-O: Running analysis: CallGraphAnalysis
76-
; CHECK-O: Running pass: RequireAnalysisPass<llvm::ProfileSummaryAnalysis
77-
; CHECK-O: Running pass: ModuleToPostOrderCGSCCPassAdaptor<llvm::DevirtSCCRepeatedPass<llvm::PassManager<LazyCallGraph::SCC
76+
; CHECK-O: Running pass: RequireAnalysisPass<{{.*}}ProfileSummaryAnalysis
77+
; CHECK-O: Running pass: ModuleToPostOrderCGSCCPassAdaptor<{{.*}}DevirtSCCRepeatedPass<{{.*}}PassManager<LazyCallGraph::SCC
7878
; CHECK-O: Running analysis: InnerAnalysisManagerProxy
7979
; CHECK-O: Running analysis: LazyCallGraphAnalysis
8080
; CHECK-O: Running analysis: FunctionAnalysisManagerCGSCCProxy on (main)
@@ -87,12 +87,12 @@
8787
; CHECK-O: Clearing all analysis results for: main
8888
; CHECK-O: Invalidating analysis: FunctionAnalysisManagerCGSCCProxy on (main)
8989
; CHECK-O3: Running pass: ArgumentPromotionPass on (main)
90-
; CHECK-O2: Running pass: CGSCCToFunctionPassAdaptor<llvm::PassManager<llvm::Function> > on (main)
90+
; CHECK-O2: Running pass: CGSCCToFunctionPassAdaptor<{{.*}}PassManager<{{.*}}Function> > on (main)
9191
; CHECK-O: Running analysis: FunctionAnalysisManagerCGSCCProxy on (main)
9292
; CHECK-O3: Running analysis: TargetIRAnalysis on main
9393
; CHECK-O: Running analysis: PassInstrumentationAnalysis on main
94-
; CHECK-O3: Running pass: CGSCCToFunctionPassAdaptor<llvm::PassManager<llvm::Function> > on (main)
95-
; CHECK-O: Starting llvm::Function pass manager run.
94+
; CHECK-O3: Running pass: CGSCCToFunctionPassAdaptor<{{.*}}PassManager<{{.*}}Function> > on (main)
95+
; CHECK-O: Starting {{.*}}Function pass manager run.
9696
; CHECK-O: Running pass: SROA on main
9797
; CHECK-O: Running analysis: DominatorTreeAnalysis on main
9898
; CHECK-O: Running analysis: AssumptionAnalysis on main
@@ -117,20 +117,20 @@
117117
; CHECK-O: Running pass: TailCallElimPass on main
118118
; CHECK-O: Running pass: SimplifyCFGPass on main
119119
; CHECK-O: Running pass: ReassociatePass on main
120-
; CHECK-O: Running pass: RequireAnalysisPass<llvm::OptimizationRemarkEmitterAnalysis
121-
; CHECK-O: Running pass: FunctionToLoopPassAdaptor<llvm::PassManager<llvm::Loop
122-
; CHECK-O: Starting llvm::Function pass manager run.
120+
; CHECK-O: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis
121+
; CHECK-O: Running pass: FunctionToLoopPassAdaptor<{{.*}}PassManager<{{.*}}Loop
122+
; CHECK-O: Starting {{.*}}Function pass manager run.
123123
; CHECK-O: Running pass: LoopSimplifyPass on main
124124
; CHECK-O: Running analysis: LoopAnalysis on main
125125
; CHECK-O: Running pass: LCSSAPass on main
126-
; CHECK-O: Finished llvm::Function pass manager run.
126+
; CHECK-O: Finished {{.*}}Function pass manager run.
127127
; CHECK-O: Running pass: SimplifyCFGPass on main
128128
; CHECK-O: Running pass: InstCombinePass on main
129-
; CHECK-O: Running pass: FunctionToLoopPassAdaptor<llvm::PassManager<llvm::Loop
130-
; CHECK-O: Starting llvm::Function pass manager run.
129+
; CHECK-O: Running pass: FunctionToLoopPassAdaptor<{{.*}}PassManager<{{.*}}Loop
130+
; CHECK-O: Starting {{.*}}Function pass manager run.
131131
; CHECK-O: Running pass: LoopSimplifyPass on main
132132
; CHECK-O: Running pass: LCSSAPass on main
133-
; CHECK-O: Finished llvm::Function pass manager run.
133+
; CHECK-O: Finished {{.*}}Function pass manager run.
134134
; CHECK-O: Running pass: SROA on main
135135
; CHECK-O: Running pass: MergedLoadStoreMotionPass on main
136136
; CHECK-O: Running pass: GVN on main
@@ -144,16 +144,16 @@
144144
; CHECK-O: Running pass: JumpThreadingPass on main
145145
; CHECK-O: Running pass: CorrelatedValuePropagationPass on main
146146
; CHECK-O: Running pass: DSEPass on main
147-
; CHECK-O: Running pass: FunctionToLoopPassAdaptor<llvm::LICMPass> on main
148-
; CHECK-O: Starting llvm::Function pass manager run.
147+
; CHECK-O: Running pass: FunctionToLoopPassAdaptor<{{.*}}LICMPass> on main
148+
; CHECK-O: Starting {{.*}}Function pass manager run.
149149
; CHECK-O: Running pass: LoopSimplifyPass on main
150150
; CHECK-O: Running pass: LCSSAPass on main
151-
; CHECK-O: Finished llvm::Function pass manager run.
151+
; CHECK-O: Finished {{.*}}Function pass manager run.
152152
; CHECK-O: Running pass: ADCEPass on main
153153
; CHECK-O: Running analysis: PostDominatorTreeAnalysis on main
154154
; CHECK-O: Running pass: SimplifyCFGPass on main
155155
; CHECK-O: Running pass: InstCombinePass on main
156-
; CHECK-O: Finished llvm::Function pass manager run.
156+
; CHECK-O: Finished {{.*}}Function pass manager run.
157157
; CHECK-O: Finished CGSCC pass manager run.
158158
; CHECK-O: Invalidating all non-preserved analyses for:
159159
; CHECK-O: Invalidating all non-preserved analyses for: main
@@ -169,27 +169,27 @@
169169
; CHECK-O: Invalidating analysis: PostDominatorTreeAnalysis on main
170170
; CHECK-O: Invalidating analysis: CallGraphAnalysis
171171
; CHECK-O: Invalidating analysis: GlobalsAA
172-
; CHECK-O: Finished llvm::Module pass manager run.
173-
; CHECK-O: Running pass: PassManager<llvm::Module>
174-
; CHECK-O: Starting llvm::Module pass manager run.
172+
; CHECK-O: Finished {{.*}}Module pass manager run.
173+
; CHECK-O: Running pass: PassManager<{{.*}}Module>
174+
; CHECK-O: Starting {{.*}}Module pass manager run.
175175
; CHECK-O: Running pass: GlobalOptPass
176176
; CHECK-O: Running analysis: DominatorTreeAnalysis on main
177177
; CHECK-O: Running pass: GlobalDCEPass
178178
; CHECK-O: Running pass: EliminateAvailableExternallyPass
179179
; CHECK-O: Running pass: ReversePostOrderFunctionAttrsPass
180180
; CHECK-O: Running analysis: CallGraphAnalysis
181-
; CHECK-O: Running pass: RequireAnalysisPass<llvm::GlobalsAA
181+
; CHECK-O: Running pass: RequireAnalysisPass<{{.*}}GlobalsAA
182182
; CHECK-O: Running analysis: GlobalsAA
183-
; CHECK-O: Running pass: ModuleToFunctionPassAdaptor<llvm::PassManager<llvm::Function> >
184-
; CHECK-O: Starting llvm::Function pass manager run.
183+
; CHECK-O: Running pass: ModuleToFunctionPassAdaptor<{{.*}}PassManager<{{.*}}Function> >
184+
; CHECK-O: Starting {{.*}}Function pass manager run.
185185
; CHECK-O: Running pass: Float2IntPass on main
186186
; CHECK-O: Running pass: LowerConstantIntrinsicsPass on main
187-
; CHECK-O: Running pass: FunctionToLoopPassAdaptor<llvm::LoopRotatePass> on main
188-
; CHECK-O: Starting llvm::Function pass manager run.
187+
; CHECK-O: Running pass: FunctionToLoopPassAdaptor<{{.*}}LoopRotatePass> on main
188+
; CHECK-O: Starting {{.*}}Function pass manager run.
189189
; CHECK-O: Running pass: LoopSimplifyPass on main
190190
; CHECK-O: Running analysis: LoopAnalysis on main
191191
; CHECK-O: Running pass: LCSSAPass on main
192-
; CHECK-O: Finished llvm::Function pass manager run.
192+
; CHECK-O: Finished {{.*}}Function pass manager run.
193193
; CHECK-O: Running pass: LoopDistributePass on main
194194
; CHECK-O: Running analysis: ScalarEvolutionAnalysis on main
195195
; CHECK-O: Running analysis: AAManager on main
@@ -208,24 +208,24 @@
208208
; CHECK-O: Running pass: LoopUnrollPass on main
209209
; CHECK-O: Running pass: WarnMissedTransformationsPass on main
210210
; CHECK-O: Running pass: InstCombinePass on main
211-
; CHECK-O: Running pass: RequireAnalysisPass<llvm::OptimizationRemarkEmitterAnalysis
212-
; CHECK-O: Running pass: FunctionToLoopPassAdaptor<llvm::LICMPass> on main
213-
; CHECK-O: Starting llvm::Function pass manager run.
211+
; CHECK-O: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis
212+
; CHECK-O: Running pass: FunctionToLoopPassAdaptor<{{.*}}LICMPass> on main
213+
; CHECK-O: Starting {{.*}}Function pass manager run.
214214
; CHECK-O: Running pass: LoopSimplifyPass on main
215215
; CHECK-O: Running pass: LCSSAPass on main
216-
; CHECK-O: Finished llvm::Function pass manager run.
216+
; CHECK-O: Finished {{.*}}Function pass manager run.
217217
; CHECK-O: Running pass: AlignmentFromAssumptionsPass on main
218218
; CHECK-O: Running pass: LoopSinkPass on main
219219
; CHECK-O: Running pass: InstSimplifyPass on main
220220
; CHECK-O: Running pass: DivRemPairsPass on main
221221
; CHECK-O: Running pass: SimplifyCFGPass on main
222222
; CHECK-O: Running pass: SpeculateAroundPHIsPass on main
223-
; CHECK-O: Finished llvm::Function pass manager run.
223+
; CHECK-O: Finished {{.*}}Function pass manager run.
224224
; CHECK-O: Running pass: CGProfilePass
225225
; CHECK-O: Running pass: GlobalDCEPass
226226
; CHECK-O: Running pass: ConstantMergePass
227-
; CHECK-O: Finished llvm::Module pass manager run.
228-
; CHECK-O: Finished llvm::Module pass manager run.
227+
; CHECK-O: Finished {{.*}}Module pass manager run.
228+
; CHECK-O: Finished {{.*}}Module pass manager run.
229229

230230
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
231231
target triple = "x86_64-grtev4-linux-gnu"

0 commit comments

Comments
 (0)