[llvm] fa7d2a8 - [ProfileData] Fix formatting (#207442)
via llvm-commits
llvm-commits at lists.llvm.org
Sat Jul 4 11:16:11 PDT 2026
Author: Kazu Hirata
Date: 2026-07-04T11:16:06-07:00
New Revision: fa7d2a86bfb22f8ff5961ab1b1bcda42c5da49ff
URL: https://github.com/llvm/llvm-project/commit/fa7d2a86bfb22f8ff5961ab1b1bcda42c5da49ff
DIFF: https://github.com/llvm/llvm-project/commit/fa7d2a86bfb22f8ff5961ab1b1bcda42c5da49ff.diff
LOG: [ProfileData] Fix formatting (#207442)
I've been working in this area, and I keep running into some of the
formatting issues fixed in this patch.
Added:
Modified:
llvm/include/llvm/ProfileData/SampleProf.h
llvm/include/llvm/ProfileData/SampleProfWriter.h
llvm/lib/ProfileData/SampleProf.cpp
llvm/lib/ProfileData/SampleProfReader.cpp
llvm/lib/ProfileData/SampleProfWriter.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/ProfileData/SampleProf.h b/llvm/include/llvm/ProfileData/SampleProf.h
index cb0344e848c34..c34394a43c638 100644
--- a/llvm/include/llvm/ProfileData/SampleProf.h
+++ b/llvm/include/llvm/ProfileData/SampleProf.h
@@ -473,9 +473,7 @@ class SampleRecord {
return NumSamples == Other.NumSamples && CallTargets == Other.CallTargets;
}
- bool operator!=(const SampleRecord &Other) const {
- return !(*this == Other);
- }
+ bool operator!=(const SampleRecord &Other) const { return !(*this == Other); }
private:
uint64_t NumSamples = 0;
@@ -573,8 +571,8 @@ class SampleContext {
SampleContext(StringRef Name)
: Func(Name), State(UnknownContext), Attributes(ContextNone) {
- assert(!Name.empty() && "Name is empty");
- }
+ assert(!Name.empty() && "Name is empty");
+ }
SampleContext(FunctionId Func)
: Func(Func), State(UnknownContext), Attributes(ContextNone) {}
@@ -629,8 +627,7 @@ class SampleContext {
// Decode context string for a frame to get function name and location.
// `ContextStr` is in the form of `FuncName:StartLine.Discriminator`.
- static void decodeContextString(StringRef ContextStr,
- FunctionId &Func,
+ static void decodeContextString(StringRef ContextStr, FunctionId &Func,
LineLocation &LineLoc) {
// Get function name
auto EntrySplit = ContextStr.split(':');
@@ -831,8 +828,7 @@ class FunctionSamples {
sampleprof_error addCalledTargetSamples(uint32_t LineOffset,
uint32_t Discriminator,
- FunctionId Func,
- uint64_t Num,
+ FunctionId Func, uint64_t Num,
uint64_t Weight = 1) {
return BodySamples[LineLocation(LineOffset, Discriminator)].addCalledTarget(
Func, Num, Weight);
@@ -862,9 +858,7 @@ class FunctionSamples {
// Remove all call site samples for inlinees. This is needed when flattening
// a nested profile.
- void removeAllCallsiteSamples() {
- CallsiteSamples.clear();
- }
+ void removeAllCallsiteSamples() { CallsiteSamples.clear(); }
// Accumulate all call target samples to update the body samples.
void updateCallsiteSamples() {
@@ -1283,7 +1277,8 @@ class FunctionSamples {
if (!UseMD5)
return Func.stringRef();
- assert(GUIDToFuncNameMap && "GUIDToFuncNameMap needs to be populated first");
+ assert(GUIDToFuncNameMap &&
+ "GUIDToFuncNameMap needs to be populated first");
return GUIDToFuncNameMap->lookup(Func.getHashCode());
}
@@ -1350,9 +1345,7 @@ class FunctionSamples {
/// Return the GUID of the context's name. If the context is already using
/// MD5, don't hash it again.
- uint64_t getGUID() const {
- return getFunction().getHashCode();
- }
+ uint64_t getGUID() const { return getFunction().getHashCode(); }
// Find all the names in the current FunctionSamples including names in
// all the inline instances and names of call targets.
@@ -1491,8 +1484,8 @@ class SampleProfileMap
}
size_t erase(const SampleContext &Ctx) {
- return HashKeyMap<std::unordered_map, SampleContext, FunctionSamples>::
- erase(Ctx);
+ return HashKeyMap<std::unordered_map, SampleContext,
+ FunctionSamples>::erase(Ctx);
}
size_t erase(const key_type &Key) { return base_type::erase(Key); }
@@ -1534,7 +1527,7 @@ template <class LocationT, class SampleT> class SampleSorter {
/// sure ProfileMap's key is consistent with FunctionSample's name/context.
class SampleContextTrimmer {
public:
- SampleContextTrimmer(SampleProfileMap &Profiles) : ProfileMap(Profiles){};
+ SampleContextTrimmer(SampleProfileMap &Profiles) : ProfileMap(Profiles) {};
// Trim and merge cold context profile when requested. TrimBaseProfileOnly
// should only be effective when TrimColdContext is true. On top of
// TrimColdContext, TrimBaseProfileOnly can be used to specify to trim all
@@ -1566,7 +1559,7 @@ class ProfileConverter {
FrameNode(FunctionId FName = FunctionId(),
FunctionSamples *FSamples = nullptr,
LineLocation CallLoc = {0, 0})
- : FuncName(FName), FuncSamples(FSamples), CallSiteLoc(CallLoc){};
+ : FuncName(FName), FuncSamples(FSamples), CallSiteLoc(CallLoc) {};
// Map line+discriminator location to child frame
std::map<uint64_t, FrameNode> AllChildFrames;
@@ -1640,10 +1633,10 @@ class ProfileConverter {
Profile.addBodySamples(I.first.LineOffset, I.first.Discriminator,
CalleeProfile.getHeadSamplesEstimate());
// Add callsite sample.
- Profile.addCalledTargetSamples(
- I.first.LineOffset, I.first.Discriminator,
- CalleeProfile.getFunction(),
- CalleeProfile.getHeadSamplesEstimate());
+ Profile.addCalledTargetSamples(I.first.LineOffset,
+ I.first.Discriminator,
+ CalleeProfile.getFunction(),
+ CalleeProfile.getHeadSamplesEstimate());
// Update total samples.
TotalSamples = TotalSamples >= CalleeProfile.getTotalSamples()
? TotalSamples - CalleeProfile.getTotalSamples()
diff --git a/llvm/include/llvm/ProfileData/SampleProfWriter.h b/llvm/include/llvm/ProfileData/SampleProfWriter.h
index 3b22f113615e1..36d4646962092 100644
--- a/llvm/include/llvm/ProfileData/SampleProfWriter.h
+++ b/llvm/include/llvm/ProfileData/SampleProfWriter.h
@@ -178,9 +178,7 @@ class LLVM_ABI SampleProfileWriterText : public SampleProfileWriter {
return sampleprof_error::success;
}
- void setUseCtxSplitLayout() override {
- MarkFlatProfiles = true;
- }
+ void setUseCtxSplitLayout() override { MarkFlatProfiles = true; }
private:
/// Indent level to use when writing.
@@ -322,6 +320,7 @@ class FuncOffsetHashTableWriterInfo {
class LLVM_ABI SampleProfileWriterExtBinaryBase
: public SampleProfileWriterBinary {
using SampleProfileWriterBinary::SampleProfileWriterBinary;
+
public:
std::error_code write(const SampleProfileMap &ProfileMap) override;
diff --git a/llvm/lib/ProfileData/SampleProf.cpp b/llvm/lib/ProfileData/SampleProf.cpp
index 8b81cfeecc9fe..7091d81925733 100644
--- a/llvm/lib/ProfileData/SampleProf.cpp
+++ b/llvm/lib/ProfileData/SampleProf.cpp
@@ -286,7 +286,7 @@ void sampleprof::sortFuncProfiles(
unsigned FunctionSamples::getOffset(const DILocation *DIL) {
return (DIL->getLine() - DIL->getScope()->getSubprogram()->getLine()) &
- 0xffff;
+ 0xffff;
}
LineLocation FunctionSamples::getCallSiteIdentifier(const DILocation *DIL,
diff --git a/llvm/lib/ProfileData/SampleProfReader.cpp b/llvm/lib/ProfileData/SampleProfReader.cpp
index 14fdaf6581efe..dba55b4e0beb7 100644
--- a/llvm/lib/ProfileData/SampleProfReader.cpp
+++ b/llvm/lib/ProfileData/SampleProfReader.cpp
@@ -1013,9 +1013,9 @@ std::error_code SampleProfileReaderExtBinaryBase::readFuncOffsetTable() {
// Because Porfiles replace existing value with new value if collision
// happens, we also use the latest offset so that they are consistent.
FuncOffsetTable->insert(Hash, *Offset);
- }
+ }
- return sampleprof_error::success;
+ return sampleprof_error::success;
}
std::error_code SampleProfileReaderExtBinaryBase::readFuncProfiles(
@@ -1423,8 +1423,7 @@ SampleProfileReaderExtBinaryBase::readFuncMetadata(bool ProfileHasAttribute,
if (FProfile) {
CalleeProfile = const_cast<FunctionSamples *>(
&FProfile->functionSamplesAt(LineLocation(
- *LineOffset,
- *Discriminator))[FContext.getFunction()]);
+ *LineOffset, *Discriminator))[FContext.getFunction()]);
}
if (std::error_code EC =
readFuncMetadata(ProfileHasAttribute, CalleeProfile))
@@ -1926,8 +1925,7 @@ std::error_code SampleProfileReaderGCC::readOneFunctionProfile(
if (Update)
FProfile->addCalledTargetSamples(LineOffset, Discriminator,
- FunctionId(TargetName),
- TargetCount);
+ FunctionId(TargetName), TargetCount);
}
}
diff --git a/llvm/lib/ProfileData/SampleProfWriter.cpp b/llvm/lib/ProfileData/SampleProfWriter.cpp
index e5f31348578b8..c267215596c67 100644
--- a/llvm/lib/ProfileData/SampleProfWriter.cpp
+++ b/llvm/lib/ProfileData/SampleProfWriter.cpp
@@ -58,8 +58,7 @@ struct SeekableWriter {
SeekableWriter(raw_pwrite_stream &OS, endianness Endian)
: OS(OS), Endian(Endian) {}
- template <typename ValueType>
- void pwrite(ValueType Val, size_t Offset) {
+ template <typename ValueType> void pwrite(ValueType Val, size_t Offset) {
std::string StringBuf;
raw_string_ostream SStream(StringBuf);
Writer(SStream, Endian).write(Val);
More information about the llvm-commits
mailing list