RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-04-03 05:41:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

In GCC 4.7, function names are now forbidden from .gcda files. Support this by

Browse Source 
passing a null pointer to the function name in to GCDAProfiling, and add another
switch onto GCOVProfiling.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@176173 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Nick Lewycky 2013-02-27 06:22:56 +00:00
parent 58591b1647
commit 52b4edf6a1
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/llvm/Transforms/Instrumentation.h
View File

@ -34,7 +34,8 @@ ModulePass *createPathProfilerPass();
ModulePass *createGCOVProfilerPass(bool EmitNotes = true, bool EmitData = true, ModulePass *createGCOVProfilerPass(bool EmitNotes = true, bool EmitData = true,
bool Use402Format = false, bool Use402Format = false,
bool UseExtraChecksum = false, bool UseExtraChecksum = false,
bool NoRedZone = false); bool NoRedZone = false,
bool NoFunctionNamesInData = false);
// Insert AddressSanitizer (address sanity checking) instrumentation // Insert AddressSanitizer (address sanity checking) instrumentation
FunctionPass *createAddressSanitizerFunctionPass( FunctionPass *createAddressSanitizerFunctionPass(

22
lib/Transforms/Instrumentation/GCOVProfiling.cpp
View File

@ -45,14 +45,16 @@ namespace {
static char ID; static char ID;
GCOVProfiler() GCOVProfiler()
: ModulePass(ID), EmitNotes(true), EmitData(true), Use402Format(false), : ModulePass(ID), EmitNotes(true), EmitData(true), Use402Format(false),
UseExtraChecksum(false), NoRedZone(false) { UseExtraChecksum(false), NoRedZone(false),
NoFunctionNamesInData(false) {
initializeGCOVProfilerPass(*PassRegistry::getPassRegistry()); initializeGCOVProfilerPass(*PassRegistry::getPassRegistry());
} }
GCOVProfiler(bool EmitNotes, bool EmitData, bool use402Format, GCOVProfiler(bool EmitNotes, bool EmitData, bool Use402Format,
bool useExtraChecksum, bool NoRedZone_) bool UseExtraChecksum, bool NoRedZone,
bool NoFunctionNamesInData)
: ModulePass(ID), EmitNotes(EmitNotes), EmitData(EmitData), : ModulePass(ID), EmitNotes(EmitNotes), EmitData(EmitData),
Use402Format(use402Format), UseExtraChecksum(useExtraChecksum), Use402Format(Use402Format), UseExtraChecksum(UseExtraChecksum),
NoRedZone(NoRedZone_) { NoRedZone(NoRedZone), NoFunctionNamesInData(NoFunctionNamesInData) {
assert((EmitNotes || EmitData) && "GCOVProfiler asked to do nothing?"); assert((EmitNotes || EmitData) && "GCOVProfiler asked to do nothing?");
initializeGCOVProfilerPass(*PassRegistry::getPassRegistry()); initializeGCOVProfilerPass(*PassRegistry::getPassRegistry());
} }
@ -100,6 +102,7 @@ namespace {
bool Use402Format; bool Use402Format;
bool UseExtraChecksum; bool UseExtraChecksum;
bool NoRedZone; bool NoRedZone;
bool NoFunctionNamesInData;
Module *M; Module *M;
LLVMContext *Ctx; LLVMContext *Ctx;
@ -113,9 +116,10 @@ INITIALIZE_PASS(GCOVProfiler, "insert-gcov-profiling",
ModulePass *llvm::createGCOVProfilerPass(bool EmitNotes, bool EmitData, ModulePass *llvm::createGCOVProfilerPass(bool EmitNotes, bool EmitData,
bool Use402Format, bool Use402Format,
bool UseExtraChecksum, bool UseExtraChecksum,
bool NoRedZone) { bool NoRedZone,
bool NoFunctionNamesInData) {
return new GCOVProfiler(EmitNotes, EmitData, Use402Format, UseExtraChecksum, return new GCOVProfiler(EmitNotes, EmitData, Use402Format, UseExtraChecksum,
NoRedZone); NoRedZone, NoFunctionNamesInData);
} }
namespace { namespace {
@ -664,7 +668,9 @@ void GCOVProfiler::insertCounterWriteout(
intptr_t ident = reinterpret_cast<intptr_t>(I->second); intptr_t ident = reinterpret_cast<intptr_t>(I->second);
Builder.CreateCall2(EmitFunction, Builder.CreateCall2(EmitFunction,
Builder.getInt32(ident), Builder.getInt32(ident),
Builder.CreateGlobalStringPtr(SP.getName())); NoFunctionNamesInData ?
Constant::getNullValue(Builder.getInt8PtrTy()) :
Builder.CreateGlobalStringPtr(SP.getName()));
GlobalVariable *GV = I->first; GlobalVariable *GV = I->first;
unsigned Arcs = unsigned Arcs =

11
runtime/libprofile/GCDAProfiling.c
View File

@ -162,17 +162,22 @@ void llvm_gcda_increment_indirect_counter(uint32_t *predecessor,
void llvm_gcda_emit_function(uint32_t ident, const char *function_name) { void llvm_gcda_emit_function(uint32_t ident, const char *function_name) {
#ifdef DEBUG_GCDAPROFILING #ifdef DEBUG_GCDAPROFILING
printf("llvmgcda: function id=%x\n", ident); printf("llvmgcda: function id=%x name=%s\n", ident,
function_name ? function_name : "NULL");
#endif #endif
if (!output_file) return; if (!output_file) return;
/* function tag */ /* function tag */
fwrite("\0\0\0\1", 4, 1, output_file); fwrite("\0\0\0\1", 4, 1, output_file);
write_int32(3 + 1 + length_of_string(function_name)); uint32_t len = 3;
if (function_name)
len += 1 + length_of_string(function_name);
write_int32(len);
write_int32(ident); write_int32(ident);
write_int32(0); write_int32(0);
write_int32(0); write_int32(0);
write_string(function_name); if (function_name)
write_string(function_name);
} }
void llvm_gcda_emit_arcs(uint32_t num_counters, uint64_t *counters) { void llvm_gcda_emit_arcs(uint32_t num_counters, uint64_t *counters) {