lib/librte_table: add hash_func header files
Subsystems (2)
PATCH v2 1/3 lib/librte_table: add hash_func header files
This commit adds rte_table_hash_func.h and rte_table_hash_func_arm64.h to librte_table. This will replace hash_func.h and hash_func_arm64.h in the IP Pipeline application and in SoftNIC. This also adds a scalar implementation of the x86_64 intrinsic for crc32 as a generic fallback.
---
v2:
- Fixed typo in commit message
- Fixed typo in arm header that caused some compilations to fail for the entire patchset
--- lib/librte_table/Makefile | 2 + lib/librte_table/meson.build | 2 + lib/librte_table/rte_table_hash_func.h | 244 +++++++++++++++++++++++++++ lib/librte_table/rte_table_hash_func_arm64.h | 21 +++ lib/librte_table/rte_table_version.map | 14 ++ 5 files changed, 283 insertions(+) create mode 100644 lib/librte_table/rte_table_hash_func.h create mode 100644 lib/librte_table/rte_table_hash_func_arm64.h
lib/librte_table/Makefile +2 -0
@@ -46,6 +46,8 @@ SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_acl.h endif SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash.h SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash_cuckoo.h +SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash_func.h +SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash_func_arm64.h SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_lru.h ifeq ($(CONFIG_RTE_ARCH_X86),y) SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_lru_x86.h
lib/librte_table/meson.build +2 -0
@@ -19,6 +19,8 @@ headers = files('rte_table.h', 'rte_table_lpm_ipv6.h', 'rte_table_hash.h', 'rte_table_hash_cuckoo.h', + 'rte_table_hash_func.h', + 'rte_table_hash_func_arm64.h', 'rte_lru.h', 'rte_table_array.h', 'rte_table_stub.h')
lib/librte_table/rte_table_hash_func.h new file +244 -0
244 lines not on this page · raw message
lib/librte_table/rte_table_hash_func_arm64.h new file +21 -0
@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(c) 2017-2018 Linaro Limited +*/ + +#ifndef __INCLUDE_RTE_TABLE_HASH_FUNC_ARM64_H__ +#define __INCLUDE_RTE_TABLE_HASH_FUNC_ARM64_H__ + +#define _CRC32CX (crc, val) \ + __asm__("crc32cx %w[c], %w[c], %x[v]":[c] "+r" (crc):[v] "r" (val)) + +static inline uint64_t +rte_crc32_u64 (uint64_t crc,uint64_t v) +{ +uint32_t crc32 = crc; + +_CRC32CX (crc32, v); + +return crc32; +} + +#endif
lib/librte_table/rte_table_version.map +14 -0
@@ -18,3 +18,17 @@ DPDK_17.11 { local: *; }; + +DPDK_18.11 { + global: + + rte_crc32_u64_generic; + rte_table_hash_crc_key8; + rte_table_hash_crc_key16; + rte_table_hash_crc_key24; + rte_table_hash_crc_key32; + rte_table_hash_crc_key40; + rte_table_hash_crc_key48; + rte_table_hash_crc_key56; + rte_table_hash_crc_key64; +} DPDK_17.11;
Signature · 1 line
2.9.5
PATCH v2 2/3 examples/ip_pipeline: modify application to use librte_table headers
This commit modifies the IP Pipeline application to use the new header files in librte_table.
As we are now using the new header files, we can remove the old ones from the application directory.
--- examples/ip_pipeline/action.c | 34 ++-- examples/ip_pipeline/hash_func.h | 357 --------------------------------- examples/ip_pipeline/hash_func_arm64.h | 232 --------------------- examples/ip_pipeline/pipeline.c | 19 +- 4 files changed, 26 insertions(+), 616 deletions(-) delete mode 100644 examples/ip_pipeline/hash_func.h delete mode 100644 examples/ip_pipeline/hash_func_arm64.h
examples/ip_pipeline/action.c +17 -17
@@ -7,9 +7,9 @@#include <string.h> #include <rte_string_fns.h> +#include <rte_table_hash_func.h> #include "action.h" -#include "hash_func.h" /** * Input port
@@ -57,35 +57,35 @@ port_in_action_profile_create(const char *name, (params->lb.f_hash == NULL)) {switch (params->lb.key_size) {case 8 : - params->lb.f_hash = hash_default_key8; + params->lb.f_hash = rte_table_hash_crc_key8;break ;case 16 : - params->lb.f_hash = hash_default_key16; + params->lb.f_hash = rte_table_hash_crc_key16;break ;case 24 : - params->lb.f_hash = hash_default_key24; + params->lb.f_hash = rte_table_hash_crc_key24;break ;case 32 : - params->lb.f_hash = hash_default_key32; + params->lb.f_hash = rte_table_hash_crc_key32;break ;case 40 : - params->lb.f_hash = hash_default_key40; + params->lb.f_hash = rte_table_hash_crc_key40;break ;case 48 : - params->lb.f_hash = hash_default_key48; + params->lb.f_hash = rte_table_hash_crc_key48;break ;case 56 : - params->lb.f_hash = hash_default_key56; + params->lb.f_hash = rte_table_hash_crc_key56;break ;case 64 : - params->lb.f_hash = hash_default_key64; + params->lb.f_hash = rte_table_hash_crc_key64;break ;default :
@@ -192,35 +192,35 @@ table_action_profile_create(const char *name, (params->lb.f_hash == NULL)) {switch (params->lb.key_size) {case 8 : - params->lb.f_hash = hash_default_key8; + params->lb.f_hash = rte_table_hash_crc_key8;break ;case 16 : - params->lb.f_hash = hash_default_key16; + params->lb.f_hash = rte_table_hash_crc_key16;break ;case 24 : - params->lb.f_hash = hash_default_key24; + params->lb.f_hash = rte_table_hash_crc_key24;break ;case 32 : - params->lb.f_hash = hash_default_key32; + params->lb.f_hash = rte_table_hash_crc_key32;break ;case 40 : - params->lb.f_hash = hash_default_key40; + params->lb.f_hash = rte_table_hash_crc_key40;break ;case 48 : - params->lb.f_hash = hash_default_key48; + params->lb.f_hash = rte_table_hash_crc_key48;break ;case 56 : - params->lb.f_hash = hash_default_key56; + params->lb.f_hash = rte_table_hash_crc_key56;break ;case 64 : - params->lb.f_hash = hash_default_key64; + params->lb.f_hash = rte_table_hash_crc_key64;break ;default :
examples/ip_pipeline/hash_func.h deleted +0 -357
357 lines not on this page · raw message
examples/ip_pipeline/hash_func_arm64.h deleted +0 -232
232 lines not on this page · raw message
examples/ip_pipeline/pipeline.c +9 -10
@@ -22,6 +22,7 @@#include <rte_table_acl.h> #include <rte_table_array.h> #include <rte_table_hash.h> +#include <rte_table_hash_func.h> #include <rte_table_lpm.h> #include <rte_table_lpm_ipv6.h> #include <rte_table_stub.h>
@@ -36,8 +37,6 @@#include "tmgr.h" #include "swq.h" -#include "hash_func.h" -#ifndef PIPELINE_MSGQ_SIZE #define PIPELINE_MSGQ_SIZE 64#endif
@@ -818,28 +817,28 @@ pipeline_table_create(const char *pipeline_name,switch (params->match.hash.key_size) {case 8 : - f_hash = hash_default_key8; + f_hash = rte_table_hash_crc_key8;break ;case 16 : - f_hash = hash_default_key16; + f_hash = rte_table_hash_crc_key16;break ;case 24 : - f_hash = hash_default_key24; + f_hash = rte_table_hash_crc_key24;break ;case 32 : - f_hash = hash_default_key32; + f_hash = rte_table_hash_crc_key32;break ;case 40 : - f_hash = hash_default_key40; + f_hash = rte_table_hash_crc_key40;break ;case 48 : - f_hash = hash_default_key48; + f_hash = rte_table_hash_crc_key48;break ;case 56 : - f_hash = hash_default_key56; + f_hash = rte_table_hash_crc_key56;break ;case 64 : - f_hash = hash_default_key64; + f_hash = rte_table_hash_crc_key64;break ;default :return -1 ;
Signature · 1 line
2.9.5
PATCH v2 3/3 net/softnic: modify softnic to use librte_table headers
In reply to Kevin LaatzThis commit modifies SoftNIC to make use of the new header files in librte_table.
As we are now using the new header files in librte_table in SoftNIC, we no longer need the old header files so they can be removed.
--- drivers/net/softnic/hash_func.h | 359 ------------------------- drivers/net/softnic/hash_func_arm64.h | 261 ------------------ drivers/net/softnic/rte_eth_softnic_action.c | 34 +-- drivers/net/softnic/rte_eth_softnic_pipeline.c | 19 +- 4 files changed, 26 insertions(+), 647 deletions(-) delete mode 100644 drivers/net/softnic/hash_func.h delete mode 100644 drivers/net/softnic/hash_func_arm64.h
drivers/net/softnic/hash_func.h deleted +0 -359
@@ -1,359 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2010-2018 Intel Corporation -*/ - -#ifndef __INCLUDE_HASH_FUNC_H__ -#define __INCLUDE_HASH_FUNC_H__ - -#include <rte_common.h> - -static inline uint64_t -hash_xor_key8(void *key, void *mask, __rte_unused uint32_t key_size, -uint64_t seed) -{ -uint64_t *k = key; -uint64_t *m = mask; -uint64_t xor0; - - xor0 = seed ^ (k[0 ] & m[0 ]); - -return (xor0 >>32 ) ^ xor0; -} - -static inline uint64_t -hash_xor_key16(void *key, void *mask, __rte_unused uint32_t key_size, -uint64_t seed) -{ -uint64_t *k = key; -uint64_t *m = mask; -uint64_t xor0; - - xor0 = ((k[0 ] & m[0 ]) ^ seed) ^ (k[1 ] & m[1 ]); - -return (xor0 >>32 ) ^ xor0; -} - -static inline uint64_t -hash_xor_key24(void *key, void *mask, __rte_unused uint32_t key_size, -uint64_t seed) -{ -uint64_t *k = key; -uint64_t *m = mask; -uint64_t xor0; - - xor0 = ((k[0 ] & m[0 ]) ^ seed) ^ (k[1 ] & m[1 ]); - - xor0 ^= k[2 ] & m[2 ]; - -return (xor0 >>32 ) ^ xor0; -} - -static inline uint64_t -hash_xor_key32(void *key, void *mask, __rte_unused uint32_t key_size, -uint64_t seed) -{ -uint64_t *k = key; -uint64_t *m = mask; -uint64_t xor0, xor1; - - xor0 = ((k[0 ] & m[0 ]) ^ seed) ^ (k[1 ] & m[1 ]); - xor1 = (k[2 ] & m[2 ]) ^ (k[3 ] & m[3 ]); - - xor0 ^= xor1; - -return (xor0 >>32 ) ^ xor0; -} - -static inline uint64_t -hash_xor_key40(void *key, void *mask, __rte_unused uint32_t key_size, -uint64_t seed) -{ -uint64_t *k = key; -uint64_t *m = mask; -uint64_t xor0, xor1; - - xor0 = ((k[0 ] & m[0 ]) ^ seed) ^ (k[1 ] & m[1 ]); - xor1 = (k[2 ] & m[2 ]) ^ (k[3 ] & m[3 ]); - - xor0 ^= xor1; - - xor0 ^= k[4 ] & m[4 ]; - -return (xor0 >>32 ) ^ xor0; -} - -static inline uint64_t -hash_xor_key48(void *key, void *mask, __rte_unused uint32_t key_size, -uint64_t seed) -{ -uint64_t *k = key; -uint64_t *m = mask; -uint64_t xor0, xor1, xor2; - - xor0 = ((k[0 ] & m[0 ]) ^ seed) ^ (k[1 ] & m[1 ]); - xor1 = (k[2 ] & m[2 ]) ^ (k[3 ] & m[3 ]); - xor2 = (k[4 ] & m[4 ]) ^ (k[5 ] & m[5 ]); - - xor0 ^= xor1; - - xor0 ^= xor2; - -return (xor0 >>32 ) ^ xor0; -} - -static inline uint64_t -hash_xor_key56(void *key, void *mask, __rte_unused uint32_t key_size, -uint64_t seed) -{ -uint64_t *k = key; -uint64_t *m = mask; -uint64_t xor0, xor1, xor2; - - xor0 = ((k[0 ] & m[0 ]) ^ seed) ^ (k[1 ] & m[1 ]); - xor1 = (k[2 ] & m[2 ]) ^ (k[3 ] & m[3 ]); - xor2 = (k[4 ] & m[4 ]) ^ (k[5 ] & m[5 ]); - - xor0 ^= xor1; - xor2 ^= k[6 ] & m[6 ]; - - xor0 ^= xor2; - -return (xor0 >>32 ) ^ xor0; -} - -static inline uint64_t -hash_xor_key64(void *key, void *mask, __rte_unused uint32_t key_size, -uint64_t seed) -{ -uint64_t *k = key; -uint64_t *m = mask; -uint64_t xor0, xor1, xor2, xor3; - - xor0 = ((k[0 ] & m[0 ]) ^ seed) ^ (k[1 ] & m[1 ]); - xor1 = (k[2 ] & m[2 ]) ^ (k[3 ] & m[3 ]); - xor2 = (k[4 ] & m[4 ]) ^ (k[5 ] & m[5 ]); - xor3 = (k[6 ] & m[6 ]) ^ (k[7 ] & m[7 ]); - - xor0 ^= xor1; - xor2 ^= xor3; - - xor0 ^= xor2; - -return (xor0 >>32 ) ^ xor0; -} - -#if defined(RTE_ARCH_X86_64 ) - -#include <x86intrin.h> - -static inline uint64_t -hash_crc_key8(void *key, void *mask, __rte_unused uint32_t key_size, -uint64_t seed) -{ -uint64_t *k = key; -uint64_t *m = mask; -uint64_t crc0; - - crc0 =_mm_crc32_u64 (seed, k[0 ] & m[0 ]); - -return crc0; -} - -static inline uint64_t -hash_crc_key16(void *key, void *mask, __rte_unused uint32_t key_size, -uint64_t seed) -{ -uint64_t *k = key; -uint64_t *m = mask; -uint64_t k0, crc0, crc1; - - k0 = k[0 ] & m[0 ]; - - crc0 =_mm_crc32_u64 (k0, seed); - crc1 =_mm_crc32_u64 (k0 >>32 , k[1 ] & m[1 ]); - - crc0 ^= crc1; - -return crc0; -} - -static inline uint64_t -hash_crc_key24(void *key, void *mask, __rte_unused uint32_t key_size, -uint64_t seed) -{ -uint64_t *k = key; -uint64_t *m = mask; -uint64_t k0, k2, crc0, crc1; - - k0 = k[0 ] & m[0 ]; - k2 = k[2 ] & m[2 ]; - - crc0 =_mm_crc32_u64 (k0, seed); - crc1 =_mm_crc32_u64 (k0 >>32 , k[1 ] & m[1 ]); - - crc0 =_mm_crc32_u64 (crc0, k2); - - crc0 ^= crc1; - -return crc0; -} - -static inline uint64_t -hash_crc_key32(void *key, void *mask, __rte_unused uint32_t key_size, -uint64_t seed) -{ -uint64_t *k = key; -uint64_t *m = mask; -uint64_t k0, k2, crc0, crc1, crc2, crc3; - - k0 = k[0 ] & m[0 ]; - k2 = k[2 ] & m[2 ]; - - crc0 =_mm_crc32_u64 (k0, seed); - crc1 =_mm_crc32_u64 (k0 >>32 , k[1 ] & m[1 ]); - - crc2 =_mm_crc32_u64 (k2, k[3 ] & m[3 ]); - crc3 = k2 >>32 ; - - crc0 =_mm_crc32_u64 (crc0, crc1); - crc1 =_mm_crc32_u64 (crc2, crc3); - - crc0 ^= crc1; - -return crc0; -} - -static inline uint64_t -hash_crc_key40(void *key, void *mask, __rte_unused uint32_t key_size, -uint64_t seed) -{ -uint64_t *k = key; -uint64_t *m = mask; -uint64_t k0, k2, crc0, crc1, crc2, crc3; - - k0 = k[0 ] & m[0 ]; - k2 = k[2 ] & m[2 ]; - - crc0 =_mm_crc32_u64 (k0, seed); - crc1 =_mm_crc32_u64 (k0 >>32 , k[1 ] & m[1 ]); - - crc2 =_mm_crc32_u64 (k2, k[3 ] & m[3 ]); - crc3 =_mm_crc32_u64 (k2 >>32 , k[4 ] & m[4 ]); - - crc0 =_mm_crc32_u64 (crc0, crc1); - crc1 =_mm_crc32_u64 (crc2, crc3); - - crc0 ^= crc1; - -return crc0; -} - -static inline uint64_t -hash_crc_key48(void *key, void *mask, __rte_unused uint32_t key_size, -uint64_t seed) -{ -uint64_t *k = key; -uint64_t *m = mask; -uint64_t k0, k2, k5, crc0, crc1, crc2, crc3; - - k0 = k[0 ] & m[0 ]; - k2 = k[2 ] & m[2 ]; - k5 = k[5 ] & m[5 ]; - - crc0 =_mm_crc32_u64 (k0, seed); - crc1 =_mm_crc32_u64 (k0 >>32 , k[1 ] & m[1 ]); - - crc2 =_mm_crc32_u64 (k2, k[3 ] & m[3 ]); - crc3 =_mm_crc32_u64 (k2 >>32 , k[4 ] & m[4 ]); - - crc0 =_mm_crc32_u64 (crc0, (crc1 <<32 ) ^ crc2); - crc1 =_mm_crc32_u64 (crc3, k5); - - crc0 ^= crc1; - -return crc0; -} - -static inline uint64_t -hash_crc_key56(void *key, void *mask, __rte_unused uint32_t key_size, -uint64_t seed) -{ -uint64_t *k = key; -uint64_t *m = mask; -uint64_t k0, k2, k5, crc0, crc1, crc2, crc3, crc4, crc5; - - k0 = k[0 ] & m[0 ]; - k2 = k[2 ] & m[2 ]; - k5 = k[5 ] & m[5 ]; - - crc0 =_mm_crc32_u64 (k0, seed); - crc1 =_mm_crc32_u64 (k0 >>32 , k[1 ] & m[1 ]); - - crc2 =_mm_crc32_u64 (k2, k[3 ] & m[3 ]); - crc3 =_mm_crc32_u64 (k2 >>32 , k[4 ] & m[4 ]); - - crc4 =_mm_crc32_u64 (k5, k[6 ] & m[6 ]); - crc5 = k5 >>32 ; - - crc0 =_mm_crc32_u64 (crc0, (crc1 <<32 ) ^ crc2); - crc1 =_mm_crc32_u64 (crc3, (crc4 <<32 ) ^ crc5); - - crc0 ^= crc1; - -return crc0; -} - -static inline uint64_t -hash_crc_key64(void *key, void *mask, __rte_unused uint32_t key_size, -uint64_t seed) -{ -uint64_t *k = key; -uint64_t *m = mask; -uint64_t k0, k2, k5, crc0, crc1, crc2, crc3, crc4, crc5; - - k0 = k[0 ] & m[0 ]; - k2 = k[2 ] & m[2 ]; - k5 = k[5 ] & m[5 ]; - - crc0 =_mm_crc32_u64 (k0, seed); - crc1 =_mm_crc32_u64 (k0 >>32 , k[1 ] & m[1 ]); - - crc2 =_mm_crc32_u64 (k2, k[3 ] & m[3 ]); - crc3 =_mm_crc32_u64 (k2 >>32 , k[4 ] & m[4 ]); - - crc4 =_mm_crc32_u64 (k5, k[6 ] & m[6 ]); - crc5 =_mm_crc32_u64 (k5 >>32 , k[7 ] & m[7 ]); - - crc0 =_mm_crc32_u64 (crc0, (crc1 <<32 ) ^ crc2); - crc1 =_mm_crc32_u64 (crc3, (crc4 <<32 ) ^ crc5); - - crc0 ^= crc1; - -return crc0; -} - -#define hash_default_key8 hash_crc_key8 -#define hash_default_key16 hash_crc_key16 -#define hash_default_key24 hash_crc_key24 -#define hash_default_key32 hash_crc_key32 -#define hash_default_key40 hash_crc_key40 -#define hash_default_key48 hash_crc_key48 -#define hash_default_key56 hash_crc_key56 -#define hash_default_key64 hash_crc_key64 - -#elif defined(RTE_ARCH_ARM64 ) -#include "hash_func_arm64.h" -#else - -#define hash_default_key8 hash_xor_key8 -#define hash_default_key16 hash_xor_key16 -#define hash_default_key24 hash_xor_key24 -#define hash_default_key32 hash_xor_key32 -#define hash_default_key40 hash_xor_key40 -#define hash_default_key48 hash_xor_key48 -#define hash_default_key56 hash_xor_key56 -#define hash_default_key64 hash_xor_key64 - -#endif - -#endif
drivers/net/softnic/hash_func_arm64.h deleted +0 -261
261 lines not on this page · raw message
drivers/net/softnic/rte_eth_softnic_action.c +17 -17
@@ -7,8 +7,8 @@#include <string.h> #include <rte_string_fns.h> +#include <rte_table_hash_func.h> -#include "hash_func.h" #include "rte_eth_softnic_internals.h" /**
@@ -72,35 +72,35 @@ softnic_port_in_action_profile_create(struct pmd_internals *p, params->lb.f_hash == NULL) {switch (params->lb.key_size) {case 8 : - params->lb.f_hash = hash_default_key8; + params->lb.f_hash = rte_table_hash_crc_key8;break ;case 16 : - params->lb.f_hash = hash_default_key16; + params->lb.f_hash = rte_table_hash_crc_key16;break ;case 24 : - params->lb.f_hash = hash_default_key24; + params->lb.f_hash = rte_table_hash_crc_key24;break ;case 32 : - params->lb.f_hash = hash_default_key32; + params->lb.f_hash = rte_table_hash_crc_key32;break ;case 40 : - params->lb.f_hash = hash_default_key40; + params->lb.f_hash = rte_table_hash_crc_key40;break ;case 48 : - params->lb.f_hash = hash_default_key48; + params->lb.f_hash = rte_table_hash_crc_key48;break ;case 56 : - params->lb.f_hash = hash_default_key56; + params->lb.f_hash = rte_table_hash_crc_key56;break ;case 64 : - params->lb.f_hash = hash_default_key64; + params->lb.f_hash = rte_table_hash_crc_key64;break ;default :
@@ -223,35 +223,35 @@ softnic_table_action_profile_create(struct pmd_internals *p, params->lb.f_hash == NULL) {switch (params->lb.key_size) {case 8 : - params->lb.f_hash = hash_default_key8; + params->lb.f_hash = rte_table_hash_crc_key8;break ;case 16 : - params->lb.f_hash = hash_default_key16; + params->lb.f_hash = rte_table_hash_crc_key16;break ;case 24 : - params->lb.f_hash = hash_default_key24; + params->lb.f_hash = rte_table_hash_crc_key24;break ;case 32 : - params->lb.f_hash = hash_default_key32; + params->lb.f_hash = rte_table_hash_crc_key32;break ;case 40 : - params->lb.f_hash = hash_default_key40; + params->lb.f_hash = rte_table_hash_crc_key40;break ;case 48 : - params->lb.f_hash = hash_default_key48; + params->lb.f_hash = rte_table_hash_crc_key48;break ;case 56 : - params->lb.f_hash = hash_default_key56; + params->lb.f_hash = rte_table_hash_crc_key56;break ;case 64 : - params->lb.f_hash = hash_default_key64; + params->lb.f_hash = rte_table_hash_crc_key64;break ;default :
drivers/net/softnic/rte_eth_softnic_pipeline.c +9 -10
@@ -19,14 +19,13 @@#include <rte_table_acl.h> #include <rte_table_array.h> #include <rte_table_hash.h> +#include <rte_table_hash_func.h> #include <rte_table_lpm.h> #include <rte_table_lpm_ipv6.h> #include <rte_table_stub.h> #include "rte_eth_softnic_internals.h" -#include "hash_func.h" -#ifndef PIPELINE_MSGQ_SIZE #define PIPELINE_MSGQ_SIZE 64#endif
@@ -797,28 +796,28 @@ softnic_pipeline_table_create(struct pmd_internals *softnic,switch (params->match.hash.key_size) {case 8 : - f_hash = hash_default_key8; + f_hash = rte_table_hash_crc_key8;break ;case 16 : - f_hash = hash_default_key16; + f_hash = rte_table_hash_crc_key16;break ;case 24 : - f_hash = hash_default_key24; + f_hash = rte_table_hash_crc_key24;break ;case 32 : - f_hash = hash_default_key32; + f_hash = rte_table_hash_crc_key32;break ;case 40 : - f_hash = hash_default_key40; + f_hash = rte_table_hash_crc_key40;break ;case 48 : - f_hash = hash_default_key48; + f_hash = rte_table_hash_crc_key48;break ;case 56 : - f_hash = hash_default_key56; + f_hash = rte_table_hash_crc_key56;break ;case 64 : - f_hash = hash_default_key64; + f_hash = rte_table_hash_crc_key64;break ;default :return -1 ;
Signature · 1 line
2.9.5
The code looks good, some comments to the commit message.
Quoted 9 lines
-----Original Message-----
From: Kevin Laatz <[email protected]>
Sent: Friday, September 7, 2018 4:05 PM
To: [email protected]
Cc: [email protected]; Jianbo Liu <[email protected]>; Gavin Hu (Arm Technology China) <[email protected]>; [email protected]; Kevin Laatz <[email protected]>
Subject: [PATCH v2 1/3]lib/librte_table: addhash_funcheader files
Quoted 4 lines
This commit adds
rte_table_hash_func.handrte_table_hash_func_arm64.htolibrte_table. This will replacehash_func.handhash_func_arm64.hin the IP Pipeline application and in SoftNIC. This also adds a scalar implementation of thex86_64intrinsic for crc32 as a generic fallback.
It is better to mention this patch reduces code duplication by removing duplicate headers files Within two folders and consolidating them into a single one.
Quoted 3 lines
Signed-off-by Cristian Dumitrescu <[email protected]>Signed-off-by Kevin Laatz <[email protected]>
Quoted 347 lines
---
v2:
- Fixed typo in commit message
- Fixed typo in arm header that caused some compilations to fail for the entire patchset--- lib/librte_table/Makefile | 2 + lib/librte_table/meson.build | 2 + lib/librte_table/rte_table_hash_func.h | 244 +++++++++++++++++++++++++++ lib/librte_table/rte_table_hash_func_arm64.h | 21 +++ lib/librte_table/rte_table_version.map | 14 ++ 5 files changed, 283 insertions(+) create mode 100644 lib/librte_table/rte_table_hash_func.h create mode 100644 lib/librte_table/rte_table_hash_func_arm64.hlib/librte_table/Makefile index renamed from lib/librte_table/Makefile +0
-0276d476..f935678 100644
lib/librte_table/Makefile +0
-0@@ -46,6 +46,8 @@ SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include +=
rte_table_acl.hendif SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include +=rte_table_hash.hSYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include +=rte_table_hash_cuckoo.hlib/librte_table/Makefile +3
-0+SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash_func.h +SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += +rte_table_hash_func_arm64.h SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_lru.h ifeq($(CONFIG_RTE_ARCH_X86),y) SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)- include +=
rte_lru_x86.hdiff --git a/lib/librte_table/meson.build b/lib/librte_table/meson.build index 8b2f841..6ae3cd6 100644lib/librte_table/meson.build +2
-0@@ -19,6 +19,8 @@ headers = files('rte_table.h', 'rte_table_lpm_ipv6.h', 'rte_table_hash.h', 'rte_table_hash_cuckoo.h', +'rte_table_hash_func.h', +'rte_table_hash_func_arm64.h', 'rte_lru.h', 'rte_table_array.h', 'rte_table_stub.h')lib/librte_table/rte_table_hash_func.h new file +51
-0@@ -0,0 +1,244 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(c) 2010-2018 Intel Corporation */ + +#ifndef __INCLUDE_RTE_TABLE_HASH_FUNC_H__ #define +__INCLUDE_RTE_TABLE_HASH_FUNC_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <stdint.h> + +#include <rte_common.h> + +static inline uint64_t +rte_crc32_u64_generic(uint64_t crc, uint64_t value) { +int i; + +crc = (crc & 0xFFFFFFFFLLU) ^ value; +for (i = 63; i >= 0; i--) { +uint64_t mask; + +mask = -(crc & 1LLU); +crc = (crc >> 1LLU) ^ (0x82F63B78LLU & mask); +} + +return crc; +} + +#if defined(RTE_ARCH_X86_64) + +#include <x86intrin.h> + +static inline uint64_t +rte_crc32_u64(uint64_t crc, uint64_t v) { +return _mm_crc32_u64(crc, v); +} + +#elif defined(RTE_ARCH_ARM64) +#include "rte_table_hash_func_arm64.h" +#else + +static inline uin64_t +rte_crc32_u64(uint64_t crc, uint64_t v) { +return rte_crc32_u64_generic(crc, v); +} + +#endif + +static inline uint64_t +rte_table_hash_crc_key8(void *key, void *mask, __rte_unused uint32_t
key_size,lib/librte_table/rte_table_hash_func.h new file +13
-0+uint64_t seed) +{ +uint64_t *k = key; +uint64_t *m = mask; +uint64_t crc0; + +crc0 =rte_crc32_u64 (seed, k[0 ] & m[0 ]); + +return crc0; +} + +static inline uint64_t +rte_table_hash_crc_key16(void *key, void *mask, __rte_unused uint32_t
key_size,lib/librte_table/rte_table_hash_func.h new file +18
-0+uint64_t seed) +{ +uint64_t *k = key; +uint64_t *m = mask; +uint64_t k0, crc0, crc1; + +k0 = k[0 ] & m[0 ]; + +crc0 =rte_crc32_u64 (k0, seed); +crc1 =rte_crc32_u64 (k0 >>32 , k[1 ] & m[1 ]); + +crc0 ^= crc1; + +return crc0; +} + +static inline uint64_t +rte_table_hash_crc_key24(void *key, void *mask, __rte_unused uint32_t
key_size,lib/librte_table/rte_table_hash_func.h new file +21
-0+uint64_t seed) +{ +uint64_t *k = key; +uint64_t *m = mask; +uint64_t k0, k2, crc0, crc1; + +k0 = k[0 ] & m[0 ]; +k2 = k[2 ] & m[2 ]; + +crc0 =rte_crc32_u64 (k0, seed); +crc1 =rte_crc32_u64 (k0 >>32 , k[1 ] & m[1 ]); + +crc0 =rte_crc32_u64 (crc0, k2); + +crc0 ^= crc1; + +return crc0; +} + +static inline uint64_t +rte_table_hash_crc_key32(void *key, void *mask, __rte_unused uint32_t
key_size,lib/librte_table/rte_table_hash_func.h new file +25
-0+uint64_t seed) +{ +uint64_t *k = key; +uint64_t *m = mask; +uint64_t k0, k2, crc0, crc1, crc2, crc3; + +k0 = k[0 ] & m[0 ]; +k2 = k[2 ] & m[2 ]; + +crc0 =rte_crc32_u64 (k0, seed); +crc1 =rte_crc32_u64 (k0 >>32 , k[1 ] & m[1 ]); + +crc2 =rte_crc32_u64 (k2, k[3 ] & m[3 ]); +crc3 = k2 >>32 ; + +crc0 =rte_crc32_u64 (crc0, crc1); +crc1 =rte_crc32_u64 (crc2, crc3); + +crc0 ^= crc1; + +return crc0; +} + +static inline uint64_t +rte_table_hash_crc_key40(void *key, void *mask, __rte_unused uint32_t
key_size,lib/librte_table/rte_table_hash_func.h new file +25
-0+uint64_t seed) +{ +uint64_t *k = key; +uint64_t *m = mask; +uint64_t k0, k2, crc0, crc1, crc2, crc3; + +k0 = k[0 ] & m[0 ]; +k2 = k[2 ] & m[2 ]; + +crc0 =rte_crc32_u64 (k0, seed); +crc1 =rte_crc32_u64 (k0 >>32 , k[1 ] & m[1 ]); + +crc2 =rte_crc32_u64 (k2, k[3 ] & m[3 ]); +crc3 =rte_crc32_u64 (k2 >>32 , k[4 ] & m[4 ]); + +crc0 =rte_crc32_u64 (crc0, crc1); +crc1 =rte_crc32_u64 (crc2, crc3); + +crc0 ^= crc1; + +return crc0; +} + +static inline uint64_t +rte_table_hash_crc_key48(void *key, void *mask, __rte_unused uint32_t
key_size,lib/librte_table/rte_table_hash_func.h new file +26
-0+uint64_t seed) +{ +uint64_t *k = key; +uint64_t *m = mask; +uint64_t k0, k2, k5, crc0, crc1, crc2, crc3; + +k0 = k[0 ] & m[0 ]; +k2 = k[2 ] & m[2 ]; +k5 = k[5 ] & m[5 ]; + +crc0 =rte_crc32_u64 (k0, seed); +crc1 =rte_crc32_u64 (k0 >>32 , k[1 ] & m[1 ]); + +crc2 =rte_crc32_u64 (k2, k[3 ] & m[3 ]); +crc3 =rte_crc32_u64 (k2 >>32 , k[4 ] & m[4 ]); + +crc0 =rte_crc32_u64 (crc0, (crc1 <<32 ) ^ crc2); +crc1 =rte_crc32_u64 (crc3, k5); + +crc0 ^= crc1; + +return crc0; +} + +static inline uint64_t +rte_table_hash_crc_key56(void *key, void *mask, __rte_unused uint32_t
key_size,lib/librte_table/rte_table_hash_func.h new file +29
-0+uint64_t seed) +{ +uint64_t *k = key; +uint64_t *m = mask; +uint64_t k0, k2, k5, crc0, crc1, crc2, crc3, crc4, crc5; + +k0 = k[0 ] & m[0 ]; +k2 = k[2 ] & m[2 ]; +k5 = k[5 ] & m[5 ]; + +crc0 =rte_crc32_u64 (k0, seed); +crc1 =rte_crc32_u64 (k0 >>32 , k[1 ] & m[1 ]); + +crc2 =rte_crc32_u64 (k2, k[3 ] & m[3 ]); +crc3 =rte_crc32_u64 (k2 >>32 , k[4 ] & m[4 ]); + +crc4 =rte_crc32_u64 (k5, k[6 ] & m[6 ]); +crc5 = k5 >>32 ; + +crc0 =rte_crc32_u64 (crc0, (crc1 <<32 ) ^ crc2); +crc1 =rte_crc32_u64 (crc3, (crc4 <<32 ) ^ crc5); + +crc0 ^= crc1; + +return crc0; +} + +static inline uint64_t +rte_table_hash_crc_key64(void *key, void *mask, __rte_unused uint32_t
key_size,lib/librte_table/rte_table_hash_func.h new file +32
-0+uint64_t seed) +{ +uint64_t *k = key; +uint64_t *m = mask; +uint64_t k0, k2, k5, crc0, crc1, crc2, crc3, crc4, crc5; + +k0 = k[0 ] & m[0 ]; +k2 = k[2 ] & m[2 ]; +k5 = k[5 ] & m[5 ]; + +crc0 =rte_crc32_u64 (k0, seed); +crc1 =rte_crc32_u64 (k0 >>32 , k[1 ] & m[1 ]); + +crc2 =rte_crc32_u64 (k2, k[3 ] & m[3 ]); +crc3 =rte_crc32_u64 (k2 >>32 , k[4 ] & m[4 ]); + +crc4 =rte_crc32_u64 (k5, k[6 ] & m[6 ]); +crc5 =rte_crc32_u64 (k5 >>32 , k[7 ] & m[7 ]); + +crc0 =rte_crc32_u64 (crc0, (crc1 <<32 ) ^ crc2); +crc1 =rte_crc32_u64 (crc3, (crc4 <<32 ) ^ crc5); + +crc0 ^= crc1; + +return crc0; +} + +#ifdef __cplusplus +} +#endif + +#endif lib/librte_table/rte_table_hash_func_arm64.h new file +19
-0@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(c) 2017-2018 Linaro Limited */ + +#ifndef __INCLUDE_RTE_TABLE_HASH_FUNC_ARM64_H__ +#define __INCLUDE_RTE_TABLE_HASH_FUNC_ARM64_H__ + +#define _CRC32CX (crc, val)\ +__asm__("crc32cx %w[c], %w[c], %x[v]":[c] "+r" (crc):[v] "r" (val)) + +static inline uint64_t +rte_crc32_u64 (uint64_t crc,uint64_t v) { +uint32_t crc32 = crc; + +_CRC32CX (crc32, v); + +return crc32; +} + +#endif lib/librte_table/rte_table_version.map +14
-1@@ -18,3 +18,17 @@ DPDK_17.11 { local: *; }; + +DPDK_18.11 { +global: + +rte_crc32_u64_generic; +rte_table_hash_crc_key8; +rte_table_hash_crc_key16; +rte_table_hash_crc_key24; +rte_table_hash_crc_key32; +rte_table_hash_crc_key40; +rte_table_hash_crc_key48; +rte_table_hash_crc_key56; +rte_table_hash_crc_key64; +} DPDK_17.11; --
Quoted 1 line
2.9.5
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.