diff options
| author | paperchalice <liujunchang97@outlook.com> | 2024-06-28 10:59:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-28 10:59:23 +0800 |
| commit | d38b518e0444b42123ac05ac5cce267baecec294 (patch) | |
| tree | aaf1bb85596b21b40ef8f35894c7ad5a7db5095c /llvm/lib/CodeGen/MachineBlockPlacement.cpp | |
| parent | e48c4011ca80385573f1b92793c75dc98abb228f (diff) | |
| download | llvm-d38b518e0444b42123ac05ac5cce267baecec294.zip llvm-d38b518e0444b42123ac05ac5cce267baecec294.tar.gz llvm-d38b518e0444b42123ac05ac5cce267baecec294.tar.bz2 | |
Reapply "[CodeGen][NewPM] Port machine-branch-prob to new pass manager" (#96858) (#96869)
This reverts commit ab58b6d58edf6a7c8881044fc716ca435d7a0156.
In `CodeGen/Generic/MachineBranchProb.ll`, `llc` crashed with dumped MIR
when targeting PowerPC. Move test to `llc/new-pm`, which is X86
specific.
Diffstat (limited to 'llvm/lib/CodeGen/MachineBlockPlacement.cpp')
| -rw-r--r-- | llvm/lib/CodeGen/MachineBlockPlacement.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/llvm/lib/CodeGen/MachineBlockPlacement.cpp b/llvm/lib/CodeGen/MachineBlockPlacement.cpp index 1cb71f3..a229475 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<MachineBranchProbabilityInfo>(); + AU.addRequired<MachineBranchProbabilityInfoWrapperPass>(); AU.addRequired<MachineBlockFrequencyInfo>(); if (TailDupPlacement) AU.addRequired<MachinePostDominatorTreeWrapperPass>(); @@ -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(MachineBranchProbabilityInfo) +INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfoWrapperPass) 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<MachineBranchProbabilityInfo>(); + MBPI = &getAnalysis<MachineBranchProbabilityInfoWrapperPass>().getMBPI(); MBFI = std::make_unique<MBFIWrapper>( getAnalysis<MachineBlockFrequencyInfo>()); MLI = &getAnalysis<MachineLoopInfo>(); @@ -3726,7 +3726,7 @@ public: bool runOnMachineFunction(MachineFunction &F) override; void getAnalysisUsage(AnalysisUsage &AU) const override { - AU.addRequired<MachineBranchProbabilityInfo>(); + AU.addRequired<MachineBranchProbabilityInfoWrapperPass>(); AU.addRequired<MachineBlockFrequencyInfo>(); 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(MachineBranchProbabilityInfo) +INITIALIZE_PASS_DEPENDENCY(MachineBranchProbabilityInfoWrapperPass) 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<MachineBranchProbabilityInfo>(); + MBPI = &getAnalysis<MachineBranchProbabilityInfoWrapperPass>().getMBPI(); MBFI = &getAnalysis<MachineBlockFrequencyInfo>(); for (MachineBasicBlock &MBB : F) { |