From ce39fdd6eeabc4a007ce7821a247cc58b816e0d7 Mon Sep 17 00:00:00 2001
From: Dehao Chen <dehao@google.com>
Date: Tue, 21 Mar 2017 19:55:46 +0000
Subject: [PATCH] Clang change: Do not inline hot callsites for samplepgo in
 thinlto compile phase.

Summary:
Because SamplePGO passes will be invoked twice in ThinLTO build: once at compile phase, the other at backend. We want to make sure the IR at the 2nd phase matches the hot part in pro
file, thus we do not want to inline hot callsites in the first phase.

Reviewers: tejohnson, eraman

Reviewed By: tejohnson

Subscribers: mehdi_amini, cfe-commits, Prazek

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

llvm-svn: 298429
---
 clang/lib/CodeGen/BackendUtil.cpp                     |  7 ++++++-
 .../CodeGen/Inputs/pgo-sample-thinlto-summary.prof    |  2 ++
 clang/test/CodeGen/pgo-sample-thinlto-summary.c       | 19 +++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 clang/test/CodeGen/Inputs/pgo-sample-thinlto-summary.prof
 create mode 100644 clang/test/CodeGen/pgo-sample-thinlto-summary.c

diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp
index 73730e0..d1aae08 100644
--- a/clang/lib/CodeGen/BackendUtil.cpp
+++ b/clang/lib/CodeGen/BackendUtil.cpp
@@ -318,8 +318,13 @@ void EmitAssemblyHelper::CreatePasses(legacy::PassManager &MPM,
                                      !CodeGenOpts.DisableLifetimeMarkers);
     PMBuilder.Inliner = createAlwaysInlinerLegacyPass(InsertLifetimeIntrinsics);
   } else {
+    // We do not want to inline hot callsites for SamplePGO module-summary build
+    // because profile annotation will happen again in ThinLTO backend, and we
+    // want the IR of the hot path to match the profile.
     PMBuilder.Inliner = createFunctionInliningPass(
-        CodeGenOpts.OptimizationLevel, CodeGenOpts.OptimizeSize);
+        CodeGenOpts.OptimizationLevel, CodeGenOpts.OptimizeSize,
+        (!CodeGenOpts.SampleProfileFile.empty() &&
+         CodeGenOpts.EmitSummaryIndex));
   }
 
   PMBuilder.OptLevel = CodeGenOpts.OptimizationLevel;
diff --git a/clang/test/CodeGen/Inputs/pgo-sample-thinlto-summary.prof b/clang/test/CodeGen/Inputs/pgo-sample-thinlto-summary.prof
new file mode 100644
index 0000000..b4ef47d
--- /dev/null
+++ b/clang/test/CodeGen/Inputs/pgo-sample-thinlto-summary.prof
@@ -0,0 +1,2 @@
+bar:100:100
+ 2: 2000 foo:2000
diff --git a/clang/test/CodeGen/pgo-sample-thinlto-summary.c b/clang/test/CodeGen/pgo-sample-thinlto-summary.c
new file mode 100644
index 0000000..cb45ea4
--- /dev/null
+++ b/clang/test/CodeGen/pgo-sample-thinlto-summary.c
@@ -0,0 +1,19 @@
+// RUN: %clang_cc1 -O2 -fprofile-sample-use=%S/Inputs/pgo-sample-thinlto-summary.prof %s -emit-llvm -o - 2>&1 | FileCheck %s -check-prefix=INLINE
+// RUN: %clang_cc1 -O2 -fprofile-sample-use=%S/Inputs/pgo-sample-thinlto-summary.prof %s -emit-llvm -flto=thin -o - 2>&1 | FileCheck %s -check-prefix=NOINLINE
+// Checks if hot call is inlined by normal compile, but not inlined by
+// thinlto compile.
+
+int baz(int);
+int g;
+
+void foo(int n) {
+  for (int i = 0; i < n; i++)
+    g += baz(i);
+}
+
+// INLINE-NOT: call{{.*}}foo
+// NOINLINE: call{{.*}}foo
+void bar(int n) {
+  for (int i = 0; i < n; i++)
+    foo(i);
+}
-- 
2.7.4