6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-11-02 07:11:49 +00:00
Code Issues Projects Releases Wiki Activity

Revert "InstrProf: Add unit tests for the profile reader and writer"

Browse Source 
Looks like the bots don't like my initializer lists.

This reverts r229455

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@229456 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Justin Bogner 2015-02-16 23:31:07 +00:00
parent 77ae39453c
commit a9c73c5bc0
6 changed files with 15 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/llvm/ProfileData/InstrProfReader.h
View File

@ -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

6
include/llvm/ProfileData/InstrProfWriter.h
View File

@ -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

29
lib/ProfileData/InstrProfReader.cpp
View File

@ -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::string Path) {
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))

30
lib/ProfileData/InstrProfWriter.cpp
View File

@ -106,7 +106,7 @@ InstrProfWriter::addFunctionCounts(StringRef FunctionName,
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> InstrProfWriter::writeImpl(raw_ostream &OS) {
// 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);
}

1
unittests/ProfileData/CMakeLists.txt
View File

@ -6,5 +6,4 @@ set(LLVM_LINK_COMPONENTS
add_llvm_unittest(ProfileDataTests
CoverageMappingTest.cpp
InstrProfTest.cpp
)

88
unittests/ProfileData/InstrProfTest.cpp
View File

@ -1,88 +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"
using namespace llvm;
namespace {
TEST(InstrProfTest, write_and_read_empty_profile) {
InstrProfWriter Writer;
std::string Profile = Writer.writeString();
auto ReaderOrErr =
IndexedInstrProfReader::create(MemoryBuffer::getMemBuffer(Profile));
ASSERT_EQ(std::error_code(), ReaderOrErr.getError());
auto Reader = std::move(ReaderOrErr.get());
ASSERT_TRUE(Reader->begin() == Reader->end());
}
TEST(InstrProfTest, write_and_read_one_function) {
InstrProfWriter Writer;
Writer.addFunctionCounts("foo", 0x1234, {1, 2, 3, 4});
std::string Profile = Writer.writeString();
auto ReaderOrErr =
IndexedInstrProfReader::create(MemoryBuffer::getMemBuffer(Profile));
ASSERT_EQ(std::error_code(), ReaderOrErr.getError());
auto Reader = std::move(ReaderOrErr.get());
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(InstrProfTest, get_function_counts) {
InstrProfWriter Writer;
Writer.addFunctionCounts("foo", 0x1234, {1, 2});
std::string Profile = Writer.writeString();
auto ReaderOrErr =
IndexedInstrProfReader::create(MemoryBuffer::getMemBuffer(Profile));
ASSERT_EQ(std::error_code(), ReaderOrErr.getError());
auto Reader = std::move(ReaderOrErr.get());
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(InstrProfTest, get_max_function_count) {
InstrProfWriter Writer;
Writer.addFunctionCounts("foo", 0x1234, {1ULL << 31, 2});
Writer.addFunctionCounts("bar", 0, {1ULL << 63});
Writer.addFunctionCounts("baz", 0x5678, {0, 0, 0, 0});
std::string Profile = Writer.writeString();
auto ReaderOrErr =
IndexedInstrProfReader::create(MemoryBuffer::getMemBuffer(Profile));
ASSERT_EQ(std::error_code(), ReaderOrErr.getError());
auto Reader = std::move(ReaderOrErr.get());
ASSERT_EQ(1ULL << 63, Reader->getMaximumFunctionCount());
}
} // end anonymous namespace