Skip to content

Commit 6240654

Browse files
committed
[NewPM] Don't preserve BlockFrequencyInfo in FunctionToLoopPassAdaptor
Function analyses in LoopStandardAnalysisResults are marked as preserved by the loop pass adaptor, because LoopAnalysisManagerFunctionProxy manually invalidates most of them. However the proxy doesn't invalidate BFI, since it is only preserved on a "lossy" basis: see https://reviews.llvm.org/D86156 and https://reviews.llvm.org/D110438. So any changes to the CFG will result in BFI giving incorrect results, which is fine for loop passes which deal with the lossiness. But the loop pass adapator still marks it as preserved, which causes the lossy result to leak out into function passes. This causes incorrect results when viewed from e.g. LoopVectorizer, where an innermost loop header may be reported to have a smaller frequency than its successors. This fixes this by dropping the call to preserve, and adds a test with the -O1 pipeline which shows the effects whenever the CFG is changed and UseBlockFrequencyInfo is set. I've also dropped it for BranchProbabilityAnalysis too, but I couldn't test for it since UseBranchProbabilityInfo always seems to be false? This may be dead code.
1 parent d62b028 commit 6240654

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

llvm/lib/Transforms/Scalar/LoopPassManager.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -349,10 +349,6 @@ PreservedAnalyses FunctionToLoopPassAdaptor::run(Function &F,
349349
PA.preserve<DominatorTreeAnalysis>();
350350
PA.preserve<LoopAnalysis>();
351351
PA.preserve<ScalarEvolutionAnalysis>();
352-
if (UseBlockFrequencyInfo && F.hasProfileData())
353-
PA.preserve<BlockFrequencyAnalysis>();
354-
if (UseBranchProbabilityInfo && F.hasProfileData())
355-
PA.preserve<BranchProbabilityAnalysis>();
356352
if (UseMemorySSA)
357353
PA.preserve<MemorySSAAnalysis>();
358354
return PA;

llvm/test/Other/loop-pm-invalidation.ll

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ exit:
257257
; CHECK-BFI-INV-NEXT: Running pass: SimpleLoopUnswitchPass on loop %l0.header in function simplifiable_loop
258258
; CHECK-BFI-INV-NEXT: Invalidating analysis: PostDominatorTreeAnalysis on simplifiable_loop
259259
; CHECK-BFI-INV-NEXT: Invalidating analysis: BranchProbabilityAnalysis on simplifiable_loop
260+
; CHECK-BFI-INV-NEXT: Invalidating analysis: BlockFrequencyAnalysis on simplifiable_loop
260261
; CHECK-BFI-INV-NEXT: Running pass: SimplifyCFGPass on simplifiable_loop (5 instructions)
261262

262263
define void @simplifiable_loop(i1 %c) !prof !0 {

0 commit comments

Comments
 (0)