From f722f529e7f3147ee286fb1d0baa2bb4e2313967 Mon Sep 17 00:00:00 2001 From: Xinliang David Li Date: Wed, 25 Nov 2015 19:13:00 +0000 Subject: [PATCH] [PGO] Regroup functions in better order (NFC) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@254080 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/ProfileData/InstrProf.cpp | 189 +++++++++++++++++----------------- 1 file changed, 96 insertions(+), 93 deletions(-) diff --git a/lib/ProfileData/InstrProf.cpp b/lib/ProfileData/InstrProf.cpp index 87757af7f19..8a3a61ff679 100644 --- a/lib/ProfileData/InstrProf.cpp +++ b/lib/ProfileData/InstrProf.cpp @@ -131,85 +131,6 @@ GlobalVariable *createPGOFuncNameVar(Function &F, StringRef FuncName) { return createPGOFuncNameVar(*F.getParent(), F.getLinkage(), FuncName); } -uint64_t stringToHash(uint32_t ValueKind, uint64_t Value) { - switch (ValueKind) { - case IPVK_IndirectCallTarget: - return IndexedInstrProf::ComputeHash(IndexedInstrProf::HashType, - (const char *)Value); - break; - default: - llvm_unreachable("value kind not handled !"); - } - return Value; -} - -void ValueProfRecord::deserializeTo(InstrProfRecord &Record, - InstrProfRecord::ValueMapType *VMap) { - Record.reserveSites(Kind, NumValueSites); - - InstrProfValueData *ValueData = getValueProfRecordValueData(this); - for (uint64_t VSite = 0; VSite < NumValueSites; ++VSite) { - uint8_t ValueDataCount = this->SiteCountArray[VSite]; - Record.addValueData(Kind, VSite, ValueData, ValueDataCount, VMap); - ValueData += ValueDataCount; - } -} - -// Extract data from \c Closure and serialize into \c This instance. -void serializeValueProfRecordFrom(ValueProfRecord *This, - ValueProfRecordClosure *Closure, - uint32_t ValueKind, uint32_t NumValueSites) { - uint32_t S; - const void *Record = Closure->Record; - This->Kind = ValueKind; - This->NumValueSites = NumValueSites; - InstrProfValueData *DstVD = getValueProfRecordValueData(This); - - for (S = 0; S < NumValueSites; S++) { - uint32_t ND = Closure->GetNumValueDataForSite(Record, ValueKind, S); - This->SiteCountArray[S] = ND; - Closure->GetValueForSite(Record, DstVD, ValueKind, S, - Closure->RemapValueData); - DstVD += ND; - } -} - -template -static T swapToHostOrder(const unsigned char *&D, support::endianness Orig) { - using namespace support; - if (Orig == little) - return endian::readNext(D); - else - return endian::readNext(D); -} - -// For writing/serializing, Old is the host endianness, and New is -// byte order intended on disk. For Reading/deserialization, Old -// is the on-disk source endianness, and New is the host endianness. -void ValueProfRecord::swapBytes(support::endianness Old, - support::endianness New) { - using namespace support; - if (Old == New) - return; - - if (getHostEndianness() != Old) { - sys::swapByteOrder(NumValueSites); - sys::swapByteOrder(Kind); - } - uint32_t ND = getValueProfRecordNumValueData(this); - InstrProfValueData *VD = getValueProfRecordValueData(this); - - // No need to swap byte array: SiteCountArrray. - for (uint32_t I = 0; I < ND; I++) { - sys::swapByteOrder(VD[I].Value); - sys::swapByteOrder(VD[I].Count); - } - if (getHostEndianness() == Old) { - sys::swapByteOrder(NumValueSites); - sys::swapByteOrder(Kind); - } -} - /// Return the total size in bytes of the on-disk value profile data /// given the data stored in Record. uint32_t getValueProfDataSize(ValueProfRecordClosure *Closure) { @@ -230,23 +151,25 @@ uint32_t getValueProfDataSize(ValueProfRecordClosure *Closure) { return TotalSize; } -void ValueProfData::deserializeTo(InstrProfRecord &Record, - InstrProfRecord::ValueMapType *VMap) { - if (NumValueKinds == 0) - return; +// Extract data from \c Closure and serialize into \c This instance. +void serializeValueProfRecordFrom(ValueProfRecord *This, + ValueProfRecordClosure *Closure, + uint32_t ValueKind, uint32_t NumValueSites) { + uint32_t S; + const void *Record = Closure->Record; + This->Kind = ValueKind; + This->NumValueSites = NumValueSites; + InstrProfValueData *DstVD = getValueProfRecordValueData(This); - ValueProfRecord *VR = getFirstValueProfRecord(this); - for (uint32_t K = 0; K < NumValueKinds; K++) { - VR->deserializeTo(Record, VMap); - VR = getValueProfRecordNext(VR); + for (S = 0; S < NumValueSites; S++) { + uint32_t ND = Closure->GetNumValueDataForSite(Record, ValueKind, S); + This->SiteCountArray[S] = ND; + Closure->GetValueForSite(Record, DstVD, ValueKind, S, + Closure->RemapValueData); + DstVD += ND; } } -static std::unique_ptr allocValueProfData(uint32_t TotalSize) { - return std::unique_ptr(new (::operator new(TotalSize)) - ValueProfData()); -} - ValueProfData *serializeValueProfDataFrom(ValueProfRecordClosure *Closure) { uint32_t TotalSize = getValueProfDataSize(Closure); @@ -295,6 +218,18 @@ void getValueForSiteInstrProf(const void *R, InstrProfValueData *Dst, ->getValueForSite(Dst, K, S, Mapper); } +uint64_t stringToHash(uint32_t ValueKind, uint64_t Value) { + switch (ValueKind) { + case IPVK_IndirectCallTarget: + return IndexedInstrProf::ComputeHash(IndexedInstrProf::HashType, + (const char *)Value); + break; + default: + llvm_unreachable("value kind not handled !"); + } + return Value; +} + ValueProfData *allocValueProfDataInstrProf(size_t TotalSizeInBytes) { return (ValueProfData *)(new (::operator new(TotalSizeInBytes)) ValueProfData()); @@ -308,13 +243,16 @@ static ValueProfRecordClosure InstrProfRecordClosure = { getNumValueDataForSiteInstrProf, stringToHash, getValueForSiteInstrProf, - allocValueProfDataInstrProf}; + allocValueProfDataInstrProf +}; +// Wrapper implementation using the closure mechanism. uint32_t ValueProfData::getSize(const InstrProfRecord &Record) { InstrProfRecordClosure.Record = &Record; return getValueProfDataSize(&InstrProfRecordClosure); } +// Wrapper implementation using the closure mechanism. std::unique_ptr ValueProfData::serializeFrom(const InstrProfRecord &Record) { InstrProfRecordClosure.Record = &Record; @@ -324,6 +262,70 @@ ValueProfData::serializeFrom(const InstrProfRecord &Record) { return VPD; } +void ValueProfRecord::deserializeTo(InstrProfRecord &Record, + InstrProfRecord::ValueMapType *VMap) { + Record.reserveSites(Kind, NumValueSites); + + InstrProfValueData *ValueData = getValueProfRecordValueData(this); + for (uint64_t VSite = 0; VSite < NumValueSites; ++VSite) { + uint8_t ValueDataCount = this->SiteCountArray[VSite]; + Record.addValueData(Kind, VSite, ValueData, ValueDataCount, VMap); + ValueData += ValueDataCount; + } +} +// For writing/serializing, Old is the host endianness, and New is +// byte order intended on disk. For Reading/deserialization, Old +// is the on-disk source endianness, and New is the host endianness. +void ValueProfRecord::swapBytes(support::endianness Old, + support::endianness New) { + using namespace support; + if (Old == New) + return; + + if (getHostEndianness() != Old) { + sys::swapByteOrder(NumValueSites); + sys::swapByteOrder(Kind); + } + uint32_t ND = getValueProfRecordNumValueData(this); + InstrProfValueData *VD = getValueProfRecordValueData(this); + + // No need to swap byte array: SiteCountArrray. + for (uint32_t I = 0; I < ND; I++) { + sys::swapByteOrder(VD[I].Value); + sys::swapByteOrder(VD[I].Count); + } + if (getHostEndianness() == Old) { + sys::swapByteOrder(NumValueSites); + sys::swapByteOrder(Kind); + } +} + +void ValueProfData::deserializeTo(InstrProfRecord &Record, + InstrProfRecord::ValueMapType *VMap) { + if (NumValueKinds == 0) + return; + + ValueProfRecord *VR = getFirstValueProfRecord(this); + for (uint32_t K = 0; K < NumValueKinds; K++) { + VR->deserializeTo(Record, VMap); + VR = getValueProfRecordNext(VR); + } +} + +template +static T swapToHostOrder(const unsigned char *&D, support::endianness Orig) { + using namespace support; + if (Orig == little) + return endian::readNext(D); + else + return endian::readNext(D); +} + +static std::unique_ptr allocValueProfData(uint32_t TotalSize) { + return std::unique_ptr(new (::operator new(TotalSize)) + ValueProfData()); +} + ErrorOr> ValueProfData::getValueProfData(const unsigned char *D, const unsigned char *const BufferEnd, @@ -392,4 +394,5 @@ void ValueProfData::swapBytesFromHost(support::endianness Endianness) { sys::swapByteOrder(TotalSize); sys::swapByteOrder(NumValueKinds); } + } -- 2.34.1