Revert "gallium: optimize util_hash_table_u64 for 64-bit builds"

This reverts commit f1e9388304.

Reviewed-by: Ryan Neph <ryanneph@google.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
macos/master
Chia-I Wu 3 years ago
parent a68284a380
commit 8c6198b41f
  1. 39
      src/gallium/auxiliary/util/u_hash_table.c

@ -301,16 +301,6 @@ util_hash_table_destroy(struct util_hash_table *ht)
FREE(ht); FREE(ht);
} }
static unsigned hash_func_pointer(void *key)
{
return XXH32(&key, sizeof(key), 0);
}
static int compare_func_pointer(void *key1, void *key2)
{
return key1 != key2;
}
static unsigned hash_func_u64(void *key) static unsigned hash_func_u64(void *key)
{ {
return XXH32(key, sizeof(uint64_t), 0); return XXH32(key, sizeof(uint64_t), 0);
@ -321,22 +311,9 @@ static int compare_func_u64(void *key1, void *key2)
return *(const uint64_t *)key1 != *(const uint64_t*)key2; return *(const uint64_t *)key1 != *(const uint64_t*)key2;
} }
static bool util_hash_table_u64_uses_pointer(void)
{
/* return true if we can store a uint64_t in a pointer */
return sizeof(void *) >= sizeof(uint64_t);
}
struct util_hash_table_u64 * struct util_hash_table_u64 *
util_hash_table_create_u64(void (*destroy)(void *value)) util_hash_table_create_u64(void (*destroy)(void *value))
{ {
if (util_hash_table_u64_uses_pointer()) {
return (struct util_hash_table_u64 *)
util_hash_table_create(hash_func_pointer,
compare_func_pointer,
destroy);
}
return (struct util_hash_table_u64 *) return (struct util_hash_table_u64 *)
util_hash_table_create(hash_func_u64, util_hash_table_create(hash_func_u64,
compare_func_u64, compare_func_u64,
@ -352,9 +329,6 @@ util_hash_table_set_u64(struct util_hash_table_u64 *ht_u64,
uint64_t *real_key; uint64_t *real_key;
enum pipe_error err; enum pipe_error err;
if (util_hash_table_u64_uses_pointer())
return util_hash_table_set(ht, uintptr_to_pointer(key), value);
real_key = MALLOC(sizeof(*real_key)); real_key = MALLOC(sizeof(*real_key));
if (!real_key) if (!real_key)
return PIPE_ERROR_OUT_OF_MEMORY; return PIPE_ERROR_OUT_OF_MEMORY;
@ -373,9 +347,6 @@ util_hash_table_get_u64(struct util_hash_table_u64 *ht_u64,
{ {
struct util_hash_table *ht = (struct util_hash_table *)ht_u64; struct util_hash_table *ht = (struct util_hash_table *)ht_u64;
if (util_hash_table_u64_uses_pointer())
return util_hash_table_get(ht, uintptr_to_pointer(key));
return util_hash_table_get(ht, &key); return util_hash_table_get(ht, &key);
} }
@ -388,11 +359,6 @@ util_hash_table_remove_u64(struct util_hash_table_u64 *ht_u64,
struct cso_hash_iter iter; struct cso_hash_iter iter;
struct util_hash_table_item *item; struct util_hash_table_item *item;
if (util_hash_table_u64_uses_pointer()) {
util_hash_table_remove(ht, uintptr_to_pointer(key));
return;
}
key_hash = ht->hash(&key); key_hash = ht->hash(&key);
iter = util_hash_table_find_iter(ht, &key, key_hash); iter = util_hash_table_find_iter(ht, &key, key_hash);
@ -414,11 +380,6 @@ util_hash_table_destroy_u64(struct util_hash_table_u64 *ht_u64)
struct cso_hash_iter iter; struct cso_hash_iter iter;
struct util_hash_table_item *item; struct util_hash_table_item *item;
if (util_hash_table_u64_uses_pointer()) {
util_hash_table_destroy(ht);
return;
}
iter = cso_hash_first_node(ht->cso); iter = cso_hash_first_node(ht->cso);
while (!cso_hash_iter_is_null(iter)) { while (!cso_hash_iter_is_null(iter)) {
item = util_hash_table_item(iter); item = util_hash_table_item(iter);

Loading…
Cancel
Save