Skip to content

Commit

Permalink
Improve hashmap and hashset
Browse files Browse the repository at this point in the history
  • Loading branch information
Julian LALU committed Jan 17, 2025
1 parent 4af1190 commit 6f654aa
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 59 deletions.
72 changes: 29 additions & 43 deletions interface/core/containers/hashset.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@ namespace hud
// ctrl | ~(ctrl >> 7) will have the lowest bit set to zero for kEmpty and
// kDeleted. We lower all other bits and count number of trailing zeros.
constexpr uint64_t bits = 0x0101010101010101ULL;
// hud::bits::trailing_zero();
return static_cast<u32>(hud::bits::trailing_zero((value_ | ~(value_ >> 7)) & bits) >> 3);
// return static_cast<u32>(countr_zero((ctrl | ~(ctrl >> 7)) & bits) >> 3);
// return 0;
Expand Down Expand Up @@ -432,16 +431,6 @@ namespace hud
HD_ASSUME(slot_ptr_ != nullptr);
}

constexpr iterator(hud::pair<control_type *, element_type *> &&ctrl_slot_ptr) noexcept
: control_ptr_(hud::forward<hud::pair<control_type *, element_type *>>(ctrl_slot_ptr).first)
, slot_ptr_(hud::forward<hud::pair<control_type *, element_type *>>(ctrl_slot_ptr).second)
{
hud::check(control_ptr_ != nullptr);
HD_ASSUME(control_ptr_ != nullptr);
hud::check(slot_ptr_ != nullptr);
HD_ASSUME(slot_ptr_ != nullptr);
}

constexpr reference_type operator*() const noexcept
{
// Ensure we are in a full control
Expand Down Expand Up @@ -487,40 +476,35 @@ namespace hud
}

private:
// The control to iterate over
control_type *control_ptr_;
// The current slot we are iterating. Keep uninitialized.
element_type *slot_ptr_;
};

template<usize idx_to_reach, typename slot_func, bool is_const>
[[nodiscard]] HD_FORCEINLINE constexpr auto &get(iterator<slot_func, is_const> &it) noexcept
{
return get<idx_to_reach>(*it);
}
template<usize idx_to_reach>
[[nodiscard]] friend constexpr decltype(auto) get(iterator &it) noexcept
{
return get<idx_to_reach>(*(it.slot_ptr_));
}

template<usize idx_to_reach, typename slot_func, bool is_const>
[[nodiscard]] HD_FORCEINLINE constexpr const auto &get(const iterator<slot_func, is_const> &it) noexcept
{
return get<idx_to_reach>(*it);
}
template<usize idx_to_reach>
[[nodiscard]] friend constexpr decltype(auto) get(const iterator &it) noexcept
{
return get<idx_to_reach>(*(it.slot_ptr_));
}

template<usize idx_to_reach, typename slot_func, bool is_const>
[[nodiscard]] HD_FORCEINLINE constexpr auto &&get(iterator<slot_func, is_const> &&it) noexcept
{
return hud::forward<tuple_element_t<idx_to_reach, iterator<slot_func, is_const>>>(get<idx_to_reach>(*it));
}
template<usize idx_to_reach>
[[nodiscard]] friend constexpr decltype(auto) get(iterator &&it) noexcept
{
return get<idx_to_reach>(*(hud::forward<iterator>(it).slot_ptr_));
}

template<usize idx_to_reach, typename slot_func, bool is_const>
[[nodiscard]] HD_FORCEINLINE constexpr const auto &&get(const iterator<slot_func, is_const> &&it) noexcept
{
return hud::forward<const tuple_element_t<idx_to_reach, iterator<slot_func, is_const>>>(get<idx_to_reach>(*it));
}
template<usize idx_to_reach>
[[nodiscard]] friend constexpr decltype(auto) get(const iterator &&it) noexcept
{
return get<idx_to_reach>(*(hud::forward<const iterator>(it).slot_ptr_));
}

struct find_result
{
usize metadata_index_;
usize slot_index_;
private:
// The control to iterate over
control_type *control_ptr_;
// The current slot we are iterating. Keep uninitialized.
element_type *slot_ptr_;
};

template<
Expand Down Expand Up @@ -757,13 +741,15 @@ namespace hud
/** Retrieves an iterator to the end of the array. */
[[nodiscard]] constexpr iterator begin() noexcept
{
return iterator {find_first_full()};
auto [control_ptr, slot_ptr] = find_first_full();
return iterator {control_ptr, slot_ptr};
}

/** Retrieves an iterator to the end of the array. */
[[nodiscard]] constexpr const_iterator begin() const noexcept
{
return const_iterator(find_first_full());
auto [control_ptr, slot_ptr] = find_first_full();
return const_iterator {control_ptr, slot_ptr};
}

/** Retrieves an iterator to the end of the array. */
Expand Down
32 changes: 16 additions & 16 deletions test/hashmap/hashmap_iterator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,23 +84,23 @@ GTEST_TEST(hashmap, structure_binding)
hud_assert_eq(second_c, 11);
}

// Copy do not modify hash value
// auto is a reference
{
// hud::hashmap<i32, i64> map;
// map.add({1, 11});
// map.add({2, 22});
// map.add({3, 33});
// map.add({4, 44});
// hud_assert_eq(map.count(), 4u);
// hud_assert_ge(map.max_count(), 4u);
// auto it = map.find(1);
// auto [first, second] = it;
// hud_assert_eq(first, 1);
// second = 111;
// hud_assert_eq(second, 111);
// auto [first_1, second_1] = map.find(1);
// hud_assert_eq(first_1, 1);
// hud_assert_eq(second_1, 11);
hud::hashmap<i32, i64> map;
map.add({1, 11});
map.add({2, 22});
map.add({3, 33});
map.add({4, 44});
hud_assert_eq(map.count(), 4u);
hud_assert_ge(map.max_count(), 4u);
auto it = map.find(1);
auto [first, second] = it;
hud_assert_eq(first, 1);
second = 111;
hud_assert_eq(second, 111);
auto [first_1, second_1] = map.find(1);
hud_assert_eq(first_1, 1);
hud_assert_eq(second_1, 111);
}

// Ref do modify hash value
Expand Down

0 comments on commit 6f654aa

Please sign in to comment.