From cd30fb546e389d1fb78ce8e579b3dba3a8fdb52a Mon Sep 17 00:00:00 2001
From: Richard-Qin-X <richard.qin.001@gmail.com>
Date: Thu, 13 Aug 2026 21:11:10 +0800
Subject: [CodeGen] Match LLVM machine copy propagation

---
 backend/lib/CodeGen/MachineOptimizationPipeline.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'backend/lib/CodeGen/MachineOptimizationPipeline.cpp')

diff --git a/backend/lib/CodeGen/MachineOptimizationPipeline.cpp b/backend/lib/CodeGen/MachineOptimizationPipeline.cpp
index 4a9d7f5..dc64b8f 100644
--- a/backend/lib/CodeGen/MachineOptimizationPipeline.cpp
+++ b/backend/lib/CodeGen/MachineOptimizationPipeline.cpp
@@ -70,10 +70,6 @@ addSelectedSSAOptimizationPipeline(MachineFunctionPassManager &Pipeline,
 Expected<void> addPreRegisterAllocationOptimizationPipeline(
     MachineFunctionPassManager &Pipeline, const MachineOptimizationPipelineTargetInfo &TargetInfo) {
   auto Added = addPass<MachineBranchOptimizationPass>(Pipeline, TargetInfo.InstrInfo);
-  if (!Added)
-    return std::unexpected(Added.error());
-  Added = addPass<MachineCopyPropagationPass>(Pipeline, TargetInfo.InstrInfo,
-                                              MachineCopyPropagationStage::PreRegisterAllocation);
   if (!Added)
     return std::unexpected(Added.error());
   Added = addPass<MachineCombinerPass>(Pipeline, TargetInfo.Combiner,
@@ -88,12 +84,9 @@ Expected<void> addPreRegisterAllocationOptimizationPipeline(
 
 Expected<void>
 addPostRegisterAllocationPipeline(MachineFunctionPassManager &Pipeline,
-                                  const MachineOptimizationPipelineTargetInfo &TargetInfo) {
+                                  const MachineOptimizationPipelineTargetInfo &TargetInfo,
+                                  MachineOptimizationPipelineOptions Options) {
   auto Added = addPass<MachineStackSlotColoringPass>(Pipeline);
-  if (!Added)
-    return std::unexpected(Added.error());
-  Added = addPass<MachineCopyPropagationPass>(Pipeline, TargetInfo.InstrInfo,
-                                              MachineCopyPropagationStage::PostRegisterAllocation);
   if (!Added)
     return std::unexpected(Added.error());
   Added = addPass<MachineCombinerPass>(Pipeline, TargetInfo.Combiner,
@@ -138,6 +131,12 @@ addPostRegisterAllocationPipeline(MachineFunctionPassManager &Pipeline,
   if (!Added)
     return std::unexpected(Added.error());
   Added = addPass<MachineFallthroughPass>(Pipeline, TargetInfo.InstrInfo);
+  if (!Added)
+    return std::unexpected(Added.error());
+  Added = addPass<MachineCopyPropagationPass>(
+      Pipeline, TargetInfo.InstrInfo,
+      MachineCopyPropagationOptions{.UseTargetCopyInstructions =
+                                        Options.UseTargetCopyInstructions});
   if (!Added)
     return std::unexpected(Added.error());
   Added = addPass<MachineBranchRelaxationPass>(Pipeline, TargetInfo.InstrInfo);
-- 
cgit v1.2.3