diff options
author | Florian Hahn <flo@fhahn.com> | 2024-11-27 09:04:16 +0000 |
---|---|---|
committer | Florian Hahn <flo@fhahn.com> | 2024-11-27 09:04:16 +0000 |
commit | 7e312c3b90cad9358d863b9b74de75d4da632845 (patch) | |
tree | 2e485174abbab4115ee500774e9c5c2cb08481e2 /llvm/unittests/ProfileData/MemProfTest.cpp | |
parent | e8a01e75e6b17e84710e7cc3bfb70d95a3a696a2 (diff) | |
download | llvm-7e312c3b90cad9358d863b9b74de75d4da632845.zip llvm-7e312c3b90cad9358d863b9b74de75d4da632845.tar.gz llvm-7e312c3b90cad9358d863b9b74de75d4da632845.tar.bz2 |
Revert "[memprof] Add YAML-based deserialization for MemProf profile (#117829)"
This reverts commit c00e53208db638c35499fc80b555f8e14baa35f0.
It looks like this breaks building LLVM on macOS and some other
platform/compiler combos
https://lab.llvm.org/buildbot/#/builders/23/builds/5252
https://green.lab.llvm.org/job/llvm.org/job/clang-san-iossim/5356/console
In file included from /Users/ec2-user/jenkins/workspace/llvm.org/clang-san-iossim/llvm-project/llvm/lib/ProfileData/MemProfReader.cpp:34:
In file included from /Users/ec2-user/jenkins/workspace/llvm.org/clang-san-iossim/llvm-project/llvm/include/llvm/ProfileData/MemProfReader.h:24:
In file included from /Users/ec2-user/jenkins/workspace/llvm.org/clang-san-iossim/llvm-project/llvm/include/llvm/ProfileData/InstrProfReader.h:22:
In file included from /Users/ec2-user/jenkins/workspace/llvm.org/clang-san-iossim/llvm-project/llvm/include/llvm/ProfileData/InstrProfCorrelator.h:21:
/Users/ec2-user/jenkins/workspace/llvm.org/clang-san-iossim/llvm-project/llvm/include/llvm/Support/YAMLTraits.h:1173:36: error: implicit instantiation of undefined template 'llvm::yaml::MissingTrait<unsigned long>'
char missing_yaml_trait_for_type[sizeof(MissingTrait<T>)];
^
/Users/ec2-user/jenkins/workspace/llvm.org/clang-san-iossim/llvm-project/llvm/include/llvm/Support/YAMLTraits.h:961:7: note: in instantiation of function template specialization 'llvm::yaml::yamlize<unsigned long>' requested here
yamlize(*this, Val, Required, Ctx);
^
/Users/ec2-user/jenkins/workspace/llvm.org/clang-san-iossim/llvm-project/llvm/include/llvm/Support/YAMLTraits.h:883:11: note: in instantiation of function template specialization 'llvm::yaml::IO::processKey<unsigned long, llvm::yaml::EmptyContext>' requested here
this->processKey(Key, Val, true, Ctx);
^
/Users/ec2-user/jenkins/workspace/llvm.org/clang-san-iossim/llvm-project/llvm/include/llvm/ProfileData/MIBEntryDef.inc:55:1: note: in instantiation of function template specialization 'llvm::yaml::IO::mapRequired<unsigned long>' requested here
MIBEntryDef(AccessHistogram = 27, AccessHistogram, uintptr_t)
^
/Users/ec2-user/jenkins/workspace/llvm.org/clang-san-iossim/llvm-project/llvm/lib/ProfileData/MemProfReader.cpp:77:8: note: expanded from macro 'MIBEntryDef'
Io.mapRequired(KeyStr.str().c_str(), MIB.Name); \
^
/Users/ec2-user/jenkins/workspace/llvm.org/clang-san-iossim/llvm-project/llvm/include/llvm/Support/YAMLTraits.h:310:8: note: template is declared here
struct MissingTrait;
^
1 error generated.
Diffstat (limited to 'llvm/unittests/ProfileData/MemProfTest.cpp')
-rw-r--r-- | llvm/unittests/ProfileData/MemProfTest.cpp | 77 |
1 files changed, 0 insertions, 77 deletions
diff --git a/llvm/unittests/ProfileData/MemProfTest.cpp b/llvm/unittests/ProfileData/MemProfTest.cpp index 5ab860e..b3b6249 100644 --- a/llvm/unittests/ProfileData/MemProfTest.cpp +++ b/llvm/unittests/ProfileData/MemProfTest.cpp @@ -34,7 +34,6 @@ using ::llvm::memprof::CallStackId; using ::llvm::memprof::CallStackMap; using ::llvm::memprof::Frame; using ::llvm::memprof::FrameId; -using ::llvm::memprof::hashCallStack; using ::llvm::memprof::IndexedAllocationInfo; using ::llvm::memprof::IndexedMemProfRecord; using ::llvm::memprof::MemInfoBlock; @@ -47,11 +46,8 @@ using ::llvm::memprof::RawMemProfReader; using ::llvm::memprof::SegmentEntry; using ::llvm::object::SectionedAddress; using ::llvm::symbolize::SymbolizableModule; -using ::testing::ElementsAre; -using ::testing::Pair; using ::testing::Return; using ::testing::SizeIs; -using ::testing::UnorderedElementsAre; class MockSymbolizer : public SymbolizableModule { public: @@ -746,77 +742,4 @@ TEST(MemProf, RadixTreeBuilderSuccessiveJumps) { EXPECT_THAT(Mappings, testing::Contains(testing::Pair( llvm::memprof::hashCallStack(CS4), 10U))); } - -// Verify that we can parse YAML and retrieve IndexedMemProfData as expected. -TEST(MemProf, YAMLParser) { - StringRef YAMLData = R"YAML( ---- -HeapProfileRecords: -- GUID: 0xdeadbeef12345678 - AllocSites: - - Callstack: - - {Function: 0x100, LineOffset: 11, Column: 10, Inline: true} - - {Function: 0x200, LineOffset: 22, Column: 20, Inline: false} - MemInfoBlock: - AllocCount: 777 - TotalSize: 888 - - Callstack: - - {Function: 0x300, LineOffset: 33, Column: 30, Inline: false} - - {Function: 0x400, LineOffset: 44, Column: 40, Inline: true} - MemInfoBlock: - AllocCount: 666 - TotalSize: 555 - CallSites: - - - {Function: 0x500, LineOffset: 55, Column: 50, Inline: true} - - {Function: 0x600, LineOffset: 66, Column: 60, Inline: false} - - - {Function: 0x700, LineOffset: 77, Column: 70, Inline: true} - - {Function: 0x800, LineOffset: 88, Column: 80, Inline: false} -)YAML"; - - llvm::memprof::YAMLMemProfReader YAMLReader; - YAMLReader.parse(YAMLData); - llvm::memprof::IndexedMemProfData MemProfData = YAMLReader.takeMemProfData(); - - Frame F1(0x100, 11, 10, true); - Frame F2(0x200, 22, 20, false); - Frame F3(0x300, 33, 30, false); - Frame F4(0x400, 44, 40, true); - Frame F5(0x500, 55, 50, true); - Frame F6(0x600, 66, 60, false); - Frame F7(0x700, 77, 70, true); - Frame F8(0x800, 88, 80, false); - - llvm::SmallVector<FrameId> CS1 = {F1.hash(), F2.hash()}; - llvm::SmallVector<FrameId> CS2 = {F3.hash(), F4.hash()}; - llvm::SmallVector<FrameId> CS3 = {F5.hash(), F6.hash()}; - llvm::SmallVector<FrameId> CS4 = {F7.hash(), F8.hash()}; - - // Verify the entire contents of MemProfData.Frames. - EXPECT_THAT(MemProfData.Frames, - UnorderedElementsAre(Pair(F1.hash(), F1), Pair(F2.hash(), F2), - Pair(F3.hash(), F3), Pair(F4.hash(), F4), - Pair(F5.hash(), F5), Pair(F6.hash(), F6), - Pair(F7.hash(), F7), Pair(F8.hash(), F8))); - - // Verify the entire contents of MemProfData.Frames. - EXPECT_THAT(MemProfData.CallStacks, - UnorderedElementsAre(Pair(hashCallStack(CS1), CS1), - Pair(hashCallStack(CS2), CS2), - Pair(hashCallStack(CS3), CS3), - Pair(hashCallStack(CS4), CS4))); - - // Verify the entire contents of MemProfData.Records. - ASSERT_THAT(MemProfData.Records, SizeIs(1)); - const auto &[GUID, Record] = *MemProfData.Records.begin(); - EXPECT_EQ(GUID, 0xdeadbeef12345678ULL); - ASSERT_THAT(Record.AllocSites, SizeIs(2)); - EXPECT_EQ(Record.AllocSites[0].CSId, hashCallStack(CS1)); - EXPECT_EQ(Record.AllocSites[0].Info.getAllocCount(), 777U); - EXPECT_EQ(Record.AllocSites[0].Info.getTotalSize(), 888U); - EXPECT_EQ(Record.AllocSites[1].CSId, hashCallStack(CS2)); - EXPECT_EQ(Record.AllocSites[1].Info.getAllocCount(), 666U); - EXPECT_EQ(Record.AllocSites[1].Info.getTotalSize(), 555U); - EXPECT_THAT(Record.CallSiteIds, - ElementsAre(hashCallStack(CS3), hashCallStack(CS4))); -} } // namespace |