https://github.com/aaupov updated
https://github.com/llvm/llvm-project/pull/139350
>From d32ce3f42af3da7ced12b0cc6b58e120deb83566 Mon Sep 17 00:00:00 2001
From: Amir Ayupov <aau...@fb.com>
Date: Fri, 9 May 2025 21:13:27 -0700
Subject: [PATCH] rename data members
Created using spr 1.3.4
---
bolt/include/bolt/Profile/DataReader.h | 6 +++---
bolt/lib/Profile/DataAggregator.cpp | 11 ++++++-----
bolt/lib/Profile/DataReader.cpp | 21 +++++++++++----------
3 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/bolt/include/bolt/Profile/DataReader.h
b/bolt/include/bolt/Profile/DataReader.h
index b91efca085c8c..fbd1dd1e68792 100644
--- a/bolt/include/bolt/Profile/DataReader.h
+++ b/bolt/include/bolt/Profile/DataReader.h
@@ -390,7 +390,7 @@ class DataReader : public ProfileReaderBase {
FuncMemData *getMemDataForNames(const std::vector<StringRef> &FuncNames);
FuncBasicSampleData *
- getFuncSampleData(const std::vector<StringRef> &FuncNames);
+ getFuncBasicSampleData(const std::vector<StringRef> &FuncNames);
/// Return a vector of all FuncBranchData matching the list of names.
/// Internally use fuzzy matching to match special names like LTO-generated
@@ -433,7 +433,7 @@ class DataReader : public ProfileReaderBase {
}
using NamesToBranchesMapTy = std::map<StringRef, FuncBranchData>;
- using NamesToSamplesMapTy = std::map<StringRef, FuncBasicSampleData>;
+ using NamesToBasicSamplesMapTy = std::map<StringRef, FuncBasicSampleData>;
using NamesToMemEventsMapTy = std::map<StringRef, FuncMemData>;
using FuncsToBranchesMapTy =
std::unordered_map<const BinaryFunction *, FuncBranchData *>;
@@ -496,7 +496,7 @@ class DataReader : public ProfileReaderBase {
unsigned Line{0};
unsigned Col{0};
NamesToBranchesMapTy NamesToBranches;
- NamesToSamplesMapTy NamesToSamples;
+ NamesToBasicSamplesMapTy NamesToBasicSamples;
NamesToMemEventsMapTy NamesToMemEvents;
FuncsToBranchesMapTy FuncsToBranches;
FuncsToMemDataMapTy FuncsToMemData;
diff --git a/bolt/lib/Profile/DataAggregator.cpp
b/bolt/lib/Profile/DataAggregator.cpp
index 7a85297fe5f0e..88dea2cef4476 100644
--- a/bolt/lib/Profile/DataAggregator.cpp
+++ b/bolt/lib/Profile/DataAggregator.cpp
@@ -572,7 +572,8 @@ void DataAggregator::processProfile(BinaryContext &BC) {
if (FuncBranchData *FBD = getBranchData(BF)) {
BF.markProfiled(BinaryFunction::PF_LBR);
BF.RawSampleCount = FBD->getNumExecutedBranches();
- } else if (FuncBasicSampleData *FSD = getFuncSampleData(BF.getNames())) {
+ } else if (FuncBasicSampleData *FSD =
+ getFuncBasicSampleData(BF.getNames())) {
BF.markProfiled(BinaryFunction::PF_IP);
BF.RawSampleCount = FSD->getSamples();
}
@@ -644,11 +645,11 @@ bool DataAggregator::doBasicSample(BinaryFunction
&OrigFunc, uint64_t Address,
// Attach executed bytes to parent function in case of cold fragment.
Func.SampleCountInBytes += Count * BlockSize;
- auto I = NamesToSamples.find(Func.getOneName());
- if (I == NamesToSamples.end()) {
+ auto I = NamesToBasicSamples.find(Func.getOneName());
+ if (I == NamesToBasicSamples.end()) {
bool Success;
StringRef LocName = getLocationName(Func, BAT);
- std::tie(I, Success) = NamesToSamples.insert(std::make_pair(
+ std::tie(I, Success) = NamesToBasicSamples.insert(std::make_pair(
Func.getOneName(),
FuncBasicSampleData(LocName, FuncBasicSampleData::ContainerTy())));
}
@@ -2194,7 +2195,7 @@ DataAggregator::writeAggregatedFile(StringRef
OutputFilename) const {
OutFile << " " << Entry.getKey();
OutFile << "\n";
- for (const auto &KV : NamesToSamples) {
+ for (const auto &KV : NamesToBasicSamples) {
const FuncBasicSampleData &FSD = KV.second;
for (const BasicSampleInfo &SI : FSD.Data) {
writeLocation(SI.Loc);
diff --git a/bolt/lib/Profile/DataReader.cpp b/bolt/lib/Profile/DataReader.cpp
index fda62e8c073ea..3376bef9d3fd7 100644
--- a/bolt/lib/Profile/DataReader.cpp
+++ b/bolt/lib/Profile/DataReader.cpp
@@ -562,7 +562,7 @@ float DataReader::evaluateProfileData(BinaryFunction &BF,
}
void DataReader::readBasicSampleData(BinaryFunction &BF) {
- FuncBasicSampleData *SampleDataOrErr = getFuncSampleData(BF.getNames());
+ FuncBasicSampleData *SampleDataOrErr = getFuncBasicSampleData(BF.getNames());
if (!SampleDataOrErr)
return;
@@ -1090,10 +1090,10 @@ bool DataReader::hasMemData() {
std::error_code DataReader::parseInNoLBRMode() {
auto GetOrCreateFuncEntry = [&](StringRef Name) {
- auto I = NamesToSamples.find(Name);
- if (I == NamesToSamples.end()) {
+ auto I = NamesToBasicSamples.find(Name);
+ if (I == NamesToBasicSamples.end()) {
bool Success;
- std::tie(I, Success) = NamesToSamples.insert(std::make_pair(
+ std::tie(I, Success) = NamesToBasicSamples.insert(std::make_pair(
Name, FuncBasicSampleData(Name,
FuncBasicSampleData::ContainerTy())));
assert(Success && "unexpected result of insert");
@@ -1142,8 +1142,8 @@ std::error_code DataReader::parseInNoLBRMode() {
I->second.Data.emplace_back(std::move(MI));
}
- for (auto &FuncSamples : NamesToSamples)
- llvm::stable_sort(FuncSamples.second.Data);
+ for (auto &FuncBasicSamples : NamesToBasicSamples)
+ llvm::stable_sort(FuncBasicSamples.second.Data);
for (auto &MemEvents : NamesToMemEvents)
llvm::stable_sort(MemEvents.second.Data);
@@ -1323,7 +1323,7 @@ bool DataReader::mayHaveProfileData(const BinaryFunction
&Function) {
if (getBranchData(Function) || getMemData(Function))
return true;
- if (getFuncSampleData(Function.getNames()) ||
+ if (getFuncBasicSampleData(Function.getNames()) ||
getBranchDataForNames(Function.getNames()) ||
getMemDataForNames(Function.getNames()))
return true;
@@ -1360,8 +1360,9 @@ DataReader::getMemDataForNames(const
std::vector<StringRef> &FuncNames) {
}
FuncBasicSampleData *
-DataReader::getFuncSampleData(const std::vector<StringRef> &FuncNames) {
- return fetchMapEntry<NamesToSamplesMapTy>(NamesToSamples, FuncNames);
+DataReader::getFuncBasicSampleData(const std::vector<StringRef> &FuncNames) {
+ return fetchMapEntry<NamesToBasicSamplesMapTy>(NamesToBasicSamples,
+ FuncNames);
}
std::vector<FuncBranchData *> DataReader::getBranchDataForNamesRegex(
@@ -1401,7 +1402,7 @@ void DataReader::dump() const {
StringRef Event = I->getKey();
Diag << "Data was collected with event: " << Event << "\n";
}
- for (const auto &KV : NamesToSamples) {
+ for (const auto &KV : NamesToBasicSamples) {
const StringRef Name = KV.first;
const FuncBasicSampleData &FSD = KV.second;
Diag << Name << " samples:\n";
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
