typedef StringRef key_type;
typedef StringRef key_type_ref;
- typedef const InstrProfWriter::CounterData *const data_type;
- typedef const InstrProfWriter::CounterData *const data_type_ref;
+ typedef const InstrProfWriter::ProfilingData *const data_type;
+ typedef const InstrProfWriter::ProfilingData *const data_type_ref;
typedef uint64_t hash_value_type;
typedef uint64_t offset_type;
LE.write<offset_type>(N);
offset_type M = 0;
- for (const auto &Counts : *V)
- M += (2 + Counts.second.size()) * sizeof(uint64_t);
+ for (const auto &ProfileData : *V) {
+ 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);
+
+ // 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
+ }
+ }
+ }
LE.write<offset_type>(M);
return std::make_pair(N, M);
offset_type) {
using namespace llvm::support;
endian::Writer<little> LE(Out);
-
- for (const auto &Counts : *V) {
- LE.write<uint64_t>(Counts.first);
- LE.write<uint64_t>(Counts.second.size());
- for (uint64_t I : Counts.second)
+ for (const auto &ProfileData : *V) {
+ 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>(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::error_code
-InstrProfWriter::addFunctionCounts(StringRef FunctionName,
- uint64_t FunctionHash,
- ArrayRef<uint64_t> Counters) {
- auto &CounterData = FunctionData[FunctionName];
+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;
- auto Where = CounterData.find(FunctionHash);
- if (Where == CounterData.end()) {
- // We've never seen a function with this name and hash, add it.
- CounterData[FunctionHash] = Counters;
- // We keep track of the max function count as we go for simplicity.
- if (Counters[0] > MaxFunctionCount)
- MaxFunctionCount = Counters[0];
- return instrprof_error::success;
+ 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];
}
- // We're updating a function we've seen before.
- auto &FoundCounters = Where->second;
- // If the number of counters doesn't match we either have bad data or a hash
- // collision.
- if (FoundCounters.size() != Counters.size())
- return instrprof_error::count_mismatch;
+ for (uint32_t Kind = IPVK_First; Kind <= IPVK_Last; ++Kind) {
- for (size_t I = 0, E = Counters.size(); I < E; ++I) {
- if (FoundCounters[I] + Counters[I] < FoundCounters[I])
- return instrprof_error::counter_overflow;
- FoundCounters[I] += Counters[I];
+ 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 (FoundCounters[0] > MaxFunctionCount)
- MaxFunctionCount = FoundCounters[0];
+ if (Dest.Counts[0] > MaxFunctionCount)
+ MaxFunctionCount = Dest.Counts[0];
return instrprof_error::success;
}
+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);
+}
+
+std::error_code InstrProfWriter::addRecord(InstrProfRecord &&I) {
+ updateStringTableReferences(I);
+ auto &ProfileDataMap = FunctionData[I.Name];
+
+ auto Where = ProfileDataMap.find(I.Hash);
+ if (Where == ProfileDataMap.end()) {
+ // 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;
+ }
+
+ // We're updating a function we've seen before.
+ return combineInstrProfRecords(Where->second, I, MaxFunctionCount);
+}
+
std::pair<uint64_t, uint64_t> InstrProfWriter::writeImpl(raw_ostream &OS) {
OnDiskChainedHashTableGenerator<InstrProfRecordTrait> Generator;
projects / oota-llvm.git / blobdiff