[ADT] Move initWithExactBucketCount to DenseMapBase (NFC) #168283
Merged
+19
−21
Conversation
This file contains hidden or 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 patch moves initWithExactBucketCount and ExactBucketCount to
DenseMapBase to share more code.
Since SmallDenseMap::allocateBuckets always returns true,
initWithExactBucketCount is equivalent to:
void initWithExactBucketCount(unsigned NewNumBuckets) {
allocateBuckets(NewNumBuckets);
initEmpty();
}
for SmallDenseMap.
Note that ExactBucketCount is not used within DenseMapBase yet.
This moves us closer to the storage policy idea outlined in llvm#168255.
Member
|
@llvm/pr-subscribers-llvm-adt Author: Kazu Hirata (kazutakahirata) ChangesThis patch moves initWithExactBucketCount and ExactBucketCount to Since SmallDenseMap::allocateBuckets always returns true, void initWithExactBucketCount(unsigned NewNumBuckets) { for SmallDenseMap. Note that ExactBucketCount is not used within DenseMapBase yet. This moves us closer to the storage policy idea outlined in #168255. Full diff: https://github.com/llvm/llvm-project/pull/168283.diff 1 Files Affected:
diff --git a/llvm/include/llvm/ADT/DenseMap.h b/llvm/include/llvm/ADT/DenseMap.h
index 7926159c4c09c..86592f12ce62c 100644
--- a/llvm/include/llvm/ADT/DenseMap.h
+++ b/llvm/include/llvm/ADT/DenseMap.h
@@ -369,6 +369,17 @@ class DenseMapBase : public DebugEpochBase {
protected:
DenseMapBase() = default;
+ struct ExactBucketCount {};
+
+ void initWithExactBucketCount(unsigned NewNumBuckets) {
+ if (derived().allocateBuckets(NewNumBuckets)) {
+ initEmpty();
+ } else {
+ setNumEntries(0);
+ setNumTombstones(0);
+ }
+ }
+
void destroyAll() {
// No need to iterate through the buckets if both KeyT and ValueT are
// trivially destructible.
@@ -729,9 +740,8 @@ class DenseMap : public DenseMapBase<DenseMap<KeyT, ValueT, KeyInfoT, BucketT>,
unsigned NumTombstones;
unsigned NumBuckets;
- struct ExactBucketCount {};
- explicit DenseMap(unsigned NumBuckets, ExactBucketCount) {
- initWithExactBucketCount(NumBuckets);
+ explicit DenseMap(unsigned NumBuckets, typename BaseT::ExactBucketCount) {
+ this->initWithExactBucketCount(NumBuckets);
}
public:
@@ -818,18 +828,9 @@ class DenseMap : public DenseMapBase<DenseMap<KeyT, ValueT, KeyInfoT, BucketT>,
return true;
}
- void initWithExactBucketCount(unsigned NewNumBuckets) {
- if (allocateBuckets(NewNumBuckets)) {
- this->BaseT::initEmpty();
- } else {
- NumEntries = 0;
- NumTombstones = 0;
- }
- }
-
void init(unsigned InitNumEntries) {
auto InitBuckets = BaseT::getMinBucketToReserveForEntries(InitNumEntries);
- initWithExactBucketCount(InitBuckets);
+ this->initWithExactBucketCount(InitBuckets);
}
// Put the zombie instance in a known good state after a move.
@@ -841,7 +842,7 @@ class DenseMap : public DenseMapBase<DenseMap<KeyT, ValueT, KeyInfoT, BucketT>,
void grow(unsigned AtLeast) {
AtLeast = std::max<unsigned>(64, NextPowerOf2(AtLeast - 1));
- DenseMap Tmp(AtLeast, ExactBucketCount{});
+ DenseMap Tmp(AtLeast, typename BaseT::ExactBucketCount{});
Tmp.moveFrom(*this);
swapImpl(Tmp);
}
@@ -891,10 +892,8 @@ class SmallDenseMap
/// a large bucket. This union will be discriminated by the 'Small' bit.
AlignedCharArrayUnion<BucketT[InlineBuckets], LargeRep> storage;
- struct ExactBucketCount {};
- SmallDenseMap(unsigned NumBuckets, ExactBucketCount) {
- allocateBuckets(NumBuckets);
- this->BaseT::initEmpty();
+ SmallDenseMap(unsigned NumBuckets, typename BaseT::ExactBucketCount) {
+ this->initWithExactBucketCount(NumBuckets);
}
public:
@@ -1097,8 +1096,7 @@ class SmallDenseMap
void init(unsigned InitNumEntries) {
auto InitBuckets = BaseT::getMinBucketToReserveForEntries(InitNumEntries);
- allocateBuckets(InitBuckets);
- this->BaseT::initEmpty();
+ this->initWithExactBucketCount(InitBuckets);
}
// Put the zombie instance in a known good state after a move.
@@ -1112,7 +1110,7 @@ class SmallDenseMap
if (AtLeast > InlineBuckets)
AtLeast = std::max<unsigned>(64, NextPowerOf2(AtLeast - 1));
- SmallDenseMap Tmp(AtLeast, ExactBucketCount{});
+ SmallDenseMap Tmp(AtLeast, typename BaseT::ExactBucketCount{});
Tmp.moveFrom(*this);
if (Tmp.Small) {
|
arsenm
approved these changes
Nov 16, 2025
kazutakahirata
deleted the
cleanup_20251116_ADT_DenseMap_ExactBucketCount
branch
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/27/builds/19022 Here is the relevant piece of the build log for the reference |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch moves initWithExactBucketCount and ExactBucketCount to
DenseMapBase to share more code.
Since SmallDenseMap::allocateBuckets always returns true,
initWithExactBucketCount is equivalent to:
void initWithExactBucketCount(unsigned NewNumBuckets) {
allocateBuckets(NewNumBuckets);
initEmpty();
}
for SmallDenseMap.
Note that ExactBucketCount is not used within DenseMapBase yet.
This moves us closer to the storage policy idea outlined in #168255.