From 6c1091ea3fb7ab31aa9b8406cb32b9a549c4e7cd Mon Sep 17 00:00:00 2001 From: Teresa Johnson Date: Tue, 3 Jun 2025 16:05:16 -0700 Subject: Revert "[MemProf] Optionally save context size info on largest cold allocations" (#142688) Reverts llvm/llvm-project#142507 due to buildbot failures that I will look into tomorrow. --- llvm/lib/Bitcode/Writer/BitcodeWriter.cpp | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) (limited to 'llvm/lib/Bitcode/Writer/BitcodeWriter.cpp') diff --git a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp index fad8ebfad9f9..8789b3123cd6 100644 --- a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp +++ b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -23,7 +23,6 @@ #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringMap.h" #include "llvm/ADT/StringRef.h" -#include "llvm/Analysis/MemoryProfileInfo.h" #include "llvm/BinaryFormat/Dwarf.h" #include "llvm/Bitcode/BitcodeCommon.h" #include "llvm/Bitcode/BitcodeReader.h" @@ -4586,23 +4585,14 @@ void ModuleBitcodeWriterBase::writePerModuleGlobalValueSummary() { Stream.EmitRecord(bitc::FS_STACK_IDS, Vals, StackIdAbbvId); } - unsigned ContextIdAbbvId = 0; - if (metadataMayIncludeContextSizeInfo()) { - // n x context id - auto ContextIdAbbv = std::make_shared(); - ContextIdAbbv->Add(BitCodeAbbrevOp(bitc::FS_ALLOC_CONTEXT_IDS)); - ContextIdAbbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Array)); - // The context ids are hashes that are close to 64 bits in size, so emitting - // as a pair of 32-bit fixed-width values is more efficient than a VBR if we - // are emitting them for all MIBs. Otherwise we use VBR to better compress 0 - // values that are expected to more frequently occur in an alloc's memprof - // summary. - if (metadataIncludesAllContextSizeInfo()) - ContextIdAbbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 32)); - else - ContextIdAbbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::VBR, 8)); - ContextIdAbbvId = Stream.EmitAbbrev(std::move(ContextIdAbbv)); - } + // n x context id + auto ContextIdAbbv = std::make_shared(); + ContextIdAbbv->Add(BitCodeAbbrevOp(bitc::FS_ALLOC_CONTEXT_IDS)); + ContextIdAbbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Array)); + // The context ids are hashes that are close to 64 bits in size, so emitting + // as a pair of 32-bit fixed-width values is more efficient than a VBR. + ContextIdAbbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 32)); + unsigned ContextIdAbbvId = Stream.EmitAbbrev(std::move(ContextIdAbbv)); // Abbrev for FS_PERMODULE_PROFILE. Abbv = std::make_shared(); -- cgit v1.2.3