Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
tests: multiple apidir locations
[vpp.git]
/
src
/
vppinfra
/
bihash_48_8.h
diff --git
a/src/vppinfra/bihash_48_8.h
b/src/vppinfra/bihash_48_8.h
index
760ec0a
..
928b102
100644
(file)
--- a/
src/vppinfra/bihash_48_8.h
+++ b/
src/vppinfra/bihash_48_8.h
@@
-14,12
+14,18
@@
*/
#undef BIHASH_TYPE
*/
#undef BIHASH_TYPE
-#undef BIHASH_KVP_CACHE_SIZE
#undef BIHASH_KVP_PER_PAGE
#undef BIHASH_KVP_PER_PAGE
+#undef BIHASH_32_64_SVM
+#undef BIHASH_ENABLE_STATS
+#undef BIHASH_KVP_AT_BUCKET_LEVEL
+#undef BIHASH_LAZY_INSTANTIATE
+#undef BIHASH_BUCKET_PREFETCH_CACHE_LINES
#define BIHASH_TYPE _48_8
#define BIHASH_KVP_PER_PAGE 4
#define BIHASH_TYPE _48_8
#define BIHASH_KVP_PER_PAGE 4
-#define BIHASH_KVP_CACHE_SIZE 2
+#define BIHASH_KVP_AT_BUCKET_LEVEL 0
+#define BIHASH_LAZY_INSTANTIATE 1
+#define BIHASH_BUCKET_PREFETCH_CACHE_LINES 1
#ifndef __included_bihash_48_8_h__
#define __included_bihash_48_8_h__
#ifndef __included_bihash_48_8_h__
#define __included_bihash_48_8_h__
@@
-39,7
+45,7
@@
typedef struct
static inline int
clib_bihash_is_free_48_8 (const clib_bihash_kv_48_8_t * v)
{
static inline int
clib_bihash_is_free_48_8 (const clib_bihash_kv_48_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;
if (v->key[0] == ~0ULL && v->value == ~0ULL)
return 1;
return 0;
@@
-72,12
+78,13
@@
static inline int
clib_bihash_key_compare_48_8 (u64 * a, u64 * b)
{
#if defined (CLIB_HAVE_VEC512)
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
;
+ return u64x8_is_equal (u64x8_mask_load_zero (a, 0x3f),
+
u64x8_mask_load_zero (b, 0x3f))
;
#elif defined (CLIB_HAVE_VEC256)
#elif defined (CLIB_HAVE_VEC256)
- u64x4 v;
- v = u64x4_load_unaligned (a) ^ u64x4_load_unaligned (b);
- v |= u64x4_load_unaligned (a + 2) ^ u64x4_load_unaligned (b + 2);
+ 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;
return u64x4_is_all_zero (v);
#elif defined(CLIB_HAVE_VEC128) && defined(CLIB_HAVE_VEC128_UNALIGNED_LOAD_STORE)
u64x2 v;