From ab58b6d58edf6a7c8881044fc716ca435d7a0156 Mon Sep 17 00:00:00 2001 From: paperchalice Date: Thu, 27 Jun 2024 15:00:17 +0800 Subject: Revert "[CodeGen][NewPM] Port machine-branch-prob to new pass manager" (#96858) Reverts llvm/llvm-project#96389 Some ppc bots failed. --- .../llvm/CodeGen/MachineBranchProbabilityInfo.h | 53 ++++------------------ llvm/include/llvm/InitializePasses.h | 2 +- llvm/include/llvm/Passes/MachinePassRegistry.def | 4 -- llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 7 ++- llvm/lib/CodeGen/BranchFolding.cpp | 9 ++-- llvm/lib/CodeGen/EarlyIfConversion.cpp | 10 ++-- llvm/lib/CodeGen/GlobalISel/RegBankSelect.cpp | 10 ++-- llvm/lib/CodeGen/IfConversion.cpp | 6 +-- llvm/lib/CodeGen/LazyMachineBlockFrequencyInfo.cpp | 6 +-- llvm/lib/CodeGen/MachineBlockFrequencyInfo.cpp | 6 +-- llvm/lib/CodeGen/MachineBlockPlacement.cpp | 12 ++--- llvm/lib/CodeGen/MachineBranchProbabilityInfo.cpp | 44 +++--------------- llvm/lib/CodeGen/MachineSink.cpp | 6 +-- llvm/lib/CodeGen/MachineTraceMetrics.cpp | 4 +- llvm/lib/CodeGen/TailDuplication.cpp | 4 +- llvm/lib/Passes/PassBuilder.cpp | 1 - .../Target/AArch64/AArch64ConditionalCompares.cpp | 6 +-- llvm/lib/Target/Hexagon/HexagonEarlyIfConv.cpp | 7 ++- llvm/lib/Target/Hexagon/HexagonLoopAlign.cpp | 4 +- llvm/lib/Target/Hexagon/HexagonNewValueJump.cpp | 6 +-- llvm/lib/Target/Hexagon/HexagonVLIWPacketizer.cpp | 7 ++- llvm/lib/Target/Mips/MipsDelaySlotFiller.cpp | 4 +- llvm/lib/Target/PowerPC/PPCReduceCRLogicals.cpp | 4 +- llvm/test/CodeGen/Generic/MachineBranchProb.ll | 5 -- 24 files changed, 73 insertions(+), 154 deletions(-) diff --git a/llvm/include/llvm/CodeGen/MachineBranchProbabilityInfo.h b/llvm/include/llvm/CodeGen/MachineBranchProbabilityInfo.h index 12d33f9..bd54442 100644 --- a/llvm/include/llvm/CodeGen/MachineBranchProbabilityInfo.h +++ b/llvm/include/llvm/CodeGen/MachineBranchProbabilityInfo.h @@ -14,13 +14,14 @@ #define LLVM_CODEGEN_MACHINEBRANCHPROBABILITYINFO_H #include "llvm/CodeGen/MachineBasicBlock.h" -#include "llvm/CodeGen/MachinePassManager.h" #include "llvm/Pass.h" #include "llvm/Support/BranchProbability.h" namespace llvm { -class MachineBranchProbabilityInfo { +class MachineBranchProbabilityInfo : public ImmutablePass { + virtual void anchor(); + // Default weight value. Used when we don't have information about the edge. // TODO: DEFAULT_WEIGHT makes sense during static predication, when none of // the successors have a weight yet. But it doesn't make sense when providing @@ -30,8 +31,13 @@ class MachineBranchProbabilityInfo { static const uint32_t DEFAULT_WEIGHT = 16; public: - bool invalidate(MachineFunction &, const PreservedAnalyses &PA, - MachineFunctionAnalysisManager::Invalidator &); + static char ID; + + MachineBranchProbabilityInfo(); + + void getAnalysisUsage(AnalysisUsage &AU) const override { + AU.setPreservesAll(); + } // Return edge probability. BranchProbability getEdgeProbability(const MachineBasicBlock *Src, @@ -55,45 +61,6 @@ public: const MachineBasicBlock *Dst) const; }; -class MachineBranchProbabilityAnalysis - : public AnalysisInfoMixin { - friend AnalysisInfoMixin; - - static AnalysisKey Key; - -public: - using Result = MachineBranchProbabilityInfo; - - Result run(MachineFunction &, MachineFunctionAnalysisManager &); -}; - -class MachineBranchProbabilityPrinterPass - : public PassInfoMixin { - raw_ostream &OS; - -public: - MachineBranchProbabilityPrinterPass(raw_ostream &OS) : OS(OS) {} - PreservedAnalyses run(MachineFunction &MF, - MachineFunctionAnalysisManager &MFAM); -}; - -class MachineBranchProbabilityInfoWrapperPass : public ImmutablePass { - virtual void anchor(); - - MachineBranchProbabilityInfo MBPI; - -public: - static char ID; - - MachineBranchProbabilityInfoWrapperPass(); - - void getAnalysisUsage(AnalysisUsage &AU) const override { - AU.setPreservesAll(); - } - - MachineBranchProbabilityInfo &getMBPI() { return MBPI; } - const MachineBranchProbabilityInfo &getMBPI() const { return MBPI; } -}; } diff --git a/llvm/include/llvm/InitializePasses.h b/llvm/include/llvm/InitializePasses.h index 421c09a..4ddb711 100644 --- a/llvm/include/llvm/InitializePasses.h +++ b/llvm/include/llvm/InitializePasses.h @@ -182,7 +182,7 @@ void initializeMIRPrintingPassPass(PassRegistry&); void initializeMachineBlockFrequencyInfoPass(PassRegistry&); void initializeMachineBlockPlacementPass(PassRegistry&); void initializeMachineBlockPlacementStatsPass(PassRegistry&); -void initializeMachineBranchProbabilityInfoWrapperPassPass(PassRegistry &); +void initializeMachineBranchProbabilityInfoPass(PassRegistry&); void initializeMachineCFGPrinterPass(PassRegistry &); void initializeMachineCSEPass(PassRegistry&); void initializeMachineCombinerPass(PassRegistry&); diff --git a/llvm/include/llvm/Passes/MachinePassRegistry.def b/llvm/include/llvm/Passes/MachinePassRegistry.def index b1542ab..b43f41b 100644 --- a/llvm/include/llvm/Passes/MachinePassRegistry.def +++ b/llvm/include/llvm/Passes/MachinePassRegistry.def @@ -89,8 +89,6 @@ LOOP_PASS("loop-reduce", LoopStrengthReducePass()) #ifndef MACHINE_FUNCTION_ANALYSIS #define MACHINE_FUNCTION_ANALYSIS(NAME, CREATE_PASS) #endif -MACHINE_FUNCTION_ANALYSIS("machine-branch-prob", - MachineBranchProbabilityAnalysis()) MACHINE_FUNCTION_ANALYSIS("machine-dom-tree", MachineDominatorTreeAnalysis()) MACHINE_FUNCTION_ANALYSIS("machine-post-dom-tree", MachinePostDominatorTreeAnalysis()) @@ -132,8 +130,6 @@ MACHINE_FUNCTION_PASS("finalize-isel", FinalizeISelPass()) MACHINE_FUNCTION_PASS("localstackalloc", LocalStackSlotAllocationPass()) MACHINE_FUNCTION_PASS("no-op-machine-function", NoOpMachineFunctionPass()) MACHINE_FUNCTION_PASS("print", PrintMIRPass()) -MACHINE_FUNCTION_PASS("print", - MachineBranchProbabilityPrinterPass(dbgs())) MACHINE_FUNCTION_PASS("print", MachineDominatorTreePrinterPass(dbgs())) MACHINE_FUNCTION_PASS("print", diff --git a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp index 505bd8a..40f4dc2 100644 --- a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp @@ -444,7 +444,7 @@ void AsmPrinter::getAnalysisUsage(AnalysisUsage &AU) const { AU.addRequired(); AU.addRequired(); AU.addRequired(); - AU.addRequired(); + AU.addRequired(); } bool AsmPrinter::doInitialization(Module &M) { @@ -1478,9 +1478,8 @@ void AsmPrinter::emitBBAddrMapSection(const MachineFunction &MF) { ? &getAnalysis().getBFI() : nullptr; const MachineBranchProbabilityInfo *MBPI = - Features.BrProb - ? &getAnalysis().getMBPI() - : nullptr; + Features.BrProb ? &getAnalysis() + : nullptr; if (Features.BBFreq || Features.BrProb) { for (const MachineBasicBlock &MBB : MF) { diff --git a/llvm/lib/CodeGen/BranchFolding.cpp b/llvm/lib/CodeGen/BranchFolding.cpp index 1b6a6ee..c6c48cf 100644 --- a/llvm/lib/CodeGen/BranchFolding.cpp +++ b/llvm/lib/CodeGen/BranchFolding.cpp @@ -99,7 +99,7 @@ namespace { void getAnalysisUsage(AnalysisUsage &AU) const override { AU.addRequired(); - AU.addRequired(); + AU.addRequired(); AU.addRequired(); AU.addRequired(); MachineFunctionPass::getAnalysisUsage(AU); @@ -131,10 +131,9 @@ bool BranchFolderPass::runOnMachineFunction(MachineFunction &MF) { PassConfig->getEnableTailMerge(); MBFIWrapper MBBFreqInfo( getAnalysis()); - BranchFolder Folder( - EnableTailMerge, /*CommonHoist=*/true, MBBFreqInfo, - getAnalysis().getMBPI(), - &getAnalysis().getPSI()); + BranchFolder Folder(EnableTailMerge, /*CommonHoist=*/true, MBBFreqInfo, + getAnalysis(), + &getAnalysis().getPSI()); return Folder.OptimizeFunction(MF, MF.getSubtarget().getInstrInfo(), MF.getSubtarget().getRegisterInfo()); } diff --git a/llvm/lib/CodeGen/EarlyIfConversion.cpp b/llvm/lib/CodeGen/EarlyIfConversion.cpp index 5f3e850..0135f33 100644 --- a/llvm/lib/CodeGen/EarlyIfConversion.cpp +++ b/llvm/lib/CodeGen/EarlyIfConversion.cpp @@ -787,14 +787,14 @@ char &llvm::EarlyIfConverterID = EarlyIfConverter::ID; INITIALIZE_PASS_BEGIN(EarlyIfConverter, DEBUG_TYPE, "Early If Converter", false, false) -INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfoWrapperPass) +INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfo) INITIALIZE_PASS_DEPENDENCY(MachineDominatorTreeWrapperPass) INITIALIZE_PASS_DEPENDENCY(MachineTraceMetrics) INITIALIZE_PASS_END(EarlyIfConverter, DEBUG_TYPE, "Early If Converter", false, false) void EarlyIfConverter::getAnalysisUsage(AnalysisUsage &AU) const { - AU.addRequired(); + AU.addRequired(); AU.addRequired(); AU.addPreserved(); AU.addRequired(); @@ -1142,12 +1142,12 @@ char &llvm::EarlyIfPredicatorID = EarlyIfPredicator::ID; INITIALIZE_PASS_BEGIN(EarlyIfPredicator, DEBUG_TYPE, "Early If Predicator", false, false) INITIALIZE_PASS_DEPENDENCY(MachineDominatorTreeWrapperPass) -INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfoWrapperPass) +INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfo) INITIALIZE_PASS_END(EarlyIfPredicator, DEBUG_TYPE, "Early If Predicator", false, false) void EarlyIfPredicator::getAnalysisUsage(AnalysisUsage &AU) const { - AU.addRequired(); + AU.addRequired(); AU.addRequired(); AU.addPreserved(); AU.addRequired(); @@ -1222,7 +1222,7 @@ bool EarlyIfPredicator::runOnMachineFunction(MachineFunction &MF) { SchedModel.init(&STI); DomTree = &getAnalysis().getDomTree(); Loops = &getAnalysis(); - MBPI = &getAnalysis().getMBPI(); + MBPI = &getAnalysis(); bool Changed = false; IfConv.runOnMachineFunction(MF); diff --git a/llvm/lib/CodeGen/GlobalISel/RegBankSelect.cpp b/llvm/lib/CodeGen/GlobalISel/RegBankSelect.cpp index e067bd8..383cb61 100644 --- a/llvm/lib/CodeGen/GlobalISel/RegBankSelect.cpp +++ b/llvm/lib/CodeGen/GlobalISel/RegBankSelect.cpp @@ -63,7 +63,7 @@ INITIALIZE_PASS_BEGIN(RegBankSelect, DEBUG_TYPE, "Assign register bank of generic virtual registers", false, false); INITIALIZE_PASS_DEPENDENCY(MachineBlockFrequencyInfo) -INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfoWrapperPass) +INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfo) INITIALIZE_PASS_DEPENDENCY(TargetPassConfig) INITIALIZE_PASS_END(RegBankSelect, DEBUG_TYPE, "Assign register bank of generic virtual registers", false, @@ -86,7 +86,7 @@ void RegBankSelect::init(MachineFunction &MF) { TPC = &getAnalysis(); if (OptMode != Mode::Fast) { MBFI = &getAnalysis(); - MBPI = &getAnalysis().getMBPI(); + MBPI = &getAnalysis(); } else { MBFI = nullptr; MBPI = nullptr; @@ -100,7 +100,7 @@ void RegBankSelect::getAnalysisUsage(AnalysisUsage &AU) const { // We could preserve the information from these two analysis but // the APIs do not allow to do so yet. AU.addRequired(); - AU.addRequired(); + AU.addRequired(); } AU.addRequired(); getSelectionDAGFallbackAnalysisUsage(AU); @@ -955,10 +955,8 @@ uint64_t RegBankSelect::EdgeInsertPoint::frequency(const Pass &P) const { if (WasMaterialized) return MBFI->getBlockFreq(DstOrSplit).getFrequency(); - auto *MBPIWrapper = - P.getAnalysisIfAvailable(); const MachineBranchProbabilityInfo *MBPI = - MBPIWrapper ? &MBPIWrapper->getMBPI() : nullptr; + P.getAnalysisIfAvailable(); if (!MBPI) return 1; // The basic block will be on the edge. diff --git a/llvm/lib/CodeGen/IfConversion.cpp b/llvm/lib/CodeGen/IfConversion.cpp index 02cb95c..e8e276a 100644 --- a/llvm/lib/CodeGen/IfConversion.cpp +++ b/llvm/lib/CodeGen/IfConversion.cpp @@ -210,7 +210,7 @@ namespace { void getAnalysisUsage(AnalysisUsage &AU) const override { AU.addRequired(); - AU.addRequired(); + AU.addRequired(); AU.addRequired(); MachineFunctionPass::getAnalysisUsage(AU); } @@ -432,7 +432,7 @@ char IfConverter::ID = 0; char &llvm::IfConverterID = IfConverter::ID; INITIALIZE_PASS_BEGIN(IfConverter, DEBUG_TYPE, "If Converter", false, false) -INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfoWrapperPass) +INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfo) INITIALIZE_PASS_DEPENDENCY(ProfileSummaryInfoWrapperPass) INITIALIZE_PASS_END(IfConverter, DEBUG_TYPE, "If Converter", false, false) @@ -445,7 +445,7 @@ bool IfConverter::runOnMachineFunction(MachineFunction &MF) { TII = ST.getInstrInfo(); TRI = ST.getRegisterInfo(); MBFIWrapper MBFI(getAnalysis()); - MBPI = &getAnalysis().getMBPI(); + MBPI = &getAnalysis(); ProfileSummaryInfo *PSI = &getAnalysis().getPSI(); MRI = &MF.getRegInfo(); diff --git a/llvm/lib/CodeGen/LazyMachineBlockFrequencyInfo.cpp b/llvm/lib/CodeGen/LazyMachineBlockFrequencyInfo.cpp index 83b16fc..721b759 100644 --- a/llvm/lib/CodeGen/LazyMachineBlockFrequencyInfo.cpp +++ b/llvm/lib/CodeGen/LazyMachineBlockFrequencyInfo.cpp @@ -23,7 +23,7 @@ using namespace llvm; INITIALIZE_PASS_BEGIN(LazyMachineBlockFrequencyInfoPass, DEBUG_TYPE, "Lazy Machine Block Frequency Analysis", true, true) -INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfoWrapperPass) +INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfo) INITIALIZE_PASS_DEPENDENCY(MachineLoopInfo) INITIALIZE_PASS_END(LazyMachineBlockFrequencyInfoPass, DEBUG_TYPE, "Lazy Machine Block Frequency Analysis", true, true) @@ -43,7 +43,7 @@ void LazyMachineBlockFrequencyInfoPass::print(raw_ostream &OS, void LazyMachineBlockFrequencyInfoPass::getAnalysisUsage( AnalysisUsage &AU) const { - AU.addRequired(); + AU.addRequired(); AU.setPreservesAll(); MachineFunctionPass::getAnalysisUsage(AU); } @@ -62,7 +62,7 @@ LazyMachineBlockFrequencyInfoPass::calculateIfNotAvailable() const { return *MBFI; } - auto &MBPI = getAnalysis().getMBPI(); + auto &MBPI = getAnalysis(); auto *MLI = getAnalysisIfAvailable(); auto *MDTWrapper = getAnalysisIfAvailable(); auto *MDT = MDTWrapper ? &MDTWrapper->getDomTree() : nullptr; diff --git a/llvm/lib/CodeGen/MachineBlockFrequencyInfo.cpp b/llvm/lib/CodeGen/MachineBlockFrequencyInfo.cpp index 2a68f18..7ebecc6 100644 --- a/llvm/lib/CodeGen/MachineBlockFrequencyInfo.cpp +++ b/llvm/lib/CodeGen/MachineBlockFrequencyInfo.cpp @@ -163,7 +163,7 @@ struct DOTGraphTraits INITIALIZE_PASS_BEGIN(MachineBlockFrequencyInfo, DEBUG_TYPE, "Machine Block Frequency Analysis", true, true) -INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfoWrapperPass) +INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfo) INITIALIZE_PASS_DEPENDENCY(MachineLoopInfo) INITIALIZE_PASS_END(MachineBlockFrequencyInfo, DEBUG_TYPE, "Machine Block Frequency Analysis", true, true) @@ -185,7 +185,7 @@ MachineBlockFrequencyInfo::MachineBlockFrequencyInfo( MachineBlockFrequencyInfo::~MachineBlockFrequencyInfo() = default; void MachineBlockFrequencyInfo::getAnalysisUsage(AnalysisUsage &AU) const { - AU.addRequired(); + AU.addRequired(); AU.addRequired(); AU.setPreservesAll(); MachineFunctionPass::getAnalysisUsage(AU); @@ -209,7 +209,7 @@ void MachineBlockFrequencyInfo::calculate( bool MachineBlockFrequencyInfo::runOnMachineFunction(MachineFunction &F) { MachineBranchProbabilityInfo &MBPI = - getAnalysis().getMBPI(); + getAnalysis(); MachineLoopInfo &MLI = getAnalysis(); calculate(F, MBPI, MLI); return false; diff --git a/llvm/lib/CodeGen/MachineBlockPlacement.cpp b/llvm/lib/CodeGen/MachineBlockPlacement.cpp index a229475..1cb71f3 100644 --- a/llvm/lib/CodeGen/MachineBlockPlacement.cpp +++ b/llvm/lib/CodeGen/MachineBlockPlacement.cpp @@ -608,7 +608,7 @@ public: } void getAnalysisUsage(AnalysisUsage &AU) const override { - AU.addRequired(); + AU.addRequired(); AU.addRequired(); if (TailDupPlacement) AU.addRequired(); @@ -627,7 +627,7 @@ char &llvm::MachineBlockPlacementID = MachineBlockPlacement::ID; INITIALIZE_PASS_BEGIN(MachineBlockPlacement, DEBUG_TYPE, "Branch Probability Basic Block Placement", false, false) -INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfoWrapperPass) +INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfo) INITIALIZE_PASS_DEPENDENCY(MachineBlockFrequencyInfo) INITIALIZE_PASS_DEPENDENCY(MachinePostDominatorTreeWrapperPass) INITIALIZE_PASS_DEPENDENCY(MachineLoopInfo) @@ -3425,7 +3425,7 @@ bool MachineBlockPlacement::runOnMachineFunction(MachineFunction &MF) { return false; F = &MF; - MBPI = &getAnalysis().getMBPI(); + MBPI = &getAnalysis(); MBFI = std::make_unique( getAnalysis()); MLI = &getAnalysis(); @@ -3726,7 +3726,7 @@ public: bool runOnMachineFunction(MachineFunction &F) override; void getAnalysisUsage(AnalysisUsage &AU) const override { - AU.addRequired(); + AU.addRequired(); AU.addRequired(); AU.setPreservesAll(); MachineFunctionPass::getAnalysisUsage(AU); @@ -3741,7 +3741,7 @@ char &llvm::MachineBlockPlacementStatsID = MachineBlockPlacementStats::ID; INITIALIZE_PASS_BEGIN(MachineBlockPlacementStats, "block-placement-stats", "Basic Block Placement Stats", false, false) -INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfoWrapperPass) +INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfo) INITIALIZE_PASS_DEPENDENCY(MachineBlockFrequencyInfo) INITIALIZE_PASS_END(MachineBlockPlacementStats, "block-placement-stats", "Basic Block Placement Stats", false, false) @@ -3754,7 +3754,7 @@ bool MachineBlockPlacementStats::runOnMachineFunction(MachineFunction &F) { if (!isFunctionInPrintList(F.getName())) return false; - MBPI = &getAnalysis().getMBPI(); + MBPI = &getAnalysis(); MBFI = &getAnalysis(); for (MachineBasicBlock &MBB : F) { diff --git a/llvm/lib/CodeGen/MachineBranchProbabilityInfo.cpp b/llvm/lib/CodeGen/MachineBranchProbabilityInfo.cpp index 56fffff..a84377d 100644 --- a/llvm/lib/CodeGen/MachineBranchProbabilityInfo.cpp +++ b/llvm/lib/CodeGen/MachineBranchProbabilityInfo.cpp @@ -18,11 +18,9 @@ using namespace llvm; -INITIALIZE_PASS_BEGIN(MachineBranchProbabilityInfoWrapperPass, - "machine-branch-prob", +INITIALIZE_PASS_BEGIN(MachineBranchProbabilityInfo, "machine-branch-prob", "Machine Branch Probability Analysis", false, true) -INITIALIZE_PASS_END(MachineBranchProbabilityInfoWrapperPass, - "machine-branch-prob", +INITIALIZE_PASS_END(MachineBranchProbabilityInfo, "machine-branch-prob", "Machine Branch Probability Analysis", false, true) namespace llvm { @@ -39,45 +37,15 @@ cl::opt ProfileLikelyProb( cl::init(51), cl::Hidden); } // namespace llvm -MachineBranchProbabilityAnalysis::Result -MachineBranchProbabilityAnalysis::run(MachineFunction &, - MachineFunctionAnalysisManager &) { - return MachineBranchProbabilityInfo(); -} - -PreservedAnalyses -MachineBranchProbabilityPrinterPass::run(MachineFunction &MF, - MachineFunctionAnalysisManager &MFAM) { - OS << "Printing analysis 'Machine Branch Probability Analysis' for machine " - "function '" - << MF.getName() << "':\n"; - auto &MBPI = MFAM.getResult(MF); - for (const MachineBasicBlock &MBB : MF) { - for (const MachineBasicBlock *Succ : MBB.successors()) - MBPI.printEdgeProbability(OS << " ", &MBB, Succ); - } - return PreservedAnalyses::all(); -} - -char MachineBranchProbabilityInfoWrapperPass::ID = 0; +char MachineBranchProbabilityInfo::ID = 0; -MachineBranchProbabilityInfoWrapperPass:: - MachineBranchProbabilityInfoWrapperPass() +MachineBranchProbabilityInfo::MachineBranchProbabilityInfo() : ImmutablePass(ID) { PassRegistry &Registry = *PassRegistry::getPassRegistry(); - initializeMachineBranchProbabilityInfoWrapperPassPass(Registry); + initializeMachineBranchProbabilityInfoPass(Registry); } -void MachineBranchProbabilityInfoWrapperPass::anchor() {} - -AnalysisKey MachineBranchProbabilityAnalysis::Key; - -bool MachineBranchProbabilityInfo::invalidate( - MachineFunction &, const PreservedAnalyses &PA, - MachineFunctionAnalysisManager::Invalidator &) { - auto PAC = PA.getChecker(); - return !PAC.preservedWhenStateless(); -} +void MachineBranchProbabilityInfo::anchor() {} BranchProbability MachineBranchProbabilityInfo::getEdgeProbability( const MachineBasicBlock *Src, diff --git a/llvm/lib/CodeGen/MachineSink.cpp b/llvm/lib/CodeGen/MachineSink.cpp index 4dabaab..76947a4 100644 --- a/llvm/lib/CodeGen/MachineSink.cpp +++ b/llvm/lib/CodeGen/MachineSink.cpp @@ -187,7 +187,7 @@ namespace { AU.addRequired(); AU.addRequired(); AU.addRequired(); - AU.addRequired(); + AU.addRequired(); AU.addPreserved(); AU.addPreserved(); if (UseBlockFreqInfo) @@ -273,7 +273,7 @@ char &llvm::MachineSinkingID = MachineSinking::ID; INITIALIZE_PASS_BEGIN(MachineSinking, DEBUG_TYPE, "Machine code sinking", false, false) -INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfoWrapperPass) +INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfo) INITIALIZE_PASS_DEPENDENCY(MachineDominatorTreeWrapperPass) INITIALIZE_PASS_DEPENDENCY(MachineCycleInfoWrapperPass) INITIALIZE_PASS_DEPENDENCY(AAResultsWrapperPass) @@ -712,7 +712,7 @@ bool MachineSinking::runOnMachineFunction(MachineFunction &MF) { PDT = &getAnalysis().getPostDomTree(); CI = &getAnalysis().getCycleInfo(); MBFI = UseBlockFreqInfo ? &getAnalysis() : nullptr; - MBPI = &getAnalysis().getMBPI(); + MBPI = &getAnalysis(); AA = &getAnalysis().getAAResults(); RegClassInfo.runOnMachineFunction(MF); TargetPassConfig *PassConfig = &getAnalysis(); diff --git a/llvm/lib/CodeGen/MachineTraceMetrics.cpp b/llvm/lib/CodeGen/MachineTraceMetrics.cpp index 07df43f..3e6f36f 100644 --- a/llvm/lib/CodeGen/MachineTraceMetrics.cpp +++ b/llvm/lib/CodeGen/MachineTraceMetrics.cpp @@ -46,7 +46,7 @@ char &llvm::MachineTraceMetricsID = MachineTraceMetrics::ID; INITIALIZE_PASS_BEGIN(MachineTraceMetrics, DEBUG_TYPE, "Machine Trace Metrics", false, true) -INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfoWrapperPass) +INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfo) INITIALIZE_PASS_DEPENDENCY(MachineLoopInfo) INITIALIZE_PASS_END(MachineTraceMetrics, DEBUG_TYPE, "Machine Trace Metrics", false, true) @@ -57,7 +57,7 @@ MachineTraceMetrics::MachineTraceMetrics() : MachineFunctionPass(ID) { void MachineTraceMetrics::getAnalysisUsage(AnalysisUsage &AU) const { AU.setPreservesAll(); - AU.addRequired(); + AU.addRequired(); AU.addRequired(); MachineFunctionPass::getAnalysisUsage(AU); } diff --git a/llvm/lib/CodeGen/TailDuplication.cpp b/llvm/lib/CodeGen/TailDuplication.cpp index 25f20d9..bf3d208 100644 --- a/llvm/lib/CodeGen/TailDuplication.cpp +++ b/llvm/lib/CodeGen/TailDuplication.cpp @@ -40,7 +40,7 @@ public: bool runOnMachineFunction(MachineFunction &MF) override; void getAnalysisUsage(AnalysisUsage &AU) const override { - AU.addRequired(); + AU.addRequired(); AU.addRequired(); AU.addRequired(); MachineFunctionPass::getAnalysisUsage(AU); @@ -84,7 +84,7 @@ bool TailDuplicateBase::runOnMachineFunction(MachineFunction &MF) { if (skipFunction(MF.getFunction())) return false; - auto MBPI = &getAnalysis().getMBPI(); + auto MBPI = &getAnalysis(); auto *PSI = &getAnalysis().getPSI(); auto *MBFI = (PSI && PSI->hasProfileSummary()) ? &getAnalysis().getBFI() : diff --git a/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp index 4ef5c2aa..a87d0b5 100644 --- a/llvm/lib/Passes/PassBuilder.cpp +++ b/llvm/lib/Passes/PassBuilder.cpp @@ -93,7 +93,6 @@ #include "llvm/CodeGen/LocalStackSlotAllocation.h" #include "llvm/CodeGen/LowerEmuTLS.h" #include "llvm/CodeGen/MIRPrinter.h" -#include "llvm/CodeGen/MachineBranchProbabilityInfo.h" #include "llvm/CodeGen/MachineDominators.h" #include "llvm/CodeGen/MachineFunctionAnalysis.h" #include "llvm/CodeGen/MachinePassManager.h" diff --git a/llvm/lib/Target/AArch64/AArch64ConditionalCompares.cpp b/llvm/lib/Target/AArch64/AArch64ConditionalCompares.cpp index 3c2201e..9a78812 100644 --- a/llvm/lib/Target/AArch64/AArch64ConditionalCompares.cpp +++ b/llvm/lib/Target/AArch64/AArch64ConditionalCompares.cpp @@ -794,7 +794,7 @@ char AArch64ConditionalCompares::ID = 0; INITIALIZE_PASS_BEGIN(AArch64ConditionalCompares, "aarch64-ccmp", "AArch64 CCMP Pass", false, false) -INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfoWrapperPass) +INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfo) INITIALIZE_PASS_DEPENDENCY(MachineDominatorTreeWrapperPass) INITIALIZE_PASS_DEPENDENCY(MachineTraceMetrics) INITIALIZE_PASS_END(AArch64ConditionalCompares, "aarch64-ccmp", @@ -805,7 +805,7 @@ FunctionPass *llvm::createAArch64ConditionalCompares() { } void AArch64ConditionalCompares::getAnalysisUsage(AnalysisUsage &AU) const { - AU.addRequired(); + AU.addRequired(); AU.addRequired(); AU.addPreserved(); AU.addRequired(); @@ -935,7 +935,7 @@ bool AArch64ConditionalCompares::runOnMachineFunction(MachineFunction &MF) { MRI = &MF.getRegInfo(); DomTree = &getAnalysis().getDomTree(); Loops = &getAnalysis(); - MBPI = &getAnalysis().getMBPI(); + MBPI = &getAnalysis(); Traces = &getAnalysis(); MinInstr = nullptr; MinSize = MF.getFunction().hasMinSize(); diff --git a/llvm/lib/Target/Hexagon/HexagonEarlyIfConv.cpp b/llvm/lib/Target/Hexagon/HexagonEarlyIfConv.cpp index e99496d..03f6882 100644 --- a/llvm/lib/Target/Hexagon/HexagonEarlyIfConv.cpp +++ b/llvm/lib/Target/Hexagon/HexagonEarlyIfConv.cpp @@ -161,7 +161,7 @@ namespace { } void getAnalysisUsage(AnalysisUsage &AU) const override { - AU.addRequired(); + AU.addRequired(); AU.addRequired(); AU.addPreserved(); AU.addRequired(); @@ -1056,9 +1056,8 @@ bool HexagonEarlyIfConversion::runOnMachineFunction(MachineFunction &MF) { MRI = &MF.getRegInfo(); MDT = &getAnalysis().getDomTree(); MLI = &getAnalysis(); - MBPI = EnableHexagonBP - ? &getAnalysis().getMBPI() - : nullptr; + MBPI = EnableHexagonBP ? &getAnalysis() : + nullptr; Deleted.clear(); bool Changed = false; diff --git a/llvm/lib/Target/Hexagon/HexagonLoopAlign.cpp b/llvm/lib/Target/Hexagon/HexagonLoopAlign.cpp index 6aa95ff..c79b528 100644 --- a/llvm/lib/Target/Hexagon/HexagonLoopAlign.cpp +++ b/llvm/lib/Target/Hexagon/HexagonLoopAlign.cpp @@ -74,7 +74,7 @@ public: bool attemptToBalignSmallLoop(MachineFunction &MF, MachineBasicBlock &MBB); void getAnalysisUsage(AnalysisUsage &AU) const override { - AU.addRequired(); + AU.addRequired(); AU.addRequired(); MachineFunctionPass::getAnalysisUsage(AU); } @@ -148,7 +148,7 @@ bool HexagonLoopAlign::attemptToBalignSmallLoop(MachineFunction &MF, return false; const MachineBranchProbabilityInfo *MBPI = - &getAnalysis().getMBPI(); + &getAnalysis(); const MachineBlockFrequencyInfo *MBFI = &getAnalysis(); diff --git a/llvm/lib/Target/Hexagon/HexagonNewValueJump.cpp b/llvm/lib/Target/Hexagon/HexagonNewValueJump.cpp index 36c52df..f539717 100644 --- a/llvm/lib/Target/Hexagon/HexagonNewValueJump.cpp +++ b/llvm/lib/Target/Hexagon/HexagonNewValueJump.cpp @@ -78,7 +78,7 @@ namespace { HexagonNewValueJump() : MachineFunctionPass(ID) {} void getAnalysisUsage(AnalysisUsage &AU) const override { - AU.addRequired(); + AU.addRequired(); MachineFunctionPass::getAnalysisUsage(AU); } @@ -107,7 +107,7 @@ char HexagonNewValueJump::ID = 0; INITIALIZE_PASS_BEGIN(HexagonNewValueJump, "hexagon-nvj", "Hexagon NewValueJump", false, false) -INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfoWrapperPass) +INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfo) INITIALIZE_PASS_END(HexagonNewValueJump, "hexagon-nvj", "Hexagon NewValueJump", false, false) @@ -459,7 +459,7 @@ bool HexagonNewValueJump::runOnMachineFunction(MachineFunction &MF) { QII = static_cast(MF.getSubtarget().getInstrInfo()); QRI = static_cast( MF.getSubtarget().getRegisterInfo()); - MBPI = &getAnalysis().getMBPI(); + MBPI = &getAnalysis(); if (DisableNewValueJumps || !MF.getSubtarget().useNewValueJumps()) diff --git a/llvm/lib/Target/Hexagon/HexagonVLIWPacketizer.cpp b/llvm/lib/Target/Hexagon/HexagonVLIWPacketizer.cpp index ef2677a..2d5352b 100644 --- a/llvm/lib/Target/Hexagon/HexagonVLIWPacketizer.cpp +++ b/llvm/lib/Target/Hexagon/HexagonVLIWPacketizer.cpp @@ -96,7 +96,7 @@ namespace { void getAnalysisUsage(AnalysisUsage &AU) const override { AU.setPreservesCFG(); AU.addRequired(); - AU.addRequired(); + AU.addRequired(); AU.addRequired(); AU.addRequired(); AU.addPreserved(); @@ -125,7 +125,7 @@ char HexagonPacketizer::ID = 0; INITIALIZE_PASS_BEGIN(HexagonPacketizer, "hexagon-packetizer", "Hexagon Packetizer", false, false) INITIALIZE_PASS_DEPENDENCY(MachineDominatorTreeWrapperPass) -INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfoWrapperPass) +INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfo) INITIALIZE_PASS_DEPENDENCY(MachineLoopInfo) INITIALIZE_PASS_DEPENDENCY(AAResultsWrapperPass) INITIALIZE_PASS_END(HexagonPacketizer, "hexagon-packetizer", @@ -213,8 +213,7 @@ bool HexagonPacketizer::runOnMachineFunction(MachineFunction &MF) { HRI = HST.getRegisterInfo(); auto &MLI = getAnalysis(); auto *AA = &getAnalysis().getAAResults(); - auto *MBPI = - &getAnalysis().getMBPI(); + auto *MBPI = &getAnalysis(); if (EnableGenAllInsnClass) HII->genAllInsnTimingClasses(MF); diff --git a/llvm/lib/Target/Mips/MipsDelaySlotFiller.cpp b/llvm/lib/Target/Mips/MipsDelaySlotFiller.cpp index 4ec01ab..b525606 100644 --- a/llvm/lib/Target/Mips/MipsDelaySlotFiller.cpp +++ b/llvm/lib/Target/Mips/MipsDelaySlotFiller.cpp @@ -236,7 +236,7 @@ namespace { } void getAnalysisUsage(AnalysisUsage &AU) const override { - AU.addRequired(); + AU.addRequired(); MachineFunctionPass::getAnalysisUsage(AU); } @@ -872,7 +872,7 @@ MipsDelaySlotFiller::selectSuccBB(MachineBasicBlock &B) const { return nullptr; // Select the successor with the larget edge weight. - auto &Prob = getAnalysis().getMBPI(); + auto &Prob = getAnalysis(); MachineBasicBlock *S = *std::max_element( B.succ_begin(), B.succ_end(), [&](const MachineBasicBlock *Dst0, const MachineBasicBlock *Dst1) { diff --git a/llvm/lib/Target/PowerPC/PPCReduceCRLogicals.cpp b/llvm/lib/Target/PowerPC/PPCReduceCRLogicals.cpp index 0bfcba9..d1cc2ad 100644 --- a/llvm/lib/Target/PowerPC/PPCReduceCRLogicals.cpp +++ b/llvm/lib/Target/PowerPC/PPCReduceCRLogicals.cpp @@ -426,7 +426,7 @@ public: } CRLogicalOpInfo createCRLogicalOpInfo(MachineInstr &MI); void getAnalysisUsage(AnalysisUsage &AU) const override { - AU.addRequired(); + AU.addRequired(); AU.addRequired(); MachineFunctionPass::getAnalysisUsage(AU); } @@ -570,7 +570,7 @@ void PPCReduceCRLogicals::initialize(MachineFunction &MFParam) { MF = &MFParam; MRI = &MF->getRegInfo(); TII = MF->getSubtarget().getInstrInfo(); - MBPI = &getAnalysis().getMBPI(); + MBPI = &getAnalysis(); AllCRLogicalOps.clear(); } diff --git a/llvm/test/CodeGen/Generic/MachineBranchProb.ll b/llvm/test/CodeGen/Generic/MachineBranchProb.ll index fa39e71..9a5ea0c 100644 --- a/llvm/test/CodeGen/Generic/MachineBranchProb.ll +++ b/llvm/test/CodeGen/Generic/MachineBranchProb.ll @@ -1,5 +1,4 @@ ; RUN: llc < %s -print-after=finalize-isel -o /dev/null 2>&1 | FileCheck %s -; RUN: llc %s -stop-after=finalize-isel -o - | llc -passes='print' -x mir -filetype=null 2>&1 | FileCheck -check-prefix=NPM %s ; Hexagon runs passes that renumber the basic blocks, causing this test ; to fail. @@ -28,10 +27,6 @@ entry: ; CHECK: bb.6.entry: ; CHECK: successors: %bb.1(0x2e8ba2d7), %bb.3(0x51745d29) -; NPM: Printing analysis 'Machine Branch Probability Analysis' for machine function 'test2': -; NPM: edge %bb.4 -> %bb.6 probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge] -; NPM: edge %bb.5 -> %bb.6 probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge] - sw.bb: ; this call will prevent simplifyCFG from optimizing the block away in ARM/AArch64. tail call void @foo() -- cgit v1.1