X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=lib%2FProfileData%2FInstrProf.cpp;h=2608847fd103f0e4ae1d65238e92b6993e3ae108;hp=ddd23014673af3ceabba41fcc5796de0d3ba451e;hb=b6b389aaac0ff6e3d3b4002e79b47a1a14e076c7;hpb=3e07540b570333a26f11814f16acdbaa29853e81 diff --git a/lib/ProfileData/InstrProf.cpp b/lib/ProfileData/InstrProf.cpp index ddd23014673..2608847fd10 100644 --- a/lib/ProfileData/InstrProf.cpp +++ b/lib/ProfileData/InstrProf.cpp @@ -32,30 +32,32 @@ class InstrProfErrorCategoryType : public std::error_category { return "Success"; case instrprof_error::eof: return "End of File"; + case instrprof_error::unrecognized_format: + return "Unrecognized instrumentation profile encoding format"; case instrprof_error::bad_magic: - return "Invalid profile data (bad magic)"; + return "Invalid instrumentation profile data (bad magic)"; case instrprof_error::bad_header: - return "Invalid profile data (file header is corrupt)"; + return "Invalid instrumentation profile data (file header is corrupt)"; case instrprof_error::unsupported_version: - return "Unsupported profiling format version"; + return "Unsupported instrumentation profile format version"; case instrprof_error::unsupported_hash_type: - return "Unsupported profiling hash"; + return "Unsupported instrumentation profile hash type"; case instrprof_error::too_large: return "Too much profile data"; case instrprof_error::truncated: return "Truncated profile data"; case instrprof_error::malformed: - return "Malformed profile data"; + return "Malformed instrumentation profile data"; case instrprof_error::unknown_function: return "No profile data available for function"; case instrprof_error::hash_mismatch: - return "Function hash mismatch"; + return "Function control flow change detected (hash mismatch)"; case instrprof_error::count_mismatch: - return "Function count mismatch"; + return "Function basic block count change detected (counter mismatch)"; case instrprof_error::counter_overflow: return "Counter overflow"; case instrprof_error::value_site_count_mismatch: - return "Function's value site counts mismatch"; + return "Function value site count change detected (counter mismatch)"; } llvm_unreachable("A value of instrprof_error has no message."); } @@ -72,13 +74,15 @@ namespace llvm { std::string getPGOFuncName(StringRef RawFuncName, GlobalValue::LinkageTypes Linkage, - StringRef FileName) { + StringRef FileName, uint64_t Version) { // Function names may be prefixed with a binary '1' to indicate // that the backend should not modify the symbols due to any platform // naming convention. Do not include that '1' in the PGO profile name. if (RawFuncName[0] == '\1') RawFuncName = RawFuncName.substr(1); + const char *Unknown = (Version <= 3 ? ":" : "__unknown__"); + const char *Sep = (Version <= 3 ? ":" : "__"); std::string FuncName = RawFuncName; if (llvm::GlobalValue::isLocalLinkage(Linkage)) { @@ -87,15 +91,16 @@ std::string getPGOFuncName(StringRef RawFuncName, // that it will stay the same, e.g., if the files are checked out from // version control in different locations. if (FileName.empty()) - FuncName = FuncName.insert(0, ":"); + FuncName = FuncName.insert(0, Unknown); else - FuncName = FuncName.insert(0, FileName.str() + ":"); + FuncName = FuncName.insert(0, FileName.str() + Sep); } return FuncName; } -std::string getPGOFuncName(const Function &F) { - return getPGOFuncName(F.getName(), F.getLinkage(), F.getParent()->getName()); +std::string getPGOFuncName(const Function &F, uint64_t Version) { + return getPGOFuncName(F.getName(), F.getLinkage(), F.getParent()->getName(), + Version); } GlobalVariable *createPGOFuncNameVar(Module &M, @@ -129,27 +134,91 @@ GlobalVariable *createPGOFuncNameVar(Function &F, StringRef FuncName) { return createPGOFuncNameVar(*F.getParent(), F.getLinkage(), FuncName); } -namespace IndexedInstrProf { +#define INSTR_PROF_COMMON_API_IMPL +#include "llvm/ProfileData/InstrProfData.inc" -uint32_t ValueProfRecord::getHeaderSize(uint32_t NumValueSites) { - uint32_t Size = offsetof(ValueProfRecord, SiteCountArray) + - sizeof(uint8_t) * NumValueSites; - // Round the size to multiple of 8 bytes. - Size = (Size + 7) & ~7; - return Size; + +/*! + * \brief ValueProfRecordClosure Interface implementation for InstrProfRecord + * class. These C wrappers are used as adaptors so that C++ code can be + * invoked as callbacks. + */ +uint32_t getNumValueKindsInstrProf(const void *Record) { + return reinterpret_cast(Record)->getNumValueKinds(); +} + +uint32_t getNumValueSitesInstrProf(const void *Record, uint32_t VKind) { + return reinterpret_cast(Record) + ->getNumValueSites(VKind); +} + +uint32_t getNumValueDataInstrProf(const void *Record, uint32_t VKind) { + return reinterpret_cast(Record) + ->getNumValueData(VKind); +} + +uint32_t getNumValueDataForSiteInstrProf(const void *R, uint32_t VK, + uint32_t S) { + return reinterpret_cast(R) + ->getNumValueDataForSite(VK, S); +} + +void getValueForSiteInstrProf(const void *R, InstrProfValueData *Dst, + uint32_t K, uint32_t S, + uint64_t (*Mapper)(uint32_t, uint64_t)) { + return reinterpret_cast(R) + ->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()); +} + +static ValueProfRecordClosure InstrProfRecordClosure = { + 0, + getNumValueKindsInstrProf, + getNumValueSitesInstrProf, + getNumValueDataInstrProf, + getNumValueDataForSiteInstrProf, + stringToHash, + getValueForSiteInstrProf, + allocValueProfDataInstrProf +}; + +// Wrapper implementation using the closure mechanism. +uint32_t ValueProfData::getSize(const InstrProfRecord &Record) { + InstrProfRecordClosure.Record = &Record; + return getValueProfDataSize(&InstrProfRecordClosure); } -uint32_t ValueProfRecord::getSize(uint32_t NumValueSites, - uint32_t NumValueData) { - return getHeaderSize(NumValueSites) + - sizeof(InstrProfValueData) * NumValueData; +// Wrapper implementation using the closure mechanism. +std::unique_ptr +ValueProfData::serializeFrom(const InstrProfRecord &Record) { + InstrProfRecordClosure.Record = &Record; + + std::unique_ptr VPD( + serializeValueProfDataFrom(&InstrProfRecordClosure, nullptr)); + return VPD; } void ValueProfRecord::deserializeTo(InstrProfRecord &Record, InstrProfRecord::ValueMapType *VMap) { Record.reserveSites(Kind, NumValueSites); - InstrProfValueData *ValueData = this->getValueData(); + 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); @@ -157,38 +226,6 @@ void ValueProfRecord::deserializeTo(InstrProfRecord &Record, } } -void ValueProfRecord::serializeFrom(const InstrProfRecord &Record, - uint32_t ValueKind, - uint32_t NumValueSites) { - Kind = ValueKind; - this->NumValueSites = NumValueSites; - InstrProfValueData *DstVD = getValueData(); - for (uint32_t S = 0; S < NumValueSites; S++) { - uint32_t ND = Record.getNumValueDataForSite(ValueKind, S); - SiteCountArray[S] = ND; - std::unique_ptr SrcVD = - Record.getValueForSite(ValueKind, S); - for (uint32_t I = 0; I < ND; I++) { - DstVD[I] = SrcVD[I]; - switch (ValueKind) { - case IPVK_IndirectCallTarget: - DstVD[I].Value = ComputeHash(HashType, (const char *)DstVD[I].Value); - break; - default: - llvm_unreachable("value kind not handled !"); - } - } - DstVD += ND; - } -} - -template static T swapToHostOrder(T v, support::endianness Orig) { - if (Orig == getHostEndianness()) - return v; - sys::swapByteOrder(v); - return v; -} - // 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. @@ -202,8 +239,8 @@ void ValueProfRecord::swapBytes(support::endianness Old, sys::swapByteOrder(NumValueSites); sys::swapByteOrder(Kind); } - uint32_t ND = getNumValueData(); - InstrProfValueData *VD = getValueData(); + uint32_t ND = getValueProfRecordNumValueData(this); + InstrProfValueData *VD = getValueProfRecordValueData(this); // No need to swap byte array: SiteCountArrray. for (uint32_t I = 0; I < ND; I++) { @@ -216,57 +253,48 @@ void ValueProfRecord::swapBytes(support::endianness Old, } } -uint32_t ValueProfData::getSize(const InstrProfRecord &Record) { - uint32_t TotalSize = sizeof(ValueProfData); - uint32_t NumValueKinds = Record.getNumValueKinds(); - if (NumValueKinds == 0) - return TotalSize; - - for (uint32_t Kind = IPVK_First; Kind <= IPVK_Last; Kind++) { - uint32_t NumValueSites = Record.getNumValueSites(Kind); - if (!NumValueSites) - continue; - TotalSize += - ValueProfRecord::getSize(NumValueSites, Record.getNumValueData(Kind)); - } - return TotalSize; -} - void ValueProfData::deserializeTo(InstrProfRecord &Record, InstrProfRecord::ValueMapType *VMap) { if (NumValueKinds == 0) return; - ValueProfRecord *VR = getFirstValueProfRecord(); + ValueProfRecord *VR = getFirstValueProfRecord(this); for (uint32_t K = 0; K < NumValueKinds; K++) { VR->deserializeTo(Record, VMap); - VR = VR->getNext(); + VR = getValueProfRecordNext(VR); } } -static ValueProfData *AllocValueProfData(uint32_t TotalSize) { - void *RawMem = ::operator new(TotalSize); - ValueProfData *VPDMem = new (RawMem) ValueProfData(); - return VPDMem; +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); } -std::unique_ptr -ValueProfData::serializeFrom(const InstrProfRecord &Record) { - uint32_t TotalSize = getSize(Record); - - std::unique_ptr VPD(AllocValueProfData(TotalSize)); - - VPD->TotalSize = TotalSize; - VPD->NumValueKinds = Record.getNumValueKinds(); - ValueProfRecord *VR = VPD->getFirstValueProfRecord(); - for (uint32_t Kind = IPVK_First; Kind <= IPVK_Last; Kind++) { - uint32_t NumValueSites = Record.getNumValueSites(Kind); - if (!NumValueSites) - continue; - VR->serializeFrom(Record, Kind, NumValueSites); - VR = VR->getNext(); +static std::unique_ptr allocValueProfData(uint32_t TotalSize) { + return std::unique_ptr(new (::operator new(TotalSize)) + ValueProfData()); +} + +instrprof_error ValueProfData::checkIntegrity() { + if (NumValueKinds > IPVK_Last + 1) + return instrprof_error::malformed; + // Total size needs to be mulltiple of quadword size. + if (TotalSize % sizeof(uint64_t)) + return instrprof_error::malformed; + + ValueProfRecord *VR = getFirstValueProfRecord(this); + for (uint32_t K = 0; K < this->NumValueKinds; K++) { + if (VR->Kind > IPVK_Last) + return instrprof_error::malformed; + VR = getValueProfRecordNext(VR); + if ((char *)VR - (char *)this > (ptrdiff_t)TotalSize) + return instrprof_error::malformed; } - return VPD; + return instrprof_error::success; } ErrorOr> @@ -277,36 +305,20 @@ ValueProfData::getValueProfData(const unsigned char *D, if (D + sizeof(ValueProfData) > BufferEnd) return instrprof_error::truncated; - uint32_t TotalSize = swapToHostOrder( - reinterpret_cast(D)[0], Endianness); - uint32_t NumValueKinds = swapToHostOrder( - reinterpret_cast(D)[1], Endianness); - + const unsigned char *Header = D; + uint32_t TotalSize = swapToHostOrder(Header, Endianness); if (D + TotalSize > BufferEnd) return instrprof_error::too_large; - if (NumValueKinds > IPVK_Last + 1) - return instrprof_error::malformed; - // Total size needs to be mulltiple of quadword size. - if (TotalSize % sizeof(uint64_t)) - return instrprof_error::malformed; - - std::unique_ptr VPD(AllocValueProfData(TotalSize)); + std::unique_ptr VPD = allocValueProfData(TotalSize); memcpy(VPD.get(), D, TotalSize); // Byte swap. VPD->swapBytesToHost(Endianness); - // Data integrety check: - ValueProfRecord *VR = VPD->getFirstValueProfRecord(); - for (uint32_t K = 0; K < VPD->NumValueKinds; K++) { - if (VR->Kind > IPVK_Last) - return instrprof_error::malformed; - VR = VR->getNext(); - if ((char *)VR - (char *)VPD.get() > (ptrdiff_t)TotalSize) - return instrprof_error::malformed; - } + instrprof_error EC = VPD->checkIntegrity(); + if (EC != instrprof_error::success) + return EC; - D += TotalSize; return std::move(VPD); } @@ -318,10 +330,10 @@ void ValueProfData::swapBytesToHost(support::endianness Endianness) { sys::swapByteOrder(TotalSize); sys::swapByteOrder(NumValueKinds); - ValueProfRecord *VR = getFirstValueProfRecord(); + ValueProfRecord *VR = getFirstValueProfRecord(this); for (uint32_t K = 0; K < NumValueKinds; K++) { VR->swapBytes(Endianness, getHostEndianness()); - VR = VR->getNext(); + VR = getValueProfRecordNext(VR); } } @@ -330,9 +342,9 @@ void ValueProfData::swapBytesFromHost(support::endianness Endianness) { if (Endianness == getHostEndianness()) return; - ValueProfRecord *VR = getFirstValueProfRecord(); + ValueProfRecord *VR = getFirstValueProfRecord(this); for (uint32_t K = 0; K < NumValueKinds; K++) { - ValueProfRecord *NVR = VR->getNext(); + ValueProfRecord *NVR = getValueProfRecordNext(VR); VR->swapBytes(getHostEndianness(), Endianness); VR = NVR; } @@ -340,26 +352,4 @@ void ValueProfData::swapBytesFromHost(support::endianness Endianness) { sys::swapByteOrder(NumValueKinds); } -ValueProfRecord *ValueProfData::getFirstValueProfRecord() { - return reinterpret_cast((char *)this + - sizeof(ValueProfData)); -} - -uint32_t ValueProfRecord::getNumValueData() const { - uint32_t NumValueData = 0; - for (uint32_t I = 0; I < NumValueSites; I++) - NumValueData += SiteCountArray[I]; - return NumValueData; -} - -ValueProfRecord *ValueProfRecord::getNext() { - return reinterpret_cast((char *)this + getSize()); -} - -InstrProfValueData *ValueProfRecord::getValueData() { - return reinterpret_cast((char *)this + - getHeaderSize(NumValueSites)); -} - -} // End of IndexedInstrProf namespace. }