Mesa (master): zink: replace fnv1a hash function with xxhash
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon May 25 19:56:39 UTC 2020
Module: Mesa
Branch: master
Commit: bf4d652f3f44da7837d5ca7c514533bf8661e31e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf4d652f3f44da7837d5ca7c514533bf8661e31e
Author: Dmitriy Nester <dmitriynester at gmail.com>
Date: Thu Feb 27 15:38:45 2020 +0200
zink: replace fnv1a hash function with xxhash
xxhash is faster than fnv1a in almost all circumstances, so we're
switching to it globally.
Signed-off-by: Dmytro Nester <dmytro.nester at globallogic.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4020>
---
src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c b/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c
index 9fb447611f3..101eed1aafa 100644
--- a/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c
+++ b/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c
@@ -27,6 +27,8 @@
#include "util/u_bitcast.h"
#include "util/u_memory.h"
#include "util/hash_table.h"
+#define XXH_INLINE_ALL
+#include "util/xxhash.h"
#include <stdbool.h>
#include <inttypes.h>
@@ -677,10 +679,9 @@ non_aggregate_type_hash(const void *arg)
{
const struct spirv_type *type = arg;
- uint32_t hash = _mesa_fnv32_1a_offset_bias;
- hash = _mesa_fnv32_1a_accumulate(hash, type->op);
- hash = _mesa_fnv32_1a_accumulate_block(hash, type->args, sizeof(uint32_t) *
- type->num_args);
+ uint32_t hash = 0;
+ hash = XXH32(&type->op, sizeof(type->op), hash);
+ hash = XXH32(type->args, sizeof(uint32_t) * type->num_args, hash);
return hash;
}
@@ -883,11 +884,10 @@ const_hash(const void *arg)
{
const struct spirv_const *key = arg;
- uint32_t hash = _mesa_fnv32_1a_offset_bias;
- hash = _mesa_fnv32_1a_accumulate(hash, key->op);
- hash = _mesa_fnv32_1a_accumulate(hash, key->type);
- hash = _mesa_fnv32_1a_accumulate_block(hash, key->args, sizeof(uint32_t) *
- key->num_args);
+ uint32_t hash = 0;
+ hash = XXH32(&key->op, sizeof(key->op), hash);
+ hash = XXH32(&key->type, sizeof(key->type), hash);
+ hash = XXH32(key->args, sizeof(uint32_t) * key->num_args, hash);
return hash;
}
More information about the mesa-commit
mailing list