roland/xo-tokenizer2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo-arena: DArenaHashMap: populate control end stub

Browse source
This commit is contained in:
Roland Conybeare 2026-01-08 14:16:26 -05:00
commit 9f43885e0c
1 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

25
xo-arena/include/xo/arena/DArenaHashMap.hpp
View file

@ -98,7 +98,7 @@ namespace xo {
/** control: compute size of control array for swiss hash map with @p n_slot cells **/
static constexpr size_type control_size(size_type n_slot) {
return n_slot + c_group_size + 12 * c_control_stub;
return n_slot + c_group_size + 2 * c_control_stub;
}
/** find smallest multiple k : k * c_group_size >= n **/
@ -248,6 +248,11 @@ namespace xo {
/* all slots marked empty initially */
std::fill(this->control_.begin() + c_control_stub,
this->control_.end() - c_control_stub,
c_empty_slot);
/* end stub: iterator bookend */
std::fill(this->control_.end() - c_control_stub,
this->control_.end(),
c_empty_slot);
@ -717,9 +722,10 @@ namespace xo {
* SM2. load factor
* - SM2.1 load_factor() <= c_max_load_factor
* SM3. control_
* - SM3.1 control_[i] = c_iterator_bookend
* - SM3.2 control_[N+i] = control_[i] for i in [0, c_group_size)
* - SM3.1 control_[i] = c_iterator_bookend for i in [0, c_control_stub)
* - SM3.2 control_[stub+i] = control_[stub+N+i] for i in [0, c_group_size)
* - SM3.3 {number of control_[i] spots with non-sentinel values} = size_
* - SM3.4 control_[stub+N+c_group_size+i] = c_iterator_bookend for i in [0, c_control_stub)
* SM4. slots_
* - SM4.1 if control_[i] is non-sentinel:
* - SM4.1.1 control_[i] = hash_(slots_[i].first) & 0x7f
@ -837,6 +843,19 @@ namespace xo {
}
}
/* SM3.4: control_[stub+N+c_group_size+i] = c_iterator_bookend for i in [0, c_control_stub) */
for (size_type i = 0; i < c_control_stub; ++i) {
size_type ix = c_control_stub + store_.n_slot_ + c_group_size + i;
if (store_.control_[ix] != c_iterator_bookend) {
return policy.report_error(log,
c_self, ": expect control_[stub+N+group+i] = c_iterator_bookend for end stub",
xtag("i", i),
xtag("ix", ix),
xtag("control_[ix]", (int)(store_.control_[ix])),
xtag("c_iterator_bookend", (int)c_iterator_bookend));
}
}
/* SM4.1.1: if control_[i] is non-sentinel, control_[i] = hash_(slots_[i].first) & 0x7f */
for (size_type i = 0; i < store_.n_slot_; ++i) {
uint8_t c = store_.control_[i + c_control_stub];