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/BranchFolding.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/BranchFolding.cpp')
| -rw-r--r-- | llvm/lib/CodeGen/BranchFolding.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/llvm/lib/CodeGen/BranchFolding.cpp b/llvm/lib/CodeGen/BranchFolding.cpp index c6c48cf..1b6a6ee 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<MachineBlockFrequencyInfo>(); - AU.addRequired<MachineBranchProbabilityInfo>(); + AU.addRequired<MachineBranchProbabilityInfoWrapperPass>(); AU.addRequired<ProfileSummaryInfoWrapperPass>(); AU.addRequired<TargetPassConfig>(); MachineFunctionPass::getAnalysisUsage(AU); @@ -131,9 +131,10 @@ bool BranchFolderPass::runOnMachineFunction(MachineFunction &MF) { PassConfig->getEnableTailMerge(); MBFIWrapper MBBFreqInfo( getAnalysis<MachineBlockFrequencyInfo>()); - BranchFolder Folder(EnableTailMerge, /*CommonHoist=*/true, MBBFreqInfo, - getAnalysis<MachineBranchProbabilityInfo>(), - &getAnalysis<ProfileSummaryInfoWrapperPass>().getPSI()); + BranchFolder Folder( + EnableTailMerge, /*CommonHoist=*/true, MBBFreqInfo, + getAnalysis<MachineBranchProbabilityInfoWrapperPass>().getMBPI(), + &getAnalysis<ProfileSummaryInfoWrapperPass>().getPSI()); return Folder.OptimizeFunction(MF, MF.getSubtarget().getInstrInfo(), MF.getSubtarget().getRegisterInfo()); } |