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

[Taewook Oh via Phabricator via llvm-commits]

twoh updated this revision to Diff 193235.
twoh added a comment.

Check for the new pass manager added. Thanks @wmi for the comment!


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D59940/new/

https://reviews.llvm.org/D59940

Files:
  llvm/lib/Transforms/IPO/SampleProfile.cpp
  llvm/test/Transforms/SampleProfile/Inputs/cold-indirect-call.prof
  llvm/test/Transforms/SampleProfile/cold-indirect-call.ll


Index: llvm/test/Transforms/SampleProfile/cold-indirect-call.ll
===================================================================
--- /dev/null
+++ llvm/test/Transforms/SampleProfile/cold-indirect-call.ll
@@ -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)
Index: llvm/test/Transforms/SampleProfile/Inputs/cold-indirect-call.prof
===================================================================
--- /dev/null
+++ llvm/test/Transforms/SampleProfile/Inputs/cold-indirect-call.prof
@@ -0,0 +1,6 @@
+foo:5000:1
+ 1: 2000 quz:1000
+ 1: bar:3000
+   1: 3000
+ 1: baz:0
+   1: 0
Index: llvm/lib/Transforms/IPO/SampleProfile.cpp
===================================================================
--- llvm/lib/Transforms/IPO/SampleProfile.cpp
+++ llvm/lib/Transforms/IPO/SampleProfile.cpp
@@ -834,6 +834,9 @@
           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() &&


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D59940.193235.patch
Type: text/x-patch
Size: 2164 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190402/a9d5206b/attachment.bin>