[llvm] r240208 - Revert "InstrProf: When reading, copy the data instead of taking a reference. NFC"
Justin Bogner
mail at justinbogner.com
Fri Jun 19 18:37:56 PDT 2015
Author: bogner
Date: Fri Jun 19 20:37:56 2015
New Revision: 240208
URL: http://llvm.org/viewvc/llvm-project?rev=240208&view=rev
Log:
Revert "InstrProf: When reading, copy the data instead of taking a reference. NFC"
Seems like MSVC doesn't like this:
InstrProf.h(49) : error C2614: 'llvm::InstrProfRecord' : illegal member initialization: 'Hash' is not a base or member
This reverts r240206.
Modified:
llvm/trunk/include/llvm/ProfileData/InstrProf.h
llvm/trunk/include/llvm/ProfileData/InstrProfReader.h
llvm/trunk/lib/ProfileData/InstrProfReader.cpp
Modified: llvm/trunk/include/llvm/ProfileData/InstrProf.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ProfileData/InstrProf.h?rev=240208&r1=240207&r2=240208&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ProfileData/InstrProf.h (original)
+++ llvm/trunk/include/llvm/ProfileData/InstrProf.h Fri Jun 19 20:37:56 2015
@@ -16,9 +16,7 @@
#ifndef LLVM_PROFILEDATA_INSTRPROF_H_
#define LLVM_PROFILEDATA_INSTRPROF_H_
-#include "llvm/ADT/StringRef.h"
#include <system_error>
-#include <vector>
namespace llvm {
const std::error_category &instrprof_category();
@@ -43,16 +41,6 @@ inline std::error_code make_error_code(i
return std::error_code(static_cast<int>(E), instrprof_category());
}
-/// Profiling information for a single function.
-struct InstrProfRecord {
- InstrProfRecord() {}
- InstrProfRecord(StringRef Name, uint64_t Hash, std::vector<uint64_t> &Counts)
- : Name(Name), Hash(Hash), Counts(std::move(Counts)) {}
- StringRef Name;
- uint64_t Hash;
- std::vector<uint64_t> Counts;
-};
-
} // end namespace llvm
namespace std {
Modified: llvm/trunk/include/llvm/ProfileData/InstrProfReader.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ProfileData/InstrProfReader.h?rev=240208&r1=240207&r2=240208&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ProfileData/InstrProfReader.h (original)
+++ llvm/trunk/include/llvm/ProfileData/InstrProfReader.h Fri Jun 19 20:37:56 2015
@@ -29,6 +29,16 @@ namespace llvm {
class InstrProfReader;
+/// Profiling information for a single function.
+struct InstrProfRecord {
+ InstrProfRecord() {}
+ InstrProfRecord(StringRef Name, uint64_t Hash, ArrayRef<uint64_t> Counts)
+ : Name(Name), Hash(Hash), Counts(Counts) {}
+ StringRef Name;
+ uint64_t Hash;
+ ArrayRef<uint64_t> Counts;
+};
+
/// A file format agnostic iterator over profiling data.
class InstrProfIterator : public std::iterator<std::input_iterator_tag,
InstrProfRecord> {
@@ -104,6 +114,8 @@ private:
std::unique_ptr<MemoryBuffer> DataBuffer;
/// Iterator over the profile data.
line_iterator Line;
+ /// The current set of counter values.
+ std::vector<uint64_t> Counts;
TextInstrProfReader(const TextInstrProfReader &) = delete;
TextInstrProfReader &operator=(const TextInstrProfReader &) = delete;
@@ -129,6 +141,8 @@ class RawInstrProfReader : public InstrP
private:
/// The profile data file contents.
std::unique_ptr<MemoryBuffer> DataBuffer;
+ /// The current set of counter values.
+ std::vector<uint64_t> Counts;
struct ProfileData {
const uint32_t NameSize;
const uint32_t NumCounters;
@@ -192,16 +206,17 @@ enum class HashT : uint32_t;
/// Trait for lookups into the on-disk hash table for the binary instrprof
/// format.
class InstrProfLookupTrait {
- std::vector<InstrProfRecord> DataBuffer;
+ std::vector<uint64_t> DataBuffer;
IndexedInstrProf::HashT HashType;
- unsigned FormatVersion;
-
public:
- InstrProfLookupTrait(IndexedInstrProf::HashT HashType, unsigned FormatVersion)
- : HashType(HashType), FormatVersion(FormatVersion) {}
-
- typedef ArrayRef<InstrProfRecord> data_type;
+ InstrProfLookupTrait(IndexedInstrProf::HashT HashType) : HashType(HashType) {}
+ struct data_type {
+ data_type(StringRef Name, ArrayRef<uint64_t> Data)
+ : Name(Name), Data(Data) {}
+ StringRef Name;
+ ArrayRef<uint64_t> Data;
+ };
typedef StringRef internal_key_type;
typedef StringRef external_key_type;
typedef uint64_t hash_value_type;
@@ -224,9 +239,22 @@ public:
return StringRef((const char *)D, N);
}
- data_type ReadData(StringRef K, const unsigned char *D, offset_type N);
-};
+ data_type ReadData(StringRef K, const unsigned char *D, offset_type N) {
+ DataBuffer.clear();
+ if (N % sizeof(uint64_t))
+ // The data is corrupt, don't try to read it.
+ return data_type("", DataBuffer);
+ using namespace support;
+ // We just treat the data as opaque here. It's simpler to handle in
+ // IndexedInstrProfReader.
+ unsigned NumEntries = N / sizeof(uint64_t);
+ DataBuffer.reserve(NumEntries);
+ for (unsigned I = 0; I < NumEntries; ++I)
+ DataBuffer.push_back(endian::readNext<uint64_t, little, unaligned>(D));
+ return data_type(K, DataBuffer);
+ }
+};
typedef OnDiskIterableChainedHashTable<InstrProfLookupTrait>
InstrProfReaderIndex;
@@ -239,6 +267,8 @@ private:
std::unique_ptr<InstrProfReaderIndex> Index;
/// Iterator over the profile data.
InstrProfReaderIndex::data_iterator RecordIterator;
+ /// Offset into our current data set.
+ size_t CurrentOffset;
/// The file format version of the profile data.
uint64_t FormatVersion;
/// The maximal execution count among all functions.
@@ -248,7 +278,7 @@ private:
IndexedInstrProfReader &operator=(const IndexedInstrProfReader &) = delete;
public:
IndexedInstrProfReader(std::unique_ptr<MemoryBuffer> DataBuffer)
- : DataBuffer(std::move(DataBuffer)), Index(nullptr) {}
+ : DataBuffer(std::move(DataBuffer)), Index(nullptr), CurrentOffset(0) {}
/// Return true if the given buffer is in an indexed instrprof format.
static bool hasFormat(const MemoryBuffer &DataBuffer);
Modified: llvm/trunk/lib/ProfileData/InstrProfReader.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ProfileData/InstrProfReader.cpp?rev=240208&r1=240207&r2=240208&view=diff
==============================================================================
--- llvm/trunk/lib/ProfileData/InstrProfReader.cpp (original)
+++ llvm/trunk/lib/ProfileData/InstrProfReader.cpp Fri Jun 19 20:37:56 2015
@@ -15,6 +15,7 @@
#include "llvm/ProfileData/InstrProfReader.h"
#include "InstrProfIndexed.h"
#include "llvm/ADT/STLExtras.h"
+#include "llvm/ProfileData/InstrProf.h"
#include <cassert>
using namespace llvm;
@@ -125,16 +126,18 @@ std::error_code TextInstrProfReader::rea
return error(instrprof_error::malformed);
// Read each counter and fill our internal storage with the values.
- Record.Counts.clear();
- Record.Counts.reserve(NumCounters);
+ Counts.clear();
+ Counts.reserve(NumCounters);
for (uint64_t I = 0; I < NumCounters; ++I) {
if (Line.is_at_end())
return error(instrprof_error::truncated);
uint64_t Count;
if ((Line++)->getAsInteger(10, Count))
return error(instrprof_error::malformed);
- Record.Counts.push_back(Count);
+ Counts.push_back(Count);
}
+ // Give the record a reference to our internal counter storage.
+ Record.Counts = Counts;
return success();
}
@@ -277,10 +280,11 @@ RawInstrProfReader<IntPtrT>::readNextRec
Record.Hash = swap(Data->FuncHash);
Record.Name = RawName;
if (ShouldSwapBytes) {
- Record.Counts.clear();
- Record.Counts.reserve(RawCounts.size());
+ Counts.clear();
+ Counts.reserve(RawCounts.size());
for (uint64_t Count : RawCounts)
- Record.Counts.push_back(swap(Count));
+ Counts.push_back(swap(Count));
+ Record.Counts = Counts;
} else
Record.Counts = RawCounts;
@@ -299,49 +303,6 @@ InstrProfLookupTrait::ComputeHash(String
return IndexedInstrProf::ComputeHash(HashType, K);
}
-typedef InstrProfLookupTrait::data_type data_type;
-typedef InstrProfLookupTrait::offset_type offset_type;
-
-data_type InstrProfLookupTrait::ReadData(StringRef K, const unsigned char *D,
- offset_type N) {
-
- // Check if the data is corrupt. If so, don't try to read it.
- if (N % sizeof(uint64_t))
- return data_type();
-
- DataBuffer.clear();
- uint64_t NumCounts;
- uint64_t NumEntries = N / sizeof(uint64_t);
- std::vector<uint64_t> CounterBuffer;
- for (uint64_t I = 0; I < NumEntries; I += NumCounts) {
- using namespace support;
- // The function hash comes first.
- uint64_t Hash = endian::readNext<uint64_t, little, unaligned>(D);
-
- if (++I >= NumEntries)
- return data_type();
-
- // In v1, we have at least one count.
- // Later, we have the number of counts.
- NumCounts = (1 == FormatVersion)
- ? NumEntries - I
- : endian::readNext<uint64_t, little, unaligned>(D);
- if (1 != FormatVersion)
- ++I;
-
- // If we have more counts than data, this is bogus.
- if (I + NumCounts > NumEntries)
- return data_type();
-
- CounterBuffer.clear();
- for (unsigned J = 0; J < NumCounts; ++J)
- CounterBuffer.push_back(endian::readNext<uint64_t, little, unaligned>(D));
-
- DataBuffer.push_back(InstrProfRecord(K, Hash, CounterBuffer));
- }
- return DataBuffer;
-}
-
bool IndexedInstrProfReader::hasFormat(const MemoryBuffer &DataBuffer) {
if (DataBuffer.getBufferSize() < 8)
return false;
@@ -381,9 +342,8 @@ std::error_code IndexedInstrProfReader::
uint64_t HashOffset = endian::readNext<uint64_t, little, unaligned>(Cur);
// The rest of the file is an on disk hash table.
- Index.reset(InstrProfReaderIndex::Create(
- Start + HashOffset, Cur, Start,
- InstrProfLookupTrait(HashType, FormatVersion)));
+ Index.reset(InstrProfReaderIndex::Create(Start + HashOffset, Cur, Start,
+ InstrProfLookupTrait(HashType)));
// Set up our iterator for readNextRecord.
RecordIterator = Index->data_begin();
@@ -397,14 +357,21 @@ std::error_code IndexedInstrProfReader::
return error(instrprof_error::unknown_function);
// Found it. Look for counters with the right hash.
- ArrayRef<InstrProfRecord> Data = (*Iter);
- if (Data.empty())
- return error(instrprof_error::malformed);
-
- for (unsigned I = 0, E = Data.size(); I < E; ++I) {
+ ArrayRef<uint64_t> Data = (*Iter).Data;
+ uint64_t NumCounts;
+ for (uint64_t I = 0, E = Data.size(); I != E; I += NumCounts) {
+ // The function hash comes first.
+ uint64_t FoundHash = Data[I++];
+ // In v1, we have at least one count. Later, we have the number of counts.
+ if (I == E)
+ return error(instrprof_error::malformed);
+ NumCounts = FormatVersion == 1 ? E - I : Data[I++];
+ // If we have more counts than data, this is bogus.
+ if (I + NumCounts > E)
+ return error(instrprof_error::malformed);
// Check for a match and fill the vector if there is one.
- if (Data[I].Hash == FuncHash) {
- Counts = Data[I].Counts;
+ if (FoundHash == FuncHash) {
+ Counts = Data.slice(I, NumCounts);
return success();
}
}
@@ -417,15 +384,30 @@ IndexedInstrProfReader::readNextRecord(I
if (RecordIterator == Index->data_end())
return error(instrprof_error::eof);
- if ((*RecordIterator).empty())
+ // Record the current function name.
+ Record.Name = (*RecordIterator).Name;
+
+ ArrayRef<uint64_t> Data = (*RecordIterator).Data;
+ // Valid data starts with a hash and either a count or the number of counts.
+ if (CurrentOffset + 1 > Data.size())
+ return error(instrprof_error::malformed);
+ // First we have a function hash.
+ Record.Hash = Data[CurrentOffset++];
+ // In version 1 we knew the number of counters implicitly, but in newer
+ // versions we store the number of counters next.
+ uint64_t NumCounts =
+ FormatVersion == 1 ? Data.size() - CurrentOffset : Data[CurrentOffset++];
+ if (CurrentOffset + NumCounts > Data.size())
return error(instrprof_error::malformed);
+ // And finally the counts themselves.
+ Record.Counts = Data.slice(CurrentOffset, NumCounts);
- static unsigned RecordIndex = 0;
- ArrayRef<InstrProfRecord> Data = (*RecordIterator);
- Record = Data[RecordIndex++];
- if (RecordIndex >= Data.size()) {
+ // If we've exhausted this function's data, increment the record.
+ CurrentOffset += NumCounts;
+ if (CurrentOffset == Data.size()) {
++RecordIterator;
- RecordIndex = 0;
+ CurrentOffset = 0;
}
+
return success();
}
More information about the llvm-commits
mailing list