From 9430569e0817c61d6fdaa37cf5cc35445f2f6289 Mon Sep 17 00:00:00 2001 From: Richard-Qin-X Date: Fri, 14 Aug 2026 21:39:49 +0800 Subject: [MIR] Normalize explicit successor probabilities --- backend/lib/CodeGen/MIRParser/MIParser.cpp | 14 ++++++++++++-- backend/lib/CodeGen/MachineIRTypes.cpp | 25 +++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) (limited to 'backend/lib/CodeGen') diff --git a/backend/lib/CodeGen/MIRParser/MIParser.cpp b/backend/lib/CodeGen/MIRParser/MIParser.cpp index b21e713..62f1f14 100644 --- a/backend/lib/CodeGen/MIRParser/MIParser.cpp +++ b/backend/lib/CodeGen/MIRParser/MIParser.cpp @@ -2500,6 +2500,9 @@ bool MIParser::Impl::parseBlockSuccessors(MachineBasicBlock &Block) { ExplicitSuccessorBlocks.insert(&Block); if (token().isNewlineOrEnd()) return false; + + std::vector Successors; + std::vector Probabilities; do { if (!at(MITokenKind::MachineBasicBlock)) return fail("expected a machine basic block reference"); @@ -2517,10 +2520,17 @@ bool MIParser::Impl::parseBlockSuccessors(MachineBasicBlock &Block) { if (expect(MITokenKind::RightParen, "')' after successor weight")) return true; } - auto Added = Function.cfgUpdater().addSuccessor(Block, *Successor, Probability); + Successors.push_back(Successor); + Probabilities.push_back(Probability); + } while (consume(MITokenKind::Comma)); + + BranchProbability::normalizeProbabilities(Probabilities); + for (std::size_t Index = 0; Index < Successors.size(); ++Index) { + auto Added = + Function.cfgUpdater().addSuccessor(Block, *Successors[Index], Probabilities[Index]); if (!Added) return importError(token(), Added.error()); - } while (consume(MITokenKind::Comma)); + } return false; } diff --git a/backend/lib/CodeGen/MachineIRTypes.cpp b/backend/lib/CodeGen/MachineIRTypes.cpp index b5348b3..2810c92 100644 --- a/backend/lib/CodeGen/MachineIRTypes.cpp +++ b/backend/lib/CodeGen/MachineIRTypes.cpp @@ -2,7 +2,9 @@ #include "rcc/CodeGen/MachineIRTypes.h" +#include #include +#include namespace rcc { @@ -30,6 +32,29 @@ Expected BranchProbability::fromFraction(std::uint32_t Numera return BranchProbability(static_cast(Rounded)); } +void BranchProbability::normalizeProbabilities( + std::span Probabilities) noexcept { + if (Probabilities.empty()) + return; + + std::uint64_t Sum = 0; + for (const BranchProbability Probability : Probabilities) + Sum += Probability.rawValue(); + + if (Sum == 0) { + const std::uint64_t Count = Probabilities.size(); + const auto Equal = + static_cast((static_cast(MaxRawValue) + Count / 2U) / Count); + std::ranges::fill(Probabilities, BranchProbability(Equal)); + return; + } + + for (BranchProbability &Probability : Probabilities) { + const std::uint64_t Scaled = static_cast(Probability.rawValue()) * MaxRawValue; + Probability = BranchProbability(static_cast((Scaled + Sum / 2U) / Sum)); + } +} + MachineInstrFlags::MachineInstrFlags(std::initializer_list Flags) noexcept { for (const MachineInstrFlag Flag : Flags) set(Flag); -- cgit v1.2.3