From b4bd28a490012ecbce292561da404d4e9b02d24b Mon Sep 17 00:00:00 2001 From: Christophe Fontaine Date: Wed, 31 May 2017 11:27:19 +0200 Subject: 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 --- src/vppinfra/bihash_48_8.h | 38 ++++---------------------------------- 1 file changed, 4 insertions(+), 34 deletions(-) (limited to 'src/vppinfra/bihash_48_8.h') diff --git a/src/vppinfra/bihash_48_8.h b/src/vppinfra/bihash_48_8.h index 1a6e76913ed..48079e0a1cf 100644 --- a/src/vppinfra/bihash_48_8.h +++ b/src/vppinfra/bihash_48_8.h @@ -21,6 +21,7 @@ #ifndef __included_bihash_48_8_h__ #define __included_bihash_48_8_h__ +#include #include #include #include @@ -41,48 +42,17 @@ clib_bihash_is_free_48_8 (const clib_bihash_kv_48_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_48_8 (const clib_bihash_kv_48_8_t * v) { - const u32 *dp = (const 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); - value = crc_u32 (dp[4], value); - value = crc_u32 (dp[5], value); - value = crc_u32 (dp[6], value); - value = crc_u32 (dp[7], value); - value = crc_u32 (dp[8], value); - value = crc_u32 (dp[9], value); - value = crc_u32 (dp[10], value); - value = crc_u32 (dp[11], value); - - return value; -} +#ifdef clib_crc32c_uses_intrinsics + return clib_crc32c ((u8 *) v->key, 48); #else -static inline u64 -clib_bihash_hash_48_8 (const clib_bihash_kv_48_8_t * v) -{ u64 tmp = v->key[0] ^ v->key[1] ^ v->key[2] ^ v->key[3] ^ v->key[4] ^ v->key[5]; return clib_xxhash (tmp); -} #endif +} static inline u8 * format_bihash_kvp_48_8 (u8 * s, va_list * args) -- cgit 1.2.3-korg