Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[reland][Debuginfo][DWARF][NFC] Refactor DwarfStringPoolEntryRef.
This review is extracted from D96035. This patch adds possibility to keep not only DwarfStringPoolEntry, but also pointer to it. The DwarfStringPoolEntryRef keeps reference to the string map entry. String map keeps string data and corresponding DwarfStringPoolEntry info. Not all string map entries may be included into the result, and then not all string entries should have DwarfStringPoolEntry info. Currently StringMap keeps DwarfStringPoolEntry for all entries. It leads to extra memory usage. This patch allows to keep DwarfStringPoolEntry info only for entries which really need it. [reland] : make msan happy. Reviewed By: JDevlieghere Differential Revision: https://reviews.llvm.org/D126883
- Loading branch information
Showing
3 changed files
with
187 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,120 @@ | ||
//===- llvm/unittest/CodeGen/DwarfStringPoolEntryRefTest.cpp --------------===// | ||
// | ||
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
// See https://llvm.org/LICENSE.txt for license information. | ||
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
// | ||
//===----------------------------------------------------------------------===// | ||
|
||
#include "llvm/CodeGen/DwarfStringPoolEntry.h" | ||
#include "llvm/Support/Allocator.h" | ||
#include "llvm/Testing/Support/Error.h" | ||
|
||
#include "gmock/gmock.h" | ||
#include "gtest/gtest.h" | ||
#include <string> | ||
|
||
using namespace llvm; | ||
|
||
TEST(DwarfStringPoolEntryRefTest, TestFullEntry) { | ||
BumpPtrAllocator Allocator; | ||
StringMapEntry<DwarfStringPoolEntry> *StringEntry1 = | ||
StringMapEntry<DwarfStringPoolEntry>::Create( | ||
"Key1", Allocator, DwarfStringPoolEntry{nullptr, 0, 0}); | ||
|
||
EXPECT_TRUE(StringEntry1->getKey() == "Key1"); | ||
EXPECT_TRUE(StringEntry1->second.Symbol == nullptr); | ||
EXPECT_TRUE(StringEntry1->second.Offset == 0); | ||
EXPECT_TRUE(StringEntry1->second.Index == 0); | ||
|
||
DwarfStringPoolEntryRef Ref1(*StringEntry1); | ||
EXPECT_TRUE(Ref1.getString() == "Key1"); | ||
EXPECT_TRUE(Ref1.getOffset() == 0); | ||
EXPECT_TRUE(Ref1.getIndex() == 0); | ||
|
||
DwarfStringPoolEntryRef Ref2(*StringEntry1); | ||
EXPECT_TRUE(Ref2.getString() == "Key1"); | ||
EXPECT_TRUE(Ref2.getOffset() == 0); | ||
EXPECT_TRUE(Ref2.getIndex() == 0); | ||
EXPECT_TRUE(Ref1 == Ref2); | ||
EXPECT_FALSE(Ref1 != Ref2); | ||
|
||
StringMapEntry<DwarfStringPoolEntry> *StringEntry2 = | ||
StringMapEntry<DwarfStringPoolEntry>::Create( | ||
"Key2", Allocator, DwarfStringPoolEntry{nullptr, 0x1000, 1}); | ||
EXPECT_TRUE(StringEntry2->getKey() == "Key2"); | ||
EXPECT_TRUE(StringEntry2->second.Symbol == nullptr); | ||
EXPECT_TRUE(StringEntry2->second.Offset == 0x1000); | ||
EXPECT_TRUE(StringEntry2->second.Index == 1); | ||
|
||
DwarfStringPoolEntryRef Ref3(*StringEntry2); | ||
EXPECT_TRUE(Ref3.getString() == "Key2"); | ||
EXPECT_TRUE(Ref3.getOffset() == 0x1000); | ||
EXPECT_TRUE(Ref3.getIndex() == 1); | ||
EXPECT_TRUE(Ref1 != Ref3); | ||
} | ||
|
||
bool isEntryEqual(const DwarfStringPoolEntry &LHS, | ||
const DwarfStringPoolEntry &RHS) { | ||
return LHS.Symbol == RHS.Symbol && LHS.Offset == RHS.Offset && | ||
LHS.Index == RHS.Index; | ||
} | ||
|
||
TEST(DwarfStringPoolEntryRefTest, TestShortEntry) { | ||
BumpPtrAllocator Allocator; | ||
DwarfStringPoolEntry DwarfEntry1 = {nullptr, 0, 0}; | ||
StringMapEntry<DwarfStringPoolEntry *> *StringEntry1 = | ||
StringMapEntry<DwarfStringPoolEntry *>::Create("Key1", Allocator, | ||
&DwarfEntry1); | ||
|
||
EXPECT_TRUE(StringEntry1->getKey() == "Key1"); | ||
EXPECT_TRUE(StringEntry1->second->Symbol == nullptr); | ||
EXPECT_TRUE(StringEntry1->second->Offset == 0); | ||
EXPECT_TRUE(StringEntry1->second->Index == 0); | ||
|
||
DwarfStringPoolEntryRef Ref1(*StringEntry1); | ||
EXPECT_TRUE(Ref1.getString() == "Key1"); | ||
EXPECT_TRUE(Ref1.getOffset() == 0); | ||
EXPECT_TRUE(Ref1.getIndex() == 0); | ||
EXPECT_TRUE(isEntryEqual(Ref1.getEntry(), DwarfEntry1)); | ||
|
||
DwarfStringPoolEntryRef Ref2(*StringEntry1); | ||
EXPECT_TRUE(Ref2.getString() == "Key1"); | ||
EXPECT_TRUE(Ref2.getOffset() == 0); | ||
EXPECT_TRUE(isEntryEqual(Ref2.getEntry(), DwarfEntry1)); | ||
EXPECT_TRUE(Ref1 == Ref2); | ||
EXPECT_FALSE(Ref1 != Ref2); | ||
|
||
DwarfStringPoolEntry DwarfEntry2 = {nullptr, 0x1000, 1}; | ||
StringMapEntry<DwarfStringPoolEntry *> *StringEntry2 = | ||
StringMapEntry<DwarfStringPoolEntry *>::Create("Key2", Allocator, | ||
&DwarfEntry2); | ||
EXPECT_TRUE(StringEntry2->getKey() == "Key2"); | ||
EXPECT_TRUE(StringEntry2->second->Symbol == nullptr); | ||
EXPECT_TRUE(StringEntry2->second->Offset == 0x1000); | ||
EXPECT_TRUE(StringEntry2->second->Index == 1); | ||
|
||
DwarfStringPoolEntryRef Ref3(*StringEntry2); | ||
EXPECT_TRUE(Ref3.getString() == "Key2"); | ||
EXPECT_TRUE(Ref3.getOffset() == 0x1000); | ||
EXPECT_TRUE(Ref3.getIndex() == 1); | ||
EXPECT_TRUE(isEntryEqual(Ref3.getEntry(), DwarfEntry2)); | ||
EXPECT_TRUE(Ref1 != Ref3); | ||
} | ||
|
||
TEST(DwarfStringPoolEntryRefTest, CompareFullAndShort) { | ||
BumpPtrAllocator Allocator; | ||
|
||
DwarfStringPoolEntry DwarfEntry1 = {nullptr, 0, 0}; | ||
StringMapEntry<DwarfStringPoolEntry *> *StringEntry1 = | ||
StringMapEntry<DwarfStringPoolEntry *>::Create("Key1", Allocator, | ||
&DwarfEntry1); | ||
DwarfStringPoolEntryRef Ref1(*StringEntry1); | ||
|
||
StringMapEntry<DwarfStringPoolEntry> *StringEntry2 = | ||
StringMapEntry<DwarfStringPoolEntry>::Create( | ||
"Key1", Allocator, DwarfStringPoolEntry{nullptr, 0, 0}); | ||
DwarfStringPoolEntryRef Ref2(*StringEntry2); | ||
|
||
EXPECT_FALSE(Ref1 == Ref2); | ||
} |