[memprof] Compare Frames instead of FrameIds in a unit test #119111
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When we call IndexedMemProfRecord::toMemProfRecord, we care about
getting the original (that is, non-indexed) MemProfRecord back, so we
should just verify that, not the hash values, which are
intermediaries.
There is a remote possibility of hash collisions where call stack
{F1, F2} might come back as {F1, F1} if F1.hash() == F2.hash() for
example. However, since FrameId uses BLAKE, the hash values should be
consistent across architectures. That is, if this test case works on
one architecture, it should work on others as well.
Member
|
@llvm/pr-subscribers-pgo Author: Kazu Hirata (kazutakahirata) ChangesWhen we call IndexedMemProfRecord::toMemProfRecord, we care about There is a remote possibility of hash collisions where call stack Full diff: https://github.com/llvm/llvm-project/pull/119111.diff 1 Files Affected:
diff --git a/llvm/unittests/ProfileData/MemProfTest.cpp b/llvm/unittests/ProfileData/MemProfTest.cpp
index 5e24579baccd37..55feb1c3f60b45 100644
--- a/llvm/unittests/ProfileData/MemProfTest.cpp
+++ b/llvm/unittests/ProfileData/MemProfTest.cpp
@@ -534,19 +534,10 @@ TEST(MemProf, IndexedMemProfRecordToMemProfRecord) {
// Verify the contents of Record.
ASSERT_THAT(Record.AllocSites, SizeIs(2));
- ASSERT_THAT(Record.AllocSites[0].CallStack, SizeIs(2));
- EXPECT_EQ(Record.AllocSites[0].CallStack[0].hash(), F1.hash());
- EXPECT_EQ(Record.AllocSites[0].CallStack[1].hash(), F2.hash());
- ASSERT_THAT(Record.AllocSites[1].CallStack, SizeIs(2));
- EXPECT_EQ(Record.AllocSites[1].CallStack[0].hash(), F1.hash());
- EXPECT_EQ(Record.AllocSites[1].CallStack[1].hash(), F3.hash());
- ASSERT_THAT(Record.CallSites, SizeIs(2));
- ASSERT_THAT(Record.CallSites[0], SizeIs(2));
- EXPECT_EQ(Record.CallSites[0][0].hash(), F2.hash());
- EXPECT_EQ(Record.CallSites[0][1].hash(), F3.hash());
- ASSERT_THAT(Record.CallSites[1], SizeIs(2));
- EXPECT_EQ(Record.CallSites[1][0].hash(), F2.hash());
- EXPECT_EQ(Record.CallSites[1][1].hash(), F4.hash());
+ EXPECT_THAT(Record.AllocSites[0].CallStack, ElementsAre(F1, F2));
+ EXPECT_THAT(Record.AllocSites[1].CallStack, ElementsAre(F1, F3));
+ EXPECT_THAT(Record.CallSites,
+ ElementsAre(ElementsAre(F2, F3), ElementsAre(F2, F4)));
}
// Populate those fields returned by getHotColdSchema.
|
teresajohnson
approved these changes
Dec 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When we call IndexedMemProfRecord::toMemProfRecord, we care about
getting the original (that is, non-indexed) MemProfRecord back, so we
should just verify that, not the hash values, which are
intermediaries.
There is a remote possibility of hash collisions where call stack
{F1, F2} might come back as {F1, F1} if F1.hash() == F2.hash() for
example. However, since FrameId uses BLAKE, the hash values should be
consistent across architectures. That is, if this test case works on
one architecture, it should work on others as well.