[llvm] r229483 - Revert "InstrProf: Add unit tests for the profile reader and writer"
Justin Bogner
mail at justinbogner.com
Tue Feb 17 01:21:44 PST 2015
Author: bogner
Date: Tue Feb 17 03:21:43 2015
New Revision: 229483
URL: http://llvm.org/viewvc/llvm-project?rev=229483&view=rev
Log:
Revert "InstrProf: Add unit tests for the profile reader and writer"
This added API to the InstrProfWriter to write to a string so I could
write unittests without using temp files. This doesn't really work,
since the format has tighter alignment requirements than a char.
This reverts r229478 and its follow-up, r229481.
Removed:
llvm/trunk/unittests/ProfileData/InstrProfTest.cpp
Modified:
llvm/trunk/include/llvm/ProfileData/InstrProfReader.h
llvm/trunk/include/llvm/ProfileData/InstrProfWriter.h
llvm/trunk/lib/ProfileData/InstrProfReader.cpp
llvm/trunk/lib/ProfileData/InstrProfWriter.cpp
llvm/trunk/unittests/ProfileData/CMakeLists.txt
Modified: llvm/trunk/include/llvm/ProfileData/InstrProfReader.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ProfileData/InstrProfReader.h?rev=229483&r1=229482&r2=229483&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ProfileData/InstrProfReader.h (original)
+++ llvm/trunk/include/llvm/ProfileData/InstrProfReader.h Tue Feb 17 03:21:43 2015
@@ -95,9 +95,6 @@ public:
/// Factory method to create an appropriately typed reader for the given
/// instrprof file.
static ErrorOr<std::unique_ptr<InstrProfReader>> create(std::string Path);
-
- static ErrorOr<std::unique_ptr<InstrProfReader>>
- create(std::unique_ptr<MemoryBuffer> Buffer);
};
/// Reader for the simple text based instrprof format.
@@ -297,9 +294,6 @@ public:
/// Factory method to create an indexed reader.
static ErrorOr<std::unique_ptr<IndexedInstrProfReader>>
create(std::string Path);
-
- static ErrorOr<std::unique_ptr<IndexedInstrProfReader>>
- create(std::unique_ptr<MemoryBuffer> Buffer);
};
} // end namespace llvm
Modified: llvm/trunk/include/llvm/ProfileData/InstrProfWriter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ProfileData/InstrProfWriter.h?rev=229483&r1=229482&r2=229483&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ProfileData/InstrProfWriter.h (original)
+++ llvm/trunk/include/llvm/ProfileData/InstrProfWriter.h Tue Feb 17 03:21:43 2015
@@ -41,12 +41,8 @@ public:
std::error_code addFunctionCounts(StringRef FunctionName,
uint64_t FunctionHash,
ArrayRef<uint64_t> Counters);
- /// Write the profile to \c OS
+ /// Ensure that all data is written to disk.
void write(raw_fd_ostream &OS);
- /// Write the profile, returning the raw data. For testing.
- std::string writeString();
-private:
- std::pair<uint64_t, uint64_t> writeImpl(raw_ostream &OS);
};
} // end namespace llvm
Modified: llvm/trunk/lib/ProfileData/InstrProfReader.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ProfileData/InstrProfReader.cpp?rev=229483&r1=229482&r2=229483&view=diff
==============================================================================
--- llvm/trunk/lib/ProfileData/InstrProfReader.cpp (original)
+++ llvm/trunk/lib/ProfileData/InstrProfReader.cpp Tue Feb 17 03:21:43 2015
@@ -25,7 +25,12 @@ setupMemoryBuffer(std::string Path) {
MemoryBuffer::getFileOrSTDIN(Path);
if (std::error_code EC = BufferOrErr.getError())
return EC;
- return std::move(BufferOrErr.get());
+ auto Buffer = std::move(BufferOrErr.get());
+
+ // Sanity check the file.
+ if (Buffer->getBufferSize() > std::numeric_limits<unsigned>::max())
+ return instrprof_error::too_large;
+ return std::move(Buffer);
}
static std::error_code initializeReader(InstrProfReader &Reader) {
@@ -38,16 +43,10 @@ InstrProfReader::create(std::string Path
auto BufferOrError = setupMemoryBuffer(Path);
if (std::error_code EC = BufferOrError.getError())
return EC;
- return InstrProfReader::create(std::move(BufferOrError.get()));
-}
-
-ErrorOr<std::unique_ptr<InstrProfReader>>
-InstrProfReader::create(std::unique_ptr<MemoryBuffer> Buffer) {
- // Sanity check the buffer.
- if (Buffer->getBufferSize() > std::numeric_limits<unsigned>::max())
- return instrprof_error::too_large;
+ auto Buffer = std::move(BufferOrError.get());
std::unique_ptr<InstrProfReader> Result;
+
// Create the reader.
if (IndexedInstrProfReader::hasFormat(*Buffer))
Result.reset(new IndexedInstrProfReader(std::move(Buffer)));
@@ -71,20 +70,14 @@ IndexedInstrProfReader::create(std::stri
auto BufferOrError = setupMemoryBuffer(Path);
if (std::error_code EC = BufferOrError.getError())
return EC;
- return IndexedInstrProfReader::create(std::move(BufferOrError.get()));
-}
-
-ErrorOr<std::unique_ptr<IndexedInstrProfReader>>
-IndexedInstrProfReader::create(std::unique_ptr<MemoryBuffer> Buffer) {
- // Sanity check the buffer.
- if (Buffer->getBufferSize() > std::numeric_limits<unsigned>::max())
- return instrprof_error::too_large;
+ auto Buffer = std::move(BufferOrError.get());
+ std::unique_ptr<IndexedInstrProfReader> Result;
// Create the reader.
if (!IndexedInstrProfReader::hasFormat(*Buffer))
return instrprof_error::bad_magic;
- auto Result = llvm::make_unique<IndexedInstrProfReader>(std::move(Buffer));
+ Result.reset(new IndexedInstrProfReader(std::move(Buffer)));
// Initialize the reader and return the result.
if (std::error_code EC = initializeReader(*Result))
Modified: llvm/trunk/lib/ProfileData/InstrProfWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ProfileData/InstrProfWriter.cpp?rev=229483&r1=229482&r2=229483&view=diff
==============================================================================
--- llvm/trunk/lib/ProfileData/InstrProfWriter.cpp (original)
+++ llvm/trunk/lib/ProfileData/InstrProfWriter.cpp Tue Feb 17 03:21:43 2015
@@ -106,7 +106,7 @@ InstrProfWriter::addFunctionCounts(Strin
return instrprof_error::success;
}
-std::pair<uint64_t, uint64_t> InstrProfWriter::writeImpl(raw_ostream &OS) {
+void InstrProfWriter::write(raw_fd_ostream &OS) {
OnDiskChainedHashTableGenerator<InstrProfRecordTrait> Generator;
// Populate the hash table generator.
@@ -128,31 +128,7 @@ std::pair<uint64_t, uint64_t> InstrProfW
// Write the hash table.
uint64_t HashTableStart = Generator.Emit(OS);
- return std::make_pair(HashTableStartLoc, HashTableStart);
-}
-
-void InstrProfWriter::write(raw_fd_ostream &OS) {
- // Write the hash table.
- auto TableStart = writeImpl(OS);
-
// Go back and fill in the hash table start.
- using namespace support;
- OS.seek(TableStart.first);
- endian::Writer<little>(OS).write<uint64_t>(TableStart.second);
-}
-
-std::string InstrProfWriter::writeString() {
- std::string Result;
- llvm::raw_string_ostream OS(Result);
- // Write the hash table.
- auto TableStart = writeImpl(OS);
- OS.flush();
-
- // Go back and fill in the hash table start.
- using namespace support;
- uint64_t Bytes = endian::byte_swap<uint64_t, little>(TableStart.second);
- Result.replace(TableStart.first, sizeof(uint64_t), (const char *)&Bytes,
- sizeof(uint64_t));
-
- return Result;
+ OS.seek(HashTableStartLoc);
+ LE.write<uint64_t>(HashTableStart);
}
Modified: llvm/trunk/unittests/ProfileData/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ProfileData/CMakeLists.txt?rev=229483&r1=229482&r2=229483&view=diff
==============================================================================
--- llvm/trunk/unittests/ProfileData/CMakeLists.txt (original)
+++ llvm/trunk/unittests/ProfileData/CMakeLists.txt Tue Feb 17 03:21:43 2015
@@ -6,5 +6,4 @@ set(LLVM_LINK_COMPONENTS
add_llvm_unittest(ProfileDataTests
CoverageMappingTest.cpp
- InstrProfTest.cpp
)
Removed: llvm/trunk/unittests/ProfileData/InstrProfTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ProfileData/InstrProfTest.cpp?rev=229482&view=auto
==============================================================================
--- llvm/trunk/unittests/ProfileData/InstrProfTest.cpp (original)
+++ llvm/trunk/unittests/ProfileData/InstrProfTest.cpp (removed)
@@ -1,97 +0,0 @@
-//===- unittest/ProfileData/InstrProfTest.cpp -------------------------------=//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ProfileData/InstrProfReader.h"
-#include "llvm/ProfileData/InstrProfWriter.h"
-#include "gtest/gtest.h"
-
-#include <cstdarg>
-
-using namespace llvm;
-
-namespace {
-
-struct InstrProfTest : ::testing::Test {
- InstrProfWriter Writer;
- std::unique_ptr<IndexedInstrProfReader> Reader;
-
- void addCounts(StringRef Name, uint64_t Hash, int NumCounts, ...) {
- SmallVector<uint64_t, 8> Counts;
- va_list Args;
- va_start(Args, NumCounts);
- for (int I = 0; I < NumCounts; ++I)
- Counts.push_back(va_arg(Args, uint64_t));
- va_end(Args);
- Writer.addFunctionCounts(Name, Hash, Counts);
- }
-
- std::string writeProfile() { return Writer.writeString(); }
- void readProfile(std::string Profile) {
- auto ReaderOrErr =
- IndexedInstrProfReader::create(MemoryBuffer::getMemBuffer(Profile));
- ASSERT_EQ(std::error_code(), ReaderOrErr.getError());
- Reader = std::move(ReaderOrErr.get());
- }
-};
-
-TEST_F(InstrProfTest, write_and_read_empty_profile) {
- std::string Profile = writeProfile();
- readProfile(Profile);
- ASSERT_TRUE(Reader->begin() == Reader->end());
-}
-
-TEST_F(InstrProfTest, write_and_read_one_function) {
- addCounts("foo", 0x1234, 4, 1ULL, 2ULL, 3ULL, 4ULL);
- std::string Profile = writeProfile();
- readProfile(Profile);
-
- auto I = Reader->begin(), E = Reader->end();
- ASSERT_TRUE(I != E);
- ASSERT_EQ(StringRef("foo"), I->Name);
- ASSERT_EQ(0x1234U, I->Hash);
- ASSERT_EQ(4U, I->Counts.size());
- ASSERT_EQ(1U, I->Counts[0]);
- ASSERT_EQ(2U, I->Counts[1]);
- ASSERT_EQ(3U, I->Counts[2]);
- ASSERT_EQ(4U, I->Counts[3]);
- ASSERT_TRUE(++I == E);
-}
-
-TEST_F(InstrProfTest, get_function_counts) {
- addCounts("foo", 0x1234, 2, 1ULL, 2ULL);
- std::string Profile = writeProfile();
- readProfile(Profile);
-
- std::vector<uint64_t> Counts;
- std::error_code EC;
-
- EC = Reader->getFunctionCounts("foo", 0x1234, Counts);
- ASSERT_EQ(instrprof_error::success, EC);
- ASSERT_EQ(2U, Counts.size());
- ASSERT_EQ(1U, Counts[0]);
- ASSERT_EQ(2U, Counts[1]);
-
- EC = Reader->getFunctionCounts("foo", 0x5678, Counts);
- ASSERT_EQ(instrprof_error::hash_mismatch, EC);
-
- EC = Reader->getFunctionCounts("bar", 0x1234, Counts);
- ASSERT_EQ(instrprof_error::unknown_function, EC);
-}
-
-TEST_F(InstrProfTest, get_max_function_count) {
- addCounts("foo", 0x1234, 2, 1ULL << 31, 2ULL);
- addCounts("bar", 0, 1, 1ULL << 63);
- addCounts("baz", 0x5678, 4, 0ULL, 0ULL, 0ULL, 0ULL);
- std::string Profile = writeProfile();
- readProfile(Profile);
-
- ASSERT_EQ(1ULL << 63, Reader->getMaximumFunctionCount());
-}
-
-} // end anonymous namespace
More information about the llvm-commits
mailing list