[llvm] r252921 - reverting r252916 to investigate test failure
Nathan Slingerland via llvm-commits
llvm-commits at lists.llvm.org
Thu Nov 12 10:39:26 PST 2015
Author: slingn
Date: Thu Nov 12 12:39:26 2015
New Revision: 252921
URL: http://llvm.org/viewvc/llvm-project?rev=252921&view=rev
Log:
reverting r252916 to investigate test failure
Modified:
llvm/trunk/include/llvm/ProfileData/InstrProf.h
llvm/trunk/include/llvm/ProfileData/InstrProfReader.h
llvm/trunk/include/llvm/ProfileData/SampleProfReader.h
llvm/trunk/lib/ProfileData/InstrProf.cpp
llvm/trunk/lib/ProfileData/InstrProfReader.cpp
llvm/trunk/lib/ProfileData/SampleProf.cpp
llvm/trunk/lib/ProfileData/SampleProfReader.cpp
llvm/trunk/test/tools/llvm-profdata/raw-magic-but-no-header.test
llvm/trunk/test/tools/llvm-profdata/sample-profile-basic.test
llvm/trunk/test/tools/llvm-profdata/text-format-errors.test
llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp
Modified: llvm/trunk/include/llvm/ProfileData/InstrProf.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ProfileData/InstrProf.h?rev=252921&r1=252920&r2=252921&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ProfileData/InstrProf.h (original)
+++ llvm/trunk/include/llvm/ProfileData/InstrProf.h Thu Nov 12 12:39:26 2015
@@ -149,7 +149,6 @@ const std::error_category &instrprof_cat
enum class instrprof_error {
success = 0,
eof,
- unrecognized_format,
bad_magic,
bad_header,
unsupported_version,
Modified: llvm/trunk/include/llvm/ProfileData/InstrProfReader.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ProfileData/InstrProfReader.h?rev=252921&r1=252920&r2=252921&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ProfileData/InstrProfReader.h (original)
+++ llvm/trunk/include/llvm/ProfileData/InstrProfReader.h Thu Nov 12 12:39:26 2015
@@ -111,9 +111,6 @@ public:
TextInstrProfReader(std::unique_ptr<MemoryBuffer> DataBuffer_)
: DataBuffer(std::move(DataBuffer_)), Line(*DataBuffer, true, '#') {}
- /// Return true if the given buffer is in text instrprof format.
- static bool hasFormat(const MemoryBuffer &Buffer);
-
/// Read the header.
std::error_code readHeader() override { return success(); }
/// Read a single record.
Modified: llvm/trunk/include/llvm/ProfileData/SampleProfReader.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ProfileData/SampleProfReader.h?rev=252921&r1=252920&r2=252921&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ProfileData/SampleProfReader.h (original)
+++ llvm/trunk/include/llvm/ProfileData/SampleProfReader.h Thu Nov 12 12:39:26 2015
@@ -292,9 +292,6 @@ public:
/// \brief Read sample profiles from the associated file.
std::error_code read() override;
-
- /// \brief Return true if \p Buffer is in the format supported by this class.
- static bool hasFormat(const MemoryBuffer &Buffer);
};
class SampleProfileReaderBinary : public SampleProfileReader {
Modified: llvm/trunk/lib/ProfileData/InstrProf.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ProfileData/InstrProf.cpp?rev=252921&r1=252920&r2=252921&view=diff
==============================================================================
--- llvm/trunk/lib/ProfileData/InstrProf.cpp (original)
+++ llvm/trunk/lib/ProfileData/InstrProf.cpp Thu Nov 12 12:39:26 2015
@@ -32,22 +32,20 @@ class InstrProfErrorCategoryType : publi
return "Success";
case instrprof_error::eof:
return "End of File";
- case instrprof_error::unrecognized_format:
- return "Unrecognized instrumentation profile encoding format";
case instrprof_error::bad_magic:
- return "Invalid instrumentation profile data (bad magic)";
+ return "Invalid profile data (bad magic)";
case instrprof_error::bad_header:
- return "Invalid instrumentation profile data (file header is corrupt)";
+ return "Invalid profile data (file header is corrupt)";
case instrprof_error::unsupported_version:
- return "Unsupported instrumentation profile format version";
+ return "Unsupported profiling format version";
case instrprof_error::unsupported_hash_type:
- return "Unsupported instrumentation profile hash type";
+ return "Unsupported profiling hash";
case instrprof_error::too_large:
return "Too much profile data";
case instrprof_error::truncated:
return "Truncated profile data";
case instrprof_error::malformed:
- return "Malformed instrumentation profile data";
+ return "Malformed profile data";
case instrprof_error::unknown_function:
return "No profile data available for function";
case instrprof_error::hash_mismatch:
Modified: llvm/trunk/lib/ProfileData/InstrProfReader.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ProfileData/InstrProfReader.cpp?rev=252921&r1=252920&r2=252921&view=diff
==============================================================================
--- llvm/trunk/lib/ProfileData/InstrProfReader.cpp (original)
+++ llvm/trunk/lib/ProfileData/InstrProfReader.cpp Thu Nov 12 12:39:26 2015
@@ -54,10 +54,8 @@ InstrProfReader::create(std::unique_ptr<
Result.reset(new RawInstrProfReader64(std::move(Buffer)));
else if (RawInstrProfReader32::hasFormat(*Buffer))
Result.reset(new RawInstrProfReader32(std::move(Buffer)));
- else if (TextInstrProfReader::hasFormat(*Buffer))
- Result.reset(new TextInstrProfReader(std::move(Buffer)));
else
- return instrprof_error::unrecognized_format;
+ Result.reset(new TextInstrProfReader(std::move(Buffer)));
// Initialize the reader and return the result.
if (std::error_code EC = initializeReader(*Result))
@@ -99,15 +97,6 @@ void InstrProfIterator::Increment() {
*this = InstrProfIterator();
}
-bool TextInstrProfReader::hasFormat(const MemoryBuffer &Buffer) {
- // Verify that this really looks like plain ASCII text by checking a
- // 'reasonable' number of characters (up to profile magic size).
- size_t count = std::min(Buffer.getBufferSize(), sizeof(uint64_t));
- StringRef buffer = Buffer.getBufferStart();
- return count == 0 || std::all_of(buffer.begin(), buffer.begin() + count,
- [](char c) { return ::isprint(c) || ::isspace(c); });
-}
-
std::error_code TextInstrProfReader::readNextRecord(InstrProfRecord &Record) {
// Skip empty lines and comments.
while (!Line.is_at_end() && (Line->empty() || Line->startswith("#")))
Modified: llvm/trunk/lib/ProfileData/SampleProf.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ProfileData/SampleProf.cpp?rev=252921&r1=252920&r2=252921&view=diff
==============================================================================
--- llvm/trunk/lib/ProfileData/SampleProf.cpp (original)
+++ llvm/trunk/lib/ProfileData/SampleProf.cpp Thu Nov 12 12:39:26 2015
@@ -28,17 +28,17 @@ class SampleProfErrorCategoryType : publ
case sampleprof_error::success:
return "Success";
case sampleprof_error::bad_magic:
- return "Invalid sample profile data (bad magic)";
+ return "Invalid file format (bad magic)";
case sampleprof_error::unsupported_version:
- return "Unsupported sample profile format version";
+ return "Unsupported format version";
case sampleprof_error::too_large:
return "Too much profile data";
case sampleprof_error::truncated:
return "Truncated profile data";
case sampleprof_error::malformed:
- return "Malformed sample profile data";
+ return "Malformed profile data";
case sampleprof_error::unrecognized_format:
- return "Unrecognized sample profile encoding format";
+ return "Unrecognized profile encoding format";
case sampleprof_error::unsupported_writing_format:
return "Profile encoding format unsupported for writing operations";
case sampleprof_error::truncated_name_table:
Modified: llvm/trunk/lib/ProfileData/SampleProfReader.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ProfileData/SampleProfReader.cpp?rev=252921&r1=252920&r2=252921&view=diff
==============================================================================
--- llvm/trunk/lib/ProfileData/SampleProfReader.cpp (original)
+++ llvm/trunk/lib/ProfileData/SampleProfReader.cpp Thu Nov 12 12:39:26 2015
@@ -222,22 +222,6 @@ std::error_code SampleProfileReaderText:
return sampleprof_error::success;
}
-bool SampleProfileReaderText::hasFormat(const MemoryBuffer &Buffer) {
- bool result = false;
-
- // Check that the first non-comment line is a valid function header.
- line_iterator LineIt(Buffer, /*SkipBlanks=*/true, '#');
- if (!LineIt.is_at_eof()) {
- if ((*LineIt)[0] != ' ') {
- uint64_t NumSamples, NumHeadSamples;
- StringRef FName;
- result = ParseHead(*LineIt, FName, NumSamples, NumHeadSamples);
- }
- }
-
- return result;
-}
-
template <typename T> ErrorOr<T> SampleProfileReaderBinary::readNumber() {
unsigned NumBytesRead = 0;
std::error_code EC;
@@ -701,10 +685,8 @@ SampleProfileReader::create(StringRef Fi
Reader.reset(new SampleProfileReaderBinary(std::move(Buffer), C));
else if (SampleProfileReaderGCC::hasFormat(*Buffer))
Reader.reset(new SampleProfileReaderGCC(std::move(Buffer), C));
- else if (SampleProfileReaderText::hasFormat(*Buffer))
- Reader.reset(new SampleProfileReaderText(std::move(Buffer), C));
else
- return sampleprof_error::unrecognized_format;
+ Reader.reset(new SampleProfileReaderText(std::move(Buffer), C));
if (std::error_code EC = Reader->readHeader())
return EC;
Modified: llvm/trunk/test/tools/llvm-profdata/raw-magic-but-no-header.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/raw-magic-but-no-header.test?rev=252921&r1=252920&r2=252921&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/raw-magic-but-no-header.test (original)
+++ llvm/trunk/test/tools/llvm-profdata/raw-magic-but-no-header.test Thu Nov 12 12:39:26 2015
@@ -3,4 +3,4 @@ RUN: not llvm-profdata show %t 2>&1 | Fi
RUN: printf '\377lprofr\201' > %t
RUN: not llvm-profdata show %t 2>&1 | FileCheck %s
-CHECK: error: {{.+}}: Invalid instrumentation profile data (file header is corrupt)
+CHECK: error: {{.+}}: Invalid profile data (file header is corrupt)
Modified: llvm/trunk/test/tools/llvm-profdata/sample-profile-basic.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/sample-profile-basic.test?rev=252921&r1=252920&r2=252921&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/sample-profile-basic.test (original)
+++ llvm/trunk/test/tools/llvm-profdata/sample-profile-basic.test Thu Nov 12 12:39:26 2015
@@ -28,7 +28,3 @@ RUN: llvm-profdata merge --sample --text
MERGE1: main:368038:0
MERGE1: 9: 4128 _Z3fooi:1262 _Z3bari:2942
MERGE1: _Z3fooi:15422:1220
-
-5- Detect invalid text encoding (e.g. instrumentation profile text format).
-RUN: not llvm-profdata show --sample %p/Inputs/foo3bar3-1.proftext 2>&1 | FileCheck %s --check-prefix=BADTEXT
-BADTEXT: error: {{.+}}: Unrecognized sample profile encoding format
Modified: llvm/trunk/test/tools/llvm-profdata/text-format-errors.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-profdata/text-format-errors.test?rev=252921&r1=252920&r2=252921&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-profdata/text-format-errors.test (original)
+++ llvm/trunk/test/tools/llvm-profdata/text-format-errors.test Thu Nov 12 12:39:26 2015
@@ -1,21 +1,10 @@
-Tests for instrumentation profile bad encoding.
-
-1- Detect invalid count
RUN: not llvm-profdata show %p/Inputs/invalid-count-later.proftext 2>&1 | FileCheck %s --check-prefix=INVALID-COUNT-LATER
RUN: not llvm-profdata merge %p/Inputs/invalid-count-later.proftext %p/Inputs/invalid-count-later.profdata -o %t.out 2>&1 | FileCheck %s --check-prefix=INVALID-COUNT-LATER
-INVALID-COUNT-LATER: error: {{.*}}invalid-count-later.proftext: Malformed instrumentation profile data
+INVALID-COUNT-LATER: error: {{.*}}invalid-count-later.proftext: Malformed profile data
-2- Detect bad hash
RUN: not llvm-profdata show %p/Inputs/bad-hash.proftext 2>&1 | FileCheck %s --check-prefix=BAD-HASH
RUN: not llvm-profdata merge %p/Inputs/bad-hash.proftext %p/Inputs/bad-hash.proftext -o %t.out 2>&1 | FileCheck %s --check-prefix=BAD-HASH
-BAD-HASH: error: {{.*}}bad-hash.proftext: Malformed instrumentation profile data
+BAD-HASH: error: {{.*}}bad-hash.proftext: Malformed profile data
-3- Detect no counts
RUN: not llvm-profdata show %p/Inputs/no-counts.proftext 2>&1 | FileCheck %s --check-prefix=NO-COUNTS
-NO-COUNTS: error: {{.*}}no-counts.proftext: Malformed instrumentation profile data
-
-4- Detect binary input
-RUN: echo -n $'\xff\xe5\xd0\xb1\xf4\c9\x94\xa8' > %t.bin
-RUN: not llvm-profdata show %t.bin 2>&1 | FileCheck %s --check-prefix=BINARY
-BINARY: error: {{.+}}: Unrecognized instrumentation profile encoding format
-BINARY: Perhaps you forgot to use the -sample option?
+NO-COUNTS: error: {{.*}}no-counts.proftext: Malformed profile data
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=252921&r1=252920&r2=252921&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp (original)
+++ llvm/trunk/tools/llvm-profdata/llvm-profdata.cpp Thu Nov 12 12:39:26 2015
@@ -29,32 +29,16 @@
using namespace llvm;
-static void exitWithError(const Twine &Message,
- StringRef Whence = "",
- StringRef Hint = "") {
+static void exitWithError(const Twine &Message, StringRef Whence = "") {
errs() << "error: ";
if (!Whence.empty())
errs() << Whence << ": ";
errs() << Message << "\n";
- if (!Hint.empty())
- errs() << Hint << "\n";
::exit(1);
}
-static void exitWithErrorCode(const std::error_code &Error, StringRef Whence = "") {
- if (Error.category() == instrprof_category()) {
- instrprof_error instrError = static_cast<instrprof_error>(Error.value());
- if (instrError == instrprof_error::unrecognized_format) {
- // Hint for common error of forgetting -sample for sample profiles.
- exitWithError(Error.message(), Whence,
- "Perhaps you forgot to use the -sample option?");
- }
- }
- exitWithError(Error.message(), Whence);
-}
-
namespace {
- enum ProfileKinds { instr, sample };
+enum ProfileKinds { instr, sample };
}
static void mergeInstrProfile(const cl::list<std::string> &Inputs,
@@ -65,20 +49,20 @@ static void mergeInstrProfile(const cl::
std::error_code EC;
raw_fd_ostream Output(OutputFilename.data(), EC, sys::fs::F_None);
if (EC)
- exitWithErrorCode(EC, OutputFilename);
+ exitWithError(EC.message(), OutputFilename);
InstrProfWriter Writer;
for (const auto &Filename : Inputs) {
auto ReaderOrErr = InstrProfReader::create(Filename);
if (std::error_code ec = ReaderOrErr.getError())
- exitWithErrorCode(ec, Filename);
+ exitWithError(ec.message(), Filename);
auto Reader = std::move(ReaderOrErr.get());
for (auto &I : *Reader)
if (std::error_code EC = Writer.addRecord(std::move(I)))
errs() << Filename << ": " << I.Name << ": " << EC.message() << "\n";
if (Reader->hasError())
- exitWithErrorCode(Reader->getError(), Filename);
+ exitWithError(Reader->getError().message(), Filename);
}
Writer.write(Output);
}
@@ -89,7 +73,7 @@ static void mergeSampleProfile(const cl:
using namespace sampleprof;
auto WriterOrErr = SampleProfileWriter::create(OutputFilename, OutputFormat);
if (std::error_code EC = WriterOrErr.getError())
- exitWithErrorCode(EC, OutputFilename);
+ exitWithError(EC.message(), OutputFilename);
auto Writer = std::move(WriterOrErr.get());
StringMap<FunctionSamples> ProfileMap;
@@ -98,7 +82,7 @@ static void mergeSampleProfile(const cl:
auto ReaderOrErr =
SampleProfileReader::create(Filename, getGlobalContext());
if (std::error_code EC = ReaderOrErr.getError())
- exitWithErrorCode(EC, Filename);
+ exitWithError(EC.message(), Filename);
// We need to keep the readers around until after all the files are
// read so that we do not lose the function names stored in each
@@ -107,7 +91,7 @@ static void mergeSampleProfile(const cl:
Readers.push_back(std::move(ReaderOrErr.get()));
const auto Reader = Readers.back().get();
if (std::error_code EC = Reader->read())
- exitWithErrorCode(EC, Filename);
+ exitWithError(EC.message(), Filename);
StringMap<FunctionSamples> &Profiles = Reader->getProfiles();
for (StringMap<FunctionSamples>::iterator I = Profiles.begin(),
@@ -159,7 +143,7 @@ static int showInstrProfile(std::string
std::string ShowFunction, raw_fd_ostream &OS) {
auto ReaderOrErr = InstrProfReader::create(Filename);
if (std::error_code EC = ReaderOrErr.getError())
- exitWithErrorCode(EC, Filename);
+ exitWithError(EC.message(), Filename);
auto Reader = std::move(ReaderOrErr.get());
uint64_t MaxFunctionCount = 0, MaxBlockCount = 0;
@@ -214,7 +198,7 @@ static int showInstrProfile(std::string
}
}
if (Reader->hasError())
- exitWithErrorCode(Reader->getError(), Filename);
+ exitWithError(Reader->getError().message(), Filename);
if (ShowAllFunctions || !ShowFunction.empty())
OS << "Functions shown: " << ShownFunctions << "\n";
@@ -230,11 +214,11 @@ static int showSampleProfile(std::string
using namespace sampleprof;
auto ReaderOrErr = SampleProfileReader::create(Filename, getGlobalContext());
if (std::error_code EC = ReaderOrErr.getError())
- exitWithErrorCode(EC, Filename);
+ exitWithError(EC.message(), Filename);
auto Reader = std::move(ReaderOrErr.get());
if (std::error_code EC = Reader->read())
- exitWithErrorCode(EC, Filename);
+ exitWithError(EC.message(), Filename);
if (ShowAllFunctions || ShowFunction.empty())
Reader->dump(OS);
@@ -275,7 +259,7 @@ static int show_main(int argc, const cha
std::error_code EC;
raw_fd_ostream OS(OutputFilename.data(), EC, sys::fs::F_Text);
if (EC)
- exitWithErrorCode(EC, OutputFilename);
+ exitWithError(EC.message(), OutputFilename);
if (ShowAllFunctions && !ShowFunction.empty())
errs() << "warning: -function argument ignored: showing all functions\n";
More information about the llvm-commits
mailing list