Skip to content

[NewPM] Don't preserve BlockFrequencyInfo in FunctionToLoopPassAdaptor #157888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 18, 2025
Merged

[NewPM] Don't preserve BlockFrequencyInfo in FunctionToLoopPassAdaptor #157888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d62b028
Precommit tests
lukel97 Sep 10, 2025
6240654
[NewPM] Don't preserve BlockFrequencyInfo in FunctionToLoopPassAdaptor
lukel97 Sep 10, 2025
0c21c2e
Try fix windows test failure
lukel97 Sep 11, 2025
329acd5
Merge branch 'main' into loop-pm-invalidate-bfi
lukel97 Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions llvm/lib/Transforms/Scalar/LoopPassManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,10 +349,6 @@ PreservedAnalyses FunctionToLoopPassAdaptor::run(Function &F,
PA.preserve<DominatorTreeAnalysis>();
PA.preserve<LoopAnalysis>();
PA.preserve<ScalarEvolutionAnalysis>();
if (UseBlockFrequencyInfo && F.hasProfileData())
PA.preserve<BlockFrequencyAnalysis>();
if (UseBranchProbabilityInfo && F.hasProfileData())
PA.preserve<BranchProbabilityAnalysis>();
if (UseMemorySSA)
PA.preserve<MemorySSAAnalysis>();
return PA;
Expand Down
30 changes: 30 additions & 0 deletions llvm/test/Other/loop-pm-invalidation.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@
; RUN: opt -disable-output -disable-verify -verify-analysis-invalidation=0 -debug-pass-manager %s -aa-pipeline= 2>&1 \
; RUN: -passes='loop(no-op-loop,loop-deletion),invalidate<scalar-evolution>,loop(no-op-loop)' \
; RUN: | FileCheck %s --check-prefix=CHECK-SCEV-INV-AFTER-DELETE
;
; Test that BFI is invalidated after the loop adapter if any of the loop passes
; invalidated it.
; RUN: opt -disable-output -disable-verify -verify-analysis-invalidation=0 -debug-pass-manager %s -aa-pipeline= 2>&1 \
; RUN: -O1 | FileCheck %s --check-prefix=CHECK-BFI-INV

define void @no_loops() {
; CHECK-LOOP-INV: Running pass: LoopSimplifyPass
Expand Down Expand Up @@ -242,3 +247,28 @@ l0.header:
exit:
ret void
}

; CHECK-BFI-INV-LABEL: Running analysis: OuterAnalysisManagerProxy<{{.*}}> on loop %l0.header in function simplifiable_loop
; CHECK-BFI-INV-NEXT: Running pass: LoopInstSimplifyPass on loop %l0.header in function simplifiable_loop
; CHECK-BFI-INV-NEXT: Running pass: LoopSimplifyCFGPass on loop %l0.header in function simplifiable_loop
; CHECK-BFI-INV-NEXT: Running pass: LICMPass on loop %l0.header in function simplifiable_loop
; CHECK-BFI-INV-NEXT: Running pass: LoopRotatePass on loop %l0.header in function simplifiable_loop
; CHECK-BFI-INV-NEXT: Running pass: LICMPass on loop %l0.header in function simplifiable_loop
; CHECK-BFI-INV-NEXT: Running pass: SimpleLoopUnswitchPass on loop %l0.header in function simplifiable_loop
; CHECK-BFI-INV-NEXT: Invalidating analysis: PostDominatorTreeAnalysis on simplifiable_loop
; CHECK-BFI-INV-NEXT: Invalidating analysis: BranchProbabilityAnalysis on simplifiable_loop
; CHECK-BFI-INV-NEXT: Invalidating analysis: BlockFrequencyAnalysis on simplifiable_loop
; CHECK-BFI-INV-NEXT: Running pass: SimplifyCFGPass on simplifiable_loop (5 instructions)

define void @simplifiable_loop(i1 %c) !prof !0 {
entry:
br label %l0.header

l0.header:
br label %l0.latch

l0.latch:
br i1 %c, label %l0.header, label %l0.latch
}

!0 = !{!"function_entry_count", i64 1}