[llvm] 99c47d9 - Remove TargetMachine::adjustPassManager
Bjorn Pettersson via llvm-commits
llvm-commits at lists.llvm.org
Mon Nov 28 01:27:29 PST 2022
Author: Bjorn Pettersson
Date: 2022-11-28T10:24:16+01:00
New Revision: 99c47d9e3113a917ea2f84f27e57f2ea3da4fc8c
URL: https://github.com/llvm/llvm-project/commit/99c47d9e3113a917ea2f84f27e57f2ea3da4fc8c
DIFF: https://github.com/llvm/llvm-project/commit/99c47d9e3113a917ea2f84f27e57f2ea3da4fc8c.diff
LOG: Remove TargetMachine::adjustPassManager
Since opt no longer supports to run default (O0/O1/O2/O3/Os/Oz)
pipelines using the legacy PM, there are no in-tree uses of
TargetMachine::adjustPassManager remaining. This patch removes the
no longer used adjustPassManager functions.
Reviewed By: aeubanks
Differential Revision: https://reviews.llvm.org/D137796
Added:
Modified:
llvm/docs/NVPTXUsage.rst
llvm/docs/NewPassManager.rst
llvm/include/llvm/LTO/legacy/LTOCodeGenerator.h
llvm/include/llvm/Target/TargetMachine.h
llvm/lib/LTO/LTO.cpp
llvm/lib/LTO/LTOCodeGenerator.cpp
llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.h
llvm/lib/Target/BPF/BPFTargetMachine.cpp
llvm/lib/Target/BPF/BPFTargetMachine.h
llvm/lib/Target/Hexagon/HexagonTargetMachine.cpp
llvm/lib/Target/Hexagon/HexagonTargetMachine.h
llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp
llvm/lib/Target/NVPTX/NVPTXTargetMachine.h
Removed:
################################################################################
diff --git a/llvm/docs/NVPTXUsage.rst b/llvm/docs/NVPTXUsage.rst
index e4b5ace6b634..5c28a3f3eee9 100644
--- a/llvm/docs/NVPTXUsage.rst
+++ b/llvm/docs/NVPTXUsage.rst
@@ -328,14 +328,16 @@ optimization pipeline before dead-code elimination.
The NVPTX TargetMachine knows how to schedule ``NVVMReflect`` at the beginning
of your pass manager; just use the following code when setting up your pass
-manager:
+manager and the PassBuilder will use ``registerPassBuilderCallbacks`` to let
+NVPTXTargetMachine::registerPassBuilderCallbacks add the the pass to the
+pass manager:
.. code-block:: c++
std::unique_ptr<TargetMachine> TM = ...;
- PassManagerBuilder PMBuilder(...);
- if (TM)
- TM->adjustPassManager(PMBuilder);
+ PassBuilder PB(TM);
+ ModulePassManager MPM;
+ PB.parsePassPipeline(MPM, ...);
Reflection Parameters
---------------------
diff --git a/llvm/docs/NewPassManager.rst b/llvm/docs/NewPassManager.rst
index 3d0bcdeb4ccb..cf464803345d 100644
--- a/llvm/docs/NewPassManager.rst
+++ b/llvm/docs/NewPassManager.rst
@@ -171,8 +171,7 @@ managers created by that ``PassBuilder``. See the documentation for
If a ``PassBuilder`` has a corresponding ``TargetMachine`` for a backend, it
will call ``TargetMachine::registerPassBuilderCallbacks()`` to allow the
-backend to inject passes into the pipeline. This is equivalent to the legacy
-PM's ``TargetMachine::adjustPassManager()``.
+backend to inject passes into the pipeline.
Clang's ``BackendUtil.cpp`` shows examples of a frontend adding (mostly
sanitizer) passes to various parts of the pipeline.
@@ -518,10 +517,13 @@ remove its usage.
Some IR passes are considered part of the backend codegen pipeline even if
they are LLVM IR passes (whereas all MIR passes are codegen passes). This
includes anything added via ``TargetPassConfig`` hooks, e.g.
-``TargetPassConfig::addCodeGenPrepare()``. As mentioned before, passes added
-in ``TargetMachine::adjustPassManager()`` are part of the optimization
-pipeline, and should have a corresponding line in
-``TargetMachine::registerPassBuilderCallbacks()``.
+``TargetPassConfig::addCodeGenPrepare()``.
+
+The ``TargetMachine::adjustPassManager()`` function that was used to extend a
+legacy PM with passes on a per target basis has been removed. It was mainly
+used from opt, but since support for using the default pipelines has been
+removed in opt the function isn't needed any longer. In the new PM such
+adjustments are done by using ``TargetMachine::registerPassBuilderCallbacks()``.
Currently there are efforts to make the codegen pipeline work with the new
PM.
diff --git a/llvm/include/llvm/LTO/legacy/LTOCodeGenerator.h b/llvm/include/llvm/LTO/legacy/LTOCodeGenerator.h
index a55dc316a67e..5f64ca4a3fd7 100644
--- a/llvm/include/llvm/LTO/legacy/LTOCodeGenerator.h
+++ b/llvm/include/llvm/LTO/legacy/LTOCodeGenerator.h
@@ -24,6 +24,7 @@
// As of this writing, we don't separate IPO and the Post-IPO SOPT. They
// are intermingled together, and are driven by a single pass manager (see
// PassManagerBuilder::populateLTOPassManager()).
+// FIXME: populateLTOPassManager no longer exists.
//
// The "LTOCodeGenerator" is the driver for the IPO and Post-IPO stages.
// The "CodeGenerator" here is bit confusing. Don't confuse the "CodeGenerator"
diff --git a/llvm/include/llvm/Target/TargetMachine.h b/llvm/include/llvm/Target/TargetMachine.h
index c86b2f27d815..e15d2b9544ac 100644
--- a/llvm/include/llvm/Target/TargetMachine.h
+++ b/llvm/include/llvm/Target/TargetMachine.h
@@ -46,7 +46,6 @@ class MCSubtargetInfo;
class MCSymbol;
class raw_pwrite_stream;
class PassBuilder;
-class PassManagerBuilder;
struct PerFunctionMIParsingState;
class SMDiagnostic;
class SMRange;
@@ -347,12 +346,7 @@ class TargetMachine {
/// corresponding to \p F.
virtual TargetTransformInfo getTargetTransformInfo(const Function &F) const;
- /// Allow the target to modify the pass manager, e.g. by calling
- /// PassManagerBuilder::addExtension.
- virtual void adjustPassManager(PassManagerBuilder &) {}
-
- /// Allow the target to modify the pass pipeline with New Pass Manager
- /// (similar to adjustPassManager for Legacy Pass manager).
+ /// Allow the target to modify the pass pipeline.
virtual void registerPassBuilderCallbacks(PassBuilder &) {}
/// Allow the target to register alias analyses with the AAManager for use
diff --git a/llvm/lib/LTO/LTO.cpp b/llvm/lib/LTO/LTO.cpp
index 54c173295172..27787d99c967 100644
--- a/llvm/lib/LTO/LTO.cpp
+++ b/llvm/lib/LTO/LTO.cpp
@@ -49,10 +49,8 @@
#include "llvm/Support/ToolOutputFile.h"
#include "llvm/Support/VCSRevision.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/Target/TargetMachine.h"
#include "llvm/Target/TargetOptions.h"
#include "llvm/Transforms/IPO.h"
-#include "llvm/Transforms/IPO/PassManagerBuilder.h"
#include "llvm/Transforms/IPO/WholeProgramDevirt.h"
#include "llvm/Transforms/Utils/FunctionImportUtils.h"
#include "llvm/Transforms/Utils/SplitModule.h"
diff --git a/llvm/lib/LTO/LTOCodeGenerator.cpp b/llvm/lib/LTO/LTOCodeGenerator.cpp
index c9ecc6df036c..b1f0cf9a7480 100644
--- a/llvm/lib/LTO/LTOCodeGenerator.cpp
+++ b/llvm/lib/LTO/LTOCodeGenerator.cpp
@@ -36,7 +36,6 @@
#include "llvm/IR/Module.h"
#include "llvm/IR/PassTimingInfo.h"
#include "llvm/IR/Verifier.h"
-#include "llvm/InitializePasses.h"
#include "llvm/LTO/LTO.h"
#include "llvm/LTO/LTOBackend.h"
#include "llvm/LTO/legacy/LTOModule.h"
@@ -60,7 +59,6 @@
#include "llvm/Target/TargetOptions.h"
#include "llvm/Transforms/IPO.h"
#include "llvm/Transforms/IPO/Internalize.h"
-#include "llvm/Transforms/IPO/PassManagerBuilder.h"
#include "llvm/Transforms/IPO/WholeProgramDevirt.h"
#include "llvm/Transforms/ObjCARC.h"
#include "llvm/Transforms/Utils/ModuleUtils.h"
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp b/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
index df43fb0eb748..219963096db6 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
@@ -51,7 +51,6 @@
#include "llvm/Transforms/IPO/AlwaysInliner.h"
#include "llvm/Transforms/IPO/GlobalDCE.h"
#include "llvm/Transforms/IPO/Internalize.h"
-#include "llvm/Transforms/IPO/PassManagerBuilder.h"
#include "llvm/Transforms/Scalar.h"
#include "llvm/Transforms/Scalar/GVN.h"
#include "llvm/Transforms/Scalar/InferAddressSpaces.h"
@@ -576,80 +575,6 @@ static bool mustPreserveGV(const GlobalValue &GV) {
return !GV.use_empty();
}
-void AMDGPUTargetMachine::adjustPassManager(PassManagerBuilder &Builder) {
- Builder.DivergentTarget = true;
-
- bool EnableOpt = getOptLevel() > CodeGenOpt::None;
- bool Internalize = InternalizeSymbols;
- bool EarlyInline = EarlyInlineAll && EnableOpt && !EnableFunctionCalls;
- bool AMDGPUAA = EnableAMDGPUAliasAnalysis && EnableOpt;
- bool LibCallSimplify = EnableLibCallSimplify && EnableOpt;
- bool PromoteKernelArguments =
- EnablePromoteKernelArguments && getOptLevel() > CodeGenOpt::Less;
-
- if (EnableFunctionCalls) {
- delete Builder.Inliner;
- Builder.Inliner = createFunctionInliningPass();
- }
-
- Builder.addExtension(
- PassManagerBuilder::EP_ModuleOptimizerEarly,
- [Internalize, EarlyInline, AMDGPUAA, this](const PassManagerBuilder &,
- legacy::PassManagerBase &PM) {
- if (AMDGPUAA) {
- PM.add(createAMDGPUAAWrapperPass());
- PM.add(createAMDGPUExternalAAWrapperPass());
- }
- PM.add(createAMDGPUUnifyMetadataPass());
- PM.add(createAMDGPUPrintfRuntimeBinding());
- if (Internalize)
- PM.add(createInternalizePass(mustPreserveGV));
- PM.add(createAMDGPUPropagateAttributesLatePass(this));
- if (Internalize)
- PM.add(createGlobalDCEPass());
- if (EarlyInline)
- PM.add(createAMDGPUAlwaysInlinePass(false));
- });
-
- Builder.addExtension(
- PassManagerBuilder::EP_EarlyAsPossible,
- [AMDGPUAA, LibCallSimplify, this](const PassManagerBuilder &,
- legacy::PassManagerBase &PM) {
- if (AMDGPUAA) {
- PM.add(createAMDGPUAAWrapperPass());
- PM.add(createAMDGPUExternalAAWrapperPass());
- }
- PM.add(llvm::createAMDGPUPropagateAttributesEarlyPass(this));
- PM.add(llvm::createAMDGPUUseNativeCallsPass());
- if (LibCallSimplify)
- PM.add(llvm::createAMDGPUSimplifyLibCallsPass(this));
- });
-
- Builder.addExtension(
- PassManagerBuilder::EP_CGSCCOptimizerLate,
- [EnableOpt, PromoteKernelArguments](const PassManagerBuilder &,
- legacy::PassManagerBase &PM) {
- // Add promote kernel arguments pass to the opt pipeline right before
- // infer address spaces which is needed to do actual address space
- // rewriting.
- if (PromoteKernelArguments)
- PM.add(createAMDGPUPromoteKernelArgumentsPass());
-
- // Add infer address spaces pass to the opt pipeline after inlining
- // but before SROA to increase SROA opportunities.
- PM.add(createInferAddressSpacesPass());
-
- // This should run after inlining to have any chance of doing anything,
- // and before other cleanup optimizations.
- PM.add(createAMDGPULowerKernelAttributesPass());
-
- // Promote alloca to vector before SROA and loop unroll. If we manage
- // to eliminate allocas before unroll we may choose to unroll less.
- if (EnableOpt)
- PM.add(createAMDGPUPromoteAllocaToVector());
- });
-}
-
void AMDGPUTargetMachine::registerDefaultAliasAnalyses(AAManager &AAM) {
AAM.registerFunctionAnalysis<AMDGPUAA>();
}
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.h b/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.h
index 567cc9d610d2..caa03de1ca0e 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.h
+++ b/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.h
@@ -50,8 +50,6 @@ class AMDGPUTargetMachine : public LLVMTargetMachine {
return TLOF.get();
}
- void adjustPassManager(PassManagerBuilder &) override;
-
void registerPassBuilderCallbacks(PassBuilder &PB) override;
void registerDefaultAliasAnalyses(AAManager &) override;
diff --git a/llvm/lib/Target/BPF/BPFTargetMachine.cpp b/llvm/lib/Target/BPF/BPFTargetMachine.cpp
index 97d9ed3cad47..0c22185d48fd 100644
--- a/llvm/lib/Target/BPF/BPFTargetMachine.cpp
+++ b/llvm/lib/Target/BPF/BPFTargetMachine.cpp
@@ -24,7 +24,6 @@
#include "llvm/Passes/PassBuilder.h"
#include "llvm/Support/FormattedStream.h"
#include "llvm/Target/TargetOptions.h"
-#include "llvm/Transforms/IPO/PassManagerBuilder.h"
#include "llvm/Transforms/Scalar.h"
#include "llvm/Transforms/Scalar/SimplifyCFG.h"
#include "llvm/Transforms/Utils/SimplifyCFGOptions.h"
@@ -102,28 +101,6 @@ TargetPassConfig *BPFTargetMachine::createPassConfig(PassManagerBase &PM) {
return new BPFPassConfig(*this, PM);
}
-void BPFTargetMachine::adjustPassManager(PassManagerBuilder &Builder) {
- Builder.addExtension(
- PassManagerBuilder::EP_EarlyAsPossible,
- [&](const PassManagerBuilder &, legacy::PassManagerBase &PM) {
- PM.add(createBPFAbstractMemberAccess(this));
- PM.add(createBPFPreserveDIType());
- PM.add(createBPFIRPeephole());
- });
-
- Builder.addExtension(
- PassManagerBuilder::EP_Peephole,
- [&](const PassManagerBuilder &, legacy::PassManagerBase &PM) {
- PM.add(createCFGSimplificationPass(
- SimplifyCFGOptions().hoistCommonInsts(true)));
- });
- Builder.addExtension(
- PassManagerBuilder::EP_ModuleOptimizerEarly,
- [&](const PassManagerBuilder &, legacy::PassManagerBase &PM) {
- PM.add(createBPFAdjustOpt());
- });
-}
-
void BPFTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) {
PB.registerPipelineStartEPCallback(
[=](ModulePassManager &MPM, OptimizationLevel) {
diff --git a/llvm/lib/Target/BPF/BPFTargetMachine.h b/llvm/lib/Target/BPF/BPFTargetMachine.h
index fede52089725..1a3afb032e91 100644
--- a/llvm/lib/Target/BPF/BPFTargetMachine.h
+++ b/llvm/lib/Target/BPF/BPFTargetMachine.h
@@ -40,7 +40,6 @@ class BPFTargetMachine : public LLVMTargetMachine {
return TLOF.get();
}
- void adjustPassManager(PassManagerBuilder &) override;
void registerPassBuilderCallbacks(PassBuilder &PB) override;
};
}
diff --git a/llvm/lib/Target/Hexagon/HexagonTargetMachine.cpp b/llvm/lib/Target/Hexagon/HexagonTargetMachine.cpp
index 4e04939e6690..0f4e8666bf52 100644
--- a/llvm/lib/Target/Hexagon/HexagonTargetMachine.cpp
+++ b/llvm/lib/Target/Hexagon/HexagonTargetMachine.cpp
@@ -27,7 +27,6 @@
#include "llvm/MC/TargetRegistry.h"
#include "llvm/Passes/PassBuilder.h"
#include "llvm/Support/CommandLine.h"
-#include "llvm/Transforms/IPO/PassManagerBuilder.h"
#include "llvm/Transforms/Scalar.h"
using namespace llvm;
@@ -273,19 +272,6 @@ HexagonTargetMachine::getSubtargetImpl(const Function &F) const {
return I.get();
}
-void HexagonTargetMachine::adjustPassManager(PassManagerBuilder &PMB) {
- PMB.addExtension(
- PassManagerBuilder::EP_LateLoopOptimizations,
- [&](const PassManagerBuilder &, legacy::PassManagerBase &PM) {
- PM.add(createHexagonLoopIdiomPass());
- });
- PMB.addExtension(
- PassManagerBuilder::EP_LoopOptimizerEnd,
- [&](const PassManagerBuilder &, legacy::PassManagerBase &PM) {
- PM.add(createHexagonVectorLoopCarriedReuseLegacyPass());
- });
-}
-
void HexagonTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) {
PB.registerLateLoopOptimizationsEPCallback(
[=](LoopPassManager &LPM, OptimizationLevel Level) {
diff --git a/llvm/lib/Target/Hexagon/HexagonTargetMachine.h b/llvm/lib/Target/Hexagon/HexagonTargetMachine.h
index 947df7574ab3..de2e0b58e998 100644
--- a/llvm/lib/Target/Hexagon/HexagonTargetMachine.h
+++ b/llvm/lib/Target/Hexagon/HexagonTargetMachine.h
@@ -36,7 +36,6 @@ class HexagonTargetMachine : public LLVMTargetMachine {
static unsigned getModuleMatchQuality(const Module &M);
- void adjustPassManager(PassManagerBuilder &PMB) override;
void registerPassBuilderCallbacks(PassBuilder &PB) override;
TargetPassConfig *createPassConfig(PassManagerBase &PM) override;
TargetTransformInfo getTargetTransformInfo(const Function &F) const override;
diff --git a/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp b/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp
index 597b8af176a2..3a805cdb7245 100644
--- a/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp
+++ b/llvm/lib/Target/NVPTX/NVPTXTargetMachine.cpp
@@ -31,7 +31,6 @@
#include "llvm/Support/CommandLine.h"
#include "llvm/Target/TargetMachine.h"
#include "llvm/Target/TargetOptions.h"
-#include "llvm/Transforms/IPO/PassManagerBuilder.h"
#include "llvm/Transforms/Scalar.h"
#include "llvm/Transforms/Scalar/GVN.h"
#include "llvm/Transforms/Vectorize.h"
@@ -201,15 +200,6 @@ TargetPassConfig *NVPTXTargetMachine::createPassConfig(PassManagerBase &PM) {
return new NVPTXPassConfig(*this, PM);
}
-void NVPTXTargetMachine::adjustPassManager(PassManagerBuilder &Builder) {
- Builder.addExtension(
- PassManagerBuilder::EP_EarlyAsPossible,
- [&](const PassManagerBuilder &, legacy::PassManagerBase &PM) {
- PM.add(createNVVMReflectPass(Subtarget.getSmVersion()));
- PM.add(createNVVMIntrRangePass(Subtarget.getSmVersion()));
- });
-}
-
void NVPTXTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) {
PB.registerPipelineParsingCallback(
[](StringRef PassName, FunctionPassManager &PM,
diff --git a/llvm/lib/Target/NVPTX/NVPTXTargetMachine.h b/llvm/lib/Target/NVPTX/NVPTXTargetMachine.h
index 491e721479d3..6f1ee9cc8f6b 100644
--- a/llvm/lib/Target/NVPTX/NVPTXTargetMachine.h
+++ b/llvm/lib/Target/NVPTX/NVPTXTargetMachine.h
@@ -62,7 +62,6 @@ class NVPTXTargetMachine : public LLVMTargetMachine {
return TLOF.get();
}
- void adjustPassManager(PassManagerBuilder &) override;
void registerPassBuilderCallbacks(PassBuilder &PB) override;
TargetTransformInfo getTargetTransformInfo(const Function &F) const override;
More information about the llvm-commits
mailing list