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

[esan|cfrag] Add the struct field size array in StructInfo 

Summary:
Adds the struct field size array in the struct StructInfo.

Prints struct field size info in the report.

Reviewers: aizatsky

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

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

llvm-svn: 272988
This commit is contained in:
Qin Zhao 2016-06-17 04:50:11 +00:00
parent 028fd50642
commit e24bc365e8
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,7 @@ struct StructInfo {
u32 Size; u32 Size;
u32 NumFields; u32 NumFields;
u32 *FieldOffsets; u32 *FieldOffsets;
u32 *FieldSize;
u64 *FieldCounters; u64 *FieldCounters;
const char **FieldTypeNames; const char **FieldTypeNames;
}; };
@ -98,9 +99,9 @@ static void reportStructCounter(StructHashMap::Handle &Handle) {
Report(" size = %u, count = %llu, ratio = %llu\n", Struct->Size, Report(" size = %u, count = %llu, ratio = %llu\n", 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 size = %u,\t count = %llu,\t type = %.*s\n",
Struct->FieldOffsets[i], Struct->FieldCounters[i], i, Struct->FieldOffsets[i], Struct->FieldSize[i],
TypePrintLimit, Struct->FieldTypeNames[i]); Struct->FieldCounters[i], TypePrintLimit, Struct->FieldTypeNames[i]);
} }
} }

32
compiler-rt/test/esan/TestCases/struct-simple.cpp
View File

@ -143,26 +143,26 @@ int main(int argc, char **argv) {
// CHECK-NEXT: Unregister class.C#3#14#13#13: 3 fields // CHECK-NEXT: Unregister class.C#3#14#13#13: 3 fields
// CHECK-NEXT: {{.*}} class C // CHECK-NEXT: {{.*}} class C
// CHECK-NEXT: {{.*}} size = 32, count = 5, ratio = 3 // CHECK-NEXT: {{.*}} size = 32, count = 5, ratio = 3
// CHECK-NEXT: {{.*}} # 0: offset = 0, count = 2, type = %struct.anon = type { i32, i32 } // CHECK-NEXT: {{.*}} # 0: offset = 0, size = 8, count = 2, type = %struct.anon = type { i32, i32 }
// CHECK-NEXT: {{.*}} # 1: offset = 8, count = 2, type = %union.anon = type { double } // CHECK-NEXT: {{.*}} # 1: offset = 8, size = 8, count = 2, type = %union.anon = type { double }
// CHECK-NEXT: {{.*}} # 2: offset = 16, count = 1, type = [10 x i8] // CHECK-NEXT: {{.*}} # 2: offset = 16, size = 10, count = 1, type = [10 x i8]
// CHECK-NEXT: Unregister struct.anon#2#11#11: 2 fields // CHECK-NEXT: Unregister struct.anon#2#11#11: 2 fields
// CHECK-NEXT: {{.*}} struct anon // CHECK-NEXT: {{.*}} struct anon
// CHECK-NEXT: {{.*}} size = 8, count = 2, ratio = 1 // CHECK-NEXT: {{.*}} size = 8, count = 2, ratio = 1
// CHECK-NEXT: {{.*}} # 0: offset = 0, count = 1, type = i32 // CHECK-NEXT: {{.*}} # 0: offset = 0, size = 4, count = 1, type = i32
// CHECK-NEXT: {{.*}} # 1: offset = 4, count = 1, type = i32 // CHECK-NEXT: {{.*}} # 1: offset = 4, size = 4, count = 1, type = i32
// CHECK-NEXT: Unregister union.anon#1#3: 1 fields // CHECK-NEXT: Unregister union.anon#1#3: 1 fields
// CHECK-NEXT: Unregister struct.S#2#11#11: 2 fields // CHECK-NEXT: Unregister struct.S#2#11#11: 2 fields
// CHECK-NEXT: {{.*}} struct S // CHECK-NEXT: {{.*}} struct S
// CHECK-NEXT: {{.*}} size = 8, count = 2, ratio = 2 // CHECK-NEXT: {{.*}} size = 8, count = 2, ratio = 2
// CHECK-NEXT: {{.*}} # 0: offset = 0, count = 2, type = i32 // CHECK-NEXT: {{.*}} # 0: offset = 0, size = 4, count = 2, type = i32
// CHECK-NEXT: {{.*}} # 1: offset = 4, count = 0, type = i32 // CHECK-NEXT: {{.*}} # 1: offset = 4, size = 4, count = 0, type = i32
// CHECK-NEXT: Unregister struct.D#3#11#11#11: 3 fields // CHECK-NEXT: Unregister struct.D#3#11#11#11: 3 fields
// CHECK-NEXT: {{.*}} struct D // CHECK-NEXT: {{.*}} struct D
// CHECK-NEXT: {{.*}} size = 12, count = 2, ratio = 2 // CHECK-NEXT: {{.*}} size = 12, count = 2, ratio = 2
// CHECK-NEXT: {{.*}} # 0: offset = 0, count = 1, type = i32 // CHECK-NEXT: {{.*}} # 0: offset = 0, size = 4, count = 1, type = i32
// CHECK-NEXT: {{.*}} # 1: offset = 4, count = 1, type = i32 // CHECK-NEXT: {{.*}} # 1: offset = 4, size = 4, count = 1, type = i32
// CHECK-NEXT: {{.*}} # 2: offset = 8, count = 0, type = i32 // CHECK-NEXT: {{.*}} # 2: offset = 8, size = 4, count = 0, type = i32
// CHECK-NEXT: in esan::processCompilationUnitExit // CHECK-NEXT: in esan::processCompilationUnitExit
// CHECK-NEXT: in esan::processCacheFragCompilationUnitExit: {{.*}}struct-simple.cpp with 0 class(es)/struct(s) // CHECK-NEXT: in esan::processCacheFragCompilationUnitExit: {{.*}}struct-simple.cpp with 0 class(es)/struct(s)
// CHECK-NEXT: in esan::processCompilationUnitExit // CHECK-NEXT: in esan::processCompilationUnitExit
@ -170,20 +170,20 @@ int main(int argc, char **argv) {
// CHECK-NEXT: Unregister struct.A#2#11#11: 2 fields // CHECK-NEXT: Unregister struct.A#2#11#11: 2 fields
// CHECK-NEXT: {{.*}} struct A // CHECK-NEXT: {{.*}} struct A
// CHECK-NEXT: {{.*}} size = 8, count = 2049, ratio = 2048 // CHECK-NEXT: {{.*}} size = 8, count = 2049, ratio = 2048
// CHECK-NEXT: {{.*}} # 0: offset = 0, count = 2048, type = i32 // CHECK-NEXT: {{.*}} # 0: offset = 0, size = 4, count = 2048, type = i32
// CHECK-NEXT: {{.*}} # 1: offset = 4, count = 1, type = i32 // CHECK-NEXT: {{.*}} # 1: offset = 4, size = 4, count = 1, type = i32
// CHECK-NEXT: Unregister struct.B#2#3#2: 2 fields // CHECK-NEXT: Unregister struct.B#2#3#2: 2 fields
// CHECK-NEXT: {{.*}} struct B // CHECK-NEXT: {{.*}} struct B
// CHECK-NEXT: {{.*}} size = 16, count = 2097153, ratio = 2097152 // CHECK-NEXT: {{.*}} size = 16, count = 2097153, ratio = 2097152
// CHECK-NEXT: {{.*}} # 0: offset = 0, count = 1, type = float // CHECK-NEXT: {{.*}} # 0: offset = 0, size = 4, count = 1, type = float
// CHECK-NEXT: {{.*}} # 1: offset = 8, count = 2097152, type = double // CHECK-NEXT: {{.*}} # 1: offset = 8, size = 8, count = 2097152, type = double
// CHECK-NEXT: Unregister union.U#1#3: 1 fields // CHECK-NEXT: Unregister union.U#1#3: 1 fields
// CHECK-NEXT: Duplicated struct.S#2#11#11: 2 fields // CHECK-NEXT: Duplicated struct.S#2#11#11: 2 fields
// CHECK-NEXT: Unregister struct.D#2#11#11: 2 fields // CHECK-NEXT: Unregister struct.D#2#11#11: 2 fields
// CHECK-NEXT: {{.*}} struct D // CHECK-NEXT: {{.*}} struct D
// CHECK-NEXT: {{.*}} size = 8, count = 1, ratio = 1 // CHECK-NEXT: {{.*}} size = 8, count = 1, ratio = 1
// CHECK-NEXT: {{.*}} # 0: offset = 0, count = 1, type = i32 // CHECK-NEXT: {{.*}} # 0: offset = 0, size = 4, count = 1, type = i32
// CHECK-NEXT: {{.*}} # 1: offset = 4, count = 0, type = i32 // CHECK-NEXT: {{.*}} # 1: offset = 4, size = 4, count = 0, type = i32
// CHECK-NEXT: {{.*}}EfficiencySanitizer: total struct field access count = 2099214 // CHECK-NEXT: {{.*}}EfficiencySanitizer: total struct field access count = 2099214
} }
#endif // MAIN #endif // MAIN