maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ProfileSummary] Count callsite samples when computing total samples. 

Summary: Currently ProfileSummaryBuilder doesn't count into callsite samples when computing total samples. Considering that ProfileSummaryInfo is used to checked the hotness of not only body samples but also callsite samples (from SampleProfileLoader), I think the callsite sample counts should be considered when computing total samples.

Reviewers: eraman, danielcdh, wmi

Subscribers: hiraditya, jdoerfert, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D59835

llvm-svn: 357627
This commit is contained in:
Taewook Oh 2019-04-03 19:54:43 +00:00
parent ffa857c7a6
commit a960f89962
6 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/include/llvm/ProfileData/ProfileCommon.h
View File

@ -83,7 +83,8 @@ public:
SampleProfileSummaryBuilder(std::vector<uint32_t> Cutoffs)
: ProfileSummaryBuilder(std::move(Cutoffs)) {}
void addRecord(const sampleprof::FunctionSamples &FS);
void addRecord(const sampleprof::FunctionSamples &FS,
bool isCallsiteSample = false);
std::unique_ptr<ProfileSummary> getSummary();
};

13
llvm/lib/ProfileData/ProfileSummaryBuilder.cpp
View File

@ -44,12 +44,17 @@ void InstrProfSummaryBuilder::addRecord(const InstrProfRecord &R) {
// To compute the detailed summary, we consider each line containing samples as
// equivalent to a block with a count in the instrumented profile.
void SampleProfileSummaryBuilder::addRecord(
const sampleprof::FunctionSamples &FS) {
NumFunctions++;
if (FS.getHeadSamples() > MaxFunctionCount)
MaxFunctionCount = FS.getHeadSamples();
const sampleprof::FunctionSamples &FS, bool isCallsiteSample) {
if (!isCallsiteSample) {
NumFunctions++;
if (FS.getHeadSamples() > MaxFunctionCount)
MaxFunctionCount = FS.getHeadSamples();
}
for (const auto &I : FS.getBodySamples())
addCount(I.second.getSamples());
for (const auto &I : FS.getCallsiteSamples())
for (const auto &CS : I.second)
addRecord(CS.second, true);
}
// The argument to this method is a vector of cutoff percentages and the return

BIN
llvm/test/Transforms/SampleProfile/Inputs/inline.compactbinary.afdo
View File

Binary file not shown.

5
llvm/test/Transforms/SampleProfile/Inputs/summary.prof
View File

@ -2,3 +2,8 @@ bar:100:3
1: 100
foo:200:1
1: 200
baz:600:1
1: 0
2: 300
1: bar:300
1: 300

2
llvm/test/Transforms/SampleProfile/compact-binary-profile.ll
View File

@ -26,7 +26,7 @@
; CHECK: br i1 %cmp, label %while.body, label %while.end{{.*}} !prof ![[IDX1:[0-9]*]]
; CHECK: br i1 %cmp1, label %if.then, label %if.else{{.*}} !prof ![[IDX2:[0-9]*]]
; CHECK: call i32 (i8*, ...) @printf{{.*}} !prof ![[IDX3:[0-9]*]]
; CHECK: = !{!"TotalCount", i64 10944}
; CHECK: = !{!"TotalCount", i64 26781}
; CHECK: = !{!"MaxCount", i64 5553}
; CHECK: ![[IDX1]] = !{!"branch_weights", i32 5392, i32 163}
; CHECK: ![[IDX2]] = !{!"branch_weights", i32 5280, i32 113}

13
llvm/test/Transforms/SampleProfile/summary.ll
View File

@ -7,9 +7,20 @@ entry:
ret i32 1, !dbg !2
}
define i32 @baz() !dbg !3 {
entry:
%call = call i32 @bar(), !dbg !4
ret i32 %call, !dbg !5
}
; CHECK-DAG: {{![0-9]+}} = !{i32 1, !"ProfileSummary", {{![0-9]+}}}
; CHECK-DAG: {{![0-9]+}} = !{!"NumFunctions", i64 2}
; CHECK-DAG: {{![0-9]+}} = !{!"TotalCount", i64 900}
; CHECK-DAG: {{![0-9]+}} = !{!"NumCounts", i64 5}
; CHECK-DAG: {{![0-9]+}} = !{!"NumFunctions", i64 3}
; CHECK-DAG: {{![0-9]+}} = !{!"MaxFunctionCount", i64 3}
!1 = distinct !DISubprogram(name: "bar")
!2 = !DILocation(line: 2, scope: !2)
!3 = distinct !DISubprogram(name: "baz")
!4 = !DILocation(line: 1, scope: !4)
!5 = !DILocation(line: 2, scope: !5)