summaryrefslogtreecommitdiffstats
path: root/src/vppinfra/bihash_16_8.h
diff options
context:
space:
mode:
authorChristophe Fontaine <christophe.fontaine@enea.com>2017-05-31 11:27:19 +0200
committerDamjan Marion <dmarion.lists@gmail.com>2017-06-12 11:56:02 +0000
commitb4bd28a490012ecbce292561da404d4e9b02d24b (patch)
tree410ace570b86fb0f0d9138807b719edd3464a4ac /src/vppinfra/bihash_16_8.h
parentc9b622fbace7482c59f28fe516eefcb6acb83a1b (diff)
Remove calls to crc_u32 and add clib_crc32c for armv8+crc
crc_u32 was not defined for non x86_64 with SSE4.2 processors. Calls to "crc_u32" are removed and replaced by either a call to clib_crc32c or a call to clib_xxhash, as the result is not used as a check value but as a hash. Change-Id: I3af4d68e2e5ebd0c9b0a6090f848d043cb0f20a2 Signed-off-by: Christophe Fontaine <christophe.fontaine@enea.com>
Diffstat (limited to 'src/vppinfra/bihash_16_8.h')
-rw-r--r--src/vppinfra/bihash_16_8.h30
1 files changed, 4 insertions, 26 deletions
diff --git a/src/vppinfra/bihash_16_8.h b/src/vppinfra/bihash_16_8.h
index ce80f70e50a..6b1b563e25b 100644
--- a/src/vppinfra/bihash_16_8.h
+++ b/src/vppinfra/bihash_16_8.h
@@ -24,6 +24,7 @@
#include <vppinfra/format.h>
#include <vppinfra/pool.h>
#include <vppinfra/xxhash.h>
+#include <vppinfra/crc32.h>
typedef struct
{
@@ -40,39 +41,16 @@ clib_bihash_is_free_16_8 (clib_bihash_kv_16_8_t * v)
return 0;
}
-#if __SSE4_2__
-#ifndef __defined_crc_u32__
-#define __defined_crc_u32__
-static inline u32
-crc_u32 (u32 data, u32 value)
-{
- __asm__ volatile ("crc32l %[data], %[value];":[value] "+r" (value):[data]
- "rm" (data));
- return value;
-}
-#endif /* __defined_crc_u32__ */
-
static inline u64
clib_bihash_hash_16_8 (clib_bihash_kv_16_8_t * v)
{
- u32 *dp = (u32 *) & v->key[0];
- u32 value = 0;
-
- value = crc_u32 (dp[0], value);
- value = crc_u32 (dp[1], value);
- value = crc_u32 (dp[2], value);
- value = crc_u32 (dp[3], value);
-
- return value;
-}
+#ifdef clib_crc32c_uses_intrinsics
+ return clib_crc32c ((u8 *) v->key, 16);
#else
-static inline u64
-clib_bihash_hash_16_8 (clib_bihash_kv_16_8_t * v)
-{
u64 tmp = v->key[0] ^ v->key[1];
return clib_xxhash (tmp);
-}
#endif
+}
static inline u8 *
format_bihash_kvp_16_8 (u8 * s, va_list * args)