[llvm] r372464 - Revert "[SampleFDO] Expose an interface to return the size of a section or the size"
Amara Emerson via llvm-commits
llvm-commits at lists.llvm.org
Sat Sep 21 02:11:51 PDT 2019
Author: aemerson
Date: Sat Sep 21 02:11:51 2019
New Revision: 372464
URL: http://llvm.org/viewvc/llvm-project?rev=372464&view=rev
Log:
Revert "[SampleFDO] Expose an interface to return the size of a section or the size"
This reverts commit f118852046a1d255ed8c65c6b5db320e8cea53a0.
Broke the macOS build/greendragon bots.
Removed:
llvm/trunk/test/tools/llvm-profdata/show-prof-size.test
Modified:
llvm/trunk/include/llvm/ProfileData/SampleProf.h
llvm/trunk/include/llvm/ProfileData/SampleProfReader.h
llvm/trunk/lib/ProfileData/SampleProfReader.cpp
llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp
Modified: llvm/trunk/include/llvm/ProfileData/SampleProf.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ProfileData/SampleProf.h?rev=372464&r1=372463&r2=372464&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ProfileData/SampleProf.h (original)
+++ llvm/trunk/include/llvm/ProfileData/SampleProf.h Sat Sep 21 02:11:51 2019
@@ -125,22 +125,6 @@ enum SecType {
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
// and SampleProfileExtBinaryBaseWriter.
struct SecHdrTableEntry {
Modified: llvm/trunk/include/llvm/ProfileData/SampleProfReader.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ProfileData/SampleProfReader.h?rev=372464&r1=372463&r2=372464&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ProfileData/SampleProfReader.h (original)
+++ llvm/trunk/include/llvm/ProfileData/SampleProfReader.h Sat Sep 21 02:11:51 2019
@@ -333,7 +333,6 @@ public:
/// It includes all the names that have samples either in outline instance
/// or inline instance.
virtual std::vector<StringRef> *getNameTable() { return nullptr; }
- virtual bool dumpSectionInfo(raw_ostream &OS = dbgs()) { return false; };
protected:
/// Map every function to its associated profile.
@@ -505,12 +504,6 @@ public:
/// Read sample profiles in extensible format from the associated file.
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 {
Modified: llvm/trunk/lib/ProfileData/SampleProfReader.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ProfileData/SampleProfReader.cpp?rev=372464&r1=372463&r2=372464&view=diff
==============================================================================
--- llvm/trunk/lib/ProfileData/SampleProfReader.cpp (original)
+++ llvm/trunk/lib/ProfileData/SampleProfReader.cpp Sat Sep 21 02:11:51 2019
@@ -667,36 +667,6 @@ std::error_code SampleProfileReaderExtBi
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() {
// Read and check the magic identifier.
auto Magic = readNumber<uint64_t>();
Removed: llvm/trunk/test/tools/llvm-profdata/show-prof-size.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/show-prof-size.test?rev=372463&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/show-prof-size.test (original)
+++ llvm/trunk/test/tools/llvm-profdata/show-prof-size.test (removed)
@@ -1,7 +0,0 @@
-; 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 |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]]
Modified: llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp?rev=372464&r1=372463&r2=372464&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp (original)
+++ llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp Sat Sep 21 02:11:51 2019
@@ -982,21 +982,10 @@ static int showInstrProfile(const std::s
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,
bool ShowAllFunctions,
const std::string &ShowFunction,
- bool ShowProfileSymbolList,
- bool ShowSectionInfoOnly, raw_fd_ostream &OS) {
+ bool ShowProfileSymbolList, raw_fd_ostream &OS) {
using namespace sampleprof;
LLVMContext Context;
auto ReaderOrErr = SampleProfileReader::create(Filename, Context);
@@ -1004,12 +993,6 @@ static int showSampleProfile(const std::
exitWithErrorCode(EC, Filename);
auto Reader = std::move(ReaderOrErr.get());
-
- if (ShowSectionInfoOnly) {
- showSectionInfo(Reader.get(), OS);
- return 0;
- }
-
if (std::error_code EC = Reader->read())
exitWithErrorCode(EC, Filename);
@@ -1079,11 +1062,6 @@ static int show_main(int argc, const cha
cl::opt<bool> ShowProfileSymbolList(
"show-prof-sym-list", cl::init(false),
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");
@@ -1112,8 +1090,7 @@ static int show_main(int argc, const cha
OnlyListBelow, ShowFunction, TextFormat, OS);
else
return showSampleProfile(Filename, ShowCounts, ShowAllFunctions,
- ShowFunction, ShowProfileSymbolList,
- ShowSectionInfoOnly, OS);
+ ShowFunction, ShowProfileSymbolList, OS);
}
int main(int argc, const char *argv[]) {
More information about the llvm-commits
mailing list