RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-23 03:02:36 +01:00
Code Issues Projects Releases Wiki Activity

[PGO] Revert r255365: solution incomplete, not handling lambda yet

Browse Source 
llvm-svn: 255369
This commit is contained in:
Xinliang David Li 2015-12-11 20:23:22 +00:00
parent de46641441
commit 2cad28318a
6 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/ProfileData/InstrProf.h
View File

@ -30,7 +30,7 @@
#include <system_error>
#include <vector>
#define INSTR_PROF_INDEX_VERSION 4
#define INSTR_PROF_INDEX_VERSION 3
namespace llvm {
class Function;

9
lib/ProfileData/InstrProf.cpp
View File

@ -74,15 +74,14 @@ namespace llvm {
std::string getPGOFuncName(StringRef RawFuncName,
GlobalValue::LinkageTypes Linkage,
StringRef FileName, uint64_t Version) {
StringRef FileName,
uint64_t Version LLVM_ATTRIBUTE_UNUSED) {
// Function names may be prefixed with a binary '1' to indicate
// that the backend should not modify the symbols due to any platform
// naming convention. Do not include that '1' in the PGO profile name.
if (RawFuncName[0] == '\1')
RawFuncName = RawFuncName.substr(1);
const char *Unknown = (Version <= 3 ? "<unknown>:" : "__unknown__");
const char *Sep = (Version <= 3 ? ":" : "__");
std::string FuncName = RawFuncName;
if (llvm::GlobalValue::isLocalLinkage(Linkage)) {
@ -91,9 +90,9 @@ std::string getPGOFuncName(StringRef RawFuncName,
// that it will stay the same, e.g., if the files are checked out from
// version control in different locations.
if (FileName.empty())
FuncName = FuncName.insert(0, Unknown);
FuncName = FuncName.insert(0, "<unknown>:");
else
FuncName = FuncName.insert(0, FileName.str() + Sep);
FuncName = FuncName.insert(0, FileName.str() + ":");
}
return FuncName;
}

2
test/Transforms/PGOProfile/Inputs/criticaledge.proftext
View File

@ -10,7 +10,7 @@ test_criticalEdge
2
1
<stdin>__bar
<stdin>:bar
12884901887
1
7

4
test/Transforms/PGOProfile/criticaledge.ll
View File

@ -5,7 +5,7 @@ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
; GEN: @__llvm_profile_name_test_criticalEdge = private constant [17 x i8] c"test_criticalEdge"
; GEN: @"__llvm_profile_name_<stdin>__bar" = private constant [12 x i8] c"<stdin>__bar"
; GEN: @"__llvm_profile_name_<stdin>:bar" = private constant [11 x i8] c"<stdin>:bar"
define i32 @test_criticalEdge(i32 %i, i32 %j) {
entry:
@ -99,7 +99,7 @@ return:
define internal i32 @bar(i32 %i) {
entry:
; GEN: call void @llvm.instrprof.increment(i8* getelementptr inbounds ([12 x i8], [12 x i8]* @"__llvm_profile_name_<stdin>__bar", i32 0, i32 0), i64 12884901887, i32 1, i32 0)
; GEN: call void @llvm.instrprof.increment(i8* getelementptr inbounds ([11 x i8], [11 x i8]* @"__llvm_profile_name_<stdin>:bar", i32 0, i32 0), i64 12884901887, i32 1, i32 0)
ret i32 %i
}

BIN
test/tools/llvm-profdata/Inputs/compat.profdata.v4
View File

Binary file not shown.

7
test/tools/llvm-profdata/compat.proftext
View File

@ -65,10 +65,3 @@ large_numbers
# FORMATV2-NEXT: Maximum internal block count: 1000000
# RUN: llvm-profdata show %S/Inputs/compat.profdata.v4 -all-functions --counts | FileCheck %s -check-prefix=FORMATV4
# FORMATV4: instrprof.c__foo_static:
# FORMATV4-NEXT: Hash: 0x000000000000000a
# FORMATV4-NEXT: Counters: 2
# FORMATV4-NEXT: Function count: 500500
# FORMATV4-NEXT: Block counts: [180100]