Skip to content

Commit 64fadf1

Browse files
[memprof] Use IndexedMemProfData in unit tests (NFC) (#119648)
This patch uses IndexedMemProfData in unit tests even when we only need CallStacks. This way, we get to use addCallStack. Also, the look is more consistent with other unit tests, where we typically do: IndexMemProfData MemProfData; MemProfData.addFrame(...); MemProfData.addCallStack(...); // Run some tests
1 parent 04313b8 commit 64fadf1

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

llvm/unittests/ProfileData/MemProfTest.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -581,11 +581,11 @@ TEST(MemProf, MissingFrameId) {
581581
// Verify CallStackRadixTreeBuilder can handle empty inputs.
582582
TEST(MemProf, RadixTreeBuilderEmpty) {
583583
llvm::DenseMap<FrameId, LinearFrameId> MemProfFrameIndexes;
584-
llvm::MapVector<CallStackId, llvm::SmallVector<FrameId>> MemProfCallStackData;
584+
IndexedMemProfData MemProfData;
585585
llvm::DenseMap<FrameId, FrameStat> FrameHistogram =
586-
computeFrameHistogram<FrameId>(MemProfCallStackData);
586+
computeFrameHistogram<FrameId>(MemProfData.CallStacks);
587587
CallStackRadixTreeBuilder<FrameId> Builder;
588-
Builder.build(std::move(MemProfCallStackData), &MemProfFrameIndexes,
588+
Builder.build(std::move(MemProfData.CallStacks), &MemProfFrameIndexes,
589589
FrameHistogram);
590590
ASSERT_THAT(Builder.getRadixArray(), IsEmpty());
591591
const auto Mappings = Builder.takeCallStackPos();
@@ -597,12 +597,12 @@ TEST(MemProf, RadixTreeBuilderOne) {
597597
llvm::DenseMap<FrameId, LinearFrameId> MemProfFrameIndexes = {
598598
{11, 1}, {12, 2}, {13, 3}};
599599
llvm::SmallVector<FrameId> CS1 = {13, 12, 11};
600-
llvm::MapVector<CallStackId, llvm::SmallVector<FrameId>> MemProfCallStackData;
601-
MemProfCallStackData.insert({hashCallStack(CS1), CS1});
600+
IndexedMemProfData MemProfData;
601+
MemProfData.addCallStack(CS1);
602602
llvm::DenseMap<FrameId, FrameStat> FrameHistogram =
603-
computeFrameHistogram<FrameId>(MemProfCallStackData);
603+
computeFrameHistogram<FrameId>(MemProfData.CallStacks);
604604
CallStackRadixTreeBuilder<FrameId> Builder;
605-
Builder.build(std::move(MemProfCallStackData), &MemProfFrameIndexes,
605+
Builder.build(std::move(MemProfData.CallStacks), &MemProfFrameIndexes,
606606
FrameHistogram);
607607
EXPECT_THAT(Builder.getRadixArray(),
608608
ElementsAre(3U, // Size of CS1,
@@ -620,13 +620,13 @@ TEST(MemProf, RadixTreeBuilderTwo) {
620620
{11, 1}, {12, 2}, {13, 3}};
621621
llvm::SmallVector<FrameId> CS1 = {12, 11};
622622
llvm::SmallVector<FrameId> CS2 = {13, 12, 11};
623-
llvm::MapVector<CallStackId, llvm::SmallVector<FrameId>> MemProfCallStackData;
624-
MemProfCallStackData.insert({hashCallStack(CS1), CS1});
625-
MemProfCallStackData.insert({hashCallStack(CS2), CS2});
623+
IndexedMemProfData MemProfData;
624+
MemProfData.addCallStack(CS1);
625+
MemProfData.addCallStack(CS2);
626626
llvm::DenseMap<FrameId, FrameStat> FrameHistogram =
627-
computeFrameHistogram<FrameId>(MemProfCallStackData);
627+
computeFrameHistogram<FrameId>(MemProfData.CallStacks);
628628
CallStackRadixTreeBuilder<FrameId> Builder;
629-
Builder.build(std::move(MemProfCallStackData), &MemProfFrameIndexes,
629+
Builder.build(std::move(MemProfData.CallStacks), &MemProfFrameIndexes,
630630
FrameHistogram);
631631
EXPECT_THAT(Builder.getRadixArray(),
632632
ElementsAre(2U, // Size of CS1
@@ -651,15 +651,15 @@ TEST(MemProf, RadixTreeBuilderSuccessiveJumps) {
651651
llvm::SmallVector<FrameId> CS2 = {15, 13, 12, 11};
652652
llvm::SmallVector<FrameId> CS3 = {17, 16, 12, 11};
653653
llvm::SmallVector<FrameId> CS4 = {18, 16, 12, 11};
654-
llvm::MapVector<CallStackId, llvm::SmallVector<FrameId>> MemProfCallStackData;
655-
MemProfCallStackData.insert({hashCallStack(CS1), CS1});
656-
MemProfCallStackData.insert({hashCallStack(CS2), CS2});
657-
MemProfCallStackData.insert({hashCallStack(CS3), CS3});
658-
MemProfCallStackData.insert({hashCallStack(CS4), CS4});
654+
IndexedMemProfData MemProfData;
655+
MemProfData.addCallStack(CS1);
656+
MemProfData.addCallStack(CS2);
657+
MemProfData.addCallStack(CS3);
658+
MemProfData.addCallStack(CS4);
659659
llvm::DenseMap<FrameId, FrameStat> FrameHistogram =
660-
computeFrameHistogram<FrameId>(MemProfCallStackData);
660+
computeFrameHistogram<FrameId>(MemProfData.CallStacks);
661661
CallStackRadixTreeBuilder<FrameId> Builder;
662-
Builder.build(std::move(MemProfCallStackData), &MemProfFrameIndexes,
662+
Builder.build(std::move(MemProfData.CallStacks), &MemProfFrameIndexes,
663663
FrameHistogram);
664664
EXPECT_THAT(Builder.getRadixArray(),
665665
ElementsAre(4U, // Size of CS1

0 commit comments

Comments
 (0)