Skip to content

[memprof] Remove inline call stacks #117833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 27, 2024
Merged

[memprof] Remove inline call stacks #117833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 1 addition & 18 deletions llvm/include/llvm/ProfileData/MemProf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,21 +344,11 @@ using LinearCallStackId = uint32_t;
struct IndexedAllocationInfo {
// The dynamic calling context for the allocation in bottom-up (leaf-to-root)
// order. Frame contents are stored out-of-line.
// TODO: Remove once we fully transition to CSId.
llvm::SmallVector<FrameId> CallStack;
// Conceptually the same as above. We are going to keep both CallStack and
// CallStackId while we are transitioning from CallStack to CallStackId.
CallStackId CSId = 0;
// The statistics obtained from the runtime for the allocation.
PortableMemInfoBlock Info;

IndexedAllocationInfo() = default;
// This constructor is soft deprecated. It will be removed once we remove all
// users of the CallStack field.
IndexedAllocationInfo(ArrayRef<FrameId> CS, CallStackId CSId,
const MemInfoBlock &MB,
const MemProfSchema &Schema = getFullSchema())
: CallStack(CS), CSId(CSId), Info(MB, Schema) {}
IndexedAllocationInfo(CallStackId CSId, const MemInfoBlock &MB,
const MemProfSchema &Schema = getFullSchema())
: CSId(CSId), Info(MB, Schema) {}
Expand Down Expand Up @@ -415,21 +405,14 @@ struct IndexedMemProfRecord {
// list of inline locations in bottom-up order i.e. from leaf to root. The
// inline location list may include additional entries, users should pick
// the last entry in the list with the same function GUID.
llvm::SmallVector<llvm::SmallVector<FrameId>> CallSites;
// Conceptually the same as above. We are going to keep both CallSites and
// CallSiteIds while we are transitioning from CallSites to CallSiteIds.
llvm::SmallVector<CallStackId> CallSiteIds;

void clear() {
AllocSites.clear();
CallSites.clear();
}
void clear() { AllocSites.clear(); }

void merge(const IndexedMemProfRecord &Other) {
// TODO: Filter out duplicates which may occur if multiple memprof
// profiles are merged together using llvm-profdata.
AllocSites.append(Other.AllocSites);
CallSites.append(Other.CallSites);
}

size_t serializedSize(const MemProfSchema &Schema,
Expand Down
3 changes: 1 addition & 2 deletions llvm/lib/ProfileData/MemProfReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ Error RawMemProfReader::mapRawProfileToRecords() {
for (size_t I = 0; /*Break out using the condition below*/; I++) {
const Frame &F = idToFrame(Callstack[I]);
IndexedMemProfRecord &Record = MemProfData.Records[F.Function];
Record.AllocSites.emplace_back(Callstack, CSId, MIB);
Record.AllocSites.emplace_back(CSId, MIB);

if (!F.IsInlineFrame)
break;
Expand All @@ -522,7 +522,6 @@ Error RawMemProfReader::mapRawProfileToRecords() {
for (LocationPtr Loc : Locs) {
CallStackId CSId = hashCallStack(*Loc);
MemProfData.CallStacks.insert({CSId, *Loc});
Record.CallSites.push_back(*Loc);
Record.CallSiteIds.push_back(CSId);
}
}
Expand Down