From 81afb6570000472c182e5b1f540f69382602aaad Mon Sep 17 00:00:00 2001 From: Richard-Qin-X Date: Mon, 24 Aug 2026 17:30:29 +0800 Subject: [RISCV] Match LLVM emergency spill layout --- backend/include/rcc/CodeGen/MachineOptimizationPipeline.h | 2 ++ backend/include/rcc/CodeGen/PrologueEpilogueInsertion.h | 11 +++++++---- backend/include/rcc/CodeGen/TargetFrameLowering.h | 7 ++++++- backend/include/rcc/Target/RISCV/RISCVPipeline.h | 1 + 4 files changed, 16 insertions(+), 5 deletions(-) (limited to 'backend/include') diff --git a/backend/include/rcc/CodeGen/MachineOptimizationPipeline.h b/backend/include/rcc/CodeGen/MachineOptimizationPipeline.h index d4abf74..c436455 100644 --- a/backend/include/rcc/CodeGen/MachineOptimizationPipeline.h +++ b/backend/include/rcc/CodeGen/MachineOptimizationPipeline.h @@ -5,6 +5,7 @@ #include "rcc/CodeGen/MachinePassManager.h" #include "rcc/CodeGen/MachineScheduler.h" +#include "rcc/CodeGen/TargetFrameLowering.h" namespace rcc { @@ -23,6 +24,7 @@ struct MachineOptimizationPipelineTargetInfo final { const TargetPseudoExpansionInfo &PseudoExpansion; const TargetSchedulingModel &SchedulingModel; MachineSchedulerOptions SchedulerOptions; + FrameLoweringOptions FrameOptions; }; struct MachineOptimizationPipelineOptions final { diff --git a/backend/include/rcc/CodeGen/PrologueEpilogueInsertion.h b/backend/include/rcc/CodeGen/PrologueEpilogueInsertion.h index a5d0028..dfade65 100644 --- a/backend/include/rcc/CodeGen/PrologueEpilogueInsertion.h +++ b/backend/include/rcc/CodeGen/PrologueEpilogueInsertion.h @@ -4,14 +4,15 @@ #define RCC_CODEGEN_PROLOGUEEPILOGUEINSERTION_H #include "rcc/CodeGen/MachinePassManager.h" +#include "rcc/CodeGen/TargetFrameLowering.h" namespace rcc { -class TargetFrameLowering; - class PrologueEpilogueInsertionPass final : public MachineFunctionPass { public: - explicit PrologueEpilogueInsertionPass(const TargetFrameLowering &Info) noexcept : Info(&Info) {} + explicit PrologueEpilogueInsertionPass(const TargetFrameLowering &Info, + FrameLoweringOptions Options = {}) noexcept + : Info(&Info), Options(Options) {} [[nodiscard]] const MachinePassContract &contract() const noexcept override; [[nodiscard]] Expected run(MachineFunction &Function, @@ -20,9 +21,11 @@ public: private: [[nodiscard]] Expected - runImplementation(MachineFunction &Function, const TargetDescription &Target) const; + runImplementation(MachineFunction &Function, const TargetDescription &Target, + FrameLoweringOptions RunOptions) const; const TargetFrameLowering *Info; + FrameLoweringOptions Options; }; } // namespace rcc diff --git a/backend/include/rcc/CodeGen/TargetFrameLowering.h b/backend/include/rcc/CodeGen/TargetFrameLowering.h index b63ce22..705a548 100644 --- a/backend/include/rcc/CodeGen/TargetFrameLowering.h +++ b/backend/include/rcc/CodeGen/TargetFrameLowering.h @@ -23,12 +23,17 @@ struct FrameIndexReference final { std::int64_t Offset = 0; }; +struct FrameLoweringOptions final { + bool EmitDebugOutput = false; +}; + class TargetFrameLowering { public: virtual ~TargetFrameLowering() = default; [[nodiscard]] virtual Expected prepareFrame(MachineFunction &Function, - const TargetDescription &Target) const = 0; + const TargetDescription &Target, + FrameLoweringOptions Options = {}) const = 0; [[nodiscard]] virtual Expected insertCalleeSavedSpillsAndRestores(MachineFunction &Function, const TargetDescription &Target) const = 0; diff --git a/backend/include/rcc/Target/RISCV/RISCVPipeline.h b/backend/include/rcc/Target/RISCV/RISCVPipeline.h index 21a4461..50a6a68 100644 --- a/backend/include/rcc/Target/RISCV/RISCVPipeline.h +++ b/backend/include/rcc/Target/RISCV/RISCVPipeline.h @@ -25,6 +25,7 @@ struct RISCVPipelineOptions final { bool UseTargetCopyInstructions = false; GlobalISelAbortMode GlobalISelAbort = GlobalISelAbortMode::Enable; bool DebugMachineScheduler = false; + bool DebugPrologueEpilogue = false; }; [[nodiscard]] Expected addCanonicalPipeline(MachineFunctionPassManager &Pipeline, -- cgit v1.2.3