Add reader support.

Author: snehasish

compiler-rt/include/profile/MemProfData.inc

@@ -36,8 +36,7 @@
 #define MEMPROF_RAW_VERSION 5ULL
 
 // Currently supported versions.
-#define MEMPROF_RAW_SUPPORTED_VERSIONS                                         \
-  { 3ULL, 4ULL, 5ULL }
+#define MEMPROF_RAW_SUPPORTED_VERSIONS {3ULL, 4ULL, 5ULL}
 
 #define MEMPROF_V3_MIB_SIZE 132ULL;
 

compiler-rt/lib/memprof/memprof_allocator.cpp

@@ -333,7 +333,8 @@ struct Allocator {
       u8 Counter =
           *((u8 *)HISTOGRAM_MEM_TO_SHADOW(p + HISTOGRAM_GRANULARITY * i));
       // Cap the counter at HISTOGRAM_MAX_COUNTER (255) to prevent overflow
-      ((uint8_t *)Histogram)[i] = (Counter > HISTOGRAM_MAX_COUNTER) ? HISTOGRAM_MAX_COUNTER : Counter;
+      ((uint8_t *)Histogram)[i] =
+          (Counter > HISTOGRAM_MAX_COUNTER) ? HISTOGRAM_MAX_COUNTER : Counter;
     }
     MemInfoBlock newMIB(user_size, c, m->timestamp_ms, curtime, m->cpu_id,
                         GetCpuId(), Histogram, HistogramSize);

compiler-rt/test/memprof/TestCases/memprof_histogram_uint8.cpp

@@ -6,7 +6,8 @@
 int main() {
   // Allocate memory that will create a histogram
   char *buffer = (char *)malloc(1024);
-  if (!buffer) return 1;
+  if (!buffer)
+    return 1;
 
   for (int i = 0; i < 10; ++i) {
     // Access every 8th byte (since shadow granularity is 8b.
@@ -18,7 +19,7 @@ int main() {
   }
 
   for (int j = 0; j < 400; ++j) {
-    buffer[16] = 'B';  // Count is saturated at 255
+    buffer[16] = 'B'; // Count is saturated at 255
   }
 
   // Free the memory to trigger MIB creation with histogram

llvm/include/llvm/ProfileData/MemProfData.inc

@@ -36,8 +36,7 @@
 #define MEMPROF_RAW_VERSION 5ULL
 
 // Currently supported versions.
-#define MEMPROF_RAW_SUPPORTED_VERSIONS                                         \
-  { 3ULL, 4ULL, 5ULL }
+#define MEMPROF_RAW_SUPPORTED_VERSIONS {3ULL, 4ULL, 5ULL}
 
 #define MEMPROF_V3_MIB_SIZE 132ULL;
 

llvm/lib/ProfileData/MemProfReader.cpp

@@ -166,6 +166,90 @@ readMemInfoBlocksV4(const char *Ptr) {
   return Items;
 }
 
+llvm::SmallVector<std::pair<uint64_t, MemInfoBlock>>
+readMemInfoBlocksV5(const char *Ptr) {
+  using namespace support;
+
+  const uint64_t NumItemsToRead =
+      endian::readNext<uint64_t, llvm::endianness::little, unaligned>(Ptr);
+
+  llvm::SmallVector<std::pair<uint64_t, MemInfoBlock>> Items;
+  for (uint64_t I = 0; I < NumItemsToRead; I++) {
+    const uint64_t Id =
+        endian::readNext<uint64_t, llvm::endianness::little, unaligned>(Ptr);
+
+    MemInfoBlock MIB;
+    MIB.AllocCount =
+        endian::readNext<uint32_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.TotalAccessCount =
+        endian::readNext<uint64_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.MinAccessCount =
+        endian::readNext<uint64_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.MaxAccessCount =
+        endian::readNext<uint64_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.TotalSize =
+        endian::readNext<uint64_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.MinSize =
+        endian::readNext<uint32_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.MaxSize =
+        endian::readNext<uint32_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.AllocTimestamp =
+        endian::readNext<uint32_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.DeallocTimestamp =
+        endian::readNext<uint32_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.TotalLifetime =
+        endian::readNext<uint64_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.MinLifetime =
+        endian::readNext<uint32_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.MaxLifetime =
+        endian::readNext<uint32_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.AllocCpuId =
+        endian::readNext<uint32_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.DeallocCpuId =
+        endian::readNext<uint32_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.NumMigratedCpu =
+        endian::readNext<uint32_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.NumLifetimeOverlaps =
+        endian::readNext<uint32_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.NumSameAllocCpu =
+        endian::readNext<uint32_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.NumSameDeallocCpu =
+        endian::readNext<uint32_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.DataTypeId =
+        endian::readNext<uint64_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.TotalAccessDensity =
+        endian::readNext<uint64_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.MinAccessDensity =
+        endian::readNext<uint32_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.MaxAccessDensity =
+        endian::readNext<uint32_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.TotalLifetimeAccessDensity =
+        endian::readNext<uint64_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.MinLifetimeAccessDensity =
+        endian::readNext<uint32_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.MaxLifetimeAccessDensity =
+        endian::readNext<uint32_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.AccessHistogramSize =
+        endian::readNext<uint32_t, llvm::endianness::little, unaligned>(Ptr);
+    MIB.AccessHistogram =
+        endian::readNext<uintptr_t, llvm::endianness::little, unaligned>(Ptr);
+
+    if (MIB.AccessHistogramSize > 0) {
+      // The in-memory representation uses uint64_t for histogram entries.
+      MIB.AccessHistogram =
+          (uintptr_t)malloc(MIB.AccessHistogramSize * sizeof(uint64_t));
+      for (uint64_t J = 0; J < MIB.AccessHistogramSize; J++) {
+        // The on-disk format for V5 uses uint8_t.
+        const uint8_t Val =
+            endian::readNext<uint8_t, llvm::endianness::little, unaligned>(Ptr);
+        ((uint64_t *)MIB.AccessHistogram)[J] = Val;
+      }
+    }
+    Items.push_back({Id, MIB});
+  }
+  return Items;
+}
+
 CallStackMap readStackInfo(const char *Ptr) {
   using namespace support;
 
@@ -658,6 +742,8 @@ RawMemProfReader::readMemInfoBlocks(const char *Ptr) {
     return readMemInfoBlocksV3(Ptr);
   if (MemprofRawVersion == 4ULL)
     return readMemInfoBlocksV4(Ptr);
+  if (MemprofRawVersion == 5ULL)
+    return readMemInfoBlocksV5(Ptr);
   llvm_unreachable(
       "Panic: Unsupported version number when reading MemInfoBlocks");
 }