Skip to content

[memprof] Use namespace scopes in unit tests (NFC) #119176

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
Dec 9, 2024
Merged

[memprof] Use namespace scopes in unit tests (NFC) #119176

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
34 changes: 15 additions & 19 deletions llvm/unittests/Transforms/Instrumentation/MemProfUseTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
#include "gmock/gmock.h"
#include "gtest/gtest.h"

namespace llvm {
namespace memprof {
namespace {
using namespace llvm;
using namespace llvm::memprof;
using testing::Contains;
using testing::ElementsAre;
using testing::Pair;
Expand Down Expand Up @@ -315,15 +315,12 @@ MemInfoBlock makePartialMIB() {
}

IndexedMemProfRecord
makeRecordV2(std::initializer_list<::llvm::memprof::CallStackId> AllocFrames,
std::initializer_list<::llvm::memprof::CallStackId> CallSiteFrames,
const MemInfoBlock &Block, const memprof::MemProfSchema &Schema) {
llvm::memprof::IndexedMemProfRecord MR;
for (const auto &CSId : AllocFrames) {
// We don't populate IndexedAllocationInfo::CallStack because we use it only
// in Version1.
makeRecordV2(std::initializer_list<CallStackId> AllocFrames,
std::initializer_list<CallStackId> CallSiteFrames,
const MemInfoBlock &Block, const MemProfSchema &Schema) {
IndexedMemProfRecord MR;
for (const auto &CSId : AllocFrames)
MR.AllocSites.emplace_back(CSId, Block, Schema);
}
for (const auto &CSId : CallSiteFrames)
MR.CallSiteIds.push_back(CSId);
return MR;
Expand Down Expand Up @@ -427,17 +424,17 @@ attributes #1 = { "no-trapping-math"="true" "stack-protector-buffer-size"="8" "t

const MemInfoBlock MIB = makePartialMIB();

Writer.setMemProfVersionRequested(memprof::Version3);
Writer.setMemProfVersionRequested(Version3);
Writer.setMemProfFullSchema(false);

ASSERT_THAT_ERROR(Writer.mergeProfileKind(InstrProfKind::MemProf),
Succeeded());

const IndexedMemProfRecord IndexedMR = makeRecordV2(
/*AllocFrames=*/{0x111, 0x222, 0x333},
/*CallSiteFrames=*/{}, MIB, memprof::getHotColdSchema());
/*CallSiteFrames=*/{}, MIB, getHotColdSchema());

memprof::IndexedMemProfData MemProfData;
IndexedMemProfData MemProfData;
// The call sites within foo.
MemProfData.Frames.try_emplace(0, GUIDFoo, 1, 8, false);
MemProfData.Frames.try_emplace(1, GUIDFoo, 2, 3, false);
Expand All @@ -447,14 +444,11 @@ attributes #1 = { "no-trapping-math"="true" "stack-protector-buffer-size"="8" "t
MemProfData.Frames.try_emplace(4, GUIDZzz, 9, 9, false);
MemProfData.Frames.try_emplace(5, GUIDBaz, 9, 9, false);
MemProfData.CallStacks.try_emplace(
0x111,
std::initializer_list<memprof::FrameId>{3, 0}); // bar called by foo
0x111, std::initializer_list<FrameId>{3, 0}); // bar called by foo
MemProfData.CallStacks.try_emplace(
0x222,
std::initializer_list<memprof::FrameId>{4, 1}); // zzz called by foo
0x222, std::initializer_list<FrameId>{4, 1}); // zzz called by foo
MemProfData.CallStacks.try_emplace(
0x333,
std::initializer_list<memprof::FrameId>{5, 2}); // baz called by foo
0x333, std::initializer_list<FrameId>{5, 2}); // baz called by foo
MemProfData.Records.try_emplace(0x9999, IndexedMR);
Writer.addMemProfData(MemProfData, Err);

Expand Down Expand Up @@ -488,3 +482,5 @@ attributes #1 = { "no-trapping-math"="true" "stack-protector-buffer-size"="8" "t
Pair(LineLocation(3, 3), LineLocation(2, 8))))));
}
} // namespace
} // namespace memprof
} // namespace llvm
Loading