Skip to content

Commit b43b59f

Browse files
tarindujjdoerfert
tarinduj
authored and
jdoerfert
committed
Expose attributor-disable to the new and old pass managers
The new and old pass managers (PassManagerBuilder.cpp and PassBuilder.cpp) are exposed to an `extern` declaration of `attributor-disable` option which will guard the addition of the attributor passes to the pass pipelines. Reviewed By: jdoerfert Differential Revision: https://reviews.llvm.org/D76871
1 parent 1b39c6f commit b43b59f

14 files changed

+27
-38
lines changed

‎llvm/lib/Passes/PassBuilder.cpp‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,8 @@ extern cl::opt<bool> EnableOrderFileInstrumentation;
258258

259259
extern cl::opt<bool> FlattenedProfileUsed;
260260

261+
extern cl::opt<bool> DisableAttributor;
262+
261263
const PassBuilder::OptimizationLevel PassBuilder::OptimizationLevel::O0 = {
262264
/*SpeedLevel*/ 0,
263265
/*SizeLevel*/ 0};
@@ -765,7 +767,9 @@ PassBuilder::buildModuleSimplificationPipeline(OptimizationLevel Level,
765767
MPM.addPass(PGOIndirectCallPromotion(Phase == ThinLTOPhase::PostLink,
766768
true /* SamplePGO */));
767769
}
768-
MPM.addPass(AttributorPass());
770+
771+
if (!DisableAttributor)
772+
MPM.addPass(AttributorPass());
769773

770774
// Interprocedural constant propagation now that basic cleanup has occurred
771775
// and prior to optimizing globals.
@@ -848,7 +852,8 @@ PassBuilder::buildModuleSimplificationPipeline(OptimizationLevel Level,
848852
IP.HotCallSiteThreshold = 0;
849853
MainCGPipeline.addPass(InlinerPass(IP));
850854

851-
MainCGPipeline.addPass(AttributorCGSCCPass());
855+
if (!DisableAttributor)
856+
MainCGPipeline.addPass(AttributorCGSCCPass());
852857

853858
if (PTO.Coroutines)
854859
MainCGPipeline.addPass(CoroSplitPass());

‎llvm/lib/Transforms/IPO/Attributor.cpp‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,6 @@ static cl::opt<bool> VerifyMaxFixpointIterations(
160160
cl::desc("Verify that max-iterations is a tight bound for a fixpoint"),
161161
cl::init(false));
162162

163-
static cl::opt<bool> DisableAttributor(
164-
"attributor-disable", cl::Hidden,
165-
cl::desc("Disable the attributor inter-procedural deduction pass."),
166-
cl::init(true));
167-
168163
static cl::opt<bool> AnnotateDeclarationCallSites(
169164
"attributor-annotate-decl-cs", cl::Hidden,
170165
cl::desc("Annotate call sites of function declarations."), cl::init(false));
@@ -8849,7 +8844,7 @@ static bool runAttributorOnFunctions(InformationCache &InfoCache,
88498844
SetVector<Function *> &Functions,
88508845
AnalysisGetter &AG,
88518846
CallGraphUpdater &CGUpdater) {
8852-
if (DisableAttributor || Functions.empty())
8847+
if (Functions.empty())
88538848
return false;
88548849

88558850
LLVM_DEBUG(dbgs() << "[Attributor] Run on module with " << Functions.size()

‎llvm/lib/Transforms/IPO/PassManagerBuilder.cpp‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,11 @@ static cl::opt<bool>
153153
EnableMatrix("enable-matrix", cl::init(false), cl::Hidden,
154154
cl::desc("Enable lowering of the matrix intrinsics"));
155155

156+
cl::opt<bool> DisableAttributor(
157+
"attributor-disable", cl::Hidden,
158+
cl::desc("Disable the attributor inter-procedural deduction pass."),
159+
cl::init(true));
160+
156161
PassManagerBuilder::PassManagerBuilder() {
157162
OptLevel = 2;
158163
SizeLevel = 0;
@@ -547,7 +552,8 @@ void PassManagerBuilder::populateModulePassManager(
547552
MPM.add(createInferFunctionAttrsLegacyPass());
548553

549554
// Infer attributes on declarations, call sites, arguments, etc.
550-
MPM.add(createAttributorLegacyPass());
555+
if (!DisableAttributor)
556+
MPM.add(createAttributorLegacyPass());
551557

552558
addExtensionsToPM(EP_ModuleOptimizerEarly, MPM);
553559

@@ -595,7 +601,8 @@ void PassManagerBuilder::populateModulePassManager(
595601
}
596602

597603
// Infer attributes on declarations, call sites, arguments, etc. for an SCC.
598-
MPM.add(createAttributorCGSCCLegacyPass());
604+
if (!DisableAttributor)
605+
MPM.add(createAttributorCGSCCLegacyPass());
599606

600607
// Try to perform OpenMP specific optimizations. This is a (quick!) no-op if
601608
// there are no OpenMP runtime calls present in the module.
@@ -881,7 +888,8 @@ void PassManagerBuilder::addLTOOptimizationPasses(legacy::PassManagerBase &PM) {
881888
PM.add(createCalledValuePropagationPass());
882889

883890
// Infer attributes on declarations, call sites, arguments, etc.
884-
PM.add(createAttributorLegacyPass());
891+
if (!DisableAttributor)
892+
PM.add(createAttributorLegacyPass());
885893
}
886894

887895
// Infer attributes about definitions. The readnone attribute in particular is
@@ -935,7 +943,8 @@ void PassManagerBuilder::addLTOOptimizationPasses(legacy::PassManagerBase &PM) {
935943
addPGOInstrPasses(PM, /* IsCS */ true);
936944

937945
// Infer attributes on declarations, call sites, arguments, etc. for an SCC.
938-
PM.add(createAttributorCGSCCLegacyPass());
946+
if (!DisableAttributor)
947+
PM.add(createAttributorCGSCCLegacyPass());
939948

940949
// Try to perform OpenMP specific optimizations. This is a (quick!) no-op if
941950
// there are no OpenMP runtime calls present in the module.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@
113113
; CHECK-O-NEXT: Running pass: LowerExpectIntrinsicPass
114114
; CHECK-O3-NEXT: Running pass: CallSiteSplittingPass
115115
; CHECK-O-NEXT: Finished llvm::Function pass manager run.
116-
; CHECK-O-NEXT: Running pass: AttributorPass
117116
; CHECK-O-NEXT: Running pass: IPSCCPPass
118117
; CHECK-O-NEXT: Running pass: CalledValuePropagationPass
119118
; CHECK-O-NEXT: Running pass: GlobalOptPass
@@ -141,7 +140,6 @@
141140
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy<{{.*}}LazyCallGraph::SCC{{.*}}>
142141
; CHECK-O-NEXT: Starting CGSCC pass manager run.
143142
; CHECK-O-NEXT: Running pass: InlinerPass
144-
; CHECK-O-NEXT: Running pass: AttributorCGSCCPass
145143
; CHECK-O-NEXT: Running pass: PostOrderFunctionAttrsPass
146144
; CHECK-O3-NEXT: Running pass: ArgumentPromotionPass
147145
; CHECK-O2-NEXT: Running pass: OpenMPOptPass on (foo)

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
; CHECK-O-NEXT: Running pass: LowerExpectIntrinsicPass
8080
; CHECK-O3-NEXT: Running pass: CallSiteSplittingPass
8181
; CHECK-O-NEXT: Finished llvm::Function pass manager run.
82-
; CHECK-O-NEXT: Running pass: AttributorPass
8382
; CHECK-O-NEXT: Running pass: IPSCCPPass
8483
; CHECK-O-NEXT: Running pass: CalledValuePropagationPass
8584
; CHECK-O-NEXT: Running pass: GlobalOptPass
@@ -106,7 +105,6 @@
106105
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy<{{.*}}LazyCallGraph::SCC{{.*}}>
107106
; CHECK-O-NEXT: Starting CGSCC pass manager run.
108107
; CHECK-O-NEXT: Running pass: InlinerPass
109-
; CHECK-O-NEXT: Running pass: AttributorCGSCCPass
110108
; CHECK-O-NEXT: Running pass: PostOrderFunctionAttrsPass
111109
; CHECK-O3-NEXT: Running pass: ArgumentPromotionPass
112110
; CHECK-O2-NEXT: Running pass: OpenMPOptPass on (foo)

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
; CHECK-O-NEXT: Running pass: LowerExpectIntrinsicPass
4949
; CHECK-O3-NEXT: Running pass: CallSiteSplittingPass
5050
; CHECK-O-NEXT: Finished {{.*}}Function pass manager run.
51-
; CHECK-O-NEXT: Running pass: AttributorPass
5251
; CHECK-O-NEXT: Running pass: IPSCCPPass
5352
; CHECK-O-NEXT: Running pass: CalledValuePropagationPass
5453
; CHECK-O-NEXT: Running pass: GlobalOptPass
@@ -78,7 +77,6 @@
7877
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy<{{.*}}LazyCallGraph::SCC{{.*}}>
7978
; CHECK-O-NEXT: Starting CGSCC pass manager run.
8079
; CHECK-O-NEXT: Running pass: InlinerPass
81-
; CHECK-O-NEXT: Running pass: AttributorCGSCCPass
8280
; CHECK-O-NEXT: Running pass: PostOrderFunctionAttrsPass
8381
; CHECK-O3-NEXT: Running pass: ArgumentPromotionPass
8482
; CHECK-O2-NEXT: Running pass: OpenMPOptPass

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
; CHECK-O-NEXT: Running analysis: CallGraphAnalysis
6060
; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}ProfileSummaryAnalysis
6161
; CHECK-O-NEXT: Running pass: PGOIndirectCallPromotion
62-
; CHECK-O-NEXT: Running pass: AttributorPass
6362
; CHECK-O-NEXT: Running pass: IPSCCPPass
6463
; CHECK-O-NEXT: Running pass: CalledValuePropagationPass
6564
; CHECK-O-NEXT: Running pass: GlobalOptPass
@@ -86,7 +85,6 @@
8685
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy<{{.*}}LazyCallGraph::SCC{{.*}}>
8786
; CHECK-O-NEXT: Starting CGSCC pass manager run.
8887
; CHECK-O-NEXT: Running pass: InlinerPass
89-
; CHECK-O-NEXT: Running pass: AttributorCGSCCPass
9088
; CHECK-O-NEXT: Running pass: PostOrderFunctionAttrsPass
9189
; CHECK-O3-NEXT: Running pass: ArgumentPromotionPass
9290
; CHECK-O2-NEXT: Running pass: OpenMPOptPass

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; Validate ThinLTO prelink pipeline when we have instrumentation PGO
22
;
33
; RUN: llvm-profdata merge %S/Inputs/new-pm-thinlto-prelink-pgo-defaults.proftext -o %t.profdata
4-
;
4+
;
55
; RUN: opt -disable-verify -debug-pass-manager \
66
; RUN: -pgo-kind=pgo-instr-use-pipeline -profile-file='%t.profdata' \
77
; RUN: -passes='thinlto-pre-link<O1>,name-anon-globals' -S %s 2>&1 \
@@ -52,7 +52,6 @@
5252
; CHECK-O-NEXT: Running pass: LowerExpectIntrinsicPass
5353
; CHECK-O3-NEXT: Running pass: CallSiteSplittingPass
5454
; CHECK-O-NEXT: Finished {{.*}}Function pass manager run.
55-
; CHECK-O-NEXT: Running pass: AttributorPass
5655
; CHECK-O-NEXT: Running pass: IPSCCPPass
5756
; CHECK-O-NEXT: Running pass: CalledValuePropagationPass
5857
; CHECK-O-NEXT: Running pass: GlobalOptPass
@@ -106,7 +105,6 @@
106105
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy<{{.*}}LazyCallGraph::SCC{{.*}}>
107106
; CHECK-O-NEXT: Starting CGSCC pass manager run.
108107
; CHECK-O-NEXT: Running pass: InlinerPass
109-
; CHECK-O-NEXT: Running pass: AttributorCGSCCPass
110108
; CHECK-O-NEXT: Running pass: PostOrderFunctionAttrsPass
111109
; CHECK-O-NEXT: Running analysis: AAManager on foo
112110
; CHECK-O3-NEXT: Running pass: ArgumentPromotionPass

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
; CHECK-O-NEXT: Running analysis: ProfileSummaryAnalysis
6060
; CHECK-O-NEXT: Running analysis: CallGraphAnalysis
6161
; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}ProfileSummaryAnalysis
62-
; CHECK-O-NEXT: Running pass: AttributorPass
6362
; CHECK-O-NEXT: Running pass: IPSCCPPass
6463
; CHECK-O-NEXT: Running pass: CalledValuePropagationPass
6564
; CHECK-O-NEXT: Running pass: GlobalOptPass
@@ -86,7 +85,6 @@
8685
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy<{{.*}}LazyCallGraph::SCC{{.*}}>
8786
; CHECK-O-NEXT: Starting CGSCC pass manager run.
8887
; CHECK-O-NEXT: Running pass: InlinerPass
89-
; CHECK-O-NEXT: Running pass: AttributorCGSCCPass
9088
; CHECK-O-NEXT: Running pass: PostOrderFunctionAttrsPass
9189
; CHECK-O3-NEXT: Running pass: ArgumentPromotionPass
9290
; CHECK-O2-NEXT: Running pass: OpenMPOptPass

‎llvm/test/Other/opt-O2-pipeline.ll‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,13 @@
2222
; CHECK-NEXT: Target Library Information
2323
; CHECK-NEXT: Target Transform Information
2424
; Target Pass Configuration
25-
; CHECK: Type-Based Alias Analysis
25+
; CHECK: Type-Based Alias Analysis
2626
; CHECK-NEXT: Scoped NoAlias Alias Analysis
2727
; CHECK-NEXT: Assumption Cache Tracker
2828
; CHECK-NEXT: Profile summary info
2929
; CHECK-NEXT: ModulePass Manager
3030
; CHECK-NEXT: Force set function attributes
3131
; CHECK-NEXT: Infer set function attributes
32-
; CHECK-NEXT: Deduce and propagate attributes
3332
; CHECK-NEXT: Interprocedural Sparse Conditional Constant Propagation
3433
; CHECK-NEXT: FunctionPass Manager
3534
; CHECK-NEXT: Dominator Tree Construction
@@ -59,7 +58,6 @@
5958
; CHECK-NEXT: Call Graph SCC Pass Manager
6059
; CHECK-NEXT: Remove unused exception handling info
6160
; CHECK-NEXT: Function Integration/Inlining
62-
; CHECK-NEXT: Deduce and propagate attributes (CGSCC pass)
6361
; CHECK-NEXT: OpenMP specific optimizations
6462
; CHECK-NEXT: Deduce function attributes
6563
; CHECK-NEXT: FunctionPass Manager

0 commit comments

Comments
 (0)