undo length record and check

Author: mingmingl-llvm

llvm/lib/ProfileData/IndexedMemProfData.cpp

@@ -228,10 +228,8 @@ static Error writeMemProfRadixTreeBased(
   OS.write(0ULL); // Reserve space for the memprof call stack payload offset.
   OS.write(0ULL); // Reserve space for the memprof record payload offset.
   OS.write(0ULL); // Reserve space for the memprof record table offset.
-  if (Version >= memprof::Version4) {
+  if (Version >= memprof::Version4)
     OS.write(0ULL); // Reserve space for the data access profile offset.
-    OS.write(0ULL); // Reserve space for the size of data access profiles.
-  }
 
   auto Schema = memprof::getHotColdSchema();
   if (MemProfFullSchema)
@@ -259,14 +257,12 @@ static Error writeMemProfRadixTreeBased(
       OS, MemProfData.Records, &Schema, Version, &MemProfCallStackIndexes);
 
   uint64_t DataAccessProfOffset = 0;
-  uint64_t DataAccessProfLength = 0;
   if (DataAccessProfileData.has_value()) {
     assert(Version >= memprof::Version4 &&
            "Data access profiles are added starting from v4");
     DataAccessProfOffset = OS.tell();
     if (Error E = (*DataAccessProfileData).get().serialize(OS))
       return E;
-    DataAccessProfLength = OS.tell() - DataAccessProfOffset;
   }
 
   // Verify that the computation for the number of elements in the call stack
@@ -275,15 +271,14 @@ static Error writeMemProfRadixTreeBased(
              NumElements * sizeof(memprof::LinearFrameId) ==
          RecordPayloadOffset);
 
-  SmallVector<uint64_t, 8> Header = {
+  SmallVector<uint64_t, 4> Header = {
       CallStackPayloadOffset,
       RecordPayloadOffset,
       RecordTableOffset,
   };
-  if (Version >= memprof::Version4) {
+  if (Version >= memprof::Version4)
     Header.push_back(DataAccessProfOffset);
-    Header.push_back(DataAccessProfLength);
-  }
+
   OS.patch({{HeaderUpdatePos, Header}});
 
   return Error::success();
@@ -400,13 +395,9 @@ Error IndexedMemProfReader::deserializeRadixTreeBased(
       support::endian::readNext<uint64_t, llvm::endianness::little>(Ptr);
 
   uint64_t DataAccessProfOffset = 0;
-  uint64_t DataAccessProfLength = 0;
-  if (Version == memprof::Version4) {
+  if (Version == memprof::Version4)
     DataAccessProfOffset =
         support::endian::readNext<uint64_t, llvm::endianness::little>(Ptr);
-    DataAccessProfLength =
-        support::endian::readNext<uint64_t, llvm::endianness::little>(Ptr);
-  }
 
   // Read the schema.
   auto SchemaOr = memprof::readMemProfSchema(Ptr);
@@ -429,7 +420,9 @@ Error IndexedMemProfReader::deserializeRadixTreeBased(
       /*Payload=*/Start + RecordPayloadOffset,
       /*Base=*/Start, memprof::RecordLookupTrait(Version, Schema)));
 
-  if (DataAccessProfLength > 0) {
+  assert((!DataAccessProfOffset || DataAccessProfOffset > RecordTableOffset) &&
+         "Data access profile is either empty or after the record table");
+  if (DataAccessProfOffset > RecordTableOffset) {
     DataAccessProfileData =
         std::make_unique<data_access_prof::DataAccessProfData>();
     const unsigned char *DAPPtr = Start + DataAccessProfOffset;

llvm/test/tools/llvm-profdata/memprof-yaml.test

@@ -7,7 +7,7 @@
 ; RUN: llvm-profdata show --memory %t/memprof-out.indexed > %t/memprof-out.yaml
 ; RUN: diff -b %t/memprof-in.yaml %t/memprof-out.yaml
 
-; memprof-in-no-dap has empty data access profiles.
+; memprof-in-no-dap.yaml has empty data access profiles.
 ; RUN: llvm-profdata merge --memprof-version=4 %t/memprof-in-no-dap.yaml -o %t/memprof-out.indexed
 ; RUN: llvm-profdata show --memory %t/memprof-out.indexed > %t/memprof-out-no-dap.yaml
 ; RUN: diff -b %t/memprof-in-no-dap.yaml %t/memprof-out-no-dap.yaml