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

[AccelTable] Provide DWARF5AccelTableStaticData for dsymutil. 

For dsymutil we want to store offsets in the accelerator table entries
rather than DIE pointers. In addition, we need a way to communicate
which CU a DIE belongs to. This patch provides support for both of these
issues.

Differential revision: https://reviews.llvm.org/D49102

llvm-svn: 337158
This commit is contained in:
Jonas Devlieghere 2018-07-16 10:52:27 +00:00
parent 3620b9957a
commit 98062cb396
2 changed files with 115 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
llvm/include/llvm/CodeGen/AccelTable.h
View File

@ -122,8 +122,8 @@ public:
return order() < Other.order(); return order() < Other.order();
} }
// Subclasses should implement: // Subclasses should implement:
// static uint32_t hash(StringRef Name); // static uint32_t hash(StringRef Name);
#ifndef NDEBUG #ifndef NDEBUG
virtual void print(raw_ostream &OS) const = 0; virtual void print(raw_ostream &OS) const = 0;
@ -261,6 +261,8 @@ public:
#endif #endif
const DIE &getDie() const { return Die; } const DIE &getDie() const { return Die; }
uint64_t getDieOffset() const { return Die.getOffset(); }
unsigned getDieTag() const { return Die.getTag(); }
protected: protected:
const DIE &Die; const DIE &Die;
@ -268,6 +270,30 @@ protected:
uint64_t order() const override { return Die.getOffset(); } uint64_t order() const override { return Die.getOffset(); }
}; };
class DWARF5AccelTableStaticData : public AccelTableData {
public:
static uint32_t hash(StringRef Name) { return caseFoldingDjbHash(Name); }
DWARF5AccelTableStaticData(uint64_t DieOffset, unsigned DieTag,
unsigned CUIndex)
: DieOffset(DieOffset), DieTag(DieTag), CUIndex(CUIndex) {}
#ifndef NDEBUG
void print(raw_ostream &OS) const override;
#endif
uint64_t getDieOffset() const { return DieOffset; }
unsigned getDieTag() const { return DieTag; }
unsigned getCUIndex() const { return CUIndex; }
protected:
uint64_t DieOffset;
unsigned DieTag;
unsigned CUIndex;
uint64_t order() const override { return DieOffset; }
};
void emitAppleAccelTableImpl(AsmPrinter *Asm, AccelTableBase &Contents, void emitAppleAccelTableImpl(AsmPrinter *Asm, AccelTableBase &Contents,
StringRef Prefix, const MCSymbol *SecBegin, StringRef Prefix, const MCSymbol *SecBegin,
ArrayRef<AppleAccelTableData::Atom> Atoms); ArrayRef<AppleAccelTableData::Atom> Atoms);
@ -287,6 +313,12 @@ void emitDWARF5AccelTable(AsmPrinter *Asm,
const DwarfDebug &DD, const DwarfDebug &DD,
ArrayRef<std::unique_ptr<DwarfCompileUnit>> CUs); ArrayRef<std::unique_ptr<DwarfCompileUnit>> CUs);
void emitDWARF5AccelTable(
AsmPrinter *Asm, AccelTable<DWARF5AccelTableStaticData> &Contents,
ArrayRef<MCSymbol *> CUs,
llvm::function_ref<unsigned(const DWARF5AccelTableStaticData &)>
getCUIndexForEntry);
/// Accelerator table data implementation for simple Apple accelerator tables /// Accelerator table data implementation for simple Apple accelerator tables
/// with just a DIE reference. /// with just a DIE reference.
class AppleAccelTableOffsetData : public AppleAccelTableData { class AppleAccelTableOffsetData : public AppleAccelTableData {

120
llvm/lib/CodeGen/AsmPrinter/AccelTable.cpp
View File

@ -21,6 +21,7 @@
#include "llvm/CodeGen/DIE.h" #include "llvm/CodeGen/DIE.h"
#include "llvm/MC/MCExpr.h" #include "llvm/MC/MCExpr.h"
#include "llvm/MC/MCStreamer.h" #include "llvm/MC/MCStreamer.h"
#include "llvm/MC/MCSymbol.h"
#include "llvm/Support/raw_ostream.h" #include "llvm/Support/raw_ostream.h"
#include <algorithm> #include <algorithm>
#include <cstddef> #include <cstddef>
@ -180,8 +181,14 @@ public:
#endif #endif
}; };
/// Class responsible for emitting a DWARF v5 Accelerator Table. The only public /// Class responsible for emitting a DWARF v5 Accelerator Table. The only
/// function is emit(), which performs the actual emission. /// public function is emit(), which performs the actual emission.
///
/// The class is templated in its data type. This allows us to emit both dyamic
/// and static data entries. A callback abstract the logic to provide a CU
/// index for a given entry, which is different per data type, but identical
/// for every entry in the same table.
template <typename DataT>
class Dwarf5AccelTableWriter : public AccelTableWriter { class Dwarf5AccelTableWriter : public AccelTableWriter {
struct Header { struct Header {
uint32_t UnitLength = 0; uint32_t UnitLength = 0;
@ -209,8 +216,8 @@ class Dwarf5AccelTableWriter : public AccelTableWriter {
Header Header; Header Header;
DenseMap<uint32_t, SmallVector<AttributeEncoding, 2>> Abbreviations; DenseMap<uint32_t, SmallVector<AttributeEncoding, 2>> Abbreviations;
const DwarfDebug &DD; ArrayRef<MCSymbol *> CompUnits;
ArrayRef<std::unique_ptr<DwarfCompileUnit>> CompUnits; llvm::function_ref<unsigned(const DataT &)> getCUIndexForEntry;
MCSymbol *ContributionStart = Asm->createTempSymbol("names_start"); MCSymbol *ContributionStart = Asm->createTempSymbol("names_start");
MCSymbol *ContributionEnd = Asm->createTempSymbol("names_end"); MCSymbol *ContributionEnd = Asm->createTempSymbol("names_end");
MCSymbol *AbbrevStart = Asm->createTempSymbol("names_abbrev_start"); MCSymbol *AbbrevStart = Asm->createTempSymbol("names_abbrev_start");
@ -226,13 +233,14 @@ class Dwarf5AccelTableWriter : public AccelTableWriter {
void emitBuckets() const; void emitBuckets() const;
void emitStringOffsets() const; void emitStringOffsets() const;
void emitAbbrevs() const; void emitAbbrevs() const;
void emitEntry(const DWARF5AccelTableData &Data) const; void emitEntry(const DataT &Data) const;
void emitData() const; void emitData() const;
public: public:
Dwarf5AccelTableWriter(AsmPrinter *Asm, const AccelTableBase &Contents, Dwarf5AccelTableWriter(
const DwarfDebug &DD, AsmPrinter *Asm, const AccelTableBase &Contents,
ArrayRef<std::unique_ptr<DwarfCompileUnit>> CompUnits); ArrayRef<MCSymbol *> CompUnits,
llvm::function_ref<unsigned(const DataT &)> GetCUIndexForEntry);
void emit() const; void emit() const;
}; };
@ -354,7 +362,8 @@ void AppleAccelTableWriter::emit() const {
emitData(); emitData();
} }
void Dwarf5AccelTableWriter::Header::emit( template <typename DataT>
void Dwarf5AccelTableWriter<DataT>::Header::emit(
const Dwarf5AccelTableWriter &Ctx) const { const Dwarf5AccelTableWriter &Ctx) const {
assert(CompUnitCount > 0 && "Index must have at least one CU."); assert(CompUnitCount > 0 && "Index must have at least one CU.");
@ -386,22 +395,23 @@ void Dwarf5AccelTableWriter::Header::emit(
Asm->OutStreamer->EmitBytes({AugmentationString, AugmentationStringSize}); Asm->OutStreamer->EmitBytes({AugmentationString, AugmentationStringSize});
} }
DenseSet<uint32_t> Dwarf5AccelTableWriter::getUniqueTags() const { template <typename DataT>
DenseSet<uint32_t> Dwarf5AccelTableWriter<DataT>::getUniqueTags() const {
DenseSet<uint32_t> UniqueTags; DenseSet<uint32_t> UniqueTags;
for (auto &Bucket : Contents.getBuckets()) { for (auto &Bucket : Contents.getBuckets()) {
for (auto *Hash : Bucket) { for (auto *Hash : Bucket) {
for (auto *Value : Hash->Values) { for (auto *Value : Hash->Values) {
const DIE &Die = unsigned Tag = static_cast<const DataT *>(Value)->getDieTag();
static_cast<const DWARF5AccelTableData *>(Value)->getDie(); UniqueTags.insert(Tag);
UniqueTags.insert(Die.getTag());
} }
} }
} }
return UniqueTags; return UniqueTags;
} }
SmallVector<Dwarf5AccelTableWriter::AttributeEncoding, 2> template <typename DataT>
Dwarf5AccelTableWriter::getUniformAttributes() const { SmallVector<typename Dwarf5AccelTableWriter<DataT>::AttributeEncoding, 2>
Dwarf5AccelTableWriter<DataT>::getUniformAttributes() const {
SmallVector<AttributeEncoding, 2> UA; SmallVector<AttributeEncoding, 2> UA;
if (CompUnits.size() > 1) { if (CompUnits.size() > 1) {
size_t LargestCUIndex = CompUnits.size() - 1; size_t LargestCUIndex = CompUnits.size() - 1;
@ -412,17 +422,16 @@ Dwarf5AccelTableWriter::getUniformAttributes() const {
return UA; return UA;
} }
void Dwarf5AccelTableWriter::emitCUList() const { template <typename DataT>
void Dwarf5AccelTableWriter<DataT>::emitCUList() const {
for (const auto &CU : enumerate(CompUnits)) { for (const auto &CU : enumerate(CompUnits)) {
assert(CU.index() == CU.value()->getUniqueID());
Asm->OutStreamer->AddComment("Compilation unit " + Twine(CU.index())); Asm->OutStreamer->AddComment("Compilation unit " + Twine(CU.index()));
const DwarfCompileUnit *MainCU = Asm->emitDwarfSymbolReference(CU.value());
DD.useSplitDwarf() ? CU.value()->getSkeleton() : CU.value().get();
Asm->emitDwarfSymbolReference(MainCU->getLabelBegin());
} }
} }
void Dwarf5AccelTableWriter::emitBuckets() const { template <typename DataT>
void Dwarf5AccelTableWriter<DataT>::emitBuckets() const {
uint32_t Index = 1; uint32_t Index = 1;
for (const auto &Bucket : enumerate(Contents.getBuckets())) { for (const auto &Bucket : enumerate(Contents.getBuckets())) {
Asm->OutStreamer->AddComment("Bucket " + Twine(Bucket.index())); Asm->OutStreamer->AddComment("Bucket " + Twine(Bucket.index()));
@ -431,7 +440,8 @@ void Dwarf5AccelTableWriter::emitBuckets() const {
} }
} }
void Dwarf5AccelTableWriter::emitStringOffsets() const { template <typename DataT>
void Dwarf5AccelTableWriter<DataT>::emitStringOffsets() const {
for (const auto &Bucket : enumerate(Contents.getBuckets())) { for (const auto &Bucket : enumerate(Contents.getBuckets())) {
for (auto *Hash : Bucket.value()) { for (auto *Hash : Bucket.value()) {
DwarfStringPoolEntryRef String = Hash->Name; DwarfStringPoolEntryRef String = Hash->Name;
@ -442,7 +452,8 @@ void Dwarf5AccelTableWriter::emitStringOffsets() const {
} }
} }
void Dwarf5AccelTableWriter::emitAbbrevs() const { template <typename DataT>
void Dwarf5AccelTableWriter<DataT>::emitAbbrevs() const {
Asm->OutStreamer->EmitLabel(AbbrevStart); Asm->OutStreamer->EmitLabel(AbbrevStart);
for (const auto &Abbrev : Abbreviations) { for (const auto &Abbrev : Abbreviations) {
Asm->OutStreamer->AddComment("Abbrev code"); Asm->OutStreamer->AddComment("Abbrev code");
@ -462,9 +473,9 @@ void Dwarf5AccelTableWriter::emitAbbrevs() const {
Asm->OutStreamer->EmitLabel(AbbrevEnd); Asm->OutStreamer->EmitLabel(AbbrevEnd);
} }
void Dwarf5AccelTableWriter::emitEntry( template <typename DataT>
const DWARF5AccelTableData &Entry) const { void Dwarf5AccelTableWriter<DataT>::emitEntry(const DataT &Entry) const {
auto AbbrevIt = Abbreviations.find(Entry.getDie().getTag()); auto AbbrevIt = Abbreviations.find(Entry.getDieTag());
assert(AbbrevIt != Abbreviations.end() && assert(AbbrevIt != Abbreviations.end() &&
"Why wasn't this abbrev generated?"); "Why wasn't this abbrev generated?");
@ -473,14 +484,13 @@ void Dwarf5AccelTableWriter::emitEntry(
Asm->OutStreamer->AddComment(dwarf::IndexString(AttrEnc.Index)); Asm->OutStreamer->AddComment(dwarf::IndexString(AttrEnc.Index));
switch (AttrEnc.Index) { switch (AttrEnc.Index) {
case dwarf::DW_IDX_compile_unit: { case dwarf::DW_IDX_compile_unit: {
const DIE *CUDie = Entry.getDie().getUnitDie(); DIEInteger ID(getCUIndexForEntry(Entry));
DIEInteger ID(DD.lookupCU(CUDie)->getUniqueID());
ID.EmitValue(Asm, AttrEnc.Form); ID.EmitValue(Asm, AttrEnc.Form);
break; break;
} }
case dwarf::DW_IDX_die_offset: case dwarf::DW_IDX_die_offset:
assert(AttrEnc.Form == dwarf::DW_FORM_ref4); assert(AttrEnc.Form == dwarf::DW_FORM_ref4);
Asm->emitInt32(Entry.getDie().getOffset()); Asm->emitInt32(Entry.getDieOffset());
break; break;
default: default:
llvm_unreachable("Unexpected index attribute!"); llvm_unreachable("Unexpected index attribute!");
@ -488,27 +498,29 @@ void Dwarf5AccelTableWriter::emitEntry(
} }
} }
void Dwarf5AccelTableWriter::emitData() const { template <typename DataT> void Dwarf5AccelTableWriter<DataT>::emitData() const {
Asm->OutStreamer->EmitLabel(EntryPool); Asm->OutStreamer->EmitLabel(EntryPool);
for (auto &Bucket : Contents.getBuckets()) { for (auto &Bucket : Contents.getBuckets()) {
for (auto *Hash : Bucket) { for (auto *Hash : Bucket) {
// Remember to emit the label for our offset. // Remember to emit the label for our offset.
Asm->OutStreamer->EmitLabel(Hash->Sym); Asm->OutStreamer->EmitLabel(Hash->Sym);
for (const auto *Value : Hash->Values) for (const auto *Value : Hash->Values)
emitEntry(*static_cast<const DWARF5AccelTableData *>(Value)); emitEntry(*static_cast<const DataT *>(Value));
Asm->OutStreamer->AddComment("End of list: " + Hash->Name.getString()); Asm->OutStreamer->AddComment("End of list: " + Hash->Name.getString());
Asm->emitInt32(0); Asm->emitInt32(0);
} }
} }
} }
Dwarf5AccelTableWriter::Dwarf5AccelTableWriter( template <typename DataT>
AsmPrinter *Asm, const AccelTableBase &Contents, const DwarfDebug &DD, Dwarf5AccelTableWriter<DataT>::Dwarf5AccelTableWriter(
ArrayRef<std::unique_ptr<DwarfCompileUnit>> CompUnits) AsmPrinter *Asm, const AccelTableBase &Contents,
ArrayRef<MCSymbol *> CompUnits,
llvm::function_ref<unsigned(const DataT &)> getCUIndexForEntry)
: AccelTableWriter(Asm, Contents, false), : AccelTableWriter(Asm, Contents, false),
Header(CompUnits.size(), Contents.getBucketCount(), Header(CompUnits.size(), Contents.getBucketCount(),
Contents.getUniqueNameCount()), Contents.getUniqueNameCount()),
DD(DD), CompUnits(CompUnits) { CompUnits(CompUnits), getCUIndexForEntry(std::move(getCUIndexForEntry)) {
DenseSet<uint32_t> UniqueTags = getUniqueTags(); DenseSet<uint32_t> UniqueTags = getUniqueTags();
SmallVector<AttributeEncoding, 2> UniformAttributes = getUniformAttributes(); SmallVector<AttributeEncoding, 2> UniformAttributes = getUniformAttributes();
@ -517,7 +529,7 @@ Dwarf5AccelTableWriter::Dwarf5AccelTableWriter(
Abbreviations.try_emplace(Tag, UniformAttributes); Abbreviations.try_emplace(Tag, UniformAttributes);
} }
void Dwarf5AccelTableWriter::emit() const { template <typename DataT> void Dwarf5AccelTableWriter<DataT>::emit() const {
Header.emit(*this); Header.emit(*this);
emitCUList(); emitCUList();
emitBuckets(); emitBuckets();
@ -540,8 +552,33 @@ void llvm::emitAppleAccelTableImpl(AsmPrinter *Asm, AccelTableBase &Contents,
void llvm::emitDWARF5AccelTable( void llvm::emitDWARF5AccelTable(
AsmPrinter *Asm, AccelTable<DWARF5AccelTableData> &Contents, AsmPrinter *Asm, AccelTable<DWARF5AccelTableData> &Contents,
const DwarfDebug &DD, ArrayRef<std::unique_ptr<DwarfCompileUnit>> CUs) { const DwarfDebug &DD, ArrayRef<std::unique_ptr<DwarfCompileUnit>> CUs) {
std::vector<MCSymbol *> CompUnits;
for (const auto &CU : enumerate(CUs)) {
assert(CU.index() == CU.value()->getUniqueID());
const DwarfCompileUnit *MainCU =
DD.useSplitDwarf() ? CU.value()->getSkeleton() : CU.value().get();
CompUnits.push_back(MainCU->getLabelBegin());
}
Contents.finalize(Asm, "names"); Contents.finalize(Asm, "names");
Dwarf5AccelTableWriter(Asm, Contents, DD, CUs).emit(); Dwarf5AccelTableWriter<DWARF5AccelTableData>(
Asm, Contents, CompUnits,
[&DD](const DWARF5AccelTableData &Entry) {
const DIE *CUDie = Entry.getDie().getUnitDie();
return DD.lookupCU(CUDie)->getUniqueID();
})
.emit();
}
void llvm::emitDWARF5AccelTable(
AsmPrinter *Asm, AccelTable<DWARF5AccelTableStaticData> &Contents,
ArrayRef<MCSymbol *> CUs,
llvm::function_ref<unsigned(const DWARF5AccelTableStaticData &)>
getCUIndexForEntry) {
Contents.finalize(Asm, "names");
Dwarf5AccelTableWriter<DWARF5AccelTableStaticData>(Asm, Contents, CUs,
getCUIndexForEntry)
.emit();
} }
void AppleAccelTableOffsetData::emit(AsmPrinter *Asm) const { void AppleAccelTableOffsetData::emit(AsmPrinter *Asm) const {
@ -651,8 +688,13 @@ void AccelTableBase::print(raw_ostream &OS) const {
} }
void DWARF5AccelTableData::print(raw_ostream &OS) const { void DWARF5AccelTableData::print(raw_ostream &OS) const {
OS << " Offset: " << Die.getOffset() << "\n"; OS << " Offset: " << getDieOffset() << "\n";
OS << " Tag: " << dwarf::TagString(Die.getTag()) << "\n"; OS << " Tag: " << dwarf::TagString(getDieTag()) << "\n";
}
void DWARF5AccelTableStaticData::print(raw_ostream &OS) const {
OS << " Offset: " << getDieOffset() << "\n";
OS << " Tag: " << dwarf::TagString(getDieTag()) << "\n";
} }
void AppleAccelTableOffsetData::print(raw_ostream &OS) const { void AppleAccelTableOffsetData::print(raw_ostream &OS) const {