Revert "[MemProf] Use radix tree for alloc contexts in bitcode summaries" (llvm#117395)

Reverts llvm#117066

This is causing some build bot failures that need investigation.

Author: teresajohnson

llvm/include/llvm/Bitcode/LLVMBitCodes.h

@@ -307,12 +307,12 @@ enum GlobalValueSummarySymtabCodes {
   // [valueid, n x stackidindex]
   FS_PERMODULE_CALLSITE_INFO = 26,
   // Summary of per-module allocation memprof metadata.
-  // [nummib, nummib x (alloc type, context radix tree index),
+  // [nummib, nummib x (alloc type, numstackids, numstackids x stackidindex),
   // [nummib x (numcontext x total size)]?]
   FS_PERMODULE_ALLOC_INFO = 27,
   // Summary of combined index memprof callsite metadata.
-  // [valueid, context radix tree index, numver,
-  //  numver x version]
+  // [valueid, numstackindices, numver,
+  //  numstackindices x stackidindex, numver x version]
   FS_COMBINED_CALLSITE_INFO = 28,
   // Summary of combined index allocation memprof metadata.
   // [nummib, numver,
@@ -331,10 +331,6 @@ enum GlobalValueSummarySymtabCodes {
   // the entries must be in the exact same order as the corresponding sizes.
   // [nummib x (numcontext x full stack id)]
   FS_ALLOC_CONTEXT_IDS = 31,
-  // Linearized radix tree of allocation contexts. See the description above the
-  // CallStackRadixTreeBuilder class in ProfileData/MemProf.h for format.
-  // [n x entry]
-  FS_CONTEXT_RADIX_TREE_ARRAY = 32,
 };
 
 enum MetadataCodes {

llvm/lib/Bitcode/Reader/BitcodeAnalyzer.cpp

@@ -329,7 +329,6 @@ GetCodeName(unsigned CodeID, unsigned BlockID,
       STRINGIFY_CODE(FS, COMBINED_ALLOC_INFO)
       STRINGIFY_CODE(FS, STACK_IDS)
       STRINGIFY_CODE(FS, ALLOC_CONTEXT_IDS)
-      STRINGIFY_CODE(FS, CONTEXT_RADIX_TREE_ARRAY)
     }
   case bitc::METADATA_ATTACHMENT_ID:
     switch (CodeID) {

llvm/lib/Bitcode/Reader/BitcodeReader.cpp

@@ -987,10 +987,6 @@ class ModuleSummaryIndexBitcodeReader : public BitcodeReaderBase {
   /// ids from the lists in the callsite and alloc entries to the index.
   std::vector<uint64_t> StackIds;
 
-  /// Linearized radix tree of allocation contexts. See the description above
-  /// the CallStackRadixTreeBuilder class in ProfileData/MemProf.h for format.
-  std::vector<uint64_t> RadixArray;
-
 public:
   ModuleSummaryIndexBitcodeReader(
       BitstreamCursor Stream, StringRef Strtab, ModuleSummaryIndex &TheIndex,
@@ -1017,8 +1013,6 @@ class ModuleSummaryIndexBitcodeReader : public BitcodeReaderBase {
                                        TypeIdCompatibleVtableInfo &TypeId);
   std::vector<FunctionSummary::ParamAccess>
   parseParamAccesses(ArrayRef<uint64_t> Record);
-  SmallVector<unsigned> parseAllocInfoContext(ArrayRef<uint64_t> Record,
-                                              unsigned &I);
 
   template <bool AllowNullValueInfo = false>
   std::pair<ValueInfo, GlobalValue::GUID>
@@ -7550,48 +7544,6 @@ void ModuleSummaryIndexBitcodeReader::parseTypeIdCompatibleVtableSummaryRecord(
     parseTypeIdCompatibleVtableInfo(Record, Slot, TypeId);
 }
 
-SmallVector<unsigned> ModuleSummaryIndexBitcodeReader::parseAllocInfoContext(
-    ArrayRef<uint64_t> Record, unsigned &I) {
-  SmallVector<unsigned> StackIdList;
-  // For backwards compatibility with old format before radix tree was
-  // used, simply see if we found a radix tree array record (and thus if
-  // the RadixArray is non-empty).
-  if (RadixArray.empty()) {
-    unsigned NumStackEntries = Record[I++];
-    assert(Record.size() - I >= NumStackEntries);
-    StackIdList.reserve(NumStackEntries);
-    for (unsigned J = 0; J < NumStackEntries; J++) {
-      assert(Record[I] < StackIds.size());
-      StackIdList.push_back(
-          TheIndex.addOrGetStackIdIndex(StackIds[Record[I++]]));
-    }
-  } else {
-    unsigned RadixIndex = Record[I++];
-    // See the comments above CallStackRadixTreeBuilder in ProfileData/MemProf.h
-    // for a detailed description of the radix tree array format. Briefly, the
-    // first entry will be the number of frames, any negative values are the
-    // negative of the offset of the next frame, and otherwise the frames are in
-    // increasing linear order.
-    assert(RadixIndex < RadixArray.size());
-    unsigned NumStackIds = RadixArray[RadixIndex++];
-    StackIdList.reserve(NumStackIds);
-    while (NumStackIds--) {
-      assert(RadixIndex < RadixArray.size());
-      unsigned Elem = RadixArray[RadixIndex];
-      if (static_cast<std::make_signed_t<unsigned>>(Elem) < 0) {
-        RadixIndex = RadixIndex - Elem;
-        assert(RadixIndex < RadixArray.size());
-        Elem = RadixArray[RadixIndex];
-        // We shouldn't encounter a second offset in a row.
-        assert(static_cast<std::make_signed_t<unsigned>>(Elem) >= 0);
-      }
-      RadixIndex++;
-      StackIdList.push_back(TheIndex.addOrGetStackIdIndex(StackIds[Elem]));
-    }
-  }
-  return StackIdList;
-}
-
 static void setSpecialRefs(SmallVectorImpl<ValueInfo> &Refs, unsigned ROCnt,
                            unsigned WOCnt) {
   // Readonly and writeonly refs are in the end of the refs list.
@@ -8058,11 +8010,6 @@ Error ModuleSummaryIndexBitcodeReader::parseEntireSummary(unsigned ID) {
       break;
     }
 
-    case bitc::FS_CONTEXT_RADIX_TREE_ARRAY: { // [n x entry]
-      RadixArray = ArrayRef<uint64_t>(Record);
-      break;
-    }
-
     case bitc::FS_PERMODULE_CALLSITE_INFO: {
       unsigned ValueID = Record[0];
       SmallVector<unsigned> StackIdList;
@@ -8118,7 +8065,14 @@ Error ModuleSummaryIndexBitcodeReader::parseEntireSummary(unsigned ID) {
              (Version < 10 && I < Record.size())) {
         assert(Record.size() - I >= 2);
         AllocationType AllocType = (AllocationType)Record[I++];
-        auto StackIdList = parseAllocInfoContext(Record, I);
+        unsigned NumStackEntries = Record[I++];
+        assert(Record.size() - I >= NumStackEntries);
+        SmallVector<unsigned> StackIdList;
+        for (unsigned J = 0; J < NumStackEntries; J++) {
+          assert(Record[I] < StackIds.size());
+          StackIdList.push_back(
+              TheIndex.addOrGetStackIdIndex(StackIds[Record[I++]]));
+        }
         MIBs.push_back(MIBInfo(AllocType, std::move(StackIdList)));
       }
       // We either have nothing left or at least NumMIBs context size info
@@ -8169,7 +8123,14 @@ Error ModuleSummaryIndexBitcodeReader::parseEntireSummary(unsigned ID) {
       while (MIBsRead++ < NumMIBs) {
         assert(Record.size() - I >= 2);
         AllocationType AllocType = (AllocationType)Record[I++];
-        auto StackIdList = parseAllocInfoContext(Record, I);
+        unsigned NumStackEntries = Record[I++];
+        assert(Record.size() - I >= NumStackEntries);
+        SmallVector<unsigned> StackIdList;
+        for (unsigned J = 0; J < NumStackEntries; J++) {
+          assert(Record[I] < StackIds.size());
+          StackIdList.push_back(
+              TheIndex.addOrGetStackIdIndex(StackIds[Record[I++]]));
+        }
         MIBs.push_back(MIBInfo(AllocType, std::move(StackIdList)));
       }
       assert(Record.size() - I >= NumVersions);