[llvm] 840f9de - [memprof] Use LinearFrameId and LinearCallStackId where appropriate (NFC) (#94076)

[via llvm-commits]

Author: Kazu Hirata
Date: 2024-05-31T16:23:22-07:00
New Revision: 840f9de9b14f40836fb28be77a4b70b41e8e9523

URL: https://github.com/llvm/llvm-project/commit/840f9de9b14f40836fb28be77a4b70b41e8e9523
DIFF: https://github.com/llvm/llvm-project/commit/840f9de9b14f40836fb28be77a4b70b41e8e9523.diff

LOG: [memprof] Use LinearFrameId and LinearCallStackId where appropriate (NFC) (#94076)

Added: 
    

Modified: 
    llvm/include/llvm/ProfileData/MemProf.h

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/ProfileData/MemProf.h b/llvm/include/llvm/ProfileData/MemProf.h
index 5b0d1c867b202..e8683e8ac2b95 100644
--- a/llvm/include/llvm/ProfileData/MemProf.h
+++ b/llvm/include/llvm/ProfileData/MemProf.h
@@ -424,7 +424,7 @@ struct IndexedMemProfRecord {
   // on the schema provided in \p Schema.
   void serialize(const MemProfSchema &Schema, raw_ostream &OS,
                  IndexedVersion Version,
-                 llvm::DenseMap<memprof::CallStackId, uint32_t>
+                 llvm::DenseMap<memprof::CallStackId, LinearCallStackId>
                      *MemProfCallStackIndexes = nullptr);
 
   // Deserializes memprof records from the Buffer.
@@ -858,7 +858,7 @@ struct LinearFrameIdConverter {
   LinearFrameIdConverter(const unsigned char *FrameBase)
       : FrameBase(FrameBase) {}
 
-  Frame operator()(uint32_t LinearId) {
+  Frame operator()(LinearFrameId LinearId) {
     uint64_t Offset = static_cast<uint64_t>(LinearId) * Frame::serializedSize();
     return Frame::deserialize(FrameBase + Offset);
   }
@@ -868,24 +868,26 @@ struct LinearFrameIdConverter {
 // call stack array in the profile.
 struct LinearCallStackIdConverter {
   const unsigned char *CallStackBase;
-  std::function<Frame(uint32_t)> FrameIdToFrame;
+  std::function<Frame(LinearFrameId)> FrameIdToFrame;
 
   LinearCallStackIdConverter() = delete;
   LinearCallStackIdConverter(const unsigned char *CallStackBase,
-                             std::function<Frame(uint32_t)> FrameIdToFrame)
+                             std::function<Frame(LinearFrameId)> FrameIdToFrame)
       : CallStackBase(CallStackBase), FrameIdToFrame(FrameIdToFrame) {}
 
-  llvm::SmallVector<Frame> operator()(uint32_t LinearCSId) {
+  llvm::SmallVector<Frame> operator()(LinearCallStackId LinearCSId) {
     llvm::SmallVector<Frame> Frames;
 
     const unsigned char *Ptr =
-        CallStackBase + static_cast<uint64_t>(LinearCSId) * sizeof(uint32_t);
+        CallStackBase +
+        static_cast<uint64_t>(LinearCSId) * sizeof(LinearFrameId);
     uint32_t NumFrames =
         support::endian::readNext<uint32_t, llvm::endianness::little>(Ptr);
     Frames.reserve(NumFrames);
     for (; NumFrames; --NumFrames) {
-      uint32_t Elem =
-          support::endian::readNext<uint32_t, llvm::endianness::little>(Ptr);
+      LinearFrameId Elem =
+          support::endian::readNext<LinearFrameId, llvm::endianness::little>(
+              Ptr);
       Frames.push_back(FrameIdToFrame(Elem));
     }