Skip to content

Commit 22a408a

Browse files
nikicnikic
committed
[Pipelines] Don't explicitly require ORE
LICM does not use ORE from the pass manager, it constructs its own instance. As such, explicitly requiring the analysis in the pipeline is unnecessary.
1 parent 692dd56 commit 22a408a

9 files changed

+0
-26
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
; CHECK-O: Running pass: TailCallElimPass on main
5252
; CHECK-O: Running pass: SimplifyCFGPass on main
5353
; CHECK-O: Running pass: ReassociatePass on main
54-
; CHECK-O: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis
5554
; CHECK-O: Running pass: LoopSimplifyPass on main
5655
; CHECK-O: Running pass: LCSSAPass on main
5756
; CHECK-O: Running pass: SimplifyCFGPass on main
@@ -96,7 +95,6 @@
9695
; CHECK-O: Running pass: LoopUnrollPass on main
9796
; CHECK-O: Running pass: WarnMissedTransformationsPass on main
9897
; CHECK-O: Running pass: InstCombinePass on main
99-
; CHECK-O: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis
10098
; CHECK-O: Running pass: LoopSimplifyPass on main
10199
; CHECK-O: Running pass: LCSSAPass on main
102100
; CHECK-O: Running pass: LICMPass on b

‎llvm/lib/Passes/PassBuilderPipelines.cpp

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "llvm/Analysis/CGSCCPassManager.h"
2121
#include "llvm/Analysis/GlobalsModRef.h"
2222
#include "llvm/Analysis/InlineAdvisor.h"
23-
#include "llvm/Analysis/OptimizationRemarkEmitter.h"
2423
#include "llvm/Analysis/ProfileSummaryInfo.h"
2524
#include "llvm/Analysis/ScopedNoAliasAA.h"
2625
#include "llvm/Analysis/TypeBasedAliasAnalysis.h"
@@ -459,10 +458,6 @@ PassBuilder::buildO1FunctionSimplificationPipeline(OptimizationLevel Level,
459458

460459
invokeLoopOptimizerEndEPCallbacks(LPM2, Level);
461460

462-
// We provide the opt remark emitter pass for LICM to use. We only need to do
463-
// this once as it is immutable.
464-
FPM.addPass(
465-
RequireAnalysisPass<OptimizationRemarkEmitterAnalysis, Function>());
466461
FPM.addPass(createFunctionToLoopPassAdaptor(std::move(LPM1),
467462
/*UseMemorySSA=*/true,
468463
/*UseBlockFrequencyInfo=*/true));
@@ -642,10 +637,6 @@ PassBuilder::buildFunctionSimplificationPipeline(OptimizationLevel Level,
642637

643638
invokeLoopOptimizerEndEPCallbacks(LPM2, Level);
644639

645-
// We provide the opt remark emitter pass for LICM to use. We only need to do
646-
// this once as it is immutable.
647-
FPM.addPass(
648-
RequireAnalysisPass<OptimizationRemarkEmitterAnalysis, Function>());
649640
FPM.addPass(createFunctionToLoopPassAdaptor(std::move(LPM1),
650641
/*UseMemorySSA=*/true,
651642
/*UseBlockFrequencyInfo=*/true));
@@ -1186,8 +1177,6 @@ void PassBuilder::addVectorPasses(OptimizationLevel Level,
11861177
/*AllowSpeculation=*/true));
11871178
LPM.addPass(SimpleLoopUnswitchPass(/* NonTrivial */ Level ==
11881179
OptimizationLevel::O3));
1189-
ExtraPasses.addPass(
1190-
RequireAnalysisPass<OptimizationRemarkEmitterAnalysis, Function>());
11911180
ExtraPasses.addPass(
11921181
createFunctionToLoopPassAdaptor(std::move(LPM), /*UseMemorySSA=*/true,
11931182
/*UseBlockFrequencyInfo=*/true));
@@ -1255,8 +1244,6 @@ void PassBuilder::addVectorPasses(OptimizationLevel Level,
12551244
// the CFG mess this may created if allowed to modify CFG, so forbid that.
12561245
FPM.addPass(SROAPass(SROAOptions::PreserveCFG));
12571246
FPM.addPass(InstCombinePass());
1258-
FPM.addPass(
1259-
RequireAnalysisPass<OptimizationRemarkEmitterAnalysis, Function>());
12601247
FPM.addPass(createFunctionToLoopPassAdaptor(
12611248
LICMPass(PTO.LicmMssaOptCap, PTO.LicmMssaNoAccForPromotionCap,
12621249
/*AllowSpeculation=*/true),

‎llvm/test/Other/new-pm-defaults.ll

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@
163163
; CHECK-O23SZ-NEXT: Running pass: TailCallElimPass
164164
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
165165
; CHECK-O-NEXT: Running pass: ReassociatePass
166-
; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis
167166
; CHECK-O-NEXT: Running pass: LoopSimplifyPass
168167
; CHECK-NO-FUNC-SPEC-NEXT: Running analysis: LoopAnalysis
169168
; CHECK-O-NEXT: Running pass: LCSSAPass
@@ -258,7 +257,6 @@
258257
; CHECK-O-NEXT: Running pass: WarnMissedTransformationsPass
259258
; CHECK-O-NEXT: Running pass: SROAPass
260259
; CHECK-O-NEXT: Running pass: InstCombinePass
261-
; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis
262260
; CHECK-O-NEXT: Running pass: LoopSimplifyPass
263261
; CHECK-O-NEXT: Running pass: LCSSAPass
264262
; CHECK-O-NEXT: Running pass: LICMPass

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@
108108
; CHECK-O23SZ-NEXT: Running pass: TailCallElimPass
109109
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
110110
; CHECK-O-NEXT: Running pass: ReassociatePass
111-
; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis
112111
; CHECK-O-NEXT: Running pass: LoopSimplifyPass
113112
; CHECK-NO-FUNC-SPEC-NEXT: Running analysis: LoopAnalysis
114113
; CHECK-O-NEXT: Running pass: LCSSAPass
@@ -193,7 +192,6 @@
193192
; CHECK-POSTLINK-O-NEXT: Running pass: WarnMissedTransformationsPass
194193
; CHECK-POSTLINK-O-NEXT: Running pass: SROAPass
195194
; CHECK-POSTLINK-O-NEXT: Running pass: InstCombinePass
196-
; CHECK-POSTLINK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis
197195
; CHECK-POSTLINK-O-NEXT: Running pass: LoopSimplifyPass
198196
; CHECK-POSTLINK-O-NEXT: Running pass: LCSSAPass
199197
; CHECK-POSTLINK-O-NEXT: Running pass: LICMPass

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@
9797
; CHECK-O23SZ-NEXT: Running pass: TailCallElimPass
9898
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
9999
; CHECK-O-NEXT: Running pass: ReassociatePass
100-
; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis
101100
; CHECK-O-NEXT: Running pass: LoopSimplifyPass
102101
; CHECK-O-NEXT: Running pass: LCSSAPass
103102
; CHECK-O-NEXT: Running analysis: ScalarEvolutionAnalysis
@@ -181,7 +180,6 @@
181180
; CHECK-O-NEXT: Running pass: WarnMissedTransformationsPass
182181
; CHECK-O-NEXT: Running pass: SROAPass
183182
; CHECK-O-NEXT: Running pass: InstCombinePass
184-
; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis
185183
; CHECK-O-NEXT: Running pass: LoopSimplifyPass
186184
; CHECK-O-NEXT: Running pass: LCSSAPass
187185
; CHECK-O-NEXT: Running pass: LICMPass

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@
104104
; CHECK-O23SZ-NEXT: Running pass: TailCallElimPass
105105
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
106106
; CHECK-O-NEXT: Running pass: ReassociatePass
107-
; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis
108107
; CHECK-O-NEXT: Running pass: LoopSimplifyPass
109108
; CHECK-O-NEXT: Running pass: LCSSAPass
110109
; CHECK-O-NEXT: Running analysis: ScalarEvolutionAnalysis
@@ -188,7 +187,6 @@
188187
; CHECK-O-NEXT: Running pass: WarnMissedTransformationsPass
189188
; CHECK-O-NEXT: Running pass: SROAPass
190189
; CHECK-O-NEXT: Running pass: InstCombinePass
191-
; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis
192190
; CHECK-O-NEXT: Running pass: LoopSimplifyPass
193191
; CHECK-O-NEXT: Running pass: LCSSAPass
194192
; CHECK-O-NEXT: Running pass: LICMPass

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@
107107
; CHECK-O23SZ-NEXT: Running pass: TailCallElimPass
108108
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
109109
; CHECK-O-NEXT: Running pass: ReassociatePass
110-
; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis
111110
; CHECK-O-NEXT: Running pass: LoopSimplifyPass
112111
; CHECK-O-NEXT: Running analysis: LoopAnalysis
113112
; CHECK-O-NEXT: Running pass: LCSSAPass

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@
134134
; CHECK-O23SZ-NEXT: Running pass: TailCallElimPass
135135
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
136136
; CHECK-O-NEXT: Running pass: ReassociatePass
137-
; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis
138137
; CHECK-O-NEXT: Running pass: LoopSimplifyPass
139138
; CHECK-O-NEXT: Running pass: LCSSAPass
140139
; CHECK-O-NEXT: Running analysis: ScalarEvolutionAnalysis

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@
100100
; CHECK-O23SZ-NEXT: Running pass: TailCallElimPass
101101
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
102102
; CHECK-O-NEXT: Running pass: ReassociatePass
103-
; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis
104103
; CHECK-O-NEXT: Running pass: LoopSimplifyPass
105104
; CHECK-O-NEXT: Running pass: LCSSAPass
106105
; CHECK-O-NEXT: Running analysis: ScalarEvolutionAnalysis

0 commit comments

Comments
 (0)