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/237478.diff


3 Files Affected:

- (modified) llvm/lib/Target/Mips/Mips.h (+13-2) 
- (modified) llvm/lib/Target/Mips/MipsPostLegalizerCombiner.cpp (+56-21) 
- (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 892fe6ea169e5..4e845710f7ef9 100644
--- a/llvm/lib/Target/Mips/Mips.h
+++ b/llvm/lib/Target/Mips/Mips.h
@@ -165,7 +165,18 @@ class MipsPreLegalizerCombinerPass
 };
 
 FunctionPass *createMipsPreLegalizeCombinerLegacyPass();
-FunctionPass *createMipsPostLegalizeCombiner(bool IsOptNone);
+
+class MipsPostLegalizerCombinerPass
+    : public RequiredPassInfoMixin<MipsPostLegalizerCombinerPass> {
+  bool IsOptNone;
+
+public:
+  MipsPostLegalizerCombinerPass(bool IsOptNone) : IsOptNone(IsOptNone) {}
+  PreservedAnalyses run(MachineFunction &MF,
+                        MachineFunctionAnalysisManager &MFAM);
+};
+
+FunctionPass *createMipsPostLegalizeCombinerLegacyPass(bool IsOptNone);
 
 class MipsMulMulBugFixPass
     : public RequiredPassInfoMixin<MipsMulMulBugFixPass> {
@@ -186,7 +197,7 @@ void initializeMipsBranchExpansionLegacyPass(PassRegistry 
&);
 void initializeMipsDAGToDAGISelLegacyPass(PassRegistry &);
 void initializeMipsDelaySlotFillerLegacyPass(PassRegistry &);
 void initializeMipsMulMulBugFixLegacyPass(PassRegistry &);
-void initializeMipsPostLegalizerCombinerPass(PassRegistry &);
+void initializeMipsPostLegalizerCombinerLegacyPass(PassRegistry &);
 void initializeMipsPreLegalizerCombinerLegacyPass(PassRegistry &);
 } // namespace llvm
 
diff --git a/llvm/lib/Target/Mips/MipsPostLegalizerCombiner.cpp 
b/llvm/lib/Target/Mips/MipsPostLegalizerCombiner.cpp
index cff1fcfdf8f5e..d51f4acd53368 100644
--- a/llvm/lib/Target/Mips/MipsPostLegalizerCombiner.cpp
+++ b/llvm/lib/Target/Mips/MipsPostLegalizerCombiner.cpp
@@ -22,7 +22,10 @@
 #include "llvm/CodeGen/GlobalISel/GISelValueTracking.h"
 #include "llvm/CodeGen/GlobalISel/MIPatternMatch.h"
 #include "llvm/CodeGen/MachineDominators.h"
+#include "llvm/CodeGen/MachineFunctionAnalysisManager.h"
+#include "llvm/CodeGen/MachinePassManager.h"
 #include "llvm/CodeGen/TargetPassConfig.h"
+#include "llvm/IR/Analysis.h"
 #include "llvm/Target/TargetMachine.h"
 
 #define GET_GICOMBINER_DEPS
@@ -84,11 +87,11 @@ 
MipsPostLegalizerCombinerImpl::MipsPostLegalizerCombinerImpl(
 // Pass boilerplate
 // ================
 
-class MipsPostLegalizerCombiner : public MachineFunctionPass {
+class MipsPostLegalizerCombinerLegacy : public MachineFunctionPass {
 public:
   static char ID;
 
-  MipsPostLegalizerCombiner(bool IsOptNone = false);
+  MipsPostLegalizerCombinerLegacy(bool IsOptNone = false);
 
   StringRef getPassName() const override { return "MipsPostLegalizerCombiner"; 
}
 
@@ -98,11 +101,11 @@ class MipsPostLegalizerCombiner : public 
MachineFunctionPass {
 
 private:
   bool IsOptNone;
-  MipsPostLegalizerCombinerImplRuleConfig RuleConfig;
 };
 } // end anonymous namespace
 
-void MipsPostLegalizerCombiner::getAnalysisUsage(AnalysisUsage &AU) const {
+void MipsPostLegalizerCombinerLegacy::getAnalysisUsage(
+    AnalysisUsage &AU) const {
   AU.setPreservesCFG();
   getSelectionDAGFallbackAnalysisUsage(AU);
   AU.addRequired<GISelValueTrackingAnalysisLegacy>();
@@ -113,28 +116,30 @@ void 
MipsPostLegalizerCombiner::getAnalysisUsage(AnalysisUsage &AU) const {
   MachineFunctionPass::getAnalysisUsage(AU);
 }
 
-MipsPostLegalizerCombiner::MipsPostLegalizerCombiner(bool IsOptNone)
-    : MachineFunctionPass(ID), IsOptNone(IsOptNone) {
-  if (!RuleConfig.parseCommandLineOption())
-    report_fatal_error("Invalid rule identifier");
-}
+MipsPostLegalizerCombinerLegacy::MipsPostLegalizerCombinerLegacy(bool 
IsOptNone)
+    : MachineFunctionPass(ID), IsOptNone(IsOptNone) {}
 
-bool MipsPostLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) {
+static bool
+runCombinerOnMachineFunction(MachineFunction &MF, bool IsOptNone,
+                             function_ref<bool()> ShouldSkip,
+                             function_ref<GISelValueTracking *()> GetVT,
+                             function_ref<MachineDominatorTree *()> GetMDT) {
   if (MF.getProperties().hasFailedISel())
     return false;
   const Function &F = MF.getFunction();
   bool EnableOpt =
-      MF.getTarget().getOptLevel() != CodeGenOptLevel::None && 
!skipFunction(F);
+      MF.getTarget().getOptLevel() != CodeGenOptLevel::None && !ShouldSkip();
+
+  MipsPostLegalizerCombinerImplRuleConfig RuleConfig;
+  if (!RuleConfig.parseCommandLineOption())
+    report_fatal_error("Invalid rule identifier");
 
   const MipsSubtarget &ST = MF.getSubtarget<MipsSubtarget>();
   const MipsLegalizerInfo *LI =
       static_cast<const MipsLegalizerInfo *>(ST.getLegalizerInfo());
 
-  GISelValueTracking *VT =
-      &getAnalysis<GISelValueTrackingAnalysisLegacy>().get(MF);
-  MachineDominatorTree *MDT =
-      IsOptNone ? nullptr
-                : &getAnalysis<MachineDominatorTreeWrapperPass>().getDomTree();
+  GISelValueTracking *VT = GetVT();
+  MachineDominatorTree *MDT = IsOptNone ? nullptr : GetMDT();
   CombinerInfo CInfo(/*AllowIllegalOps*/ false, /*ShouldLegalizeIllegal*/ true,
                      LI, EnableOpt, F.hasOptSize(), F.hasMinSize());
   MipsPostLegalizerCombinerImpl Impl(MF, CInfo, *VT, /*CSEInfo*/ nullptr,
@@ -142,15 +147,45 @@ bool 
MipsPostLegalizerCombiner::runOnMachineFunction(MachineFunction &MF) {
   return Impl.combineMachineInstrs();
 }
 
-char MipsPostLegalizerCombiner::ID = 0;
-INITIALIZE_PASS_BEGIN(MipsPostLegalizerCombiner, DEBUG_TYPE,
+char MipsPostLegalizerCombinerLegacy::ID = 0;
+INITIALIZE_PASS_BEGIN(MipsPostLegalizerCombinerLegacy, DEBUG_TYPE,
                       "Combine Mips machine instrs after legalization", false,
                       false)
 INITIALIZE_PASS_DEPENDENCY(GISelValueTrackingAnalysisLegacy)
-INITIALIZE_PASS_END(MipsPostLegalizerCombiner, DEBUG_TYPE,
+INITIALIZE_PASS_END(MipsPostLegalizerCombinerLegacy, DEBUG_TYPE,
                     "Combine Mips machine instrs after legalization", false,
                     false)
 
-FunctionPass *llvm::createMipsPostLegalizeCombiner(bool IsOptNone) {
-  return new MipsPostLegalizerCombiner(IsOptNone);
+FunctionPass *llvm::createMipsPostLegalizeCombinerLegacyPass(bool IsOptNone) {
+  return new MipsPostLegalizerCombinerLegacy(IsOptNone);
+}
+
+bool MipsPostLegalizerCombinerLegacy::runOnMachineFunction(
+    MachineFunction &MF) {
+  return runCombinerOnMachineFunction(
+      MF, IsOptNone, [&]() { return skipFunction(MF.getFunction()); },
+      [&]() {
+        return &getAnalysis<GISelValueTrackingAnalysisLegacy>().get(MF);
+      },
+      [&]() {
+        return &getAnalysis<MachineDominatorTreeWrapperPass>().getDomTree();
+      });
+}
+
+PreservedAnalyses
+MipsPostLegalizerCombinerPass::run(MachineFunction &MF,
+                                   MachineFunctionAnalysisManager &MFAM) {
+  bool Changed = runCombinerOnMachineFunction(
+      MF, IsOptNone,
+      [&]() {
+        return MF.getFunction().hasOptNone() ||
+               shouldSkipOptimizationForOptBisect(MF.getFunction());
+      },
+      [&]() { return &MFAM.getResult<GISelValueTrackingAnalysis>(MF); },
+      [&]() { return &MFAM.getResult<MachineDominatorTreeAnalysis>(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 732ca12e46004..e2988180fa1f6 100644
--- a/llvm/lib/Target/Mips/MipsTargetMachine.cpp
+++ b/llvm/lib/Target/Mips/MipsTargetMachine.cpp
@@ -64,7 +64,7 @@ extern "C" LLVM_ABI LLVM_EXTERNAL_VISIBILITY void 
LLVMInitializeMipsTarget() {
   initializeMipsBranchExpansionLegacyPass(*PR);
   initializeMipsMicroSizeReduceLegacyPass(*PR);
   initializeMipsPreLegalizerCombinerLegacyPass(*PR);
-  initializeMipsPostLegalizerCombinerPass(*PR);
+  initializeMipsPostLegalizerCombinerLegacyPass(*PR);
   initializeMipsMulMulBugFixLegacyPass(*PR);
   initializeMipsDAGToDAGISelLegacyPass(*PR);
 }
@@ -292,7 +292,7 @@ bool MipsPassConfig::addLegalizeMachineIR() {
 
 void MipsPassConfig::addPreRegBankSelect() {
   bool IsOptNone = getOptLevel() == CodeGenOptLevel::None;
-  addPass(createMipsPostLegalizeCombiner(IsOptNone));
+  addPass(createMipsPostLegalizeCombinerLegacyPass(IsOptNone));
 }
 
 bool MipsPassConfig::addRegBankSelect() {

``````````

</details>


https://github.com/llvm/llvm-project/pull/237478
_______________________________________________
llvm-branch-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits

Reply via email to