using namespace llvm;
namespace {
+static support::endianness ValueProfDataEndianness = support::little;
+
class InstrProfRecordTrait {
public:
typedef StringRef key_type;
offset_type M = 0;
for (const auto &ProfileData : *V) {
+ const InstrProfRecord &ProfRecord = ProfileData.second;
M += sizeof(uint64_t); // The function hash
M += sizeof(uint64_t); // The size of the Counts vector
- M += ProfileData.second.Counts.size() * sizeof(uint64_t);
+ M += ProfRecord.Counts.size() * sizeof(uint64_t);
// Value data
- M += sizeof(uint64_t); // Number of value kinds with value sites.
- for (uint32_t Kind = IPVK_First; Kind <= IPVK_Last; ++Kind) {
- const std::vector<InstrProfValueSiteRecord> &ValueSites =
- ProfileData.second.getValueSitesForKind(Kind);
- if (ValueSites.empty())
- continue;
- M += sizeof(uint64_t); // Value kind
- M += sizeof(uint64_t); // The number of value sites for given value kind
- for (InstrProfValueSiteRecord I : ValueSites) {
- M += sizeof(uint64_t); // Number of value data pairs at a value site
- M += 2 * sizeof(uint64_t) * I.ValueData.size(); // Value data pairs
- }
- }
+ M += ValueProfData::getSize(ProfileData.second);
}
LE.write<offset_type>(M);
using namespace llvm::support;
endian::Writer<little> LE(Out);
for (const auto &ProfileData : *V) {
+ const InstrProfRecord &ProfRecord = ProfileData.second;
+
LE.write<uint64_t>(ProfileData.first); // Function hash
- LE.write<uint64_t>(ProfileData.second.Counts.size());
- for (uint64_t I : ProfileData.second.Counts)
+ LE.write<uint64_t>(ProfRecord.Counts.size());
+ for (uint64_t I : ProfRecord.Counts)
LE.write<uint64_t>(I);
- // Compute the number of value kinds with value sites.
- uint64_t NumValueKinds = 0;
- for (uint32_t Kind = IPVK_First; Kind <= IPVK_Last; ++Kind)
- NumValueKinds +=
- !(ProfileData.second.getValueSitesForKind(Kind).empty());
- LE.write<uint64_t>(NumValueKinds);
-
// Write value data
- for (uint32_t Kind = IPVK_First; Kind <= IPVK_Last; ++Kind) {
- const std::vector<InstrProfValueSiteRecord> &ValueSites =
- ProfileData.second.getValueSitesForKind(Kind);
- if (ValueSites.empty())
- continue;
- LE.write<uint64_t>(Kind); // Write value kind
- // Write number of value sites for current value kind
- LE.write<uint64_t>(ValueSites.size());
- for (InstrProfValueSiteRecord I : ValueSites) {
- // Write number of value data pairs at this value site
- LE.write<uint64_t>(I.ValueData.size());
- for (auto V : I.ValueData) {
- if (Kind == IPVK_IndirectCallTarget)
- LE.write<uint64_t>(ComputeHash((const char *)V.first));
- else
- LE.write<uint64_t>(V.first);
- LE.write<uint64_t>(V.second);
- }
- }
- }
+ std::unique_ptr<ValueProfData> VDataPtr =
+ ValueProfData::serializeFrom(ProfileData.second);
+ uint32_t S = VDataPtr->getSize();
+ VDataPtr->swapBytesFromHost(ValueProfDataEndianness);
+ Out.write((const char *)VDataPtr.get(), S);
}
}
};
}
-static std::error_code combineInstrProfRecords(InstrProfRecord &Dest,
- InstrProfRecord &Source,
- uint64_t &MaxFunctionCount) {
- // If the number of counters doesn't match we either have bad data
- // or a hash collision.
- if (Dest.Counts.size() != Source.Counts.size())
- return instrprof_error::count_mismatch;
-
- for (size_t I = 0, E = Source.Counts.size(); I < E; ++I) {
- if (Dest.Counts[I] + Source.Counts[I] < Dest.Counts[I])
- return instrprof_error::counter_overflow;
- Dest.Counts[I] += Source.Counts[I];
- }
-
- for (uint32_t Kind = IPVK_First; Kind <= IPVK_Last; ++Kind) {
-
- std::vector<InstrProfValueSiteRecord> &SourceValueSites =
- Source.getValueSitesForKind(Kind);
- if (SourceValueSites.empty())
- continue;
-
- std::vector<InstrProfValueSiteRecord> &DestValueSites =
- Dest.getValueSitesForKind(Kind);
-
- if (DestValueSites.empty()) {
- DestValueSites.swap(SourceValueSites);
- continue;
- }
-
- if (DestValueSites.size() != SourceValueSites.size())
- return instrprof_error::value_site_count_mismatch;
- for (size_t I = 0, E = SourceValueSites.size(); I < E; ++I)
- DestValueSites[I].mergeValueData(SourceValueSites[I]);
- }
-
- // We keep track of the max function count as we go for simplicity.
- if (Dest.Counts[0] > MaxFunctionCount)
- MaxFunctionCount = Dest.Counts[0];
-
- return instrprof_error::success;
+// Internal interface for testing purpose only.
+void InstrProfWriter::setValueProfDataEndianness(
+ support::endianness Endianness) {
+ ValueProfDataEndianness = Endianness;
}
void InstrProfWriter::updateStringTableReferences(InstrProfRecord &I) {
- I.Name = StringTable.insertString(I.Name);
- for (auto &VSite : I.IndirectCallSites)
- for (auto &VData : VSite.ValueData)
- VData.first =
- (uint64_t)StringTable.insertString((const char *)VData.first);
+ I.updateStrings(&StringTable);
}
std::error_code InstrProfWriter::addRecord(InstrProfRecord &&I) {
updateStringTableReferences(I);
auto &ProfileDataMap = FunctionData[I.Name];
- auto Where = ProfileDataMap.find(I.Hash);
- if (Where == ProfileDataMap.end()) {
+ bool NewFunc;
+ ProfilingData::iterator Where;
+ std::tie(Where, NewFunc) =
+ ProfileDataMap.insert(std::make_pair(I.Hash, InstrProfRecord()));
+ InstrProfRecord &Dest = Where->second;
+ if (NewFunc) {
// We've never seen a function with this name and hash, add it.
- ProfileDataMap[I.Hash] = I;
-
- // We keep track of the max function count as we go for simplicity.
- if (I.Counts[0] > MaxFunctionCount)
- MaxFunctionCount = I.Counts[0];
- return instrprof_error::success;
+ Dest = std::move(I);
+ } else {
+ // We're updating a function we've seen before.
+ instrprof_error MergeResult = Dest.merge(I);
+ if (MergeResult != instrprof_error::success) {
+ return MergeResult;
+ }
}
- // We're updating a function we've seen before.
- return combineInstrProfRecords(Where->second, I, MaxFunctionCount);
+ // We keep track of the max function count as we go for simplicity.
+ if (Dest.Counts[0] > MaxFunctionCount)
+ MaxFunctionCount = Dest.Counts[0];
+
+ return instrprof_error::success;
}
std::pair<uint64_t, uint64_t> InstrProfWriter::writeImpl(raw_ostream &OS) {
projects / oota-llvm.git / blobdiff