[SampleProfile] Repeat indirect call promotion only when the target is actually hot.

Summary: It is possible that multiple indirect call targets have been promoted for a single callsite from the profiled binary. Current implementation repeats promotion for all these targets as far as the callsite itself is hot (the callsite is assumed to be hot if any one of these targets was "hot" during the profiling). However, even when one of the ICPed target is hot other targets may not, and we should not repeat promotion for "cold" targets.

Reviewers: danielcdh, wmi

Subscribers: hiraditya, jdoerfert, llvm-commits

Tags: #llvm

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

llvm-svn: 357484
This commit is contained in:
Taewook Oh 2019-04-02 15:48:21 +00:00
parent b69afa8e9b
commit 6a27c48be2
3 changed files with 40 additions and 0 deletions

View File

@ -834,6 +834,9 @@ bool SampleProfileLoader::inlineHotFunctions(
if (CalleeFunctionName == F.getName())
continue;
if (!callsiteIsHot(FS, PSI))
continue;
const char *Reason = "Callee function not available";
auto R = SymbolMap.find(CalleeFunctionName);
if (R != SymbolMap.end() && R->getValue() &&

View File

@ -0,0 +1,6 @@
foo:5000:1
1: 2000 quz:1000
1: bar:3000
1: 3000
1: baz:0
1: 0

View File

@ -0,0 +1,31 @@
; RUN: opt < %s -sample-profile -sample-profile-file=%S/Inputs/cold-indirect-call.prof -S | FileCheck %s
; RUN: opt < %s -passes=sample-profile -sample-profile-file=%S/Inputs/cold-indirect-call.prof -S | FileCheck %s
define i32 @foo(i32 ()* %func) !dbg !3 {
; CHECK: icmp {{.*}} @bar
; CHECK-NOT: icmp {{.*}} @baz
%call = call i32 %func(), !dbg !4
ret i32 %call
}
define i32 @bar() !dbg !5 {
ret i32 41, !dbg !6
}
define i32 @baz() !dbg !7 {
ret i32 42, !dbg !8
}
!llvm.dbg.cu = !{!0}
!llvm.module.flags = !{!2}
!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !1)
!1 = !DIFile(filename: "foo.cc", directory: "/")
!2 = !{i32 2, !"Debug Info Version", i32 3}
!3 = distinct !DISubprogram(name: "foo", scope: !1, file: !1, line: 4, unit: !0)
!4 = !DILocation(line: 5, scope: !3)
!5 = distinct !DISubprogram(name: "bar", scope: !1, file: !1, line: 8, unit: !0)
!6 = !DILocation(line: 9, scope: !5)
!7 = distinct !DISubprogram(name: "baz", scope: !1, file: !1, line: 12, unit: !0)
!8 = !DILocation(line: 13, scope: !7)