From 36c4344ddf1866005c62910166ca077bf2e8f62e Mon Sep 17 00:00:00 2001
From: Richard-Qin-X <richard.qin.001@gmail.com>
Date: Wed, 26 Aug 2026 17:38:21 +0800
Subject: [CodeGen] Implement RISC-V finalize-isel

---
 backend/lib/Target/RISCV/RISCVPipeline.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(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 adcf22c..331d81f 100644
--- a/backend/lib/Target/RISCV/RISCVPipeline.cpp
+++ b/backend/lib/Target/RISCV/RISCVPipeline.cpp
@@ -7,6 +7,7 @@
 #include "RISCV.h"
 #include "RISCVInstrInfo.h"
 #include "rcc/CodeGen/CFIInstrInserter.h"
+#include "rcc/CodeGen/FinalizeISel.h"
 #include "rcc/CodeGen/GlobalISel/Combiner.h"
 #include "rcc/CodeGen/GlobalISel/InstructionSelect.h"
 #include "rcc/CodeGen/GlobalISel/Legalizer.h"
@@ -57,7 +58,10 @@ template <typename PassT, typename... ArgumentT>
   Added = addPass<RegBankSelect>(Pipeline, Subtarget.getRegBankInfo());
   if (!Added)
     return std::unexpected(Added.error());
-  return addPass<InstructionSelect>(Pipeline, Subtarget.getInstructionSelector());
+  Added = addPass<InstructionSelect>(Pipeline, Subtarget.getInstructionSelector());
+  if (!Added)
+    return std::unexpected(Added.error());
+  return addPass<FinalizeISelPass>(Pipeline, finalizeISelInfo());
 }
 
 [[nodiscard]] Expected<void> addSSAExitPipeline(MachineFunctionPassManager &Pipeline,
@@ -154,6 +158,11 @@ Expected<void> addCanonicalPipeline(MachineFunctionPassManager &Pipeline,
     if (!Added)
       return std::unexpected(Added.error());
   }
+  if (!Function.properties().has(MachineFunctionProperty::TiedOpsRewritten)) {
+    auto Added = addPass<FinalizeISelPass>(Pipeline, finalizeISelInfo());
+    if (!Added)
+      return std::unexpected(Added.error());
+  }
   if (!Function.properties().has(MachineFunctionProperty::TiedOpsRewritten)) {
     auto Added = addSelectedSSAOptimizationPipeline(
         Pipeline, optimizationPipelineInfo(Subtarget, Options.DebugMachineScheduler,
-- 
cgit v1.2.3