Skip to content

[MemProf] Fix the propagation of context/size info after inlining #164872

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
Oct 24, 2025
Merged

[MemProf] Fix the propagation of context/size info after inlining #164872

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
10 changes: 7 additions & 3 deletions llvm/lib/Analysis/MemoryProfileInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,13 @@ static MDNode *createMIBNode(LLVMContext &Ctx, ArrayRef<uint64_t> MIBCallStack,
ColdBytes += TotalSize;
// If we have the max cold context size from summary information and have
// requested identification of contexts above a percentage of the max, see
// if this context qualifies.
if (MaxColdSize > 0 && MinPercentMaxColdSize < 100 &&
TotalSize * 100 >= MaxColdSize * MinPercentMaxColdSize)
// if this context qualifies. We should assume this is large if we rebuilt
// the trie from existing metadata (i.e. to update after inlining), in
// which case we don't have a MaxSize from the profile - we assume any
// context size info in existence on the metadata should be propagated.
if (BuiltFromExistingMetadata ||
(MaxColdSize > 0 && MinPercentMaxColdSize < 100 &&
TotalSize * 100 >= MaxColdSize * MinPercentMaxColdSize))
LargeColdContext = true;
}
// Only add the context size info as metadata if we need it in the thin
Expand Down
22 changes: 19 additions & 3 deletions llvm/unittests/Analysis/MemoryProfileInfoTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ declare dso_local noalias noundef i8* @malloc(i64 noundef)
!0 = !{!1, !3, !5, !7, !9, !11}
!1 = !{!2, !"cold"}
!2 = !{i64 1, i64 2, i64 3}
!3 = !{!4, !"cold"}
!3 = !{!4, !"cold", !13}
!4 = !{i64 1, i64 2, i64 4}
!5 = !{!6, !"notcold"}
!6 = !{i64 1, i64 5, i64 6}
Expand All @@ -648,6 +648,7 @@ declare dso_local noalias noundef i8* @malloc(i64 noundef)
!10 = !{i64 1, i64 8, i64 9}
!11 = !{!12, !"hot"}
!12 = !{i64 1, i64 8, i64 10}
!13 = !{i64 123, i64 456}
)IR");

Function *Func = M->getFunction("test");
Expand Down Expand Up @@ -683,10 +684,25 @@ declare dso_local noalias noundef i8* @malloc(i64 noundef)
auto *StackId = mdconst::dyn_extract<ConstantInt>(StackMD->getOperand(0));
EXPECT_EQ(StackId->getZExtValue(), 1u);
StackId = mdconst::dyn_extract<ConstantInt>(StackMD->getOperand(1));
if (StackId->getZExtValue() == 2u)
if (StackId->getZExtValue() == 2u) {
EXPECT_EQ(getMIBAllocType(MIB), AllocationType::Cold);
else if (StackId->getZExtValue() == 5u)
// We should propagate the single context size info from the second cold
// context above onto the new merged/trimmed context.
ASSERT_EQ(MIB->getNumOperands(), 3u);
MDNode *ContextSizePair = dyn_cast<MDNode>(MIB->getOperand(2));
assert(ContextSizePair->getNumOperands() == 2);
EXPECT_EQ(
mdconst::dyn_extract<ConstantInt>(ContextSizePair->getOperand(0))
->getZExtValue(),
123u);
EXPECT_EQ(
mdconst::dyn_extract<ConstantInt>(ContextSizePair->getOperand(1))
->getZExtValue(),
456u);
} else if (StackId->getZExtValue() == 5u) {
EXPECT_EQ(getMIBAllocType(MIB), AllocationType::NotCold);
ASSERT_EQ(MIB->getNumOperands(), 2u);
}
}
}

Expand Down