nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ThinLTO/CFI] Include TYPE_ID summaries into GLOBALVAL_SUMMARY_BLOCK

Browse Source 
Summary:
TypeID summaries are used by CFI and need to be serialized by ThinLTO
indexing for later use by LTO Backend.

Reviewers: tejohnson, pcc

Subscribers: mehdi_amini, inglorion, eraman, hiraditya, llvm-commits

Differential Revision: https://reviews.llvm.org/D42611

llvm-svn: 325182
This commit is contained in:
Vitaly Buka
2018-02-14 22:41:15 +00:00
parent de8140066a
commit 44396faabc
10 changed files with 306 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
View File

@@ -3366,6 +3366,51 @@ static void writeFunctionTypeMetadataRecords(BitstreamWriter &Stream,
FS->type_checked_load_const_vcalls());
}
static void writeWholeProgramDevirtResolutionByArg(
SmallVector<uint64_t, 64> &NameVals, const std::vector<uint64_t> &args,
const WholeProgramDevirtResolution::ByArg &ByArg) {
NameVals.push_back(args.size());
NameVals.insert(NameVals.end(), args.begin(), args.end());
NameVals.push_back(ByArg.TheKind);
NameVals.push_back(ByArg.Info);
NameVals.push_back(ByArg.Byte);
NameVals.push_back(ByArg.Bit);
}
static void writeWholeProgramDevirtResolution(
SmallVector<uint64_t, 64> &NameVals, StringTableBuilder &StrtabBuilder,
uint64_t Id, const WholeProgramDevirtResolution &Wpd) {
NameVals.push_back(Id);
NameVals.push_back(Wpd.TheKind);
NameVals.push_back(StrtabBuilder.add(Wpd.SingleImplName));
NameVals.push_back(Wpd.SingleImplName.size());
NameVals.push_back(Wpd.ResByArg.size());
for (auto &A : Wpd.ResByArg)
writeWholeProgramDevirtResolutionByArg(NameVals, A.first, A.second);
}
static void writeTypeIdSummaryRecord(SmallVector<uint64_t, 64> &NameVals,
StringTableBuilder &StrtabBuilder,
const std::string &Id,
const TypeIdSummary &Summary) {
NameVals.push_back(StrtabBuilder.add(Id));
NameVals.push_back(Id.size());
NameVals.push_back(Summary.TTRes.TheKind);
NameVals.push_back(Summary.TTRes.SizeM1BitWidth);
NameVals.push_back(Summary.TTRes.AlignLog2);
NameVals.push_back(Summary.TTRes.SizeM1);
NameVals.push_back(Summary.TTRes.BitMask);
NameVals.push_back(Summary.TTRes.InlineBits);
for (auto &W : Summary.WPDRes)
writeWholeProgramDevirtResolution(NameVals, StrtabBuilder, W.first,
W.second);
}
// Helper to emit a single function summary record.
void ModuleBitcodeWriterBase::writePerModuleFunctionSummaryRecord(
SmallVector<uint64_t, 64> &NameVals, GlobalValueSummary *Summary,
@@ -3783,6 +3828,14 @@ void IndexBitcodeWriter::writeCombinedGlobalValueSummary() {
NameVals.clear();
}
if (!Index.typeIds().empty()) {
for (auto &S : Index.typeIds()) {
writeTypeIdSummaryRecord(NameVals, StrtabBuilder, S.first, S.second);
Stream.EmitRecord(bitc::FS_TYPE_ID, NameVals);
NameVals.clear();
}
}
Stream.ExitBlock();
}