2 files changed, 7 insertions, 15 deletions
diff --git a/backend/include/rcc/Target/RISCV/RISCVPipeline.h b/backend/include/rcc/Target/RISCV/RISCVPipeline.h
index 3e8ea3d..f556ded 100644
--- a/backend/include/rcc/Target/RISCV/RISCVPipeline.h
+++ b/backend/include/rcc/Target/RISCV/RISCVPipeline.h
@@ -3,10 +3,10 @@
 #ifndef RCC_TARGET_RISCV_RISCVPIPELINE_H
 #define RCC_TARGET_RISCV_RISCVPIPELINE_H
 
-#include "rcc/CodeGen/CommandFlags.h"
 #include "rcc/CodeGen/MachinePassManager.h"
 #include "rcc/Support/Error.h"
 #include "rcc/Target/RISCV/RISCVSubtarget.h"
+#include "rcc/Target/TargetMachine.h"
 
 #include <memory>
 #include <string>
@@ -21,21 +21,13 @@ class TargetMachineOutlinerInfo;
 
 namespace riscv {
 
-struct RISCVPipelineOptions final {
-  OptimizationLevel Optimization = OptimizationLevel::O2;
-  bool UseTargetCopyInstructions = false;
-  GlobalISelAbortMode GlobalISelAbort = GlobalISelAbortMode::Enable;
-  bool DebugMachineScheduler = false;
-  bool DebugPrologueEpilogue = false;
-};
-
 [[nodiscard]] Expected<void> addCanonicalPipeline(MachineFunctionPassManager &Pipeline,
                                                   const MachineFunction &Function,
                                                   const RISCVSubtarget &Subtarget,
-                                                  RISCVPipelineOptions Options = {});
+                                                  TargetPipelineOptions Options = {});
 [[nodiscard]] Expected<std::unique_ptr<MachineFunctionPass>>
 createCanonicalPipelinePass(std::string_view Name, const RISCVSubtarget &Subtarget,
-                            RISCVPipelineOptions Options = {});
+                            TargetPipelineOptions Options = {});
 [[nodiscard]] Expected<std::vector<std::string>>
 canonicalPipelinePassNames(const MachineFunction &Function, const RISCVSubtarget &Subtarget);
 [[nodiscard]] Expected<std::unique_ptr<TargetMachineOutlinerInfo>>
diff --git a/backend/include/rcc/Target/RISCV/RISCVSubtarget.h b/backend/include/rcc/Target/RISCV/RISCVSubtarget.h
index 52e4b03..a5ba01a 100644
--- a/backend/include/rcc/Target/RISCV/RISCVSubtarget.h
+++ b/backend/include/rcc/Target/RISCV/RISCVSubtarget.h
@@ -142,10 +142,10 @@ private:
   CodeModel Code;
   RISCVABI ABI;
   std::unique_ptr<TargetFrameLowering> FrameLoweringInfo;
-  mutable std::unique_ptr<TargetCallLowering> CallLoweringInfo;
-  mutable std::unique_ptr<InstructionSelector> InstSelector;
-  mutable std::unique_ptr<LegalizerInfo> Legalizer;
-  mutable std::unique_ptr<RISCVRegisterBankInfo> RegBankInfo;
+  std::unique_ptr<TargetCallLowering> CallLoweringInfo;
+  std::unique_ptr<InstructionSelector> InstSelector;
+  std::unique_ptr<LegalizerInfo> Legalizer;
+  std::unique_ptr<RISCVRegisterBankInfo> RegBankInfo;
   std::unique_ptr<TargetSchedulingHooks> SchedulingHooks;
   std::unique_ptr<TargetSchedulingModel> SchedulingModel;
 };