Extending the lifetime of these type index mappings does increase memory usage (+2% in my case), but it decouples type merging from symbol merging. This is a pre-requisite for two changes that I have in mind: - parallel type merging: speeds up slow type merging - defered symbol merging: avoid heap allocating (relocating) all symbols This eliminates CVIndexMap and moves its data into TpiSource. The maps are also split into a SmallVector and ArrayRef component, so that the ipiMap can alias the tpiMap for /Z7 object files, and so that both maps can simply alias the PDB type server maps for /Zi files. Splitting TypeServerSource establishes that all input types to be merged can be identified with two 32-bit indices: - The index of the TpiSource object - The type index of the record This is useful, because this information can be stored in a single 64-bit atomic word to enable concurrent hashtable insertion. One last change is that now all object files with debugChunks get a TpiSource, even if they have no type info. This avoids some null checks and special cases. Differential Revision: https://reviews.llvm.org/D87736
62 lines
1.9 KiB
C++
62 lines
1.9 KiB
C++
//===- TypeMerger.h ---------------------------------------------*- C++ -*-===//
|
|
//
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef LLD_COFF_TYPEMERGER_H
|
|
#define LLD_COFF_TYPEMERGER_H
|
|
|
|
#include "Config.h"
|
|
#include "llvm/DebugInfo/CodeView/GlobalTypeTableBuilder.h"
|
|
#include "llvm/DebugInfo/CodeView/MergingTypeTableBuilder.h"
|
|
#include "llvm/Support/Allocator.h"
|
|
|
|
namespace lld {
|
|
namespace coff {
|
|
|
|
class TypeMerger {
|
|
public:
|
|
TypeMerger(llvm::BumpPtrAllocator &alloc)
|
|
: typeTable(alloc), idTable(alloc), globalTypeTable(alloc),
|
|
globalIDTable(alloc) {}
|
|
|
|
/// Get the type table or the global type table if /DEBUG:GHASH is enabled.
|
|
inline llvm::codeview::TypeCollection &getTypeTable() {
|
|
if (config->debugGHashes)
|
|
return globalTypeTable;
|
|
return typeTable;
|
|
}
|
|
|
|
/// Get the ID table or the global ID table if /DEBUG:GHASH is enabled.
|
|
inline llvm::codeview::TypeCollection &getIDTable() {
|
|
if (config->debugGHashes)
|
|
return globalIDTable;
|
|
return idTable;
|
|
}
|
|
|
|
/// Type records that will go into the PDB TPI stream.
|
|
llvm::codeview::MergingTypeTableBuilder typeTable;
|
|
|
|
/// Item records that will go into the PDB IPI stream.
|
|
llvm::codeview::MergingTypeTableBuilder idTable;
|
|
|
|
/// Type records that will go into the PDB TPI stream (for /DEBUG:GHASH)
|
|
llvm::codeview::GlobalTypeTableBuilder globalTypeTable;
|
|
|
|
/// Item records that will go into the PDB IPI stream (for /DEBUG:GHASH)
|
|
llvm::codeview::GlobalTypeTableBuilder globalIDTable;
|
|
|
|
// When showSummary is enabled, these are histograms of TPI and IPI records
|
|
// keyed by type index.
|
|
SmallVector<uint32_t, 0> tpiCounts;
|
|
SmallVector<uint32_t, 0> ipiCounts;
|
|
};
|
|
|
|
} // namespace coff
|
|
} // namespace lld
|
|
|
|
#endif
|