[PATCH] D153995: [NFC][Sample PGO] Avoid non-const accessor for CallsiteSamples

[Wenlei He via Phabricator via llvm-commits]

wenlei created this revision.
wenlei added reviewers: hoy, wlei.
Herald added a subscriber: modimo.
Herald added a project: All.
wenlei requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Exposing a non-const accessor for clearing CallsiteSamples during flattening is a big of an overkill. Replace the non-const accessor with removeAllCallsiteSamples.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D153995

Files:
  llvm/include/llvm/ProfileData/SampleProf.h


Index: llvm/include/llvm/ProfileData/SampleProf.h
===================================================================
--- llvm/include/llvm/ProfileData/SampleProf.h
+++ llvm/include/llvm/ProfileData/SampleProf.h
@@ -800,6 +800,12 @@
     return Count;
   }
 
+  // Remove all call site samples for inlinees. This is needed when flattening
+  // a nested profile.
+  void removeAllCallsiteSamples() {
+    CallsiteSamples.clear();
+  }
+
   // Accumulate all call target samples to update the body samples.
   void updateCallsiteSamples() {
     for (auto &I : BodySamples) {
@@ -957,8 +963,6 @@
     return CallsiteSamples;
   }
 
-  CallsiteSampleMap &getCallsiteSamples() { return CallsiteSamples; }
-
   /// Return the maximum of sample counts in a function body. When SkipCallSite
   /// is false, which is the default, the return count includes samples in the
   /// inlined functions. When SkipCallSite is true, the return count only
@@ -1384,9 +1388,9 @@
     auto Ret = OutputProfiles.try_emplace(Context, FS);
     FunctionSamples &Profile = Ret.first->second;
     if (Ret.second) {
-      // When it's the copy of the old profile, just clear all the inlinees'
-      // samples.
-      Profile.getCallsiteSamples().clear();
+      // Clear nested inlinees' samples for the flattened copy. These inlinees
+      // will have their own top-level entries after flattening.
+      Profile.removeAllCallsiteSamples();
       // We recompute TotalSamples later, so here set to zero.
       Profile.setTotalSamples(0);
     } else {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D153995.535488.patch
Type: text/x-patch
Size: 1537 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230628/cea96598/attachment.bin>