[llvm] 7feb816 - [NFC] Removes unused Combiner dependency on TargetPassConfig (#188365)
via llvm-commits
llvm-commits at lists.llvm.org
Mon Mar 30 08:58:27 PDT 2026
Author: Anshul Nigham
Date: 2026-03-30T08:58:22-07:00
New Revision: 7feb816ed07f1a6ac79de71b8d66c7eff6e7e922
URL: https://github.com/llvm/llvm-project/commit/7feb816ed07f1a6ac79de71b8d66c7eff6e7e922
DIFF: https://github.com/llvm/llvm-project/commit/7feb816ed07f1a6ac79de71b8d66c7eff6e7e922.diff
LOG: [NFC] Removes unused Combiner dependency on TargetPassConfig (#188365)
This enables NewPM ports since it removes multiple pass dependencies on
`TargetPassConfig` which we don't want to port to the NewPM.
It looks like no derived classes of Combiner actually use this pointer,
and it is also unused in the Combiner class.
Added:
Modified:
llvm/include/llvm/CodeGen/GlobalISel/Combiner.h
llvm/lib/CodeGen/GlobalISel/Combiner.cpp
llvm/lib/Target/AArch64/GISel/AArch64O0PreLegalizerCombiner.cpp
llvm/lib/Target/AArch64/GISel/AArch64PostLegalizerCombiner.cpp
llvm/lib/Target/AArch64/GISel/AArch64PostLegalizerLowering.cpp
llvm/lib/Target/AArch64/GISel/AArch64PreLegalizerCombiner.cpp
llvm/lib/Target/AMDGPU/AMDGPUPostLegalizerCombiner.cpp
llvm/lib/Target/AMDGPU/AMDGPUPreLegalizerCombiner.cpp
llvm/lib/Target/AMDGPU/AMDGPURegBankCombiner.cpp
llvm/lib/Target/Mips/MipsPostLegalizerCombiner.cpp
llvm/lib/Target/Mips/MipsPreLegalizerCombiner.cpp
llvm/lib/Target/RISCV/GISel/RISCVO0PreLegalizerCombiner.cpp
llvm/lib/Target/RISCV/GISel/RISCVPostLegalizerCombiner.cpp
llvm/lib/Target/RISCV/GISel/RISCVPreLegalizerCombiner.cpp
llvm/lib/Target/SPIRV/SPIRVPreLegalizerCombiner.cpp
llvm/lib/Target/WebAssembly/GISel/WebAssemblyPostLegalizerCombiner.cpp
llvm/lib/Target/WebAssembly/GISel/WebAssemblyPreLegalizerCombiner.cpp
llvm/lib/Target/X86/GISel/X86PostLegalizerCombiner.cpp
llvm/lib/Target/X86/GISel/X86PreLegalizerCombiner.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/CodeGen/GlobalISel/Combiner.h b/llvm/include/llvm/CodeGen/GlobalISel/Combiner.h
index abae1f323ba64..8b028cd5c023c 100644
--- a/llvm/include/llvm/CodeGen/GlobalISel/Combiner.h
+++ b/llvm/include/llvm/CodeGen/GlobalISel/Combiner.h
@@ -23,7 +23,6 @@
namespace llvm {
class MachineRegisterInfo;
class GISelCSEInfo;
-class TargetPassConfig;
class MachineFunction;
class MachineIRBuilder;
@@ -58,8 +57,7 @@ class Combiner : public GIMatchTableExecutor {
/// If CSEInfo is not null, then the Combiner will use CSEInfo as the observer
/// and also create a CSEMIRBuilder. Pass nullptr if CSE is not needed.
Combiner(MachineFunction &MF, const CombinerInfo &CInfo,
- const TargetPassConfig *TPC, GISelValueTracking *VT,
- GISelCSEInfo *CSEInfo = nullptr);
+ GISelValueTracking *VT, GISelCSEInfo *CSEInfo = nullptr);
~Combiner() override;
virtual bool tryCombineAll(MachineInstr &I) const = 0;
@@ -74,7 +72,6 @@ class Combiner : public GIMatchTableExecutor {
MachineRegisterInfo &MRI;
GISelValueTracking *VT;
- const TargetPassConfig *TPC;
GISelCSEInfo *CSEInfo;
};
diff --git a/llvm/lib/CodeGen/GlobalISel/Combiner.cpp b/llvm/lib/CodeGen/GlobalISel/Combiner.cpp
index 81b79f36f95fb..a4121fbb7b6c8 100644
--- a/llvm/lib/CodeGen/GlobalISel/Combiner.cpp
+++ b/llvm/lib/CodeGen/GlobalISel/Combiner.cpp
@@ -222,17 +222,14 @@ Combiner::WorkListMaintainer::create(Level Lvl, WorkListTy &WorkList,
}
Combiner::Combiner(MachineFunction &MF, const CombinerInfo &CInfo,
- const TargetPassConfig *TPC, GISelValueTracking *VT,
- GISelCSEInfo *CSEInfo)
+ GISelValueTracking *VT, GISelCSEInfo *CSEInfo)
: Builder(CSEInfo ? std::make_unique<CSEMIRBuilder>()
: std::make_unique<MachineIRBuilder>()),
WLObserver(WorkListMaintainer::create(CInfo.ObserverLvl, WorkList,
MF.getRegInfo())),
ObserverWrapper(std::make_unique<GISelObserverWrapper>()), CInfo(CInfo),
Observer(*ObserverWrapper), B(*Builder), MF(MF), MRI(MF.getRegInfo()),
- VT(VT), TPC(TPC), CSEInfo(CSEInfo) {
- (void)this->TPC; // FIXME: Remove when used.
-
+ VT(VT), CSEInfo(CSEInfo) {
// Setup builder.
B.setMF(MF);
if (CSEInfo)
diff --git a/llvm/lib/Target/AArch64/GISel/AArch64O0PreLegalizerCombiner.cpp b/llvm/lib/Target/AArch64/GISel/AArch64O0PreLegalizerCombiner.cpp
index 7f568b49f2619..8bb3e64504b20 100644
--- a/llvm/lib/Target/AArch64/GISel/AArch64O0PreLegalizerCombiner.cpp
+++ b/llvm/lib/Target/AArch64/GISel/AArch64O0PreLegalizerCombiner.cpp
@@ -48,8 +48,8 @@ class AArch64O0PreLegalizerCombinerImpl : public Combiner {
public:
AArch64O0PreLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const AArch64O0PreLegalizerCombinerImplRuleConfig &RuleConfig,
const AArch64Subtarget &STI, const LibcallLoweringInfo &Libcalls);
@@ -70,11 +70,11 @@ class AArch64O0PreLegalizerCombinerImpl : public Combiner {
#undef GET_GICOMBINER_IMPL
AArch64O0PreLegalizerCombinerImpl::AArch64O0PreLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const AArch64O0PreLegalizerCombinerImplRuleConfig &RuleConfig,
const AArch64Subtarget &STI, const LibcallLoweringInfo &Libcalls)
- : Combiner(MF, CInfo, TPC, &VT, CSEInfo),
+ : Combiner(MF, CInfo, &VT, CSEInfo),
Helper(Observer, B, /*IsPreLegalize*/ true, &VT), RuleConfig(RuleConfig),
STI(STI), Libcalls(Libcalls),
#define GET_GICOMBINER_CONSTRUCTOR_INITS
@@ -134,7 +134,6 @@ class AArch64O0PreLegalizerCombiner : public MachineFunctionPass {
} // end anonymous namespace
void AArch64O0PreLegalizerCombiner::getAnalysisUsage(AnalysisUsage &AU) const {
- AU.addRequired<TargetPassConfig>();
AU.setPreservesCFG();
getSelectionDAGFallbackAnalysisUsage(AU);
AU.addRequired<GISelValueTrackingAnalysisLegacy>();
@@ -152,7 +151,6 @@ AArch64O0PreLegalizerCombiner::AArch64O0PreLegalizerCombiner()
bool AArch64O0PreLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) {
if (MF.getProperties().hasFailedISel())
return false;
- auto &TPC = getAnalysis<TargetPassConfig>();
const Function &F = MF.getFunction();
GISelValueTracking *VT =
@@ -170,7 +168,7 @@ bool AArch64O0PreLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) {
// at the cost of possibly missing optimizations. See PR#94291 for details.
CInfo.MaxIterations = 1;
- AArch64O0PreLegalizerCombinerImpl Impl(MF, CInfo, &TPC, *VT,
+ AArch64O0PreLegalizerCombinerImpl Impl(MF, CInfo, *VT,
/*CSEInfo*/ nullptr, RuleConfig, ST,
Libcalls);
return Impl.combineMachineInstrs();
@@ -180,7 +178,6 @@ char AArch64O0PreLegalizerCombiner::ID = 0;
INITIALIZE_PASS_BEGIN(AArch64O0PreLegalizerCombiner, DEBUG_TYPE,
"Combine AArch64 machine instrs before legalization",
false, false)
-INITIALIZE_PASS_DEPENDENCY(TargetPassConfig)
INITIALIZE_PASS_DEPENDENCY(GISelValueTrackingAnalysisLegacy)
INITIALIZE_PASS_DEPENDENCY(GISelCSEAnalysisWrapperPass)
INITIALIZE_PASS_DEPENDENCY(LibcallLoweringInfoWrapper)
diff --git a/llvm/lib/Target/AArch64/GISel/AArch64PostLegalizerCombiner.cpp b/llvm/lib/Target/AArch64/GISel/AArch64PostLegalizerCombiner.cpp
index 1502a3c871571..631c09db7242e 100644
--- a/llvm/lib/Target/AArch64/GISel/AArch64PostLegalizerCombiner.cpp
+++ b/llvm/lib/Target/AArch64/GISel/AArch64PostLegalizerCombiner.cpp
@@ -596,8 +596,8 @@ class AArch64PostLegalizerCombinerImpl : public Combiner {
public:
AArch64PostLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const AArch64PostLegalizerCombinerImplRuleConfig &RuleConfig,
const AArch64Subtarget &STI, MachineDominatorTree *MDT,
const LegalizerInfo *LI);
@@ -617,12 +617,12 @@ class AArch64PostLegalizerCombinerImpl : public Combiner {
#undef GET_GICOMBINER_IMPL
AArch64PostLegalizerCombinerImpl::AArch64PostLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const AArch64PostLegalizerCombinerImplRuleConfig &RuleConfig,
const AArch64Subtarget &STI, MachineDominatorTree *MDT,
const LegalizerInfo *LI)
- : Combiner(MF, CInfo, TPC, &VT, CSEInfo),
+ : Combiner(MF, CInfo, &VT, CSEInfo),
Helper(Observer, B, /*IsPreLegalize*/ false, &VT, MDT, LI),
RuleConfig(RuleConfig), STI(STI),
#define GET_GICOMBINER_CONSTRUCTOR_INITS
@@ -716,8 +716,8 @@ bool AArch64PostLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) {
CInfo.ObserverLvl = CombinerInfo::ObserverLevel::SinglePass;
// Legalizer performs DCE, so a full DCE pass is unnecessary.
CInfo.EnableFullDCE = false;
- AArch64PostLegalizerCombinerImpl Impl(MF, CInfo, TPC, *VT, CSEInfo,
- RuleConfig, ST, MDT, LI);
+ AArch64PostLegalizerCombinerImpl Impl(MF, CInfo, *VT, CSEInfo, RuleConfig, ST,
+ MDT, LI);
bool Changed = Impl.combineMachineInstrs();
auto MIB = CSEMIRBuilder(MF);
diff --git a/llvm/lib/Target/AArch64/GISel/AArch64PostLegalizerLowering.cpp b/llvm/lib/Target/AArch64/GISel/AArch64PostLegalizerLowering.cpp
index 70e917187fac0..2b34a89a1db64 100644
--- a/llvm/lib/Target/AArch64/GISel/AArch64PostLegalizerLowering.cpp
+++ b/llvm/lib/Target/AArch64/GISel/AArch64PostLegalizerLowering.cpp
@@ -1227,8 +1227,7 @@ class AArch64PostLegalizerLoweringImpl : public Combiner {
public:
AArch64PostLegalizerLoweringImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelCSEInfo *CSEInfo,
const AArch64PostLegalizerLoweringImplRuleConfig &RuleConfig,
const AArch64Subtarget &STI);
@@ -1247,11 +1246,10 @@ class AArch64PostLegalizerLoweringImpl : public Combiner {
#undef GET_GICOMBINER_IMPL
AArch64PostLegalizerLoweringImpl::AArch64PostLegalizerLoweringImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelCSEInfo *CSEInfo,
const AArch64PostLegalizerLoweringImplRuleConfig &RuleConfig,
const AArch64Subtarget &STI)
- : Combiner(MF, CInfo, TPC, /*VT*/ nullptr, CSEInfo),
+ : Combiner(MF, CInfo, /*VT*/ nullptr, CSEInfo),
Helper(Observer, B, /*IsPreLegalize*/ true), RuleConfig(RuleConfig),
STI(STI),
#define GET_GICOMBINER_CONSTRUCTOR_INITS
@@ -1279,7 +1277,6 @@ class AArch64PostLegalizerLowering : public MachineFunctionPass {
} // end anonymous namespace
void AArch64PostLegalizerLowering::getAnalysisUsage(AnalysisUsage &AU) const {
- AU.addRequired<TargetPassConfig>();
AU.setPreservesCFG();
getSelectionDAGFallbackAnalysisUsage(AU);
MachineFunctionPass::getAnalysisUsage(AU);
@@ -1295,7 +1292,6 @@ bool AArch64PostLegalizerLowering::runOnMachineFunction(MachineFunction &MF) {
if (MF.getProperties().hasFailedISel())
return false;
assert(MF.getProperties().hasLegalized() && "Expected a legalized function?");
- auto *TPC = &getAnalysis<TargetPassConfig>();
const Function &F = MF.getFunction();
const AArch64Subtarget &ST = MF.getSubtarget<AArch64Subtarget>();
@@ -1307,7 +1303,7 @@ bool AArch64PostLegalizerLowering::runOnMachineFunction(MachineFunction &MF) {
CInfo.ObserverLvl = CombinerInfo::ObserverLevel::SinglePass;
// PostLegalizerCombiner performs DCE, so a full DCE pass is unnecessary.
CInfo.EnableFullDCE = false;
- AArch64PostLegalizerLoweringImpl Impl(MF, CInfo, TPC, /*CSEInfo*/ nullptr,
+ AArch64PostLegalizerLoweringImpl Impl(MF, CInfo, /*CSEInfo*/ nullptr,
RuleConfig, ST);
return Impl.combineMachineInstrs();
}
@@ -1316,7 +1312,6 @@ char AArch64PostLegalizerLowering::ID = 0;
INITIALIZE_PASS_BEGIN(AArch64PostLegalizerLowering, DEBUG_TYPE,
"Lower AArch64 MachineInstrs after legalization", false,
false)
-INITIALIZE_PASS_DEPENDENCY(TargetPassConfig)
INITIALIZE_PASS_END(AArch64PostLegalizerLowering, DEBUG_TYPE,
"Lower AArch64 MachineInstrs after legalization", false,
false)
diff --git a/llvm/lib/Target/AArch64/GISel/AArch64PreLegalizerCombiner.cpp b/llvm/lib/Target/AArch64/GISel/AArch64PreLegalizerCombiner.cpp
index 43e74405ac965..cc670a8d0c5af 100644
--- a/llvm/lib/Target/AArch64/GISel/AArch64PreLegalizerCombiner.cpp
+++ b/llvm/lib/Target/AArch64/GISel/AArch64PreLegalizerCombiner.cpp
@@ -733,8 +733,8 @@ class AArch64PreLegalizerCombinerImpl : public Combiner {
public:
AArch64PreLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const AArch64PreLegalizerCombinerImplRuleConfig &RuleConfig,
const AArch64Subtarget &STI, const LibcallLoweringInfo &Libcalls,
MachineDominatorTree *MDT, const LegalizerInfo *LI);
@@ -756,12 +756,12 @@ class AArch64PreLegalizerCombinerImpl : public Combiner {
#undef GET_GICOMBINER_IMPL
AArch64PreLegalizerCombinerImpl::AArch64PreLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const AArch64PreLegalizerCombinerImplRuleConfig &RuleConfig,
const AArch64Subtarget &STI, const LibcallLoweringInfo &Libcalls,
MachineDominatorTree *MDT, const LegalizerInfo *LI)
- : Combiner(MF, CInfo, TPC, &VT, CSEInfo),
+ : Combiner(MF, CInfo, &VT, CSEInfo),
Helper(Observer, B, /*IsPreLegalize*/ true, &VT, MDT, LI),
RuleConfig(RuleConfig), STI(STI), Libcalls(Libcalls),
#define GET_GICOMBINER_CONSTRUCTOR_INITS
@@ -877,8 +877,8 @@ bool AArch64PreLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) {
// This is the first Combiner, so the input IR might contain dead
// instructions.
CInfo.EnableFullDCE = true;
- AArch64PreLegalizerCombinerImpl Impl(MF, CInfo, &TPC, *VT, CSEInfo,
- RuleConfig, ST, Libcalls, MDT, LI);
+ AArch64PreLegalizerCombinerImpl Impl(MF, CInfo, *VT, CSEInfo, RuleConfig, ST,
+ Libcalls, MDT, LI);
return Impl.combineMachineInstrs();
}
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUPostLegalizerCombiner.cpp b/llvm/lib/Target/AMDGPU/AMDGPUPostLegalizerCombiner.cpp
index 0264d88c4d0ec..3e20a486e0ce6 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUPostLegalizerCombiner.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUPostLegalizerCombiner.cpp
@@ -52,8 +52,8 @@ class AMDGPUPostLegalizerCombinerImpl : public Combiner {
public:
AMDGPUPostLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const AMDGPUPostLegalizerCombinerImplRuleConfig &RuleConfig,
const GCNSubtarget &STI, MachineDominatorTree *MDT,
const LegalizerInfo *LI);
@@ -128,11 +128,11 @@ class AMDGPUPostLegalizerCombinerImpl : public Combiner {
#undef GET_GICOMBINER_IMPL
AMDGPUPostLegalizerCombinerImpl::AMDGPUPostLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const AMDGPUPostLegalizerCombinerImplRuleConfig &RuleConfig,
const GCNSubtarget &STI, MachineDominatorTree *MDT, const LegalizerInfo *LI)
- : Combiner(MF, CInfo, TPC, &VT, CSEInfo), RuleConfig(RuleConfig), STI(STI),
+ : Combiner(MF, CInfo, &VT, CSEInfo), RuleConfig(RuleConfig), STI(STI),
TII(*STI.getInstrInfo()),
Helper(Observer, B, /*IsPreLegalize*/ false, &VT, MDT, LI, STI),
#define GET_GICOMBINER_CONSTRUCTOR_INITS
@@ -459,7 +459,6 @@ class AMDGPUPostLegalizerCombiner : public MachineFunctionPass {
} // end anonymous namespace
void AMDGPUPostLegalizerCombiner::getAnalysisUsage(AnalysisUsage &AU) const {
- AU.addRequired<TargetPassConfig>();
AU.setPreservesCFG();
getSelectionDAGFallbackAnalysisUsage(AU);
AU.addRequired<GISelValueTrackingAnalysisLegacy>();
@@ -480,7 +479,6 @@ AMDGPUPostLegalizerCombiner::AMDGPUPostLegalizerCombiner(bool IsOptNone)
bool AMDGPUPostLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) {
if (MF.getProperties().hasFailedISel())
return false;
- auto *TPC = &getAnalysis<TargetPassConfig>();
const Function &F = MF.getFunction();
bool EnableOpt =
MF.getTarget().getOptLevel() != CodeGenOptLevel::None && !skipFunction(F);
@@ -502,7 +500,7 @@ bool AMDGPUPostLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) {
CInfo.ObserverLvl = CombinerInfo::ObserverLevel::SinglePass;
// Legalizer performs DCE, so a full DCE pass is unnecessary.
CInfo.EnableFullDCE = false;
- AMDGPUPostLegalizerCombinerImpl Impl(MF, CInfo, TPC, *VT, /*CSEInfo*/ nullptr,
+ AMDGPUPostLegalizerCombinerImpl Impl(MF, CInfo, *VT, /*CSEInfo*/ nullptr,
RuleConfig, ST, MDT, LI);
return Impl.combineMachineInstrs();
}
@@ -511,7 +509,6 @@ char AMDGPUPostLegalizerCombiner::ID = 0;
INITIALIZE_PASS_BEGIN(AMDGPUPostLegalizerCombiner, DEBUG_TYPE,
"Combine AMDGPU machine instrs after legalization", false,
false)
-INITIALIZE_PASS_DEPENDENCY(TargetPassConfig)
INITIALIZE_PASS_DEPENDENCY(GISelValueTrackingAnalysisLegacy)
INITIALIZE_PASS_END(AMDGPUPostLegalizerCombiner, DEBUG_TYPE,
"Combine AMDGPU machine instrs after legalization", false,
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUPreLegalizerCombiner.cpp b/llvm/lib/Target/AMDGPU/AMDGPUPreLegalizerCombiner.cpp
index 4a70c5d6e78f6..08f78ef820654 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUPreLegalizerCombiner.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUPreLegalizerCombiner.cpp
@@ -49,8 +49,8 @@ class AMDGPUPreLegalizerCombinerImpl : public Combiner {
public:
AMDGPUPreLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const AMDGPUPreLegalizerCombinerImplRuleConfig &RuleConfig,
const GCNSubtarget &STI, MachineDominatorTree *MDT,
const LegalizerInfo *LI);
@@ -88,11 +88,11 @@ class AMDGPUPreLegalizerCombinerImpl : public Combiner {
#undef GET_GICOMBINER_IMPL
AMDGPUPreLegalizerCombinerImpl::AMDGPUPreLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const AMDGPUPreLegalizerCombinerImplRuleConfig &RuleConfig,
const GCNSubtarget &STI, MachineDominatorTree *MDT, const LegalizerInfo *LI)
- : Combiner(MF, CInfo, TPC, &VT, CSEInfo), RuleConfig(RuleConfig), STI(STI),
+ : Combiner(MF, CInfo, &VT, CSEInfo), RuleConfig(RuleConfig), STI(STI),
Helper(Observer, B, /*IsPreLegalize*/ true, &VT, MDT, LI, STI),
#define GET_GICOMBINER_CONSTRUCTOR_INITS
#include "AMDGPUGenPreLegalizeGICombiner.inc"
@@ -278,8 +278,8 @@ bool AMDGPUPreLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) {
// This is the first Combiner, so the input IR might contain dead
// instructions.
CInfo.EnableFullDCE = true;
- AMDGPUPreLegalizerCombinerImpl Impl(MF, CInfo, TPC, *VT, CSEInfo, RuleConfig,
- STI, MDT, STI.getLegalizerInfo());
+ AMDGPUPreLegalizerCombinerImpl Impl(MF, CInfo, *VT, CSEInfo, RuleConfig, STI,
+ MDT, STI.getLegalizerInfo());
return Impl.combineMachineInstrs();
}
diff --git a/llvm/lib/Target/AMDGPU/AMDGPURegBankCombiner.cpp b/llvm/lib/Target/AMDGPU/AMDGPURegBankCombiner.cpp
index e2e84ce2e6219..0e1d4075ed92e 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPURegBankCombiner.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPURegBankCombiner.cpp
@@ -52,8 +52,8 @@ class AMDGPURegBankCombinerImpl : public Combiner {
public:
AMDGPURegBankCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const AMDGPURegBankCombinerImplRuleConfig &RuleConfig,
const GCNSubtarget &STI, MachineDominatorTree *MDT,
const LegalizerInfo *LI);
@@ -115,11 +115,11 @@ class AMDGPURegBankCombinerImpl : public Combiner {
#undef GET_GICOMBINER_IMPL
AMDGPURegBankCombinerImpl::AMDGPURegBankCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const AMDGPURegBankCombinerImplRuleConfig &RuleConfig,
const GCNSubtarget &STI, MachineDominatorTree *MDT, const LegalizerInfo *LI)
- : Combiner(MF, CInfo, TPC, &VT, CSEInfo), RuleConfig(RuleConfig), STI(STI),
+ : Combiner(MF, CInfo, &VT, CSEInfo), RuleConfig(RuleConfig), STI(STI),
RBI(*STI.getRegBankInfo()), TRI(*STI.getRegisterInfo()),
TII(*STI.getInstrInfo()),
Helper(Observer, B, /*IsPreLegalize*/ false, &VT, MDT, LI),
@@ -529,7 +529,6 @@ class AMDGPURegBankCombiner : public MachineFunctionPass {
} // end anonymous namespace
void AMDGPURegBankCombiner::getAnalysisUsage(AnalysisUsage &AU) const {
- AU.addRequired<TargetPassConfig>();
AU.setPreservesCFG();
getSelectionDAGFallbackAnalysisUsage(AU);
AU.addRequired<GISelValueTrackingAnalysisLegacy>();
@@ -550,7 +549,6 @@ AMDGPURegBankCombiner::AMDGPURegBankCombiner(bool IsOptNone)
bool AMDGPURegBankCombiner::runOnMachineFunction(MachineFunction &MF) {
if (MF.getProperties().hasFailedISel())
return false;
- auto *TPC = &getAnalysis<TargetPassConfig>();
const Function &F = MF.getFunction();
bool EnableOpt =
MF.getTarget().getOptLevel() != CodeGenOptLevel::None && !skipFunction(F);
@@ -572,7 +570,7 @@ bool AMDGPURegBankCombiner::runOnMachineFunction(MachineFunction &MF) {
// RegBankSelect seems not to leave dead instructions, so a full DCE pass is
// unnecessary.
CInfo.EnableFullDCE = false;
- AMDGPURegBankCombinerImpl Impl(MF, CInfo, TPC, *VT, /*CSEInfo*/ nullptr,
+ AMDGPURegBankCombinerImpl Impl(MF, CInfo, *VT, /*CSEInfo*/ nullptr,
RuleConfig, ST, MDT, LI);
return Impl.combineMachineInstrs();
}
@@ -581,7 +579,6 @@ char AMDGPURegBankCombiner::ID = 0;
INITIALIZE_PASS_BEGIN(AMDGPURegBankCombiner, DEBUG_TYPE,
"Combine AMDGPU machine instrs after regbankselect",
false, false)
-INITIALIZE_PASS_DEPENDENCY(TargetPassConfig)
INITIALIZE_PASS_DEPENDENCY(GISelValueTrackingAnalysisLegacy)
INITIALIZE_PASS_END(AMDGPURegBankCombiner, DEBUG_TYPE,
"Combine AMDGPU machine instrs after regbankselect", false,
diff --git a/llvm/lib/Target/Mips/MipsPostLegalizerCombiner.cpp b/llvm/lib/Target/Mips/MipsPostLegalizerCombiner.cpp
index d28129663e72e..b2b74217d578d 100644
--- a/llvm/lib/Target/Mips/MipsPostLegalizerCombiner.cpp
+++ b/llvm/lib/Target/Mips/MipsPostLegalizerCombiner.cpp
@@ -47,8 +47,8 @@ class MipsPostLegalizerCombinerImpl : public Combiner {
public:
MipsPostLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const MipsPostLegalizerCombinerImplRuleConfig &RuleConfig,
const MipsSubtarget &STI, MachineDominatorTree *MDT,
const LegalizerInfo *LI);
@@ -68,12 +68,12 @@ class MipsPostLegalizerCombinerImpl : public Combiner {
#undef GET_GICOMBINER_IMPL
MipsPostLegalizerCombinerImpl::MipsPostLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const MipsPostLegalizerCombinerImplRuleConfig &RuleConfig,
const MipsSubtarget &STI, MachineDominatorTree *MDT,
const LegalizerInfo *LI)
- : Combiner(MF, CInfo, TPC, &VT, CSEInfo), RuleConfig(RuleConfig), STI(STI),
+ : Combiner(MF, CInfo, &VT, CSEInfo), RuleConfig(RuleConfig), STI(STI),
Helper(Observer, B, /*IsPreLegalize*/ false, &VT, MDT, LI),
#define GET_GICOMBINER_CONSTRUCTOR_INITS
#include "MipsGenPostLegalizeGICombiner.inc"
@@ -103,7 +103,6 @@ class MipsPostLegalizerCombiner : public MachineFunctionPass {
} // end anonymous namespace
void MipsPostLegalizerCombiner::getAnalysisUsage(AnalysisUsage &AU) const {
- AU.addRequired<TargetPassConfig>();
AU.setPreservesCFG();
getSelectionDAGFallbackAnalysisUsage(AU);
AU.addRequired<GISelValueTrackingAnalysisLegacy>();
@@ -124,7 +123,6 @@ MipsPostLegalizerCombiner::MipsPostLegalizerCombiner(bool IsOptNone)
bool MipsPostLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) {
if (MF.getProperties().hasFailedISel())
return false;
- auto *TPC = &getAnalysis<TargetPassConfig>();
const Function &F = MF.getFunction();
bool EnableOpt =
MF.getTarget().getOptLevel() != CodeGenOptLevel::None && !skipFunction(F);
@@ -140,7 +138,7 @@ bool MipsPostLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) {
: &getAnalysis<MachineDominatorTreeWrapperPass>().getDomTree();
CombinerInfo CInfo(/*AllowIllegalOps*/ false, /*ShouldLegalizeIllegal*/ true,
LI, EnableOpt, F.hasOptSize(), F.hasMinSize());
- MipsPostLegalizerCombinerImpl Impl(MF, CInfo, TPC, *VT, /*CSEInfo*/ nullptr,
+ MipsPostLegalizerCombinerImpl Impl(MF, CInfo, *VT, /*CSEInfo*/ nullptr,
RuleConfig, ST, MDT, LI);
return Impl.combineMachineInstrs();
}
@@ -149,7 +147,6 @@ char MipsPostLegalizerCombiner::ID = 0;
INITIALIZE_PASS_BEGIN(MipsPostLegalizerCombiner, DEBUG_TYPE,
"Combine Mips machine instrs after legalization", false,
false)
-INITIALIZE_PASS_DEPENDENCY(TargetPassConfig)
INITIALIZE_PASS_DEPENDENCY(GISelValueTrackingAnalysisLegacy)
INITIALIZE_PASS_END(MipsPostLegalizerCombiner, DEBUG_TYPE,
"Combine Mips machine instrs after legalization", false,
diff --git a/llvm/lib/Target/Mips/MipsPreLegalizerCombiner.cpp b/llvm/lib/Target/Mips/MipsPreLegalizerCombiner.cpp
index c3a2668182b28..5ada356de7e44 100644
--- a/llvm/lib/Target/Mips/MipsPreLegalizerCombiner.cpp
+++ b/llvm/lib/Target/Mips/MipsPreLegalizerCombiner.cpp
@@ -40,12 +40,11 @@ class MipsPreLegalizerCombinerImpl : public Combiner {
public:
MipsPreLegalizerCombinerImpl(MachineFunction &MF, CombinerInfo &CInfo,
- const TargetPassConfig *TPC,
GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
const MipsSubtarget &STI,
MachineDominatorTree *MDT,
const LegalizerInfo *LI)
- : Combiner(MF, CInfo, TPC, &VT, CSEInfo), STI(STI),
+ : Combiner(MF, CInfo, &VT, CSEInfo), STI(STI),
Helper(Observer, B, /*IsPreLegalize*/ true, &VT, MDT, LI) {}
static const char *getName() { return "MipsPreLegalizerCombiner"; }
@@ -100,7 +99,6 @@ class MipsPreLegalizerCombiner : public MachineFunctionPass {
} // end anonymous namespace
void MipsPreLegalizerCombiner::getAnalysisUsage(AnalysisUsage &AU) const {
- AU.addRequired<TargetPassConfig>();
AU.addRequired<GISelValueTrackingAnalysisLegacy>();
AU.addPreserved<GISelValueTrackingAnalysisLegacy>();
AU.setPreservesCFG();
@@ -115,7 +113,6 @@ bool MipsPreLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) {
if (MF.getProperties().hasFailedISel())
return false;
- auto *TPC = &getAnalysis<TargetPassConfig>();
const MipsSubtarget &ST = MF.getSubtarget<MipsSubtarget>();
const MipsLegalizerInfo *LI =
static_cast<const MipsLegalizerInfo *>(ST.getLegalizerInfo());
@@ -123,8 +120,8 @@ bool MipsPreLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) {
GISelValueTracking *VT =
&getAnalysis<GISelValueTrackingAnalysisLegacy>().get(MF);
MipsPreLegalizerCombinerInfo PCInfo;
- MipsPreLegalizerCombinerImpl Impl(MF, PCInfo, TPC, *VT, /*CSEInfo*/ nullptr,
- ST, /*MDT*/ nullptr, LI);
+ MipsPreLegalizerCombinerImpl Impl(MF, PCInfo, *VT, /*CSEInfo*/ nullptr, ST,
+ /*MDT*/ nullptr, LI);
return Impl.combineMachineInstrs();
}
@@ -132,7 +129,6 @@ char MipsPreLegalizerCombiner::ID = 0;
INITIALIZE_PASS_BEGIN(MipsPreLegalizerCombiner, DEBUG_TYPE,
"Combine Mips machine instrs before legalization", false,
false)
-INITIALIZE_PASS_DEPENDENCY(TargetPassConfig)
INITIALIZE_PASS_DEPENDENCY(GISelValueTrackingAnalysisLegacy)
INITIALIZE_PASS_END(MipsPreLegalizerCombiner, DEBUG_TYPE,
"Combine Mips machine instrs before legalization", false,
diff --git a/llvm/lib/Target/RISCV/GISel/RISCVO0PreLegalizerCombiner.cpp b/llvm/lib/Target/RISCV/GISel/RISCVO0PreLegalizerCombiner.cpp
index 895c3dbcb2c18..1d28d524b9149 100644
--- a/llvm/lib/Target/RISCV/GISel/RISCVO0PreLegalizerCombiner.cpp
+++ b/llvm/lib/Target/RISCV/GISel/RISCVO0PreLegalizerCombiner.cpp
@@ -44,8 +44,8 @@ class RISCVO0PreLegalizerCombinerImpl : public Combiner {
public:
RISCVO0PreLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const RISCVO0PreLegalizerCombinerImplRuleConfig &RuleConfig,
const RISCVSubtarget &STI);
@@ -64,11 +64,11 @@ class RISCVO0PreLegalizerCombinerImpl : public Combiner {
#undef GET_GICOMBINER_IMPL
RISCVO0PreLegalizerCombinerImpl::RISCVO0PreLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const RISCVO0PreLegalizerCombinerImplRuleConfig &RuleConfig,
const RISCVSubtarget &STI)
- : Combiner(MF, CInfo, TPC, &VT, CSEInfo),
+ : Combiner(MF, CInfo, &VT, CSEInfo),
Helper(Observer, B, /*IsPreLegalize*/ true, &VT), RuleConfig(RuleConfig),
STI(STI),
#define GET_GICOMBINER_CONSTRUCTOR_INITS
@@ -100,7 +100,6 @@ class RISCVO0PreLegalizerCombiner : public MachineFunctionPass {
} // end anonymous namespace
void RISCVO0PreLegalizerCombiner::getAnalysisUsage(AnalysisUsage &AU) const {
- AU.addRequired<TargetPassConfig>();
AU.setPreservesCFG();
getSelectionDAGFallbackAnalysisUsage(AU);
AU.addRequired<GISelValueTrackingAnalysisLegacy>();
@@ -117,7 +116,6 @@ RISCVO0PreLegalizerCombiner::RISCVO0PreLegalizerCombiner()
bool RISCVO0PreLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) {
if (MF.getProperties().hasFailedISel())
return false;
- auto &TPC = getAnalysis<TargetPassConfig>();
const Function &F = MF.getFunction();
GISelValueTracking *VT =
@@ -132,7 +130,7 @@ bool RISCVO0PreLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) {
// at the cost of possibly missing optimizations. See PR#94291 for details.
CInfo.MaxIterations = 1;
- RISCVO0PreLegalizerCombinerImpl Impl(MF, CInfo, &TPC, *VT,
+ RISCVO0PreLegalizerCombinerImpl Impl(MF, CInfo, *VT,
/*CSEInfo*/ nullptr, RuleConfig, ST);
return Impl.combineMachineInstrs();
}
@@ -141,7 +139,6 @@ char RISCVO0PreLegalizerCombiner::ID = 0;
INITIALIZE_PASS_BEGIN(RISCVO0PreLegalizerCombiner, DEBUG_TYPE,
"Combine RISC-V machine instrs before legalization",
false, false)
-INITIALIZE_PASS_DEPENDENCY(TargetPassConfig)
INITIALIZE_PASS_DEPENDENCY(GISelValueTrackingAnalysisLegacy)
INITIALIZE_PASS_DEPENDENCY(GISelCSEAnalysisWrapperPass)
INITIALIZE_PASS_END(RISCVO0PreLegalizerCombiner, DEBUG_TYPE,
diff --git a/llvm/lib/Target/RISCV/GISel/RISCVPostLegalizerCombiner.cpp b/llvm/lib/Target/RISCV/GISel/RISCVPostLegalizerCombiner.cpp
index f2b216be1db15..95695c5f08bfc 100644
--- a/llvm/lib/Target/RISCV/GISel/RISCVPostLegalizerCombiner.cpp
+++ b/llvm/lib/Target/RISCV/GISel/RISCVPostLegalizerCombiner.cpp
@@ -101,8 +101,8 @@ class RISCVPostLegalizerCombinerImpl : public Combiner {
public:
RISCVPostLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const RISCVPostLegalizerCombinerImplRuleConfig &RuleConfig,
const RISCVSubtarget &STI, MachineDominatorTree *MDT,
const LegalizerInfo *LI);
@@ -122,12 +122,12 @@ class RISCVPostLegalizerCombinerImpl : public Combiner {
#undef GET_GICOMBINER_IMPL
RISCVPostLegalizerCombinerImpl::RISCVPostLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const RISCVPostLegalizerCombinerImplRuleConfig &RuleConfig,
const RISCVSubtarget &STI, MachineDominatorTree *MDT,
const LegalizerInfo *LI)
- : Combiner(MF, CInfo, TPC, &VT, CSEInfo),
+ : Combiner(MF, CInfo, &VT, CSEInfo),
Helper(Observer, B, /*IsPreLegalize*/ false, &VT, MDT, LI),
RuleConfig(RuleConfig), STI(STI),
#define GET_GICOMBINER_CONSTRUCTOR_INITS
@@ -196,8 +196,8 @@ bool RISCVPostLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) {
CombinerInfo CInfo(/*AllowIllegalOps*/ true, /*ShouldLegalizeIllegal*/ false,
/*LegalizerInfo*/ nullptr, EnableOpt, F.hasOptSize(),
F.hasMinSize());
- RISCVPostLegalizerCombinerImpl Impl(MF, CInfo, TPC, *VT, CSEInfo, RuleConfig,
- ST, MDT, LI);
+ RISCVPostLegalizerCombinerImpl Impl(MF, CInfo, *VT, CSEInfo, RuleConfig, ST,
+ MDT, LI);
return Impl.combineMachineInstrs();
}
diff --git a/llvm/lib/Target/RISCV/GISel/RISCVPreLegalizerCombiner.cpp b/llvm/lib/Target/RISCV/GISel/RISCVPreLegalizerCombiner.cpp
index d955205d066d4..f652f74c8bdc7 100644
--- a/llvm/lib/Target/RISCV/GISel/RISCVPreLegalizerCombiner.cpp
+++ b/llvm/lib/Target/RISCV/GISel/RISCVPreLegalizerCombiner.cpp
@@ -46,8 +46,8 @@ class RISCVPreLegalizerCombinerImpl : public Combiner {
public:
RISCVPreLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const RISCVPreLegalizerCombinerImplRuleConfig &RuleConfig,
const RISCVSubtarget &STI, MachineDominatorTree *MDT,
const LegalizerInfo *LI);
@@ -67,12 +67,12 @@ class RISCVPreLegalizerCombinerImpl : public Combiner {
#undef GET_GICOMBINER_IMPL
RISCVPreLegalizerCombinerImpl::RISCVPreLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const RISCVPreLegalizerCombinerImplRuleConfig &RuleConfig,
const RISCVSubtarget &STI, MachineDominatorTree *MDT,
const LegalizerInfo *LI)
- : Combiner(MF, CInfo, TPC, &VT, CSEInfo),
+ : Combiner(MF, CInfo, &VT, CSEInfo),
Helper(Observer, B, /*IsPreLegalize*/ true, &VT, MDT, LI),
RuleConfig(RuleConfig), STI(STI),
#define GET_GICOMBINER_CONSTRUCTOR_INITS
@@ -149,8 +149,8 @@ bool RISCVPreLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) {
// This is the first Combiner, so the input IR might contain dead
// instructions.
CInfo.EnableFullDCE = true;
- RISCVPreLegalizerCombinerImpl Impl(MF, CInfo, &TPC, *VT, CSEInfo, RuleConfig,
- ST, MDT, LI);
+ RISCVPreLegalizerCombinerImpl Impl(MF, CInfo, *VT, CSEInfo, RuleConfig, ST,
+ MDT, LI);
return Impl.combineMachineInstrs();
}
diff --git a/llvm/lib/Target/SPIRV/SPIRVPreLegalizerCombiner.cpp b/llvm/lib/Target/SPIRV/SPIRVPreLegalizerCombiner.cpp
index 48f4047851858..447d41940df36 100644
--- a/llvm/lib/Target/SPIRV/SPIRVPreLegalizerCombiner.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVPreLegalizerCombiner.cpp
@@ -47,8 +47,8 @@ class SPIRVPreLegalizerCombinerImpl : public Combiner {
public:
SPIRVPreLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const SPIRVPreLegalizerCombinerImplRuleConfig &RuleConfig,
const SPIRVSubtarget &STI, MachineDominatorTree *MDT,
const LegalizerInfo *LI);
@@ -70,12 +70,12 @@ class SPIRVPreLegalizerCombinerImpl : public Combiner {
#undef GET_GICOMBINER_IMPL
SPIRVPreLegalizerCombinerImpl::SPIRVPreLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const SPIRVPreLegalizerCombinerImplRuleConfig &RuleConfig,
const SPIRVSubtarget &STI, MachineDominatorTree *MDT,
const LegalizerInfo *LI)
- : Combiner(MF, CInfo, TPC, &VT, CSEInfo),
+ : Combiner(MF, CInfo, &VT, CSEInfo),
Helper(Observer, B, /*IsPreLegalize*/ true, &VT, MDT, LI, STI),
RuleConfig(RuleConfig), STI(STI),
#define GET_GICOMBINER_CONSTRUCTOR_INITS
@@ -110,7 +110,6 @@ class SPIRVPreLegalizerCombiner : public MachineFunctionPass {
} // end anonymous namespace
void SPIRVPreLegalizerCombiner::getAnalysisUsage(AnalysisUsage &AU) const {
- AU.addRequired<TargetPassConfig>();
AU.setPreservesCFG();
getSelectionDAGFallbackAnalysisUsage(AU);
AU.addRequired<GISelValueTrackingAnalysisLegacy>();
@@ -129,7 +128,6 @@ SPIRVPreLegalizerCombiner::SPIRVPreLegalizerCombiner()
bool SPIRVPreLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) {
if (MF.getProperties().hasFailedISel())
return false;
- auto &TPC = getAnalysis<TargetPassConfig>();
const SPIRVSubtarget &ST = MF.getSubtarget<SPIRVSubtarget>();
const auto *LI = ST.getLegalizerInfo();
@@ -150,7 +148,7 @@ bool SPIRVPreLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) {
// This is the first Combiner, so the input IR might contain dead
// instructions.
CInfo.EnableFullDCE = false;
- SPIRVPreLegalizerCombinerImpl Impl(MF, CInfo, &TPC, *VT, /*CSEInfo*/ nullptr,
+ SPIRVPreLegalizerCombinerImpl Impl(MF, CInfo, *VT, /*CSEInfo*/ nullptr,
RuleConfig, ST, MDT, LI);
return Impl.combineMachineInstrs();
}
@@ -159,7 +157,6 @@ char SPIRVPreLegalizerCombiner::ID = 0;
INITIALIZE_PASS_BEGIN(SPIRVPreLegalizerCombiner, DEBUG_TYPE,
"Combine SPIRV machine instrs before legalization", false,
false)
-INITIALIZE_PASS_DEPENDENCY(TargetPassConfig)
INITIALIZE_PASS_DEPENDENCY(GISelValueTrackingAnalysisLegacy)
INITIALIZE_PASS_END(SPIRVPreLegalizerCombiner, DEBUG_TYPE,
"Combine SPIRV machine instrs before legalization", false,
diff --git a/llvm/lib/Target/WebAssembly/GISel/WebAssemblyPostLegalizerCombiner.cpp b/llvm/lib/Target/WebAssembly/GISel/WebAssemblyPostLegalizerCombiner.cpp
index aa7e4c4e91136..b0de2dbca491a 100644
--- a/llvm/lib/Target/WebAssembly/GISel/WebAssemblyPostLegalizerCombiner.cpp
+++ b/llvm/lib/Target/WebAssembly/GISel/WebAssemblyPostLegalizerCombiner.cpp
@@ -51,8 +51,8 @@ class WebAssemblyPostLegalizerCombinerImpl : public Combiner {
public:
WebAssemblyPostLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const WebAssemblyPostLegalizerCombinerImplRuleConfig &RuleConfig,
const WebAssemblySubtarget &STI, MachineDominatorTree *MDT,
const LegalizerInfo *LI);
@@ -72,12 +72,12 @@ class WebAssemblyPostLegalizerCombinerImpl : public Combiner {
#undef GET_GICOMBINER_IMPL
WebAssemblyPostLegalizerCombinerImpl::WebAssemblyPostLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const WebAssemblyPostLegalizerCombinerImplRuleConfig &RuleConfig,
const WebAssemblySubtarget &STI, MachineDominatorTree *MDT,
const LegalizerInfo *LI)
- : Combiner(MF, CInfo, TPC, &VT, CSEInfo),
+ : Combiner(MF, CInfo, &VT, CSEInfo),
Helper(Observer, B, /*IsPreLegalize*/ false, &VT, MDT, LI),
RuleConfig(RuleConfig), STI(STI),
#define GET_GICOMBINER_CONSTRUCTOR_INITS
@@ -156,8 +156,8 @@ bool WebAssemblyPostLegalizerCombiner::runOnMachineFunction(
CInfo.ObserverLvl = CombinerInfo::ObserverLevel::SinglePass;
// Legalizer performs DCE, so a full DCE pass is unnecessary.
CInfo.EnableFullDCE = false;
- WebAssemblyPostLegalizerCombinerImpl Impl(MF, CInfo, TPC, *VT, CSEInfo,
- RuleConfig, ST, MDT, LI);
+ WebAssemblyPostLegalizerCombinerImpl Impl(MF, CInfo, *VT, CSEInfo, RuleConfig,
+ ST, MDT, LI);
return Impl.combineMachineInstrs();
}
diff --git a/llvm/lib/Target/WebAssembly/GISel/WebAssemblyPreLegalizerCombiner.cpp b/llvm/lib/Target/WebAssembly/GISel/WebAssemblyPreLegalizerCombiner.cpp
index 81f424db67227..9f0b9d2f4053e 100644
--- a/llvm/lib/Target/WebAssembly/GISel/WebAssemblyPreLegalizerCombiner.cpp
+++ b/llvm/lib/Target/WebAssembly/GISel/WebAssemblyPreLegalizerCombiner.cpp
@@ -48,8 +48,8 @@ class WebAssemblyPreLegalizerCombinerImpl : public Combiner {
public:
WebAssemblyPreLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const WebAssemblyPreLegalizerCombinerImplRuleConfig &RuleConfig,
const WebAssemblySubtarget &STI, MachineDominatorTree *MDT,
const LegalizerInfo *LI);
@@ -69,12 +69,12 @@ class WebAssemblyPreLegalizerCombinerImpl : public Combiner {
#undef GET_GICOMBINER_IMPL
WebAssemblyPreLegalizerCombinerImpl::WebAssemblyPreLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const WebAssemblyPreLegalizerCombinerImplRuleConfig &RuleConfig,
const WebAssemblySubtarget &STI, MachineDominatorTree *MDT,
const LegalizerInfo *LI)
- : Combiner(MF, CInfo, TPC, &VT, CSEInfo),
+ : Combiner(MF, CInfo, &VT, CSEInfo),
Helper(Observer, B, /*IsPreLegalize*/ true, &VT, MDT, LI),
RuleConfig(RuleConfig), STI(STI),
#define GET_GICOMBINER_CONSTRUCTOR_INITS
@@ -155,8 +155,8 @@ bool WebAssemblyPreLegalizerCombiner::runOnMachineFunction(
// This is the first Combiner, so the input IR might contain dead
// instructions.
CInfo.EnableFullDCE = true;
- WebAssemblyPreLegalizerCombinerImpl Impl(MF, CInfo, &TPC, *VT, CSEInfo,
- RuleConfig, ST, MDT, LI);
+ WebAssemblyPreLegalizerCombinerImpl Impl(MF, CInfo, *VT, CSEInfo, RuleConfig,
+ ST, MDT, LI);
return Impl.combineMachineInstrs();
}
diff --git a/llvm/lib/Target/X86/GISel/X86PostLegalizerCombiner.cpp b/llvm/lib/Target/X86/GISel/X86PostLegalizerCombiner.cpp
index 1122da0dc619c..411cc190dbaff 100644
--- a/llvm/lib/Target/X86/GISel/X86PostLegalizerCombiner.cpp
+++ b/llvm/lib/Target/X86/GISel/X86PostLegalizerCombiner.cpp
@@ -76,8 +76,8 @@ class X86PostLegalizerCombinerImpl : public Combiner {
public:
X86PostLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const X86PostLegalizerCombinerImplRuleConfig &RuleConfig,
MachineDominatorTree *MDT);
@@ -97,11 +97,11 @@ class X86PostLegalizerCombinerImpl : public Combiner {
#undef GET_GICOMBINER_IMPL
X86PostLegalizerCombinerImpl::X86PostLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const X86PostLegalizerCombinerImplRuleConfig &RuleConfig,
MachineDominatorTree *MDT)
- : Combiner(MF, CInfo, TPC, &VT, CSEInfo),
+ : Combiner(MF, CInfo, &VT, CSEInfo),
Helper(Observer, B, /*IsPreLegalize=*/false, &VT, MDT,
MF.getSubtarget<X86Subtarget>().getLegalizerInfo()),
RuleConfig(RuleConfig), STI(MF.getSubtarget<X86Subtarget>()),
@@ -171,8 +171,7 @@ bool X86PostLegalizerCombinerLegacy::runOnMachineFunction(MachineFunction &MF) {
CombinerInfo CInfo = createCombinerInfo(!skipFunction(F), F);
- X86PostLegalizerCombinerImpl Impl(MF, CInfo, TPC, *VT, CSEInfo, RuleConfig,
- MDT);
+ X86PostLegalizerCombinerImpl Impl(MF, CInfo, *VT, CSEInfo, RuleConfig, MDT);
return Impl.combineMachineInstrs();
}
@@ -206,8 +205,8 @@ X86PostLegalizerCombinerPass::run(MachineFunction &MF,
if (!RuleConfig.parseCommandLineOption())
reportFatalInternalError("Invalid rule identifier");
- X86PostLegalizerCombinerImpl Impl(MF, CInfo, nullptr, VT, CSEInfo.get(),
- RuleConfig, &MDT);
+ X86PostLegalizerCombinerImpl Impl(MF, CInfo, VT, CSEInfo.get(), RuleConfig,
+ &MDT);
if (!Impl.combineMachineInstrs())
return PreservedAnalyses::all();
diff --git a/llvm/lib/Target/X86/GISel/X86PreLegalizerCombiner.cpp b/llvm/lib/Target/X86/GISel/X86PreLegalizerCombiner.cpp
index 01c3473d16292..4aa58f0876466 100644
--- a/llvm/lib/Target/X86/GISel/X86PreLegalizerCombiner.cpp
+++ b/llvm/lib/Target/X86/GISel/X86PreLegalizerCombiner.cpp
@@ -52,8 +52,8 @@ class X86PreLegalizerCombinerImpl : public Combiner {
public:
X86PreLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const X86PreLegalizerCombinerImplRuleConfig &RuleConfig,
const X86Subtarget &STI, MachineDominatorTree *MDT,
const LegalizerInfo *LI);
@@ -75,11 +75,11 @@ class X86PreLegalizerCombinerImpl : public Combiner {
#undef GET_GICOMBINER_IMPL
X86PreLegalizerCombinerImpl::X86PreLegalizerCombinerImpl(
- MachineFunction &MF, CombinerInfo &CInfo, const TargetPassConfig *TPC,
- GISelValueTracking &VT, GISelCSEInfo *CSEInfo,
+ MachineFunction &MF, CombinerInfo &CInfo, GISelValueTracking &VT,
+ GISelCSEInfo *CSEInfo,
const X86PreLegalizerCombinerImplRuleConfig &RuleConfig,
const X86Subtarget &STI, MachineDominatorTree *MDT, const LegalizerInfo *LI)
- : Combiner(MF, CInfo, TPC, &VT, CSEInfo),
+ : Combiner(MF, CInfo, &VT, CSEInfo),
Helper(Observer, B, /*IsPreLegalize=*/true, &VT, MDT, LI),
RuleConfig(RuleConfig), STI(STI),
#define GET_GICOMBINER_CONSTRUCTOR_INITS
@@ -154,8 +154,8 @@ bool X86PreLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) {
// This is the first Combiner, so the input IR might contain dead
// instructions.
CInfo.EnableFullDCE = true;
- X86PreLegalizerCombinerImpl Impl(MF, CInfo, &TPC, *VT, CSEInfo, RuleConfig,
- ST, MDT, LI);
+ X86PreLegalizerCombinerImpl Impl(MF, CInfo, *VT, CSEInfo, RuleConfig, ST, MDT,
+ LI);
return Impl.combineMachineInstrs();
}
More information about the llvm-commits
mailing list