diff options
| -rw-r--r-- | vnet/vnet/map/map.c | 10 | ||||
| -rw-r--r-- | vppinfra/vppinfra/bihash_24_8.h | 28 |
2 files changed, 14 insertions, 24 deletions
diff --git a/vnet/vnet/map/map.c b/vnet/vnet/map/map.c index beeaf1121a6..aeec6a946c9 100644 --- a/vnet/vnet/map/map.c +++ b/vnet/vnet/map/map.c @@ -22,7 +22,15 @@ #include "map.h" -#ifndef __SSE4_2__ +#ifdef __SSE4_2__ +static inline u32 +crc_u32 (u32 data, u32 value) +{ + __asm__ volatile ("crc32l %[data], %[value];":[value] "+r" (value):[data] + "rm" (data)); + return value; +} +#else #include <vppinfra/xxhash.h> static inline u32 diff --git a/vppinfra/vppinfra/bihash_24_8.h b/vppinfra/vppinfra/bihash_24_8.h index 17e99bf8aa8..353f06bf11f 100644 --- a/vppinfra/vppinfra/bihash_24_8.h +++ b/vppinfra/vppinfra/bihash_24_8.h @@ -40,38 +40,20 @@ clib_bihash_is_free_24_8 (const clib_bihash_kv_24_8_t * v) return 0; } -#if __SSE4_2__ -static inline u32 -crc_u32 (u32 data, u32 value) -{ - __asm__ volatile ("crc32l %[data], %[value];":[value] "+r" (value):[data] - "rm" (data)); - return value; -} - static inline u64 clib_bihash_hash_24_8 (const clib_bihash_kv_24_8_t * v) { - const u32 *dp = (const u32 *) &v->key[0]; +#if __SSE4_2__ 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 = _mm_crc32_u64 (value, v->key[0]); + value = _mm_crc32_u64 (value, v->key[1]); + value = _mm_crc32_u64 (value, v->key[2]); return value; -} #else -static inline u64 -clib_bihash_hash_24_8 (const clib_bihash_kv_24_8_t * v) -{ u64 tmp = v->key[0] ^ v->key[1] ^ v->key[2]; return clib_xxhash (tmp); -} #endif +} static inline u8 * format_bihash_kvp_24_8 (u8 * s, va_list * args) |