Skip to content

[FunctionSpecialization] Fix profile count preserving logic #157939

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 5 commits into from
Sep 11, 2025
Merged

[FunctionSpecialization] Fix profile count preserving logic #157939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7c4211f
[FunctionSpecialization] Fix profile count preserving logic
alanzhao1 Sep 10, 2025
146ff7f
undo accidental reverted change
alanzhao1 Sep 10, 2025
16fd512
make the test expectations more consistent
alanzhao1 Sep 10, 2025
5511d80
check second call to foo.specialized.2
alanzhao1 Sep 11, 2025
1b0914a
remove FunctionSpecialization from profcheck-xfail.txt
alanzhao1 Sep 11, 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: 2 additions & 2 deletions llvm/lib/Transforms/IPO/FunctionSpecialization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,8 +802,8 @@ bool FunctionSpecializer::run() {
if (std::optional<llvm::Function::ProfileCount> MaybeOriginalCount =
S.F->getEntryCount()) {
uint64_t OriginalCount = MaybeOriginalCount->getCount();
if (OriginalCount >= CallCount) {
S.F->setEntryCount(OriginalCount - CallCount);
if (OriginalCount >= *Count) {
S.F->setEntryCount(OriginalCount - *Count);
} else {
// This should generally not happen as that would mean there are
// more computed calls to the function than what was recorded.
Expand Down
24 changes: 15 additions & 9 deletions llvm/test/Transforms/FunctionSpecialization/profile-counts.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,29 @@ entry:

; CHECK: if.then:
; CHECK: call i32 @foo.specialized.1(i32 %x, ptr @A)
; CHECK: call i32 @foo.specialized.2(i32 %y, ptr @B)
; CHECK: call i32 @foo.specialized.2(i32 %y, ptr @B)
if.then:
%call = call i32 @foo(i32 %x, ptr @A)
%call1 = call i32 @foo(i32 %y, ptr @B)
%call2 = call i32 @foo(i32 %y, ptr @B)
%add = add i32 %call, %call1
%add1 = add i32 %add, %call2
br label %return

; CHECK: if.else:
; CHECK: call i32 @foo.specialized.2(i32 %y, ptr @B)
if.else:
%call1 = call i32 @foo(i32 %y, ptr @B)
%call3 = call i32 @foo(i32 %y, ptr @B)
br label %return

; CHECK: return:
; CHECK: %call2 = call i32 @foo(i32 %x, ptr %z)
; CHECK: call i32 @foo(i32 %x, ptr %z)
return:
%retval.0 = phi i32 [ %call, %if.then ], [ %call1, %if.else ]
%call2 = call i32 @foo(i32 %x, ptr %z);
%add = add i32 %retval.0, %call2
ret i32 %add
%retval.0 = phi i32 [ %add1, %if.then ], [ %call3, %if.else ]
%call4 = call i32 @foo(i32 %x, ptr %z);
%add2 = add i32 %retval.0, %call4
ret i32 %add2
}

; CHECK: define internal i32 @foo(i32 %x, ptr %b) !prof ![[FOO_UNSPEC_PROF:[0-9]]]
Expand All @@ -44,9 +50,9 @@ entry:

; CHECK: ![[BAR_PROF]] = !{!"function_entry_count", i64 1000}
; CHECK: ![[BRANCH_PROF]] = !{!"branch_weights", i32 1, i32 3}
; CHECK: ![[FOO_UNSPEC_PROF]] = !{!"function_entry_count", i64 234}
; CHECK: ![[FOO_UNSPEC_PROF]] = !{!"function_entry_count", i64 500}
; CHECK: ![[FOO_SPEC_1_PROF]] = !{!"function_entry_count", i64 250}
; CHECK: ![[FOO_SPEC_2_PROF]] = !{!"function_entry_count", i64 750}
; CHECK: ![[FOO_SPEC_2_PROF]] = !{!"function_entry_count", i64 1250}
!0 = !{!"function_entry_count", i64 1000}
!1 = !{!"branch_weights", i32 1, i32 3}
!2 = !{!"function_entry_count", i64 1234}
!2 = !{!"function_entry_count", i64 2000}
1 change: 0 additions & 1 deletion llvm/utils/profcheck-xfail.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,6 @@ Transforms/FixIrreducible/basic.ll
Transforms/FixIrreducible/bug45623.ll
Transforms/FixIrreducible/nested.ll
Transforms/FixIrreducible/switch.ll
Transforms/FunctionSpecialization/function-specialization3.ll
Transforms/GCOVProfiling/atomic-counter.ll
Transforms/GCOVProfiling/exit-block.ll
Transforms/GCOVProfiling/function-numbering.ll
Expand Down
Loading