From bdd6759557c1280c62197ca81be4992ea40c33fb Mon Sep 17 00:00:00 2001 From: Xinliang David Li Date: Thu, 29 Oct 2015 04:08:31 +0000 Subject: [PATCH] [PGO] Do not emit runtime hook user function for Linux Clang driver now injects -u flag in the linker command line, in which case user function is not needed any more. Differential Revision: http://reviews.llvm.org/D14033 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@251612 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../Instrumentation/InstrProfiling.cpp | 5 +++ .../Instrumentation/InstrProfiling/linkage.ll | 33 ++++++++++--------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/lib/Transforms/Instrumentation/InstrProfiling.cpp b/lib/Transforms/Instrumentation/InstrProfiling.cpp index 55fd86f7172..493c70e8fd6 100644 --- a/lib/Transforms/Instrumentation/InstrProfiling.cpp +++ b/lib/Transforms/Instrumentation/InstrProfiling.cpp @@ -288,6 +288,11 @@ void InstrProfiling::emitRegistration() { void InstrProfiling::emitRuntimeHook() { + // We expect the linker to be invoked with -u flag for linux, + // for which case there is no need to emit the user function. + if (Triple(M->getTargetTriple()).isOSLinux()) + return; + // If the module's provided its own runtime, we don't need to do anything. if (M->getGlobalVariable(getInstrProfRuntimeHookVarName())) return; diff --git a/test/Instrumentation/InstrProfiling/linkage.ll b/test/Instrumentation/InstrProfiling/linkage.ll index fcca7754fa8..2c9e97becec 100644 --- a/test/Instrumentation/InstrProfiling/linkage.ll +++ b/test/Instrumentation/InstrProfiling/linkage.ll @@ -1,36 +1,36 @@ ;; Check that runtime symbols get appropriate linkage. -; RUN: opt < %s -mtriple=x86_64-apple-macosx10.10.0 -instrprof -S | FileCheck %s -; RUN: opt < %s -mtriple=x86_64-unknown-linux -instrprof -S | FileCheck %s +; RUN: opt < %s -mtriple=x86_64-apple-macosx10.10.0 -instrprof -S | FileCheck %s --check-prefix=OTHER --check-prefix=COMMON +; RUN: opt < %s -mtriple=x86_64-unknown-linux -instrprof -S | FileCheck %s --check-prefix=LINUX --check-prefix=COMMON @__llvm_profile_name_foo = hidden constant [3 x i8] c"foo" @__llvm_profile_name_foo_weak = weak hidden constant [8 x i8] c"foo_weak" @"__llvm_profile_name_linkage.ll:foo_internal" = internal constant [23 x i8] c"linkage.ll:foo_internal" @__llvm_profile_name_foo_inline = linkonce_odr hidden constant [10 x i8] c"foo_inline" -; CHECK: @__llvm_profile_counters_foo = hidden global -; CHECK: @__llvm_profile_data_foo = hidden constant +; COMMON: @__llvm_profile_counters_foo = hidden global +; COMMON: @__llvm_profile_data_foo = hidden constant define void @foo() { call void @llvm.instrprof.increment(i8* getelementptr inbounds ([3 x i8], [3 x i8]* @__llvm_profile_name_foo, i32 0, i32 0), i64 0, i32 1, i32 0) ret void } -; CHECK: @__llvm_profile_counters_foo_weak = weak hidden global -; CHECK: @__llvm_profile_data_foo_weak = weak hidden constant +; COMMON: @__llvm_profile_counters_foo_weak = weak hidden global +; COMMON: @__llvm_profile_data_foo_weak = weak hidden constant define weak void @foo_weak() { call void @llvm.instrprof.increment(i8* getelementptr inbounds ([8 x i8], [8 x i8]* @__llvm_profile_name_foo_weak, i32 0, i32 0), i64 0, i32 1, i32 0) ret void } -; CHECK: @"__llvm_profile_counters_linkage.ll:foo_internal" = internal global -; CHECK: @"__llvm_profile_data_linkage.ll:foo_internal" = internal constant +; COMMON: @"__llvm_profile_counters_linkage.ll:foo_internal" = internal global +; COMMON: @"__llvm_profile_data_linkage.ll:foo_internal" = internal constant define internal void @foo_internal() { call void @llvm.instrprof.increment(i8* getelementptr inbounds ([23 x i8], [23 x i8]* @"__llvm_profile_name_linkage.ll:foo_internal", i32 0, i32 0), i64 0, i32 1, i32 0) ret void } -; CHECK: @__llvm_profile_counters_foo_inline = linkonce_odr hidden global -; CHECK: @__llvm_profile_data_foo_inline = linkonce_odr hidden constant +; COMMON: @__llvm_profile_counters_foo_inline = linkonce_odr hidden global +; COMMON: @__llvm_profile_data_foo_inline = linkonce_odr hidden constant define linkonce_odr void @foo_inline() { call void @llvm.instrprof.increment(i8* getelementptr inbounds ([10 x i8], [10 x i8]* @__llvm_profile_name_foo_inline, i32 0, i32 0), i64 0, i32 1, i32 0) ret void @@ -38,9 +38,12 @@ define linkonce_odr void @foo_inline() { declare void @llvm.instrprof.increment(i8*, i64, i32, i32) -; CHECK: @__llvm_profile_runtime = external global i32 +; OTHER: @__llvm_profile_runtime = external global i32 +; LINUX-NOT: @__llvm_profile_runtime = external global i32 -; CHECK: define linkonce_odr hidden i32 @__llvm_profile_runtime_user() {{.*}} { -; CHECK: %[[REG:.*]] = load i32, i32* @__llvm_profile_runtime -; CHECK: ret i32 %[[REG]] -; CHECK: } +; OTHER: define linkonce_odr hidden i32 @__llvm_profile_runtime_user() {{.*}} { +; OTHER: %[[REG:.*]] = load i32, i32* @__llvm_profile_runtime +; OTHER: ret i32 %[[REG]] +; OTHER: } +; LINUX-NOT: define linkonce_odr hidden i32 @__llvm_profile_runtime_user() {{.*}} { +; LINUX-NOT: %[[REG:.*]] = load i32, i32* @__llvm_profile_runtime -- 2.34.1