Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
@martinus
martinus committed Dec 12, 2023
1 parent ea7622e commit 250ec0f
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 38 deletions.
78 changes: 42 additions & 36 deletions include/ankerl/unordered_dense.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ class table : public std::conditional_t<is_map_v<T>, base_table_type_map<T>, bas
typename std::allocator_traits<typename value_container_type::allocator_type>::template rebind_alloc<Bucket>;
using bucket_alloc_traits = std::allocator_traits<bucket_alloc>;

static constexpr uint8_t initial_shifts = 64 - 3; // 2^(64-m_shift) number of buckets
static constexpr uint8_t initial_shifts = 64 - 2; // 2^(64-m_shift) number of buckets
static constexpr float default_max_load_factor = 0.8F;

public:
Expand Down Expand Up @@ -893,7 +893,10 @@ class table : public std::conditional_t<is_map_v<T>, base_table_type_map<T>, bas

// assumes m_values has data, m_buckets=m_buckets_end=nullptr, m_shifts is INITIAL_SHIFTS
void copy_buckets(table const& other) {
if (!empty()) {
if (empty()) {
allocate_buckets_from_shift();
clear_buckets();
} else {
m_shifts = other.m_shifts;
allocate_buckets_from_shift();
std::memcpy(m_buckets, other.m_buckets, sizeof(Bucket) * bucket_count());
Expand All @@ -904,7 +907,7 @@ class table : public std::conditional_t<is_map_v<T>, base_table_type_map<T>, bas
* True when no element can be added any more without increasing the size
*/
[[nodiscard]] auto is_full() const -> bool {
return size() >= m_max_bucket_capacity;
return size() > m_max_bucket_capacity;
}

void deallocate_buckets() {
Expand Down Expand Up @@ -949,6 +952,8 @@ class table : public std::conditional_t<is_map_v<T>, base_table_type_map<T>, bas

void increase_size() {
if (ANKERL_UNORDERED_DENSE_UNLIKELY(m_max_bucket_capacity == max_bucket_count())) {
// remove the value again, we can't add it!
m_values.pop_back();
on_error_bucket_overflow();
}
--m_shifts;
Expand Down Expand Up @@ -1018,27 +1023,8 @@ class table : public std::conditional_t<is_map_v<T>, base_table_type_map<T>, bas
return it_isinserted;
}

template <typename K, typename... Args>
auto do_place_element(dist_and_fingerprint_type dist_and_fingerprint, value_idx_type bucket_idx, K&& key, Args&&... args)
-> std::pair<iterator, bool> {

// emplace the new value. If that throws an exception, no harm done; index is still in a valid state
m_values.emplace_back(std::piecewise_construct,
std::forward_as_tuple(std::forward<K>(key)),
std::forward_as_tuple(std::forward<Args>(args)...));

// place element and shift up until we find an empty spot
auto value_idx = static_cast<value_idx_type>(m_values.size() - 1);
place_and_shift_up({dist_and_fingerprint, value_idx}, bucket_idx);
return {begin() + static_cast<difference_type>(value_idx), true};
}

template <typename K, typename... Args>
auto do_try_emplace(K&& key, Args&&... args) -> std::pair<iterator, bool> {
if (ANKERL_UNORDERED_DENSE_UNLIKELY(is_full())) {
increase_size();
}

auto hash = mixed_hash(key);
auto dist_and_fingerprint = dist_and_fingerprint_from_hash(hash);
auto bucket_idx = bucket_idx_from_hash(hash);
Expand All @@ -1050,7 +1036,18 @@ class table : public std::conditional_t<is_map_v<T>, base_table_type_map<T>, bas
return {begin() + static_cast<difference_type>(bucket->m_value_idx), false};
}
} else if (dist_and_fingerprint > bucket->m_dist_and_fingerprint) {
return do_place_element(dist_and_fingerprint, bucket_idx, std::forward<K>(key), std::forward<Args>(args)...);
m_values.emplace_back(std::piecewise_construct,
std::forward_as_tuple(std::forward<K>(key)),
std::forward_as_tuple(std::forward<Args>(args)...));
auto value_idx = static_cast<value_idx_type>(m_values.size() - 1);
if (ANKERL_UNORDERED_DENSE_UNLIKELY(is_full())) {
// increase_size just rehashes all the data we have in m_values
increase_size();
} else {
// place element and shift up until we find an empty spot
place_and_shift_up({dist_and_fingerprint, value_idx}, bucket_idx);
}
return {begin() + static_cast<difference_type>(value_idx), true};
}
dist_and_fingerprint = dist_inc(dist_and_fingerprint);
bucket_idx = next(bucket_idx);
Expand Down Expand Up @@ -1117,7 +1114,10 @@ class table : public std::conditional_t<is_map_v<T>, base_table_type_map<T>, bas

public:
table()
: table(0) {}
: table(0) {
allocate_buckets_from_shift();
clear_buckets();
}

explicit table(size_t bucket_count,
Hash const& hash = Hash(),
Expand All @@ -1128,6 +1128,9 @@ class table : public std::conditional_t<is_map_v<T>, base_table_type_map<T>, bas
, m_equal(equal) {
if (0 != bucket_count) {
reserve(bucket_count);
} else {
allocate_buckets_from_shift();
clear_buckets();
}
}

Expand Down Expand Up @@ -1230,6 +1233,8 @@ class table : public std::conditional_t<is_map_v<T>, base_table_type_map<T>, bas
m_max_load_factor = std::exchange(other.m_max_load_factor, default_max_load_factor);
m_hash = std::exchange(other.m_hash, {});
m_equal = std::exchange(other.m_equal, {});
other.allocate_buckets_from_shift();
other.clear_buckets();
} else {
// set max_load_factor *before* copying the other's buckets, so we have the same
// behavior
Expand Down Expand Up @@ -1453,10 +1458,6 @@ class table : public std::conditional_t<is_map_v<T>, base_table_type_map<T>, bas
typename KE = KeyEqual,
std::enable_if_t<!is_map_v<Q> && is_transparent_v<H, KE>, bool> = true>
auto emplace(K&& key) -> std::pair<iterator, bool> {
if (is_full()) {
increase_size();
}

auto hash = mixed_hash(key);
auto dist_and_fingerprint = dist_and_fingerprint_from_hash(hash);
auto bucket_idx = bucket_idx_from_hash(hash);
Expand All @@ -1473,18 +1474,18 @@ class table : public std::conditional_t<is_map_v<T>, base_table_type_map<T>, bas

// value is new, insert element first, so when exception happens we are in a valid state
m_values.emplace_back(std::forward<K>(key));
// now place the bucket and shift up until we find an empty spot
auto value_idx = static_cast<value_idx_type>(m_values.size() - 1);
place_and_shift_up({dist_and_fingerprint, value_idx}, bucket_idx);
if (ANKERL_UNORDERED_DENSE_UNLIKELY(is_full())) {
increase_size();
} else {
// now place the bucket and shift up until we find an empty spot
place_and_shift_up({dist_and_fingerprint, value_idx}, bucket_idx);
}
return {begin() + static_cast<difference_type>(value_idx), true};
}

template <class... Args>
auto emplace(Args&&... args) -> std::pair<iterator, bool> {
if (is_full()) {
increase_size();
}

// we have to instantiate the value_type to be able to access the key.
// 1. emplace_back the object so it is constructed. 2. If the key is already there, pop it later in the loop.
auto& key = get_key(m_values.emplace_back(std::forward<Args>(args)...));
Expand All @@ -1504,8 +1505,13 @@ class table : public std::conditional_t<is_map_v<T>, base_table_type_map<T>, bas

// value is new, place the bucket and shift up until we find an empty spot
auto value_idx = static_cast<value_idx_type>(m_values.size() - 1);
place_and_shift_up({dist_and_fingerprint, value_idx}, bucket_idx);

if (ANKERL_UNORDERED_DENSE_UNLIKELY(is_full())) {
// increase_size just rehashes all the data we have in m_values
increase_size();
} else {
// place element and shift up until we find an empty spot
place_and_shift_up({dist_and_fingerprint, value_idx}, bucket_idx);
}
return {begin() + static_cast<difference_type>(value_idx), true};
}

Expand Down
4 changes: 4 additions & 0 deletions test/unit/bucket.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,11 @@ TEST_CASE_MAP("bucket_micro",
INFO(counts);

auto map = map_t();
INFO("map_t::max_size()=" << map_t::max_size());
for (size_t i = 0; i < map_t::max_size(); ++i) {
if (i == 255) {
INFO("i=" << i);
}
auto const r = map.try_emplace({i, counts}, i, counts);
REQUIRE(r.second);

Expand Down
3 changes: 2 additions & 1 deletion test/unit/ctors.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ TEST_CASE_MAP("ctors_map", counter::obj, counter::obj) {
TEST_CASE_MAP("ctor_bucket_count_map", counter::obj, counter::obj) {
{
auto m = map_t{};
REQUIRE(m.bucket_count() == 0U);
// depends on initial bucket count, could also be 0
// REQUIRE(m.bucket_count() == 2U);
}
{
auto m = map_t{150U};
Expand Down
2 changes: 1 addition & 1 deletion test/unit/pmr.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ TEST_CASE("pmr_move_same_mr") {
REQUIRE(map1.find(3) != map1.end());
show(mr1, "mr1");

REQUIRE(mr1.num_allocs() == 4);
REQUIRE(mr1.num_allocs() == 5); // 5 because of the initial allocation
REQUIRE(mr1.num_deallocs() == 2);
REQUIRE(mr1.num_is_equals() == 0);
}
Expand Down

0 comments on commit 250ec0f

Please sign in to comment.