Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions libc/src/__support/HashTable/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,8 @@ add_header_library(
libc.src.__support.macros.attributes
libc.src.__support.macros.optimization
libc.src.__support.memory_size
libc.src.string.memset
libc.src.string.strcmp
libc.src.string.strlen
libc.src.string.memory_utils.inline_strcmp
libc.src.string.string_utils
)

add_header_library(
Expand Down
15 changes: 8 additions & 7 deletions libc/src/__support/HashTable/table.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@
#include "src/__support/macros/config.h"
#include "src/__support/macros/optimization.h"
#include "src/__support/memory_size.h"
#include "src/string/memset.h"
#include "src/string/strcmp.h"
#include "src/string/strlen.h"
#include "src/string/memory_utils/inline_strcmp.h"
#include "src/string/string_utils.h"
#include <stddef.h>
#include <stdint.h>

Expand Down Expand Up @@ -158,7 +157,9 @@ struct HashTable {
for (size_t i : masks) {
size_t index = (pos + i) & entries_mask;
ENTRY &entry = this->entry(index);
if (LIBC_LIKELY(entry.key != nullptr && strcmp(entry.key, key) == 0))
auto comp = [](char l, char r) -> int { return l - r; };
if (LIBC_LIKELY(entry.key != nullptr &&
inline_strcmp(entry.key, key, comp) == 0))
return index;
}
BitMask available = ctrls.mask_available();
Expand All @@ -176,7 +177,7 @@ struct HashTable {

LIBC_INLINE uint64_t oneshot_hash(const char *key) const {
LIBC_NAMESPACE::internal::HashState hasher = state;
hasher.update(key, strlen(key));
hasher.update(key, internal::string_length(key));
return hasher.finish();
}

Expand Down Expand Up @@ -282,8 +283,8 @@ struct HashTable {
table->entries_mask = entries - 1u;
table->available_slots = entries / 8 * 7;
table->state = HashState{randomness};
memset(&table->control(0), 0x80, ctrl_sizes);
memset(mem, 0, table->offset_from_entries());
__builtin_memset(&table->control(0), 0x80, ctrl_sizes);
__builtin_memset(mem, 0, table->offset_from_entries());
}
return table;
}
Expand Down
4 changes: 3 additions & 1 deletion libc/test/src/__support/HashTable/table_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,9 @@ TEST(LlvmLibcTableTest, Insertion) {
static_cast<void *>(keys[CAP].bytes));

for (size_t i = 0; i <= CAP; ++i) {
ASSERT_EQ(strcmp(table->find(keys[i].bytes)->key, keys[i].bytes), 0);
auto comp = [](char l, char r) -> int { return l - r; };
ASSERT_EQ(
inline_strcmp(table->find(keys[i].bytes)->key, keys[i].bytes, comp), 0);
}
for (size_t i = CAP + 1; i < 256; ++i) {
ASSERT_EQ(table->find(keys[i].bytes), static_cast<ENTRY *>(nullptr));
Expand Down
Loading