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_8_8.h
diff --git
a/src/vppinfra/bihash_8_8.h
b/src/vppinfra/bihash_8_8.h
index
d70da59
..
2fdd2ed
100644
(file)
--- a/
src/vppinfra/bihash_8_8.h
+++ b/
src/vppinfra/bihash_8_8.h
@@
-13,9
+13,20
@@
* limitations under the License.
*/
#undef BIHASH_TYPE
* limitations under the License.
*/
#undef BIHASH_TYPE
+#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
+#undef BIHASH_USE_HEAP
#define BIHASH_TYPE _8_8
#define BIHASH_TYPE _8_8
-#define BIHASH_KVP_PER_PAGE 4
+#define BIHASH_KVP_PER_PAGE 7
+#define BIHASH_KVP_AT_BUCKET_LEVEL 1
+#define BIHASH_LAZY_INSTANTIATE 0
+#define BIHASH_BUCKET_PREFETCH_CACHE_LINES 2
+#define BIHASH_USE_HEAP 1
#ifndef __included_bihash_8_8_h__
#define __included_bihash_8_8_h__
#ifndef __included_bihash_8_8_h__
#define __included_bihash_8_8_h__
@@
-24,10
+35,7
@@
#include <vppinfra/format.h>
#include <vppinfra/pool.h>
#include <vppinfra/xxhash.h>
#include <vppinfra/format.h>
#include <vppinfra/pool.h>
#include <vppinfra/xxhash.h>
-
-#if __SSE4_2__
-#include <x86intrin.h>
-#endif
+#include <vppinfra/crc32.h>
/** 8 octet key, 8 octet key value pair */
typedef struct
/** 8 octet key, 8 octet key value pair */
typedef struct
@@
-54,8
+62,8
@@
static inline u64
clib_bihash_hash_8_8 (clib_bihash_kv_8_8_t * v)
{
/* Note: to torture-test linear scan, make this fn return a constant */
clib_bihash_hash_8_8 (clib_bihash_kv_8_8_t * v)
{
/* Note: to torture-test linear scan, make this fn return a constant */
-#if
__SSE4_2__
- return
_mm_crc32_u64 (0, v->key
);
+#if
def clib_crc32c_uses_intrinsics
+ return
clib_crc32c ((u8 *) & v->key, 8
);
#else
return clib_xxhash (v->key);
#endif
#else
return clib_xxhash (v->key);
#endif