Skip to content

Commit 00090ac

Browse files
[memprof] Use IndexedMemProfData in tests (NFC) (#119049)
This patch replaces FrameIdMap and CallStackIdMap with IndexedMemProfData, which comes with recently introduced methods like addFrame and addCallStack.
1 parent 495816c commit 00090ac

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

llvm/unittests/ProfileData/MemProfTest.cpp

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ using ::llvm::memprof::Frame;
3636
using ::llvm::memprof::FrameId;
3737
using ::llvm::memprof::hashCallStack;
3838
using ::llvm::memprof::IndexedAllocationInfo;
39+
using ::llvm::memprof::IndexedMemProfData;
3940
using ::llvm::memprof::IndexedMemProfRecord;
4041
using ::llvm::memprof::MemInfoBlock;
4142
using ::llvm::memprof::MemProfReader;
@@ -500,25 +501,24 @@ TEST(MemProf, IndexedMemProfRecordToMemProfRecord) {
500501
// Verify that MemProfRecord can be constructed from IndexedMemProfRecord with
501502
// CallStackIds only.
502503

503-
llvm::DenseMap<FrameId, Frame> FrameIdMap;
504+
IndexedMemProfData MemProfData;
504505
Frame F1(1, 0, 0, false);
505506
Frame F2(2, 0, 0, false);
506507
Frame F3(3, 0, 0, false);
507508
Frame F4(4, 0, 0, false);
508-
FrameIdMap.insert({F1.hash(), F1});
509-
FrameIdMap.insert({F2.hash(), F2});
510-
FrameIdMap.insert({F3.hash(), F3});
511-
FrameIdMap.insert({F4.hash(), F4});
509+
MemProfData.addFrame(F1);
510+
MemProfData.addFrame(F2);
511+
MemProfData.addFrame(F3);
512+
MemProfData.addFrame(F4);
512513

513-
llvm::DenseMap<CallStackId, llvm::SmallVector<FrameId>> CallStackIdMap;
514514
llvm::SmallVector<FrameId> CS1 = {F1.hash(), F2.hash()};
515515
llvm::SmallVector<FrameId> CS2 = {F1.hash(), F3.hash()};
516516
llvm::SmallVector<FrameId> CS3 = {F2.hash(), F3.hash()};
517517
llvm::SmallVector<FrameId> CS4 = {F2.hash(), F4.hash()};
518-
CallStackIdMap.insert({hashCallStack(CS1), CS1});
519-
CallStackIdMap.insert({hashCallStack(CS2), CS2});
520-
CallStackIdMap.insert({hashCallStack(CS3), CS3});
521-
CallStackIdMap.insert({hashCallStack(CS4), CS4});
518+
MemProfData.addCallStack(CS1);
519+
MemProfData.addCallStack(CS2);
520+
MemProfData.addCallStack(CS3);
521+
MemProfData.addCallStack(CS4);
522522

523523
IndexedMemProfRecord IndexedRecord;
524524
IndexedAllocationInfo AI;
@@ -529,9 +529,10 @@ TEST(MemProf, IndexedMemProfRecordToMemProfRecord) {
529529
IndexedRecord.CallSiteIds.push_back(hashCallStack(CS3));
530530
IndexedRecord.CallSiteIds.push_back(hashCallStack(CS4));
531531

532-
llvm::memprof::FrameIdConverter<decltype(FrameIdMap)> FrameIdConv(FrameIdMap);
533-
llvm::memprof::CallStackIdConverter<decltype(CallStackIdMap)> CSIdConv(
534-
CallStackIdMap, FrameIdConv);
532+
llvm::memprof::FrameIdConverter<decltype(MemProfData.Frames)> FrameIdConv(
533+
MemProfData.Frames);
534+
llvm::memprof::CallStackIdConverter<decltype(MemProfData.CallStacks)>
535+
CSIdConv(MemProfData.CallStacks, FrameIdConv);
535536

536537
MemProfRecord Record = IndexedRecord.toMemProfRecord(CSIdConv);
537538

0 commit comments

Comments
 (0)