X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fbihash_48_8.h;h=9aebe66d264b8f23e68cdbadf62415258355ddea;hb=refs%2Fchanges%2F50%2F14950%2F2;hp=48079e0a1cf24308fee54ee74c8c243f34ee60fa;hpb=b4bd28a490012ecbce292561da404d4e9b02d24b;p=vpp.git diff --git a/src/vppinfra/bihash_48_8.h b/src/vppinfra/bihash_48_8.h index 48079e0a1cf..9aebe66d264 100644 --- a/src/vppinfra/bihash_48_8.h +++ b/src/vppinfra/bihash_48_8.h @@ -14,6 +14,7 @@ */ #undef BIHASH_TYPE +#undef BIHASH_KVP_PER_PAGE #define BIHASH_TYPE _48_8 #define BIHASH_KVP_PER_PAGE 4 @@ -66,10 +67,27 @@ format_bihash_kvp_48_8 (u8 * s, va_list * args) } static inline int -clib_bihash_key_compare_48_8 (const u64 * a, const u64 * b) +clib_bihash_key_compare_48_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) & 0x3f) == 0; +#elif defined (CLIB_HAVE_VEC256) + u64x4 v = { 0 }; + v = u64x4_insert_lo (v, u64x2_load_unaligned (a + 4) ^ + u64x2_load_unaligned (b + 4)); + v |= u64x4_load_unaligned (a) ^ u64x4_load_unaligned (b); + return u64x4_is_all_zero (v); +#elif defined(CLIB_HAVE_VEC128) && defined(CLIB_HAVE_VEC128_UNALIGNED_LOAD_STORE) + u64x2 v; + v = u64x2_load_unaligned (a) ^ u64x2_load_unaligned (b); + v |= u64x2_load_unaligned (a + 2) ^ u64x2_load_unaligned (b + 2); + v |= u64x2_load_unaligned (a + 4) ^ u64x2_load_unaligned (b + 4); + return u64x2_is_all_zero (v); +#else return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2]) | (a[3] ^ b[3]) | (a[4] ^ b[4]) | (a[5] ^ b[5])) == 0; +#endif } #undef __included_bihash_template_h__