diff options
| author |   Damjan Marion <damarion@cisco.com> | 2017-04-26 13:05:05 +0200 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2017-05-10 16:47:10 +0000 |
| commit | 0f68c79a9d8533d492c8221f924b14cf4e222136 (patch) | |
| tree | 269f45626938f179a20d0519ebd27781d7c51708 /src/plugins | |
| parent | 4fb27eed7e1f986394e20035a24476237c7e6f60 (diff) | |
Add crc32c inline function, allows compilation on 32-bit systems
32-bit code still can use crc32c instructions, but it operates
on 32 registers
Change-Id: I9bb6b0b59635d6ea6a753584676ebcf59c8f6584
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/acl/bihash_40_8.h | 9 | ||||
| -rw-r--r-- | src/plugins/lb/lbhash.h | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/plugins/acl/bihash_40_8.h b/src/plugins/acl/bihash_40_8.h index ba3dfbea..1dfb6a1e 100644 --- a/src/plugins/acl/bihash_40_8.h +++ b/src/plugins/acl/bihash_40_8.h @@ -24,6 +24,7 @@ #include <vppinfra/format.h> #include <vppinfra/pool.h> #include <vppinfra/xxhash.h> +#include <vppinfra/crc32.h> typedef struct { @@ -44,13 +45,7 @@ static inline u64 clib_bihash_hash_40_8 (const clib_bihash_kv_40_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]); - value = _mm_crc32_u64 (value, v->key[3]); - value = _mm_crc32_u64 (value, v->key[4]); - return value; + return clib_crc32c ((u8 *) v->key, 40); #else u64 tmp = v->key[0] ^ v->key[1] ^ v->key[2] ^ v->key[3] ^ v->key[4]; return clib_xxhash (tmp); diff --git a/src/plugins/lb/lbhash.h b/src/plugins/lb/lbhash.h index ca3cc143..c514fb57 100644 --- a/src/plugins/lb/lbhash.h +++ b/src/plugins/lb/lbhash.h @@ -101,7 +101,7 @@ void lb_hash_free(lb_hash_t *h) vec_free(mem); } -#if __SSE4_2__ +#if __SSE4_2__ && !defined (__i386__) static_always_inline u32 lb_hash_hash(u64 k0, u64 k1, u64 k2, u64 k3, u64 k4) { |