maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[esan|cfrag] Minor cfrag report adjustment 

Summary:
Reports the struct field access info only if it has been used at least
once.

Adds type printing size limit.

Formats the cache_frag.cpp with clang-format.

Reviewers: bruening

Subscribers: llvm-commits, eugenis, kcc, zhaoqin, vitalybuka, aizatsky, kubabrecka

Differential Revision: http://reviews.llvm.org/D21351

llvm-svn: 272810
This commit is contained in:
Qin Zhao 2016-06-15 17:27:29 +00:00
parent 4e7ab67c0b
commit cd5fe14d89
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
compiler-rt/lib/esan/cache_frag.cpp
View File

@ -43,8 +43,8 @@ struct CacheFragInfo {
struct StructCounter { struct StructCounter {
StructInfo *Struct; StructInfo *Struct;
u64 Count; // The total access count of the struct. u64 Count; // The total access count of the struct.
u64 Ratio; // Difference ratio for the struct layout access. u64 Ratio; // Difference ratio for the struct layout access.
}; };
// We use StructHashMap to keep track of an unique copy of StructCounter. // We use StructHashMap to keep track of an unique copy of StructCounter.
@ -58,20 +58,24 @@ static Context *Ctx;
static void reportStructSummary() { static void reportStructSummary() {
// FIXME: provide a better struct field access summary report. // FIXME: provide a better struct field access summary report.
Report("%s: total struct field access count = %llu\n", Report("%s: total struct field access count = %llu\n", SanitizerToolName,
SanitizerToolName, Ctx->TotalCount); Ctx->TotalCount);
} }
// FIXME: we are still exploring proper ways to evaluate the difference between // FIXME: we are still exploring proper ways to evaluate the difference between
// struct field counts. Currently, we use a simple formula to calculate the // struct field counts. Currently, we use a simple formula to calculate the
// difference ratio: V1/V2. // difference ratio: V1/V2.
static inline u64 computeDifferenceRatio(u64 Val1, u64 Val2) { static inline u64 computeDifferenceRatio(u64 Val1, u64 Val2) {
if (Val2 > Val1) { Swap(Val1, Val2); } if (Val2 > Val1) {
if (Val2 == 0) Val2 = 1; Swap(Val1, Val2);
}
if (Val2 == 0)
Val2 = 1;
return (Val1 / Val2); return (Val1 / Val2);
} }
static void reportStructCounter(StructHashMap::Handle &Handle) { static void reportStructCounter(StructHashMap::Handle &Handle) {
const u32 TypePrintLimit = 512;
const char *type, *start, *end; const char *type, *start, *end;
StructInfo *Struct = Handle->Struct; StructInfo *Struct = Handle->Struct;
// Union field address calculation is done via bitcast instead of GEP, // Union field address calculation is done via bitcast instead of GEP,
@ -91,12 +95,12 @@ static void reportStructCounter(StructHashMap::Handle &Handle) {
end = strchr(start, '#'); end = strchr(start, '#');
CHECK(end != nullptr); CHECK(end != nullptr);
Report(" %s %.*s\n", type, end - start, start); Report(" %s %.*s\n", type, end - start, start);
Report(" size = %u, count = %llu, ratio = %llu\n", Report(" size = %u, count = %llu, ratio = %llu\n", Struct->Size,
Struct->Size, Handle->Count, Handle->Ratio); Handle->Count, Handle->Ratio);
for (u32 i = 0; i < Struct->NumFields; ++i) { for (u32 i = 0; i < Struct->NumFields; ++i) {
Report(" #%2u: offset = %u,\t count = %llu,\t type = %s\n", i, Report(" #%2u: offset = %u,\t count = %llu,\t type = %.*s\n", i,
Struct->FieldOffsets[i], Struct->FieldCounters[i], Struct->FieldOffsets[i], Struct->FieldCounters[i],
Struct->FieldTypeNames[i]); TypePrintLimit, Struct->FieldTypeNames[i]);
} }
} }
@ -109,7 +113,8 @@ static void computeStructRatio(StructHashMap::Handle &Handle) {
Handle->Struct->FieldCounters[i - 1], Handle->Struct->FieldCounters[i]); Handle->Struct->FieldCounters[i - 1], Handle->Struct->FieldCounters[i]);
} }
Ctx->TotalCount += Handle->Count; Ctx->TotalCount += Handle->Count;
if (Handle->Ratio >= (u64)getFlags()->report_threshold || Verbosity() >= 1) if (Handle->Ratio >= (u64)getFlags()->report_threshold ||
(Verbosity() >= 1 && Handle->Count > 0))
reportStructCounter(Handle); reportStructCounter(Handle);
} }