From: Zachary Turner Date: Tue, 23 May 2017 18:56:23 +0000 (+0000) Subject: [CodeView] Eliminate redundant hashes and allocations. X-Git-Tag: llvmorg-5.0.0-rc1~4479 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7daf62e7436ad5ff7fced724195371b1a28b0423;p=platform%2Fupstream%2Fllvm.git [CodeView] Eliminate redundant hashes and allocations. When writing field list records, we would construct a temporary type serializer that shared a bump ptr allocator with the rest of the application, so anything allocated from here would live forever. Furthermore, this temporary serializer had all the properties of a full blown serializer including record hashing and de-duplication. These features are required when you're merging multiple type streams into each other, because different streams may contain identical records, but records from the same type stream will never collide with each other. So all of this hashing was unnecessary. To solve this, two fixes are made: 1) The temporary serializer keeps its own bump ptr allocator instead of sharing a global one. When it's finished, all of its memory is freed. 2) Instead of using the same temporary serializer for the life of an entire type stream, we use it only for the life of a single field list record and delete it when the field list record is completed. This way the hash table will not grow as other records from the same type stream get inserted. Further improvements could eliminate hashing entirely from this codepath. This reduces the link time by 85% in my test, from 1 minute to 9 seconds. llvm-svn: 303676 --- diff --git a/llvm/include/llvm/DebugInfo/CodeView/TypeTableBuilder.h b/llvm/include/llvm/DebugInfo/CodeView/TypeTableBuilder.h index de7bc44..c7d4170 100644 --- a/llvm/include/llvm/DebugInfo/CodeView/TypeTableBuilder.h +++ b/llvm/include/llvm/DebugInfo/CodeView/TypeTableBuilder.h @@ -82,12 +82,13 @@ public: class FieldListRecordBuilder { TypeTableBuilder &TypeTable; + BumpPtrAllocator Allocator; TypeSerializer TempSerializer; CVType Type; public: explicit FieldListRecordBuilder(TypeTableBuilder &TypeTable) - : TypeTable(TypeTable), TempSerializer(TypeTable.getAllocator()) { + : TypeTable(TypeTable), TempSerializer(Allocator) { Type.Type = TypeLeafKind::LF_FIELDLIST; } diff --git a/llvm/lib/DebugInfo/CodeView/TypeStreamMerger.cpp b/llvm/lib/DebugInfo/CodeView/TypeStreamMerger.cpp index c3f8973..1526340 100644 --- a/llvm/lib/DebugInfo/CodeView/TypeStreamMerger.cpp +++ b/llvm/lib/DebugInfo/CodeView/TypeStreamMerger.cpp @@ -416,6 +416,8 @@ Error TypeStreamMerger::visitKnownRecord(CVType &, FieldListRecord &R) { assert(DestTypeStream); // Visit the members inside the field list. HadUntranslatedMember = false; + FieldListBuilder = llvm::make_unique(*DestTypeStream); + FieldListBuilder->begin(); if (auto EC = codeview::visitMemberRecordStream(R.Data, *this)) return EC; @@ -428,6 +430,7 @@ Error TypeStreamMerger::visitKnownRecord(CVType &, FieldListRecord &R) { FieldListBuilder->reset(); addMapping(DestIdx); + FieldListBuilder.reset(); return Error::success(); } @@ -496,7 +499,6 @@ Error TypeStreamMerger::visitUnknownType(CVType &Rec) { Error TypeStreamMerger::mergeTypeRecords(TypeTableBuilder &Dest, TypeCollection &Types) { DestTypeStream = &Dest; - FieldListBuilder = llvm::make_unique(Dest); return doit(Types); } @@ -515,7 +517,6 @@ Error TypeStreamMerger::mergeTypesAndIds(TypeTableBuilder &DestIds, TypeCollection &IdsAndTypes) { DestIdStream = &DestIds; DestTypeStream = &DestTypes; - FieldListBuilder = llvm::make_unique(DestTypes); return doit(IdsAndTypes); }