Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Allow the user to select master or release during the install
[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
a0d6df2
..
604cf30
100644
(file)
--- a/
src/vppinfra/bihash_8_8.h
+++ b/
src/vppinfra/bihash_8_8.h
@@
-13,6
+13,7
@@
* limitations under the License.
*/
#undef BIHASH_TYPE
* limitations under the License.
*/
#undef BIHASH_TYPE
+#undef BIHASH_KVP_PER_PAGE
#define BIHASH_TYPE _8_8
#define BIHASH_KVP_PER_PAGE 4
#define BIHASH_TYPE _8_8
#define BIHASH_KVP_PER_PAGE 4
@@
-24,10
+25,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
@@
-53,8
+51,9
@@
clib_bihash_is_free_8_8 (clib_bihash_kv_8_8_t * v)
static inline u64
clib_bihash_hash_8_8 (clib_bihash_kv_8_8_t * v)
{
static inline u64
clib_bihash_hash_8_8 (clib_bihash_kv_8_8_t * v)
{
-#if __SSE4_2__
- return _mm_crc32_u64 (0, v->key);
+ /* Note: to torture-test linear scan, make this fn return a constant */
+#ifdef 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