RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-04-05 23:01:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PGO] Unify VP data format between raw and indexed profile (Reader)

Browse Source 
With the latest refactoring and code sharing patches landed, 
it is possible to unify the value profile implementation between
raw and indexed profile. This is the patch in raw profile reader 
that uses the common interface. 

Differential Revision: http://reviews.llvm.org/D15056


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@254677 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Xinliang David Li 2015-12-04 01:02:10 +00:00
parent cd7c95d7e8
commit 7579d3aaed
2 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,10 +162,19 @@ public:
private: private:
std::error_code readNextHeader(const char *CurrentPos); std::error_code readNextHeader(const char *CurrentPos);
std::error_code readHeader(const RawInstrProf::Header &Header); std::error_code readHeader(const RawInstrProf::Header &Header);
template <class IntT> template <class IntT> IntT swap(IntT Int) const {
IntT swap(IntT Int) const {
return ShouldSwapBytes ? sys::getSwappedBytes(Int) : Int; return ShouldSwapBytes ? sys::getSwappedBytes(Int) : Int;
} }
support::endianness getDataEndianness() const {
support::endianness HostEndian = getHostEndianness();
if (!ShouldSwapBytes)
return HostEndian;
if (HostEndian == support::little)
return support::big;
else
return support::little;
}
inline uint8_t getNumPaddingBytes(uint64_t SizeInBytes) { inline uint8_t getNumPaddingBytes(uint64_t SizeInBytes) {
return 7 & (sizeof(uint64_t) - SizeInBytes % sizeof(uint64_t)); return 7 & (sizeof(uint64_t) - SizeInBytes % sizeof(uint64_t));
} }

49
lib/ProfileData/InstrProfReader.cpp
View File

@ -296,55 +296,28 @@ std::error_code RawInstrProfReader<IntPtrT>::readRawCounts(
} }
template <class IntPtrT> template <class IntPtrT>
std::error_code RawInstrProfReader<IntPtrT>::readValueProfilingData( std::error_code
InstrProfRecord &Record) { RawInstrProfReader<IntPtrT>::readValueProfilingData(InstrProfRecord &Record) {
Record.clearValueData(); Record.clearValueData();
if (!Data->Values || (ValueDataDelta == 0)) if (!Data->Values || (ValueDataDelta == 0))
return success(); return success();
// Read value data. ErrorOr<std::unique_ptr<ValueProfData>> VDataPtrOrErr =
uint64_t NumVSites = 0; ValueProfData::getValueProfData(getValueDataCounts(Data->Values),
for (uint32_t Kind = IPVK_First; Kind <= ValueKindLast; ++Kind) (const unsigned char *)ProfileEnd,
NumVSites += swap(Data->NumValueSites[Kind]); getDataEndianness());
NumVSites += getNumPaddingBytes(NumVSites);
auto VDataCounts = makeArrayRef(getValueDataCounts(Data->Values), NumVSites); if (VDataPtrOrErr.getError())
// Check bounds. return VDataPtrOrErr.getError();
if (VDataCounts.data() < ValueDataStart ||
VDataCounts.data() + VDataCounts.size() >
reinterpret_cast<const uint8_t *>(ProfileEnd))
return error(instrprof_error::malformed);
const InstrProfValueData *VDataPtr = VDataPtrOrErr.get()->deserializeTo(Record, &FunctionPtrToNameMap);
getValueData(swap(Data->Values) + NumVSites);
for (uint32_t Kind = IPVK_First; Kind <= ValueKindLast; ++Kind) {
NumVSites = swap(Data->NumValueSites[Kind]);
Record.reserveSites(Kind, NumVSites);
for (uint32_t VSite = 0; VSite < NumVSites; ++VSite) {
uint32_t VDataCount = VDataCounts[VSite];
if ((const char *)(VDataPtr + VDataCount) > ProfileEnd)
return error(instrprof_error::malformed);
std::vector<InstrProfValueData> CurrentValues;
CurrentValues.reserve(VDataCount);
for (uint32_t VIndex = 0; VIndex < VDataCount; ++VIndex) {
uint64_t TargetValue = swap(VDataPtr->Value);
uint64_t Count = swap(VDataPtr->Count);
CurrentValues.push_back({TargetValue, Count});
++VDataPtr;
}
Record.addValueData(Kind, VSite, CurrentValues.data(),
VDataCount, &FunctionPtrToNameMap);
}
}
return success(); return success();
} }
template <class IntPtrT> template <class IntPtrT>
std::error_code RawInstrProfReader<IntPtrT>::readNextRecord( std::error_code
InstrProfRecord &Record) { RawInstrProfReader<IntPtrT>::readNextRecord(InstrProfRecord &Record) {
if (atEnd()) if (atEnd())
if (std::error_code EC = readNextHeader(ProfileEnd)) if (std::error_code EC = readNextHeader(ProfileEnd))
return EC; return EC;