From a932de71457e16030d7d05e4230c56e231c7a8e9 Mon Sep 17 00:00:00 2001 From: Richard-Qin-X Date: Wed, 26 Aug 2026 23:48:41 +0800 Subject: [CodeGen] Run scheduling transformations once --- backend/lib/CodeGen/MachineBlockPlacement.cpp | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) (limited to 'backend/lib/CodeGen/MachineBlockPlacement.cpp') diff --git a/backend/lib/CodeGen/MachineBlockPlacement.cpp b/backend/lib/CodeGen/MachineBlockPlacement.cpp index 0dbcd37..76e44d0 100644 --- a/backend/lib/CodeGen/MachineBlockPlacement.cpp +++ b/backend/lib/CodeGen/MachineBlockPlacement.cpp @@ -6,7 +6,6 @@ #include "rcc/CodeGen/MachineBasicBlock.h" #include "rcc/CodeGen/MachineBasicBlockAttributes.h" #include "rcc/CodeGen/MachineFunction.h" -#include "rcc/CodeGen/MachineFunctionCloner.h" #include #include @@ -99,31 +98,12 @@ const MachinePassContract &MachineBlockPlacementPass::contract() const noexcept Expected MachineBlockPlacementPass::run(MachineFunction &Function, const TargetDescription &Target, MachineFunctionAnalysisManager &Analyses) { - auto Trial = cloneMachineFunction( - Function, Target, - MachineFunctionCloneOptions{.NewStableID = Function.stableID(), .NewName = std::nullopt}); - if (!Trial) - return std::unexpected(withErrorContext(Trial.error(), "block placement setup failed: ")); - MachineFunctionAnalysisManager TrialAnalyses; - MachineActionReplay Actions(Analyses, Trial->InstructionStableIDs); - auto TrialResult = runImplementation(*Trial->ClonedFunction, Target, TrialAnalyses, Actions); - if (!TrialResult) - return std::unexpected(TrialResult.error()); - Actions.beginReplay(); - auto Result = runImplementation(Function, Target, Analyses, Actions); - if (!Result) { - return std::unexpected(withErrorContext( - Result.error(), "block placement diverged after a successful transaction preflight: ")); - } - auto Replayed = Actions.finishReplay(); - if (!Replayed) - return std::unexpected(Replayed.error()); - return Result; + return runImplementation(Function, Target, Analyses); } Expected MachineBlockPlacementPass::runImplementation( MachineFunction &Function, const TargetDescription &Target, - MachineFunctionAnalysisManager &Analyses, MachineActionReplay &Actions) const { + MachineFunctionAnalysisManager &Analyses) const { auto Probabilities = Analyses.getResult(Function, Target); if (!Probabilities) return std::unexpected(Probabilities.error()); @@ -224,7 +204,7 @@ Expected MachineBlockPlacementPass::runImplementation( } } if (Changed) { - auto Accepted = Actions.request("apply-block-layout", Function); + auto Accepted = Analyses.requestAction("apply-block-layout", Function); if (!Accepted) return std::unexpected(Accepted.error()); if (!*Accepted) { -- cgit v1.2.3