mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-02-28 21:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes to improve hash map/set performance

Browse Source
This commit is contained in:
gingerBill
2020-05-21 16:27:40 +01:00
parent 8e63c94393
commit d09ac8943a
6 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/ptr_set.cpp
View File

@@ -7,8 +7,8 @@ struct PtrSetFindResult {
template <typename T>
struct PtrSetEntry {
T ptr;
isize next;
T ptr;
isize next;
};
template <typename T>
@@ -29,8 +29,11 @@ template <typename T> void ptr_set_rehash (PtrSet<T> *s, isize new_count);
template <typename T>
void ptr_set_init(PtrSet<T> *s, gbAllocator a, isize capacity) {
array_init(&s->hashes, a, 0, capacity);
array_init(&s->hashes, a, capacity);
array_init(&s->entries, a, 0, capacity);
for (isize i = 0; i < capacity; i++) {
s->hashes.data[i] = -1;
}
}
template <typename T>
@@ -53,9 +56,9 @@ template <typename T>
gb_internal PtrSetFindResult ptr_set__find(PtrSet<T> *s, T ptr) {
PtrSetFindResult fr = {-1, -1, -1};
if (s->hashes.count > 0) {
uintptr p = cast(uintptr)ptr;
uintptr n = cast(uintptr)s->hashes.count;
fr.hash_index = cast(isize)(p % n);
u64 hash = 0xcbf29ce484222325ull ^ cast(u64)cast(uintptr)ptr;
u64 n = cast(u64)s->hashes.count;
fr.hash_index = cast(isize)(hash % n);
fr.entry_index = s->hashes[fr.hash_index];
while (fr.entry_index >= 0) {
if (s->entries[fr.entry_index].ptr == ptr) {
@@ -68,23 +71,6 @@ gb_internal PtrSetFindResult ptr_set__find(PtrSet<T> *s, T ptr) {
return fr;
}
template <typename T>
gb_internal PtrSetFindResult ptr_set__find_from_entry(PtrSet<T> *s, PtrSetEntry<T> *e) {
PtrSetFindResult fr = {-1, -1, -1};
if (s->hashes.count > 0) {
fr.hash_index = e->key.key % s->hashes.count;
fr.entry_index = s->hashes[fr.hash_index];
while (fr.entry_index >= 0) {
if (&s->entries[fr.entry_index] == e) {
return fr;
}
fr.entry_prev = fr.entry_index;
fr.entry_index = s->entries[fr.entry_index].next;
}
}
return fr;
}
template <typename T>
gb_internal b32 ptr_set__full(PtrSet<T> *s) {
return 0.75f * s->hashes.count <= s->entries.count;