1
0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 04:32:44 +01:00

Recommit [SampleFDO] Expose an interface to return the size of a section

or the size of the profile for profile in ExtBinary format.

Fix a test failure on Mac.

[SampleFDO] Expose an interface to return the size of a section or the
size of the profile for profile in ExtBinary format.

Sometimes we want to limit the size of the profile by stripping some functions
with low sample count or by stripping some function names with small text size
from profile symbol list. That requires the profile reader to have the
interfaces returning the size of a section or the size of total profile. The
patch add those interfaces.

At the same time, add some dump facility to show the size of each section.

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

llvm-svn: 372478
This commit is contained in:
Wei Mi 2019-09-21 17:23:55 +00:00
parent 567fce3ca2
commit b265118981
5 changed files with 85 additions and 2 deletions

View File

@ -125,6 +125,22 @@ enum SecType {
SecLBRProfile = SecFuncProfileFirst SecLBRProfile = SecFuncProfileFirst
}; };
static inline std::string getSecName(SecType Type) {
switch (Type) {
case SecInValid:
return "InvalidSection";
case SecProfSummary:
return "ProfileSummarySection";
case SecNameTable:
return "NameTableSection";
case SecProfileSymbolList:
return "ProfileSymbolListSection";
case SecLBRProfile:
return "LBRProfileSection";
}
llvm_unreachable("A SecType has no name for output");
}
// Entry type of section header table used by SampleProfileExtBinaryBaseReader // Entry type of section header table used by SampleProfileExtBinaryBaseReader
// and SampleProfileExtBinaryBaseWriter. // and SampleProfileExtBinaryBaseWriter.
struct SecHdrTableEntry { struct SecHdrTableEntry {

View File

@ -333,6 +333,7 @@ public:
/// It includes all the names that have samples either in outline instance /// It includes all the names that have samples either in outline instance
/// or inline instance. /// or inline instance.
virtual std::vector<StringRef> *getNameTable() { return nullptr; } virtual std::vector<StringRef> *getNameTable() { return nullptr; }
virtual bool dumpSectionInfo(raw_ostream &OS = dbgs()) { return false; };
protected: protected:
/// Map every function to its associated profile. /// Map every function to its associated profile.
@ -504,6 +505,12 @@ public:
/// Read sample profiles in extensible format from the associated file. /// Read sample profiles in extensible format from the associated file.
std::error_code read() override; std::error_code read() override;
/// Get the total size of all \p Type sections.
uint64_t getSectionSize(SecType Type);
/// Get the total size of header and all sections.
uint64_t getFileSize();
virtual bool dumpSectionInfo(raw_ostream &OS = dbgs()) override;
}; };
class SampleProfileReaderExtBinary : public SampleProfileReaderExtBinaryBase { class SampleProfileReaderExtBinary : public SampleProfileReaderExtBinaryBase {

View File

@ -667,6 +667,36 @@ std::error_code SampleProfileReaderExtBinaryBase::readHeader() {
return sampleprof_error::success; return sampleprof_error::success;
} }
uint64_t SampleProfileReaderExtBinaryBase::getSectionSize(SecType Type) {
for (auto &Entry : SecHdrTable) {
if (Entry.Type == Type)
return Entry.Size;
}
return 0;
}
uint64_t SampleProfileReaderExtBinaryBase::getFileSize() {
auto &LastEntry = SecHdrTable.back();
return LastEntry.Offset + LastEntry.Size;
}
bool SampleProfileReaderExtBinaryBase::dumpSectionInfo(raw_ostream &OS) {
uint64_t TotalSecsSize = 0;
for (auto &Entry : SecHdrTable) {
OS << getSecName(Entry.Type) << " - Offset: " << Entry.Offset
<< ", Size: " << Entry.Size << "\n";
TotalSecsSize += getSectionSize(Entry.Type);
}
uint64_t HeaderSize = SecHdrTable.front().Offset;
assert(HeaderSize + TotalSecsSize == getFileSize() &&
"Size of 'header + sections' doesn't match the total size of profile");
OS << "Header Size: " << HeaderSize << "\n";
OS << "Total Sections Size: " << TotalSecsSize << "\n";
OS << "File Size: " << getFileSize() << "\n";
return true;
}
std::error_code SampleProfileReaderBinary::readMagicIdent() { std::error_code SampleProfileReaderBinary::readMagicIdent() {
// Read and check the magic identifier. // Read and check the magic identifier.
auto Magic = readNumber<uint64_t>(); auto Magic = readNumber<uint64_t>();

View File

@ -0,0 +1,7 @@
; RUN: llvm-profdata merge -sample -extbinary -prof-sym-list=%S/Inputs/profile-symbol-list-1.text %S/Inputs/sample-profile.proftext -o %t.1.output
; RUN: ls -l %t.1.output |tr -s ' ' |cut -f5 -d ' ' > %t.txt
; RUN: llvm-profdata show -sample -show-sec-info-only %t.1.output >> %t.txt
; RUN: FileCheck %s --input-file=%t.txt
; Check llvm-profdata shows the correct file size.
; CHECK: [[FILESIZE:.*]]
; CHECK: [[FILESIZE]]

View File

@ -982,10 +982,21 @@ static int showInstrProfile(const std::string &Filename, bool ShowCounts,
return 0; return 0;
} }
static void showSectionInfo(sampleprof::SampleProfileReader *Reader,
raw_fd_ostream &OS) {
if (!Reader->dumpSectionInfo(OS)) {
WithColor::warning() << "-show-sec-info-only is only supported for "
<< "sample profile in extbinary format and is "
<< "ignored for other formats.\n";
return;
}
}
static int showSampleProfile(const std::string &Filename, bool ShowCounts, static int showSampleProfile(const std::string &Filename, bool ShowCounts,
bool ShowAllFunctions, bool ShowAllFunctions,
const std::string &ShowFunction, const std::string &ShowFunction,
bool ShowProfileSymbolList, raw_fd_ostream &OS) { bool ShowProfileSymbolList,
bool ShowSectionInfoOnly, raw_fd_ostream &OS) {
using namespace sampleprof; using namespace sampleprof;
LLVMContext Context; LLVMContext Context;
auto ReaderOrErr = SampleProfileReader::create(Filename, Context); auto ReaderOrErr = SampleProfileReader::create(Filename, Context);
@ -993,6 +1004,12 @@ static int showSampleProfile(const std::string &Filename, bool ShowCounts,
exitWithErrorCode(EC, Filename); exitWithErrorCode(EC, Filename);
auto Reader = std::move(ReaderOrErr.get()); auto Reader = std::move(ReaderOrErr.get());
if (ShowSectionInfoOnly) {
showSectionInfo(Reader.get(), OS);
return 0;
}
if (std::error_code EC = Reader->read()) if (std::error_code EC = Reader->read())
exitWithErrorCode(EC, Filename); exitWithErrorCode(EC, Filename);
@ -1062,6 +1079,11 @@ static int show_main(int argc, const char *argv[]) {
cl::opt<bool> ShowProfileSymbolList( cl::opt<bool> ShowProfileSymbolList(
"show-prof-sym-list", cl::init(false), "show-prof-sym-list", cl::init(false),
cl::desc("Show profile symbol list if it exists in the profile. ")); cl::desc("Show profile symbol list if it exists in the profile. "));
cl::opt<bool> ShowSectionInfoOnly(
"show-sec-info-only", cl::init(false),
cl::desc("Show the information of each section in the sample profile. "
"The flag is only usable when the sample profile is in "
"extbinary format"));
cl::ParseCommandLineOptions(argc, argv, "LLVM profile data summary\n"); cl::ParseCommandLineOptions(argc, argv, "LLVM profile data summary\n");
@ -1090,7 +1112,8 @@ static int show_main(int argc, const char *argv[]) {
OnlyListBelow, ShowFunction, TextFormat, OS); OnlyListBelow, ShowFunction, TextFormat, OS);
else else
return showSampleProfile(Filename, ShowCounts, ShowAllFunctions, return showSampleProfile(Filename, ShowCounts, ShowAllFunctions,
ShowFunction, ShowProfileSymbolList, OS); ShowFunction, ShowProfileSymbolList,
ShowSectionInfoOnly, OS);
} }
int main(int argc, const char *argv[]) { int main(int argc, const char *argv[]) {