[llvm] 81334f4 - [ORC] Further improvements to SymbolStringPtr & NonOwningSymbolStringPtr.
Lang Hames via llvm-commits
llvm-commits at lists.llvm.org
Tue Jan 31 16:50:09 PST 2023
Author: Lang Hames
Date: 2023-01-31T16:41:26-08:00
New Revision: 81334f4b018ea5781aa32388a5a51805b1004141
URL: https://github.com/llvm/llvm-project/commit/81334f4b018ea5781aa32388a5a51805b1004141
DIFF: https://github.com/llvm/llvm-project/commit/81334f4b018ea5781aa32388a5a51805b1004141.diff
LOG: [ORC] Further improvements to SymbolStringPtr & NonOwningSymbolStringPtr.
A follow-up to https://reviews.llvm.org/D142314:
* Make SymbolStringPtrs constructible from NonOwningSymbolStringPtrs.
* Move and rename getRefCount and isValid (now poolEntryIsAlive) to improve
readability. Also updates these routines to make them safe for use with
sentinel values (null, empty, tombstone).
* Move ref-counting operations into their own incRef and decRef methods.
Added:
Modified:
llvm/include/llvm/ExecutionEngine/Orc/SymbolStringPool.h
llvm/unittests/ExecutionEngine/Orc/SymbolStringPoolTest.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/SymbolStringPool.h b/llvm/include/llvm/ExecutionEngine/Orc/SymbolStringPool.h
index 9372a3d82dc84..d488848b278e0 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/SymbolStringPool.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/SymbolStringPool.h
@@ -26,6 +26,7 @@ namespace orc {
class SymbolStringPtrBase;
class SymbolStringPtr;
+class NonOwningSymbolStringPtr;
/// String pool for symbol names used by the JIT.
class SymbolStringPool {
@@ -48,12 +49,6 @@ class SymbolStringPool {
/// Returns true if the pool is empty.
bool empty() const;
-#ifndef NDEBUG
- // Useful for debugging and testing: This method can be used to identify
- // non-owning pointers pointing to unowned pool entries.
- bool isValid(const SymbolStringPtrBase &S) const { return getRefCount(S); }
-#endif
-
private:
size_t getRefCount(const SymbolStringPtrBase &S) const;
@@ -94,6 +89,16 @@ class SymbolStringPtrBase {
return LHS.S < RHS.S;
}
+#ifndef NDEBUG
+ // Returns true if the pool entry's ref count is above zero (or if the entry
+ // is an empty or tombstone value). Useful for debugging and testing -- this
+ // method can be used to identify SymbolStringPtrs and
+ // NonOwningSymbolStringPtrs that are pointing to abandoned pool entries.
+ bool poolEntryIsAlive() const {
+ return isRealPoolEntry(S) ? S->getValue() != 0 : true;
+ }
+#endif
+
protected:
using PoolEntry = SymbolStringPool::PoolMapEntry;
using PoolEntryPtr = PoolEntry *;
@@ -112,6 +117,16 @@ class SymbolStringPtrBase {
(std::numeric_limits<uintptr_t>::max() - 3)
<< PointerLikeTypeTraits<PoolEntryPtr>::NumLowBitsAvailable;
+ // Returns false for null, empty, and tombstone values, true otherwise.
+ static bool isRealPoolEntry(PoolEntryPtr P) {
+ return ((reinterpret_cast<uintptr_t>(P) - 1) & InvalidPtrMask) !=
+ InvalidPtrMask;
+ }
+
+ size_t getRefCount() const {
+ return isRealPoolEntry(S) ? size_t(S->getValue()) : size_t(0);
+ }
+
PoolEntryPtr S = nullptr;
};
@@ -125,50 +140,42 @@ class SymbolStringPtr : public SymbolStringPtrBase {
SymbolStringPtr() = default;
SymbolStringPtr(std::nullptr_t) {}
SymbolStringPtr(const SymbolStringPtr &Other) : SymbolStringPtrBase(Other.S) {
- if (isRealPoolEntry(S))
- ++S->getValue();
+ incRef();
}
+ explicit SymbolStringPtr(NonOwningSymbolStringPtr Other);
+
SymbolStringPtr& operator=(const SymbolStringPtr &Other) {
- if (isRealPoolEntry(S)) {
- assert(S->getValue() && "Releasing SymbolStringPtr with zero ref count");
- --S->getValue();
- }
+ decRef();
S = Other.S;
- if (isRealPoolEntry(S))
- ++S->getValue();
+ incRef();
return *this;
}
SymbolStringPtr(SymbolStringPtr &&Other) { std::swap(S, Other.S); }
SymbolStringPtr& operator=(SymbolStringPtr &&Other) {
- if (isRealPoolEntry(S)) {
- assert(S->getValue() && "Releasing SymbolStringPtr with zero ref count");
- --S->getValue();
- }
+ decRef();
S = nullptr;
std::swap(S, Other.S);
return *this;
}
- ~SymbolStringPtr() {
- if (isRealPoolEntry(S)) {
- assert(S->getValue() && "Releasing SymbolStringPtr with zero ref count");
- --S->getValue();
- }
- }
+ ~SymbolStringPtr() { decRef(); }
private:
- SymbolStringPtr(PoolEntryPtr S) : SymbolStringPtrBase(S) {
+ SymbolStringPtr(PoolEntryPtr S) : SymbolStringPtrBase(S) { incRef(); }
+
+ void incRef() {
if (isRealPoolEntry(S))
++S->getValue();
}
- // Returns false for null, empty, and tombstone values, true otherwise.
- bool isRealPoolEntry(PoolEntryPtr P) {
- return ((reinterpret_cast<uintptr_t>(P) - 1) & InvalidPtrMask) !=
- InvalidPtrMask;
+ void decRef() {
+ if (isRealPoolEntry(S)) {
+ assert(S->getValue() && "Releasing SymbolStringPtr with zero ref count");
+ --S->getValue();
+ }
}
static SymbolStringPtr getEmptyVal() {
@@ -216,6 +223,15 @@ class NonOwningSymbolStringPtr : public SymbolStringPtrBase {
}
};
+inline SymbolStringPtr::SymbolStringPtr(NonOwningSymbolStringPtr Other)
+ : SymbolStringPtrBase(Other) {
+ assert(poolEntryIsAlive() &&
+ "SymbolStringPtr constructed from invalid non-owning pointer.");
+
+ if (isRealPoolEntry(S))
+ ++S->getValue();
+}
+
inline SymbolStringPool::~SymbolStringPool() {
#ifndef NDEBUG
clearDeadEntries();
@@ -247,7 +263,7 @@ inline bool SymbolStringPool::empty() const {
inline size_t
SymbolStringPool::getRefCount(const SymbolStringPtrBase &S) const {
- return S.S->second;
+ return S.getRefCount();
}
} // end namespace orc
diff --git a/llvm/unittests/ExecutionEngine/Orc/SymbolStringPoolTest.cpp b/llvm/unittests/ExecutionEngine/Orc/SymbolStringPoolTest.cpp
index cd1134142be28..4aea0f4cca79a 100644
--- a/llvm/unittests/ExecutionEngine/Orc/SymbolStringPoolTest.cpp
+++ b/llvm/unittests/ExecutionEngine/Orc/SymbolStringPoolTest.cpp
@@ -90,6 +90,9 @@ TEST_F(SymbolStringPoolTest, NonOwningPointerBasics) {
// Assignment.
ANP2 = ANP1;
ANP2 = A;
+
+ SymbolStringPtr S(ANP1); // Construct SymbolStringPtr from non-owning.
+ EXPECT_EQ(S, A);
}
TEST_F(SymbolStringPoolTest, NonOwningPointerRefCounts) {
More information about the llvm-commits
mailing list