Skip to content

Commit b6dfdd2

Browse files
kazutakahiratakazutakahirata
authored
[memprof] Drop memprof:: in unit tests (NFC) (#119113)
This patch replaces memprof::Foo with Foo if we have corresponding: using llvm::memprof::Foo;
1 parent b0f0676 commit b6dfdd2

File tree

2 files changed

+28
-32
lines changed

2 files changed

+28
-32
lines changed

‎llvm/unittests/ProfileData/InstrProfTest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ IndexedMemProfRecord
393393
makeRecordV2(std::initializer_list<::llvm::memprof::CallStackId> AllocFrames,
394394
std::initializer_list<::llvm::memprof::CallStackId> CallSiteFrames,
395395
const MemInfoBlock &Block, const memprof::MemProfSchema &Schema) {
396-
llvm::memprof::IndexedMemProfRecord MR;
396+
IndexedMemProfRecord MR;
397397
for (const auto &CSId : AllocFrames)
398398
MR.AllocSites.emplace_back(CSId, Block, Schema);
399399
for (const auto &CSId : CallSiteFrames)
@@ -533,7 +533,7 @@ TEST_F(InstrProfTest, test_caller_callee_pairs) {
533533
/*AllocFrames=*/{0x111, 0x222},
534534
/*CallSiteFrames=*/{}, MIB, memprof::getHotColdSchema());
535535

536-
memprof::IndexedMemProfData MemProfData;
536+
IndexedMemProfData MemProfData;
537537
MemProfData.Frames.try_emplace(0, 0x123, 1, 2, false);
538538
MemProfData.Frames.try_emplace(1, 0x234, 3, 4, true);
539539
MemProfData.Frames.try_emplace(2, 0x123, 5, 6, false);

‎llvm/unittests/ProfileData/MemProfTest.cpp

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,9 @@ TEST(MemProf, RecordSerializationRoundTripVerion2) {
277277
/*dealloc_timestamp=*/2000, /*alloc_cpu=*/3,
278278
/*dealloc_cpu=*/4, /*Histogram=*/0, /*HistogramSize=*/0);
279279

280-
llvm::SmallVector<llvm::memprof::CallStackId> CallStackIds = {0x123, 0x456};
280+
llvm::SmallVector<CallStackId> CallStackIds = {0x123, 0x456};
281281

282-
llvm::SmallVector<llvm::memprof::CallStackId> CallSiteIds = {0x333, 0x444};
282+
llvm::SmallVector<CallStackId> CallSiteIds = {0x333, 0x444};
283283

284284
IndexedMemProfRecord Record;
285285
for (const auto &CSId : CallStackIds) {
@@ -308,9 +308,9 @@ TEST(MemProf, RecordSerializationRoundTripVersion2HotColdSchema) {
308308
Info.TotalLifetime = 33;
309309
Info.TotalLifetimeAccessDensity = 44;
310310

311-
llvm::SmallVector<llvm::memprof::CallStackId> CallStackIds = {0x123, 0x456};
311+
llvm::SmallVector<CallStackId> CallStackIds = {0x123, 0x456};
312312

313-
llvm::SmallVector<llvm::memprof::CallStackId> CallSiteIds = {0x333, 0x444};
313+
llvm::SmallVector<CallStackId> CallSiteIds = {0x333, 0x444};
314314

315315
IndexedMemProfRecord Record;
316316
for (const auto &CSId : CallStackIds) {
@@ -422,7 +422,7 @@ TEST(MemProf, SymbolizationFilter) {
422422
}
423423

424424
TEST(MemProf, BaseMemProfReader) {
425-
llvm::memprof::IndexedMemProfData MemProfData;
425+
IndexedMemProfData MemProfData;
426426
Frame F1(/*Hash=*/IndexedMemProfRecord::getGUID("foo"), /*LineOffset=*/20,
427427
/*Column=*/5, /*IsInlineFrame=*/true);
428428
Frame F2(/*Hash=*/IndexedMemProfRecord::getGUID("bar"), /*LineOffset=*/10,
@@ -455,7 +455,7 @@ TEST(MemProf, BaseMemProfReader) {
455455
}
456456

457457
TEST(MemProf, BaseMemProfReaderWithCSIdMap) {
458-
llvm::memprof::IndexedMemProfData MemProfData;
458+
IndexedMemProfData MemProfData;
459459
Frame F1(/*Hash=*/IndexedMemProfRecord::getGUID("foo"), /*LineOffset=*/20,
460460
/*Column=*/5, /*IsInlineFrame=*/true);
461461
Frame F2(/*Hash=*/IndexedMemProfRecord::getGUID("bar"), /*LineOffset=*/10,
@@ -553,8 +553,8 @@ MemInfoBlock makePartialMIB() {
553553
TEST(MemProf, MissingCallStackId) {
554554
// Use a non-existent CallStackId to trigger a mapping error in
555555
// toMemProfRecord.
556-
llvm::memprof::IndexedAllocationInfo AI(0xdeadbeefU, makePartialMIB(),
557-
llvm::memprof::getHotColdSchema());
556+
IndexedAllocationInfo AI(0xdeadbeefU, makePartialMIB(),
557+
llvm::memprof::getHotColdSchema());
558558

559559
IndexedMemProfRecord IndexedMR;
560560
IndexedMR.AllocSites.push_back(AI);
@@ -575,8 +575,8 @@ TEST(MemProf, MissingCallStackId) {
575575
}
576576

577577
TEST(MemProf, MissingFrameId) {
578-
llvm::memprof::IndexedAllocationInfo AI(0x222, makePartialMIB(),
579-
llvm::memprof::getHotColdSchema());
578+
IndexedAllocationInfo AI(0x222, makePartialMIB(),
579+
llvm::memprof::getHotColdSchema());
580580

581581
IndexedMemProfRecord IndexedMR;
582582
IndexedMR.AllocSites.push_back(AI);
@@ -602,9 +602,8 @@ TEST(MemProf, MissingFrameId) {
602602
TEST(MemProf, RadixTreeBuilderEmpty) {
603603
llvm::DenseMap<FrameId, llvm::memprof::LinearFrameId> MemProfFrameIndexes;
604604
llvm::MapVector<CallStackId, llvm::SmallVector<FrameId>> MemProfCallStackData;
605-
llvm::DenseMap<llvm::memprof::FrameId, llvm::memprof::FrameStat>
606-
FrameHistogram =
607-
llvm::memprof::computeFrameHistogram<FrameId>(MemProfCallStackData);
605+
llvm::DenseMap<FrameId, llvm::memprof::FrameStat> FrameHistogram =
606+
llvm::memprof::computeFrameHistogram<FrameId>(MemProfCallStackData);
608607
llvm::memprof::CallStackRadixTreeBuilder<FrameId> Builder;
609608
Builder.build(std::move(MemProfCallStackData), &MemProfFrameIndexes,
610609
FrameHistogram);
@@ -617,12 +616,11 @@ TEST(MemProf, RadixTreeBuilderEmpty) {
617616
TEST(MemProf, RadixTreeBuilderOne) {
618617
llvm::DenseMap<FrameId, llvm::memprof::LinearFrameId> MemProfFrameIndexes = {
619618
{11, 1}, {12, 2}, {13, 3}};
620-
llvm::SmallVector<llvm::memprof::FrameId> CS1 = {13, 12, 11};
619+
llvm::SmallVector<FrameId> CS1 = {13, 12, 11};
621620
llvm::MapVector<CallStackId, llvm::SmallVector<FrameId>> MemProfCallStackData;
622621
MemProfCallStackData.insert({hashCallStack(CS1), CS1});
623-
llvm::DenseMap<llvm::memprof::FrameId, llvm::memprof::FrameStat>
624-
FrameHistogram =
625-
llvm::memprof::computeFrameHistogram<FrameId>(MemProfCallStackData);
622+
llvm::DenseMap<FrameId, llvm::memprof::FrameStat> FrameHistogram =
623+
llvm::memprof::computeFrameHistogram<FrameId>(MemProfCallStackData);
626624
llvm::memprof::CallStackRadixTreeBuilder<FrameId> Builder;
627625
Builder.build(std::move(MemProfCallStackData), &MemProfFrameIndexes,
628626
FrameHistogram);
@@ -640,14 +638,13 @@ TEST(MemProf, RadixTreeBuilderOne) {
640638
TEST(MemProf, RadixTreeBuilderTwo) {
641639
llvm::DenseMap<FrameId, llvm::memprof::LinearFrameId> MemProfFrameIndexes = {
642640
{11, 1}, {12, 2}, {13, 3}};
643-
llvm::SmallVector<llvm::memprof::FrameId> CS1 = {12, 11};
644-
llvm::SmallVector<llvm::memprof::FrameId> CS2 = {13, 12, 11};
641+
llvm::SmallVector<FrameId> CS1 = {12, 11};
642+
llvm::SmallVector<FrameId> CS2 = {13, 12, 11};
645643
llvm::MapVector<CallStackId, llvm::SmallVector<FrameId>> MemProfCallStackData;
646644
MemProfCallStackData.insert({hashCallStack(CS1), CS1});
647645
MemProfCallStackData.insert({hashCallStack(CS2), CS2});
648-
llvm::DenseMap<llvm::memprof::FrameId, llvm::memprof::FrameStat>
649-
FrameHistogram =
650-
llvm::memprof::computeFrameHistogram<FrameId>(MemProfCallStackData);
646+
llvm::DenseMap<FrameId, llvm::memprof::FrameStat> FrameHistogram =
647+
llvm::memprof::computeFrameHistogram<FrameId>(MemProfCallStackData);
651648
llvm::memprof::CallStackRadixTreeBuilder<FrameId> Builder;
652649
Builder.build(std::move(MemProfCallStackData), &MemProfFrameIndexes,
653650
FrameHistogram);
@@ -670,18 +667,17 @@ TEST(MemProf, RadixTreeBuilderSuccessiveJumps) {
670667
llvm::DenseMap<FrameId, llvm::memprof::LinearFrameId> MemProfFrameIndexes = {
671668
{11, 1}, {12, 2}, {13, 3}, {14, 4}, {15, 5}, {16, 6}, {17, 7}, {18, 8},
672669
};
673-
llvm::SmallVector<llvm::memprof::FrameId> CS1 = {14, 13, 12, 11};
674-
llvm::SmallVector<llvm::memprof::FrameId> CS2 = {15, 13, 12, 11};
675-
llvm::SmallVector<llvm::memprof::FrameId> CS3 = {17, 16, 12, 11};
676-
llvm::SmallVector<llvm::memprof::FrameId> CS4 = {18, 16, 12, 11};
670+
llvm::SmallVector<FrameId> CS1 = {14, 13, 12, 11};
671+
llvm::SmallVector<FrameId> CS2 = {15, 13, 12, 11};
672+
llvm::SmallVector<FrameId> CS3 = {17, 16, 12, 11};
673+
llvm::SmallVector<FrameId> CS4 = {18, 16, 12, 11};
677674
llvm::MapVector<CallStackId, llvm::SmallVector<FrameId>> MemProfCallStackData;
678675
MemProfCallStackData.insert({hashCallStack(CS1), CS1});
679676
MemProfCallStackData.insert({hashCallStack(CS2), CS2});
680677
MemProfCallStackData.insert({hashCallStack(CS3), CS3});
681678
MemProfCallStackData.insert({hashCallStack(CS4), CS4});
682-
llvm::DenseMap<llvm::memprof::FrameId, llvm::memprof::FrameStat>
683-
FrameHistogram =
684-
llvm::memprof::computeFrameHistogram<FrameId>(MemProfCallStackData);
679+
llvm::DenseMap<FrameId, llvm::memprof::FrameStat> FrameHistogram =
680+
llvm::memprof::computeFrameHistogram<FrameId>(MemProfCallStackData);
685681
llvm::memprof::CallStackRadixTreeBuilder<FrameId> Builder;
686682
Builder.build(std::move(MemProfCallStackData), &MemProfFrameIndexes,
687683
FrameHistogram);
@@ -737,7 +733,7 @@ TEST(MemProf, YAMLParser) {
737733

738734
llvm::memprof::YAMLMemProfReader YAMLReader;
739735
YAMLReader.parse(YAMLData);
740-
llvm::memprof::IndexedMemProfData MemProfData = YAMLReader.takeMemProfData();
736+
IndexedMemProfData MemProfData = YAMLReader.takeMemProfData();
741737

742738
Frame F1(0x100, 11, 10, true);
743739
Frame F2(0x200, 22, 20, false);

0 commit comments

Comments
 (0)