X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fbihash_24_8.h;h=6d1cdd310bdfd9d88b6a15f0e68d25e09e396285;hb=fa76a76bf3388f09d55d0c83e7aea507c44f9619;hp=353f06bf11f5e6c51ebe129a8618f168f450356b;hpb=7cd468a3d7dee7d6c92f69a0bb7061ae208ec727;p=vpp.git

diff --git a/src/vppinfra/bihash_24_8.h b/src/vppinfra/bihash_24_8.h
index 353f06bf11f..6d1cdd310bd 100644
--- a/src/vppinfra/bihash_24_8.h
+++ b/src/vppinfra/bihash_24_8.h
@@ -13,6 +13,7 @@
  * limitations under the License.
  */
 #undef BIHASH_TYPE
+#undef BIHASH_KVP_PER_PAGE
 
 #define BIHASH_TYPE _24_8
 #define BIHASH_KVP_PER_PAGE 4
@@ -20,6 +21,7 @@
 #ifndef __included_bihash_24_8_h__
 #define __included_bihash_24_8_h__
 
+#include <vppinfra/crc32.h>
 #include <vppinfra/heap.h>
 #include <vppinfra/format.h>
 #include <vppinfra/pool.h>
@@ -34,7 +36,7 @@ typedef struct
 static inline int
 clib_bihash_is_free_24_8 (const clib_bihash_kv_24_8_t * v)
 {
-  /* Free values are memset to 0xff, check a bit... */
+  /* Free values are clib_memset to 0xff, check a bit... */
   if (v->key[0] == ~0ULL && v->value == ~0ULL)
     return 1;
   return 0;
@@ -43,12 +45,8 @@ clib_bihash_is_free_24_8 (const clib_bihash_kv_24_8_t * v)
 static inline u64
 clib_bihash_hash_24_8 (const clib_bihash_kv_24_8_t * v)
 {
-#if __SSE4_2__
-  u32 value = 0;
-  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;
+#ifdef clib_crc32c_uses_intrinsics
+  return clib_crc32c ((u8 *) v->key, 24);
 #else
   u64 tmp = v->key[0] ^ v->key[1] ^ v->key[2];
   return clib_xxhash (tmp);
@@ -66,9 +64,18 @@ format_bihash_kvp_24_8 (u8 * s, va_list * args)
 }
 
 static inline int
-clib_bihash_key_compare_24_8 (const u64 * a, const u64 * b)
+clib_bihash_key_compare_24_8 (u64 * a, u64 * b)
 {
+#if defined (CLIB_HAVE_VEC512)
+  u64x8 v = u64x8_load_unaligned (a) ^ u64x8_load_unaligned (b);
+  return (u64x8_is_zero_mask (v) & 0x7) == 0;
+#elif defined(CLIB_HAVE_VEC128) && defined(CLIB_HAVE_VEC128_UNALIGNED_LOAD_STORE)
+  u64x2 v = { a[2] ^ b[2], 0 };
+  v |= u64x2_load_unaligned (a) ^ u64x2_load_unaligned (b);
+  return u64x2_is_all_zero (v);
+#else
   return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) == 0;
+#endif
 }
 
 #undef __included_bihash_template_h__