llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-backend-mips Author: Aiden Grossman (boomanaiden154) <details> <summary>Changes</summary> Standard NewPM pass porting. --- Full diff: https://github.com/llvm/llvm-project/pull/237476.diff 3 Files Affected: - (modified) llvm/lib/Target/Mips/Mips.h (+10-2) - (modified) llvm/lib/Target/Mips/MipsPreLegalizerCombiner.cpp (+35-12) - (modified) llvm/lib/Target/Mips/MipsTargetMachine.cpp (+2-2) ``````````diff diff --git a/llvm/lib/Target/Mips/Mips.h b/llvm/lib/Target/Mips/Mips.h index 727182fb0fb82..892fe6ea169e5 100644 --- a/llvm/lib/Target/Mips/Mips.h +++ b/llvm/lib/Target/Mips/Mips.h @@ -156,7 +156,15 @@ class MipsExpandPseudoPass }; FunctionPass *createMipsExpandPseudoLegacyPass(); -FunctionPass *createMipsPreLegalizeCombiner(); + +class MipsPreLegalizerCombinerPass + : public RequiredPassInfoMixin<MipsPreLegalizerCombinerPass> { +public: + PreservedAnalyses run(MachineFunction &MF, + MachineFunctionAnalysisManager &MFAM); +}; + +FunctionPass *createMipsPreLegalizeCombinerLegacyPass(); FunctionPass *createMipsPostLegalizeCombiner(bool IsOptNone); class MipsMulMulBugFixPass @@ -179,7 +187,7 @@ void initializeMipsDAGToDAGISelLegacyPass(PassRegistry &); void initializeMipsDelaySlotFillerLegacyPass(PassRegistry &); void initializeMipsMulMulBugFixLegacyPass(PassRegistry &); void initializeMipsPostLegalizerCombinerPass(PassRegistry &); -void initializeMipsPreLegalizerCombinerPass(PassRegistry &); +void initializeMipsPreLegalizerCombinerLegacyPass(PassRegistry &); } // namespace llvm #endif diff --git a/llvm/lib/Target/Mips/MipsPreLegalizerCombiner.cpp b/llvm/lib/Target/Mips/MipsPreLegalizerCombiner.cpp index 070daa62d0605..efea4dc608974 100644 --- a/llvm/lib/Target/Mips/MipsPreLegalizerCombiner.cpp +++ b/llvm/lib/Target/Mips/MipsPreLegalizerCombiner.cpp @@ -11,13 +11,17 @@ // //===----------------------------------------------------------------------===// +#include "Mips.h" #include "MipsLegalizerInfo.h" #include "MipsTargetMachine.h" #include "llvm/CodeGen/GlobalISel/Combiner.h" #include "llvm/CodeGen/GlobalISel/CombinerHelper.h" #include "llvm/CodeGen/GlobalISel/CombinerInfo.h" #include "llvm/CodeGen/GlobalISel/GISelValueTracking.h" +#include "llvm/CodeGen/MachineFunctionAnalysisManager.h" #include "llvm/CodeGen/MachineFunctionPass.h" +#include "llvm/CodeGen/MachinePassManager.h" +#include "llvm/IR/Analysis.h" #define DEBUG_TYPE "mips-prelegalizer-combiner" @@ -84,11 +88,11 @@ class MipsPreLegalizerCombinerImpl : public Combiner { // Pass boilerplate // ================ -class MipsPreLegalizerCombiner : public MachineFunctionPass { +class MipsPreLegalizerCombinerLegacy : public MachineFunctionPass { public: static char ID; - MipsPreLegalizerCombiner(); + MipsPreLegalizerCombinerLegacy(); StringRef getPassName() const override { return "MipsPreLegalizerCombiner"; } @@ -98,7 +102,7 @@ class MipsPreLegalizerCombiner : public MachineFunctionPass { }; } // end anonymous namespace -void MipsPreLegalizerCombiner::getAnalysisUsage(AnalysisUsage &AU) const { +void MipsPreLegalizerCombinerLegacy::getAnalysisUsage(AnalysisUsage &AU) const { AU.addRequired<GISelValueTrackingAnalysisLegacy>(); AU.addPreserved<GISelValueTrackingAnalysisLegacy>(); AU.setPreservesCFG(); @@ -106,10 +110,12 @@ void MipsPreLegalizerCombiner::getAnalysisUsage(AnalysisUsage &AU) const { MachineFunctionPass::getAnalysisUsage(AU); } -MipsPreLegalizerCombiner::MipsPreLegalizerCombiner() +MipsPreLegalizerCombinerLegacy::MipsPreLegalizerCombinerLegacy() : MachineFunctionPass(ID) {} -bool MipsPreLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) { +static bool +runPreLegalizerCombinerOnMF(MachineFunction &MF, + function_ref<GISelValueTracking *()> GetVT) { if (MF.getProperties().hasFailedISel()) return false; @@ -117,23 +123,40 @@ bool MipsPreLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) { const MipsLegalizerInfo *LI = static_cast<const MipsLegalizerInfo *>(ST.getLegalizerInfo()); - GISelValueTracking *VT = - &getAnalysis<GISelValueTrackingAnalysisLegacy>().get(MF); + GISelValueTracking *VT = GetVT(); MipsPreLegalizerCombinerInfo PCInfo; MipsPreLegalizerCombinerImpl Impl(MF, PCInfo, *VT, /*CSEInfo*/ nullptr, ST, /*MDT*/ nullptr, LI); return Impl.combineMachineInstrs(); } -char MipsPreLegalizerCombiner::ID = 0; -INITIALIZE_PASS_BEGIN(MipsPreLegalizerCombiner, DEBUG_TYPE, +char MipsPreLegalizerCombinerLegacy::ID = 0; +INITIALIZE_PASS_BEGIN(MipsPreLegalizerCombinerLegacy, DEBUG_TYPE, "Combine Mips machine instrs before legalization", false, false) INITIALIZE_PASS_DEPENDENCY(GISelValueTrackingAnalysisLegacy) -INITIALIZE_PASS_END(MipsPreLegalizerCombiner, DEBUG_TYPE, +INITIALIZE_PASS_END(MipsPreLegalizerCombinerLegacy, DEBUG_TYPE, "Combine Mips machine instrs before legalization", false, false) -FunctionPass *llvm::createMipsPreLegalizeCombiner() { - return new MipsPreLegalizerCombiner(); +FunctionPass *llvm::createMipsPreLegalizeCombinerLegacyPass() { + return new MipsPreLegalizerCombinerLegacy(); +} + +bool MipsPreLegalizerCombinerLegacy::runOnMachineFunction(MachineFunction &MF) { + return runPreLegalizerCombinerOnMF(MF, [&]() { + return &getAnalysis<GISelValueTrackingAnalysisLegacy>().get(MF); + }); +} + +PreservedAnalyses +MipsPreLegalizerCombinerPass::run(MachineFunction &MF, + MachineFunctionAnalysisManager &MFAM) { + bool Changed = runPreLegalizerCombinerOnMF( + MF, [&]() { return &MFAM.getResult<GISelValueTrackingAnalysis>(MF); }); + if (!Changed) + return PreservedAnalyses::all(); + return getMachineFunctionPassPreservedAnalyses() + .preserveSet<CFGAnalyses>() + .preserve<GISelValueTrackingAnalysis>(); } diff --git a/llvm/lib/Target/Mips/MipsTargetMachine.cpp b/llvm/lib/Target/Mips/MipsTargetMachine.cpp index 8958107c6b2f8..732ca12e46004 100644 --- a/llvm/lib/Target/Mips/MipsTargetMachine.cpp +++ b/llvm/lib/Target/Mips/MipsTargetMachine.cpp @@ -63,7 +63,7 @@ extern "C" LLVM_ABI LLVM_EXTERNAL_VISIBILITY void LLVMInitializeMipsTarget() { initializeMipsDelaySlotFillerLegacyPass(*PR); initializeMipsBranchExpansionLegacyPass(*PR); initializeMipsMicroSizeReduceLegacyPass(*PR); - initializeMipsPreLegalizerCombinerPass(*PR); + initializeMipsPreLegalizerCombinerLegacyPass(*PR); initializeMipsPostLegalizerCombinerPass(*PR); initializeMipsMulMulBugFixLegacyPass(*PR); initializeMipsDAGToDAGISelLegacyPass(*PR); @@ -282,7 +282,7 @@ bool MipsPassConfig::addIRTranslator() { } void MipsPassConfig::addPreLegalizeMachineIR() { - addPass(createMipsPreLegalizeCombiner()); + addPass(createMipsPreLegalizeCombinerLegacyPass()); } bool MipsPassConfig::addLegalizeMachineIR() { `````````` </details> https://github.com/llvm/llvm-project/pull/237476 _______________________________________________ llvm-branch-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
