2012-11-07 07:18:41 +00:00
|
|
|
/*
|
|
|
|
* Copyright © 2009,2012 Intel Corporation
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
|
|
* to deal in the Software without restriction, including without limitation
|
|
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice (including the next
|
|
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
|
|
* Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
|
|
* IN THE SOFTWARE.
|
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Eric Anholt <eric@anholt.net>
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2012-11-14 05:18:09 +00:00
|
|
|
#ifndef _HASH_TABLE_H
|
|
|
|
#define _HASH_TABLE_H
|
|
|
|
|
2014-07-23 22:58:52 +01:00
|
|
|
#include <stdlib.h>
|
2012-11-07 07:18:41 +00:00
|
|
|
#include <inttypes.h>
|
|
|
|
#include <stdbool.h>
|
2014-08-04 20:34:54 +01:00
|
|
|
#include "c99_compat.h"
|
2014-07-23 22:58:52 +01:00
|
|
|
#include "macros.h"
|
2012-11-07 07:18:41 +00:00
|
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
extern "C" {
|
|
|
|
#endif
|
|
|
|
|
|
|
|
struct hash_entry {
|
|
|
|
uint32_t hash;
|
|
|
|
const void *key;
|
|
|
|
void *data;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct hash_table {
|
|
|
|
struct hash_entry *table;
|
util/hash_table: Rework the API to know about hashing
Previously, the hash_table API required the user to do all of the hashing
of keys as it passed them in. Since the hashing function is intrinsically
tied to the comparison function, it makes sense for the hash table to know
about it. Also, it makes for a somewhat clumsy API as the user is
constantly calling hashing functions many of which have long names. This
is especially bad when the standard call looks something like
_mesa_hash_table_insert(ht, _mesa_pointer_hash(key), key, data);
In the above case, there is no reason why the hash table shouldn't do the
hashing for you. We leave the option for you to do your own hashing if
it's more efficient, but it's no longer needed. Also, if you do do your
own hashing, the hash table will assert that your hash matches what it
expects out of the hashing function. This should make it harder to mess up
your hashing.
v2: change to call the old entrypoint "pre_hashed" rather than
"with_hash", like cworth's equivalent change upstream (change by
anholt, acked-in-general by Jason).
Signed-off-by: Jason Ekstrand <jason.ekstrand@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
2014-11-25 06:19:50 +00:00
|
|
|
uint32_t (*key_hash_function)(const void *key);
|
2012-11-07 07:18:41 +00:00
|
|
|
bool (*key_equals_function)(const void *a, const void *b);
|
|
|
|
const void *deleted_key;
|
|
|
|
uint32_t size;
|
|
|
|
uint32_t rehash;
|
|
|
|
uint32_t max_entries;
|
|
|
|
uint32_t size_index;
|
|
|
|
uint32_t entries;
|
|
|
|
uint32_t deleted_entries;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct hash_table *
|
|
|
|
_mesa_hash_table_create(void *mem_ctx,
|
util/hash_table: Rework the API to know about hashing
Previously, the hash_table API required the user to do all of the hashing
of keys as it passed them in. Since the hashing function is intrinsically
tied to the comparison function, it makes sense for the hash table to know
about it. Also, it makes for a somewhat clumsy API as the user is
constantly calling hashing functions many of which have long names. This
is especially bad when the standard call looks something like
_mesa_hash_table_insert(ht, _mesa_pointer_hash(key), key, data);
In the above case, there is no reason why the hash table shouldn't do the
hashing for you. We leave the option for you to do your own hashing if
it's more efficient, but it's no longer needed. Also, if you do do your
own hashing, the hash table will assert that your hash matches what it
expects out of the hashing function. This should make it harder to mess up
your hashing.
v2: change to call the old entrypoint "pre_hashed" rather than
"with_hash", like cworth's equivalent change upstream (change by
anholt, acked-in-general by Jason).
Signed-off-by: Jason Ekstrand <jason.ekstrand@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
2014-11-25 06:19:50 +00:00
|
|
|
uint32_t (*key_hash_function)(const void *key),
|
2012-11-07 07:18:41 +00:00
|
|
|
bool (*key_equals_function)(const void *a,
|
|
|
|
const void *b));
|
|
|
|
void _mesa_hash_table_destroy(struct hash_table *ht,
|
|
|
|
void (*delete_function)(struct hash_entry *entry));
|
2016-01-06 19:50:46 +00:00
|
|
|
void _mesa_hash_table_clear(struct hash_table *ht,
|
|
|
|
void (*delete_function)(struct hash_entry *entry));
|
2012-11-07 07:18:41 +00:00
|
|
|
void _mesa_hash_table_set_deleted_key(struct hash_table *ht,
|
|
|
|
const void *deleted_key);
|
|
|
|
|
2016-01-11 20:07:27 +00:00
|
|
|
static inline uint32_t _mesa_hash_table_num_entries(struct hash_table *ht)
|
|
|
|
{
|
|
|
|
return ht->entries;
|
|
|
|
}
|
|
|
|
|
2012-11-07 07:18:41 +00:00
|
|
|
struct hash_entry *
|
util/hash_table: Rework the API to know about hashing
Previously, the hash_table API required the user to do all of the hashing
of keys as it passed them in. Since the hashing function is intrinsically
tied to the comparison function, it makes sense for the hash table to know
about it. Also, it makes for a somewhat clumsy API as the user is
constantly calling hashing functions many of which have long names. This
is especially bad when the standard call looks something like
_mesa_hash_table_insert(ht, _mesa_pointer_hash(key), key, data);
In the above case, there is no reason why the hash table shouldn't do the
hashing for you. We leave the option for you to do your own hashing if
it's more efficient, but it's no longer needed. Also, if you do do your
own hashing, the hash table will assert that your hash matches what it
expects out of the hashing function. This should make it harder to mess up
your hashing.
v2: change to call the old entrypoint "pre_hashed" rather than
"with_hash", like cworth's equivalent change upstream (change by
anholt, acked-in-general by Jason).
Signed-off-by: Jason Ekstrand <jason.ekstrand@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
2014-11-25 06:19:50 +00:00
|
|
|
_mesa_hash_table_insert(struct hash_table *ht, const void *key, void *data);
|
2012-11-07 07:18:41 +00:00
|
|
|
struct hash_entry *
|
2015-01-15 15:58:07 +00:00
|
|
|
_mesa_hash_table_insert_pre_hashed(struct hash_table *ht, uint32_t hash,
|
|
|
|
const void *key, void *data);
|
util/hash_table: Rework the API to know about hashing
Previously, the hash_table API required the user to do all of the hashing
of keys as it passed them in. Since the hashing function is intrinsically
tied to the comparison function, it makes sense for the hash table to know
about it. Also, it makes for a somewhat clumsy API as the user is
constantly calling hashing functions many of which have long names. This
is especially bad when the standard call looks something like
_mesa_hash_table_insert(ht, _mesa_pointer_hash(key), key, data);
In the above case, there is no reason why the hash table shouldn't do the
hashing for you. We leave the option for you to do your own hashing if
it's more efficient, but it's no longer needed. Also, if you do do your
own hashing, the hash table will assert that your hash matches what it
expects out of the hashing function. This should make it harder to mess up
your hashing.
v2: change to call the old entrypoint "pre_hashed" rather than
"with_hash", like cworth's equivalent change upstream (change by
anholt, acked-in-general by Jason).
Signed-off-by: Jason Ekstrand <jason.ekstrand@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
2014-11-25 06:19:50 +00:00
|
|
|
struct hash_entry *
|
|
|
|
_mesa_hash_table_search(struct hash_table *ht, const void *key);
|
|
|
|
struct hash_entry *
|
|
|
|
_mesa_hash_table_search_pre_hashed(struct hash_table *ht, uint32_t hash,
|
|
|
|
const void *key);
|
2012-11-07 07:18:41 +00:00
|
|
|
void _mesa_hash_table_remove(struct hash_table *ht,
|
|
|
|
struct hash_entry *entry);
|
|
|
|
|
|
|
|
struct hash_entry *_mesa_hash_table_next_entry(struct hash_table *ht,
|
|
|
|
struct hash_entry *entry);
|
|
|
|
struct hash_entry *
|
|
|
|
_mesa_hash_table_random_entry(struct hash_table *ht,
|
|
|
|
bool (*predicate)(struct hash_entry *entry));
|
|
|
|
|
|
|
|
uint32_t _mesa_hash_data(const void *data, size_t size);
|
|
|
|
uint32_t _mesa_hash_string(const char *key);
|
|
|
|
bool _mesa_key_string_equal(const void *a, const void *b);
|
|
|
|
bool _mesa_key_pointer_equal(const void *a, const void *b);
|
|
|
|
|
util/hash_table: Rework the API to know about hashing
Previously, the hash_table API required the user to do all of the hashing
of keys as it passed them in. Since the hashing function is intrinsically
tied to the comparison function, it makes sense for the hash table to know
about it. Also, it makes for a somewhat clumsy API as the user is
constantly calling hashing functions many of which have long names. This
is especially bad when the standard call looks something like
_mesa_hash_table_insert(ht, _mesa_pointer_hash(key), key, data);
In the above case, there is no reason why the hash table shouldn't do the
hashing for you. We leave the option for you to do your own hashing if
it's more efficient, but it's no longer needed. Also, if you do do your
own hashing, the hash table will assert that your hash matches what it
expects out of the hashing function. This should make it harder to mess up
your hashing.
v2: change to call the old entrypoint "pre_hashed" rather than
"with_hash", like cworth's equivalent change upstream (change by
anholt, acked-in-general by Jason).
Signed-off-by: Jason Ekstrand <jason.ekstrand@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
2014-11-25 06:19:50 +00:00
|
|
|
static inline uint32_t _mesa_key_hash_string(const void *key)
|
|
|
|
{
|
|
|
|
return _mesa_hash_string((const char *)key);
|
|
|
|
}
|
|
|
|
|
2012-11-07 07:18:41 +00:00
|
|
|
static inline uint32_t _mesa_hash_pointer(const void *pointer)
|
|
|
|
{
|
util: Change the pointer hashing function
Use our knowledge that pointers are at least 4 byte aligned to remove
the useless digits. Then shift by 6, 10, and 14 bits and add this to
the original pointer, effectively folding in the entropy of the higher
bits of the pointer into a 4-bit section. Stopping at 14 means we can
add the entropy from 18 bits, or at least a 600Kbyte section of memory.
Assuming that ralloc allocates from a linearly allocated heap less than
this we can make a very efficient pointer hashing function for our usecase.
Even if we are not on an architecture that is 4 byte aligned, there is
still a high big chance that the thing we are allocating is at least
8 bytes in size, so even then we will have entropy into the third bit.
The 4 bit increment on the shifts is chosen rather arbitrarily; if we
had chosen a 3 bit increment we would need to add another xor to
cover a decently sized memorypool. Increasing it to 5 bits would
spread our entropy more, possibly hurting us with more collisions on
hash tables of size less than 32. With a hash table of size 16 there
are a max of 11 entries, and we can assume that with such a small table
collisions are not that painfull.
This allows us to hash the whole 32 or 64 bit pointer at once,
instead of running FNV1a, looping through each byte and doing
increments, decrements, muls, and xors on every byte. This cuts
_mesa_hash_data from 1.5 % on profiles, to making _mesa_hash_pointer
show up with a 0.09% share. Collisions on insertion actually seems to be
ever so slightly lower with this hash function, as found by printing
a loop counter and sorting the data.
perf stat shows a 1.5% reduction in instruction count,
and a 5% reduction in stalled cycles. Shader-db runtime goes
from 225 to 220 seconds.
No instruction-count changes in shader-db, but there are some minor
changes in cycle-count that is likely caused by nir walking a set
in some of its passes, and this causing a different ordering.
That might eventually lead to a difference in register allocation.
However, the effect is a net positive;
total cycles in shared programs: 24739550 -> 24738482 (-0.00%)
cycles in affected programs: 374468 -> 373400 (-0.29%)
helped: 178
HURT: 49
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
2017-02-10 18:14:32 +00:00
|
|
|
uintptr_t num = (uintptr_t) pointer;
|
|
|
|
return (uint32_t) ((num >> 2) ^ (num >> 6) ^ (num >> 10) ^ (num >> 14));
|
2012-11-07 07:18:41 +00:00
|
|
|
}
|
|
|
|
|
2016-02-16 17:45:04 +00:00
|
|
|
enum {
|
|
|
|
_mesa_fnv32_1a_offset_bias = 2166136261u,
|
|
|
|
};
|
2015-01-06 06:31:23 +00:00
|
|
|
|
|
|
|
static inline uint32_t
|
|
|
|
_mesa_fnv32_1a_accumulate_block(uint32_t hash, const void *data, size_t size)
|
|
|
|
{
|
|
|
|
const uint8_t *bytes = (const uint8_t *)data;
|
|
|
|
|
|
|
|
while (size-- != 0) {
|
|
|
|
hash ^= *bytes;
|
|
|
|
hash = hash * 0x01000193;
|
|
|
|
bytes++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define _mesa_fnv32_1a_accumulate(hash, expr) \
|
|
|
|
_mesa_fnv32_1a_accumulate_block(hash, &(expr), sizeof(expr))
|
|
|
|
|
2012-11-07 07:18:41 +00:00
|
|
|
/**
|
|
|
|
* This foreach function is safe against deletion (which just replaces
|
|
|
|
* an entry's data with the deleted marker), but not against insertion
|
|
|
|
* (which may rehash the table, making entry a dangling pointer).
|
|
|
|
*/
|
|
|
|
#define hash_table_foreach(ht, entry) \
|
|
|
|
for (entry = _mesa_hash_table_next_entry(ht, NULL); \
|
|
|
|
entry != NULL; \
|
|
|
|
entry = _mesa_hash_table_next_entry(ht, entry))
|
|
|
|
|
2016-08-16 21:10:17 +01:00
|
|
|
static inline void
|
|
|
|
hash_table_call_foreach(struct hash_table *ht,
|
|
|
|
void (*callback)(const void *key,
|
|
|
|
void *data,
|
|
|
|
void *closure),
|
|
|
|
void *closure)
|
|
|
|
{
|
|
|
|
struct hash_entry *entry;
|
|
|
|
|
|
|
|
hash_table_foreach(ht, entry)
|
|
|
|
callback(entry->key, entry->data, closure);
|
|
|
|
}
|
|
|
|
|
2012-11-07 07:18:41 +00:00
|
|
|
#ifdef __cplusplus
|
|
|
|
} /* extern C */
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#endif /* _HASH_TABLE_H */
|