From b516cf3f3f72540f8756e5a9f1681e79111987a4 Mon Sep 17 00:00:00 2001 From: Adam Nemet Date: Thu, 23 Feb 2017 17:30:01 +0000 Subject: [LazyMachineBFI] Reimplement with getAnalysisIfAvailable Since LoopInfo is not available in machine passes as universally as in IR passes, using the same approach for OptimizationRemarkEmitter as we did for IR will run LoopInfo and DominatorTree unnecessarily. (LoopInfo is not used lazily by ORE.) To fix this, I am modifying the approach I took in D29836. LazyMachineBFI now uses its client passes including MachineBFI itself that are available or otherwise compute them on the fly. So for example GreedyRegAlloc, since it's already using MBFI, will reuse that instance. On the other hand, AsmPrinter in Justin's patch will generate DT, LI and finally BFI on the fly. (I am of course wondering now if the simplicity of this approach is even preferable in IR. I will do some experiments.) Testing is provided by an updated version of D29837 which requires Justin's patch to bring ORE to the AsmPrinter. Differential Revision: https://reviews.llvm.org/D30128 llvm-svn: 295996 --- llvm/lib/CodeGen/LazyMachineBlockFrequencyInfo.cpp | 61 +++++++++++++++------- 1 file changed, 42 insertions(+), 19 deletions(-) (limited to 'llvm/lib/CodeGen/LazyMachineBlockFrequencyInfo.cpp') diff --git a/llvm/lib/CodeGen/LazyMachineBlockFrequencyInfo.cpp b/llvm/lib/CodeGen/LazyMachineBlockFrequencyInfo.cpp index 34611f8064d..996d40ca6e1 100644 --- a/llvm/lib/CodeGen/LazyMachineBlockFrequencyInfo.cpp +++ b/llvm/lib/CodeGen/LazyMachineBlockFrequencyInfo.cpp @@ -37,38 +37,61 @@ LazyMachineBlockFrequencyInfoPass::LazyMachineBlockFrequencyInfoPass() void LazyMachineBlockFrequencyInfoPass::print(raw_ostream &OS, const Module *M) const { - LMBFI.getCalculated().print(OS, M); + getBFI().print(OS, M); } void LazyMachineBlockFrequencyInfoPass::getAnalysisUsage( AnalysisUsage &AU) const { AU.addRequired(); - AU.addRequired(); AU.setPreservesAll(); MachineFunctionPass::getAnalysisUsage(AU); } void LazyMachineBlockFrequencyInfoPass::releaseMemory() { - LMBFI.releaseMemory(); + OwnedMBFI.reset(); + OwnedMLI.reset(); + OwnedMDT.reset(); } -bool LazyMachineBlockFrequencyInfoPass::runOnMachineFunction( - MachineFunction &MF) { - auto &BPIPass = getAnalysis(); - auto &LI = getAnalysis(); - LMBFI.setAnalysis(&MF, &BPIPass, &LI); - return false; -} +MachineBlockFrequencyInfo & +LazyMachineBlockFrequencyInfoPass::calculateIfNotAvailable() const { + auto *MBFI = getAnalysisIfAvailable(); + if (MBFI) { + DEBUG(dbgs() << "MachineBlockFrequencyInfo is available\n"); + return *MBFI; + } -void LazyMachineBlockFrequencyInfoPass::getLazyMachineBFIAnalysisUsage( - AnalysisUsage &AU) { - AU.addRequired(); - AU.addRequired(); - AU.addRequired(); + auto &MBPI = getAnalysis(); + auto *MLI = getAnalysisIfAvailable(); + auto *MDT = getAnalysisIfAvailable(); + DEBUG(dbgs() << "Building MachineBlockFrequencyInfo on the fly\n"); + DEBUG(if (MLI) dbgs() << "LoopInfo is available\n"); + + if (!MLI) { + DEBUG(dbgs() << "Building LoopInfo on the fly\n"); + // First create a dominator tree. + DEBUG(if (MDT) dbgs() << "DominatorTree is available\n"); + + if (!MDT) { + DEBUG(dbgs() << "Building DominatorTree on the fly\n"); + OwnedMDT = make_unique(); + OwnedMDT->getBase().recalculate(*MF); + MDT = OwnedMDT.get(); + } + + // Generate LoopInfo from it. + OwnedMLI = make_unique(); + OwnedMLI->getBase().analyze(MDT->getBase()); + MLI = OwnedMLI.get(); + } + + OwnedMBFI = make_unique(); + OwnedMBFI->calculate(*MF, MBPI, *MLI); + return *OwnedMBFI.get(); } -void llvm::initializeLazyMachineBFIPassPass(PassRegistry &Registry) { - INITIALIZE_PASS_DEPENDENCY(LazyMachineBlockFrequencyInfoPass); - INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfo); - INITIALIZE_PASS_DEPENDENCY(MachineLoopInfo); +bool LazyMachineBlockFrequencyInfoPass::runOnMachineFunction( + MachineFunction &F) { + MF = &F; + return false; } -- cgit v1.2.3