From 0bb35fa2306a66f1f0baf118619b5c1640ed9c01 Mon Sep 17 00:00:00 2001
From: Richard-Qin-X <richard.qin.001@gmail.com>
Date: Wed, 12 Aug 2026 21:56:37 +0800
Subject: [GlobalISel] Split the generic pipeline components

---
 backend/lib/Target/RISCV/RISCVPipeline.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'backend/lib/Target/RISCV/RISCVPipeline.cpp')

diff --git a/backend/lib/Target/RISCV/RISCVPipeline.cpp b/backend/lib/Target/RISCV/RISCVPipeline.cpp
index 08a4653..7c778ea 100644
--- a/backend/lib/Target/RISCV/RISCVPipeline.cpp
+++ b/backend/lib/Target/RISCV/RISCVPipeline.cpp
@@ -3,10 +3,12 @@
 #include "rcc/Target/RISCV/RISCVPipeline.h"
 
 #include "RISCVInstrInfo.h"
+#include "rcc/CodeGen/GlobalISel/InstructionSelect.h"
+#include "rcc/CodeGen/GlobalISel/Legalizer.h"
+#include "rcc/CodeGen/GlobalISel/RegBankSelect.h"
 #include "rcc/CodeGen/MachineCombiner.h"
 #include "rcc/CodeGen/MachineFunction.h"
 #include "rcc/CodeGen/MachineOptimizationPipeline.h"
-#include "rcc/CodeGen/MachinePipelinePasses.h"
 #include "rcc/CodeGen/MachineSSAExit.h"
 #include "rcc/CodeGen/RegAllocPBQP.h"
 #include "rcc/CodeGen/TargetDescription.h"
@@ -33,13 +35,13 @@ template <typename PassT, typename... ArgumentT>
                                             MachineCombinerStage::PreLegalizer);
   if (!Added)
     return std::unexpected(Added.error());
-  Added = addPass<LegalizerPass>(Pipeline, createLegalizerInfo(Features));
+  Added = addPass<Legalizer>(Pipeline, createLegalizerInfo(Features));
   if (!Added)
     return std::unexpected(Added.error());
-  Added = addPass<RegisterBankSelectPass>(Pipeline, registerBankInfo());
+  Added = addPass<RegBankSelect>(Pipeline, registerBankInfo());
   if (!Added)
     return std::unexpected(Added.error());
-  return addPass<InstructionSelectPass>(Pipeline, instructionSelector());
+  return addPass<InstructionSelect>(Pipeline, instructionSelector());
 }
 
 [[nodiscard]] Expected<void> addSSAExitPipeline(MachinePassManager &Pipeline) {
@@ -86,17 +88,17 @@ Expected<void> addCanonicalPipeline(MachinePassManager &Pipeline, const MachineF
                                               MachineCombinerStage::PreLegalizer);
     if (!Added)
       return std::unexpected(Added.error());
-    Added = addPass<LegalizerPass>(Pipeline, createLegalizerInfo(Features));
+    Added = addPass<Legalizer>(Pipeline, createLegalizerInfo(Features));
     if (!Added)
       return std::unexpected(Added.error());
   }
   if (!Function.properties().has(MachineFunctionProperty::RegBankSelected)) {
-    auto Added = addPass<RegisterBankSelectPass>(Pipeline, registerBankInfo());
+    auto Added = addPass<RegBankSelect>(Pipeline, registerBankInfo());
     if (!Added)
       return std::unexpected(Added.error());
   }
   if (!Function.properties().has(MachineFunctionProperty::Selected)) {
-    auto Added = addPass<InstructionSelectPass>(Pipeline, instructionSelector());
+    auto Added = addPass<InstructionSelect>(Pipeline, instructionSelector());
     if (!Added)
       return std::unexpected(Added.error());
   }
-- 
cgit v1.2.3