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

[llvm-dwp] Deduplicate type units

Browse Source 
It's O(N^2) because it does a simple walk through the existing types to
find duplicates, but that will be fixed in a follow-up commit to use a
mapping data structure of some kind.

llvm-svn: 255482
This commit is contained in:
David Blaikie 2015-12-14 07:42:00 +00:00
parent b64e80ae57
commit bf4705c1bc
4 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/tools/llvm-dwp/Inputs/type_dedup/a.dwo Normal file
View File

Binary file not shown.

BIN
test/tools/llvm-dwp/Inputs/type_dedup/b.dwo Normal file
View File

Binary file not shown.

35
test/tools/llvm-dwp/X86/type_dedup.test Normal file
View File

@ -0,0 +1,35 @@
RUN: llvm-dwp %p/../Inputs/type_dedup/a.dwo %p/../Inputs/type_dedup/b.dwo -o %t
RUN: llvm-dwarfdump %t | FileCheck %s
a.cpp:
struct common { };
common a1;
struct adistinct { };
adistinct a2;
b.cpp:
struct common { };
common b1;
struct bdistinct { };
bdistinct b2;
CHECK-LABEL: .debug_types.dwo contents:
CHECK: [[COMMONUOFF:0x[0-9a-f]*]]:
CHECK-LABEL: Type Unit: length = 0x00000020 version = 0x0004 abbr_offset =
CHECK: 0x0000 addr_size = 0x08 type_signature = [[COMMONSIG:0x[0-9a-f]*]] type_offset = 0x[[COMMONOFF:.*]] (next unit at [[AUOFF:.*]])
CHECK: DW_TAG_type_unit
CHECK: [[COMMONOFF]]: DW_TAG_structure_type
CHECK: DW_AT_name {{.*}} "common"
CHECK: [[AUOFF]]:
CHECK-LABEL: Type Unit: length = 0x00000020 version = 0x0004 abbr_offset =
CHECK: 0x0000 addr_size = 0x08 type_signature = [[ASIG:0x[0-9a-f]*]] type_offset = 0x[[AOFF:.*]] (next unit at [[BUOFF:.*]])
CHECK: DW_TAG_type_unit
CHECK: 0x00000042: DW_TAG_structure_type
CHECK: DW_AT_name {{.*}} "adistinct"
CHECK: [[BUOFF]]:
CHECK-LABEL: Type Unit: length = 0x00000020 version = 0x0004 abbr_offset =
CHECK: 0x{{.*}} addr_size = 0x08 type_signature = [[BSIG:0x[0-9a-f]*]] type_offset = 0x[[BOFF:.*]] (next unit at [[XUOFF:.*]])
CHECK: DW_TAG_type_unit
CHECK: 0x00000066: DW_TAG_structure_type
CHECK: DW_AT_name {{.*}} "bdistinct"
CHECK-NOT: Type Unit

18
tools/llvm-dwp/llvm-dwp.cpp
View File

@ -148,24 +148,30 @@ static void addAllTypes(MCStreamer &Out,
uint32_t Offset = 0; uint32_t Offset = 0;
DataExtractor Data(Types, true, 0); DataExtractor Data(Types, true, 0);
while (Data.isValidOffset(Offset)) { while (Data.isValidOffset(Offset)) {
TypeIndexEntries.push_back(CUEntry); UnitIndexEntry Entry = CUEntry;
auto &Entry = TypeIndexEntries.back();
// Zero out the debug_info contribution // Zero out the debug_info contribution
Entry.Contributions[0] = {}; Entry.Contributions[0] = {};
auto &C = Entry.Contributions[DW_SECT_TYPES - DW_SECT_INFO]; auto &C = Entry.Contributions[DW_SECT_TYPES - DW_SECT_INFO];
C.Offset = TypesOffset + Offset; C.Offset = TypesOffset;
auto PrevOffset = Offset; auto PrevOffset = Offset;
// Length of the unit, including the 4 byte length field. // Length of the unit, including the 4 byte length field.
C.Length = Data.getU32(&Offset) + 4; C.Length = Data.getU32(&Offset) + 4;
Out.EmitBytes(Types.substr(Offset - 4, C.Length));
TypesOffset += C.Length;
Data.getU16(&Offset); // Version Data.getU16(&Offset); // Version
Data.getU32(&Offset); // Abbrev offset Data.getU32(&Offset); // Abbrev offset
Data.getU8(&Offset); // Address size Data.getU8(&Offset); // Address size
Entry.Signature = Data.getU64(&Offset); Entry.Signature = Data.getU64(&Offset);
Offset = PrevOffset + C.Length; Offset = PrevOffset + C.Length;
if (any_of(TypeIndexEntries, [&](const UnitIndexEntry &E) {
return E.Signature == Entry.Signature;
}))
continue;
Out.EmitBytes(Types.substr(PrevOffset, C.Length));
TypesOffset += C.Length;
TypeIndexEntries.push_back(Entry);
} }
} }