enable lpm, acl and other missing libraries in ppc64le
v3 cover enable lpm, acl and other missing libraries in ppc64le
This patchset enables LPM, ACL and other few missing libs in ppc64le and also address few patches in related examples (ip_pipeline and l3fwd).
Test report:
LPM and ACL unit tests passed.
RTE>>acl_autotest
ACL: allocation of 25166728 bytes on socket 33 for ACL_acl_ctx failed
ACL: rte_acl_add_rules(acl_ctx): rule #1 is invalid
ACL: rte_acl_ipv4vlan_add_rules: rule #1 is invalid
ACL: rte_acl_ipv4vlan_add_rules: rule #1 is invalid
ACL: rte_acl_ipv4vlan_add_rules: rule #1 is invalid
ACL: rte_acl_ipv4vlan_add_rules: rule #1 is invalid
ACL: rte_acl_add_rules(acl_ctx): rule #1 is invalid
acl context <acl_ctx>@0x3efded7ffb80
socket_id=-1
alg=5
max_rules=196608
rule_size=128
num_rules=0
num_categories=0
num_tries=0
acl context <acl_ctx>@0x3efded7ffb80
socket_id=-1
alg=5
max_rules=196608
rule_size=128
num_rules=0
num_categories=0
num_tries=0
running test_convert_rules(acl_ipv4vlan_tuple)
running test_convert_rules(acl_ipv4vlan_tuple, RTE_ACL_FIELD_TYPE_BITMASK type for IPv4) running test_convert_rules(acl_ipv4vlan_tuple, RTE_ACL_FIELD_TYPE_RANGE type for IPv4) running test_convert_rules(acl_ipv4vlan_tuple: swap VLAN and PORTs order) running test_convert_rules(acl_ipv4vlan_tuple: swap SRC and DST IPv4 order) Test OK
RTE>>lpm_autotest
Test OK
RTE>>
v3 changes:
- rebase over master to fix conflict in examples/l3fwd/l3fwd_em.c
v2 changes:
- enabling libs in config included as part of lib changes itself.
gowrishankar (6):
lpm: add altivec intrinsics for dpdk lpm on ppc_64
acl: add altivec intrinsics for dpdk acl on ppc_64
ip_pipeline: fix lcore mapping for varying SMT threads as in ppc64
table: cache align rte_bucket_4_8
sched: enable sched library for ppc64le
l3fwd: add altivec support for em_hash_key
app/test-acl/main.c | 4 + app/test/test_xmmt_ops.h | 16 + config/defconfig_ppc_64-power8-linuxapp-gcc | 7 - examples/ip_pipeline/cpu_core_map.c | 12 +- examples/ip_pipeline/init.c | 4 + examples/l3fwd/l3fwd_em.c | 10 +- lib/librte_acl/Makefile | 2 + lib/librte_acl/acl.h | 4 + lib/librte_acl/acl_run.h | 2 + lib/librte_acl/acl_run_altivec.c | 47 +++ lib/librte_acl/acl_run_altivec.h | 328 +++++++++++++++++++++ lib/librte_acl/rte_acl.c | 13 + lib/librte_acl/rte_acl.h | 1 + .../common/include/arch/ppc_64/rte_vect.h | 60 ++++ lib/librte_lpm/Makefile | 2 + lib/librte_lpm/rte_lpm.h | 2 + lib/librte_lpm/rte_lpm_altivec.h | 154 ++++++++++ lib/librte_table/rte_table_hash_key8.c | 2 +- 18 files changed, 650 insertions(+), 20 deletions(-) create mode 100644 lib/librte_acl/acl_run_altivec.c create mode 100644 lib/librte_acl/acl_run_altivec.h create mode 100644 lib/librte_eal/common/include/arch/ppc_64/rte_vect.h create mode 100644 lib/librte_lpm/rte_lpm_altivec.h
Signature · 1 line
1.9.1
PATCH v3 1/6 lpm: add altivec intrinsics for dpdk lpm on ppc_64
This patch adds ppc64le port for LPM library in DPDK.
--- app/test/test_xmmt_ops.h | 16 +++ config/defconfig_ppc_64-power8-linuxapp-gcc | 1 - .../common/include/arch/ppc_64/rte_vect.h | 60 ++++++++ lib/librte_lpm/Makefile | 2 + lib/librte_lpm/rte_lpm.h | 2 + lib/librte_lpm/rte_lpm_altivec.h | 154 +++++++++++++++++++++ 6 files changed, 234 insertions(+), 1 deletion(-) create mode 100644 lib/librte_eal/common/include/arch/ppc_64/rte_vect.h create mode 100644 lib/librte_lpm/rte_lpm_altivec.h
app/test/test_xmmt_ops.h +16 -0
@@ -62,6 +62,22 @@ vect_set_epi32(int i3, int i2, int i1, int i0)/* sets the 4 signed 32-bit integer values and returns the xmm_t variable */ #define vect_set_epi32 (i3, i2, i1, i0) _mm_set_epi32(i3, i2, i1, i0) +#elif defined(RTE_ARCH_PPC_64 ) + +/* vect_* abstraction implementation using ALTIVEC */ + +/* loads the xmm_t value from address p(does not need to be 16-byte aligned)*/ +#define vect_loadu_sil128 (p) vec_ld(0, p) + +/* sets the 4 signed 32-bit integer values and returns the xmm_t variable */ +static inline xmm_t __attribute__((always_inline)) +vect_set_epi32 (int i3,int i2,int i1,int i0) +{ +xmm_t data = (xmm_t ){i0, i1, i2, i3}; + +return data; +} +#endif #endif /* _TEST_XMMT_OPS_H_ */
config/defconfig_ppc_64-power8-linuxapp-gcc +0 -1
@@ -57,7 +57,6 @@ CONFIG_RTE_LIBRTE_ENIC_PMD=n CONFIG_RTE_LIBRTE_FM10K_PMD=n # This following libraries are not available on Power. So they're turned off. -CONFIG_RTE_LIBRTE_LPM=n CONFIG_RTE_LIBRTE_ACL=n CONFIG_RTE_LIBRTE_SCHED=n CONFIG_RTE_LIBRTE_PORT=n
lib/librte_eal/common/include/arch/ppc_64/rte_vect.h new file +60 -0
60 lines not on this page · raw message
lib/librte_lpm/Makefile +2 -0
@@ -51,6 +51,8 @@ ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_neon.h else ifeq ($(CONFIG_RTE_ARCH_X86),y) SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_sse.h +else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y) +SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_altivec.h endif # this lib needs eal
lib/librte_lpm/rte_lpm.h +2 -0
@@ -480,6 +480,8 @@ rte_lpm_lookupx4(const struct rte_lpm *lpm, xmm_t ip, uint32_t hop[4],#if defined(RTE_ARCH_ARM ) || defined(RTE_ARCH_ARM64 )#include "rte_lpm_neon.h" +#elif defined(RTE_ARCH_PPC_64 ) +#include "rte_lpm_altivec.h" #else #include "rte_lpm_sse.h" #endif
lib/librte_lpm/rte_lpm_altivec.h new file +154 -0
154 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v3 2/6 acl: add altivec intrinsics for dpdk acl on ppc_64
In reply to Gowrishankar MuthukrishnanThis patch adds port for ACL library in ppc64le.
--- app/test-acl/main.c | 4 + config/defconfig_ppc_64-power8-linuxapp-gcc | 1 - lib/librte_acl/Makefile | 2 + lib/librte_acl/acl.h | 4 + lib/librte_acl/acl_run.h | 2 + lib/librte_acl/acl_run_altivec.c | 47 ++++ lib/librte_acl/acl_run_altivec.h | 328 ++++++++++++++++++++++++++++ lib/librte_acl/rte_acl.c | 13 ++ lib/librte_acl/rte_acl.h | 1 + 9 files changed, 401 insertions(+), 1 deletion(-) create mode 100644 lib/librte_acl/acl_run_altivec.c create mode 100644 lib/librte_acl/acl_run_altivec.h
app/test-acl/main.c +4 -0
@@ -105,6 +105,10 @@ static const struct acl_alg acl_alg[] = { .name = "neon", .alg = RTE_ACL_CLASSIFY_NEON, }, + { + .name = "altivec", + .alg = RTE_ACL_CLASSIFY_ALTIVEC, + }, }; static struct {
config/defconfig_ppc_64-power8-linuxapp-gcc +0 -1
@@ -57,7 +57,6 @@ CONFIG_RTE_LIBRTE_ENIC_PMD=n CONFIG_RTE_LIBRTE_FM10K_PMD=n # This following libraries are not available on Power. So they're turned off. -CONFIG_RTE_LIBRTE_ACL=n CONFIG_RTE_LIBRTE_SCHED=n CONFIG_RTE_LIBRTE_PORT=n CONFIG_RTE_LIBRTE_TABLE=n
lib/librte_acl/Makefile +2 -0
@@ -52,6 +52,8 @@ SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_scalar.c ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_neon.c CFLAGS_acl_run_neon.o += -flax-vector-conversions -Wno-maybe-uninitialized +else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y) +SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_altivec.c else SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_sse.c #check if flag for SSE4.1 is already on, if not set it up manually
lib/librte_acl/acl.h +4 -0
@@ -234,6 +234,10 @@ int rte_acl_classify_neon(const struct rte_acl_ctx *ctx, const uint8_t **data, uint32_t *results, uint32_t num, uint32_t categories); +int +rte_acl_classify_altivec (const struct rte_acl_ctx *ctx,const uint8_t **data, +uint32_t *results,uint32_t num,uint32_t categories); + #ifdef __cplusplus }#endif /* __cplusplus */
lib/librte_acl/acl_run.h +2 -0
@@ -39,7 +39,9 @@#define MAX_SEARCHES_AVX16 16#define MAX_SEARCHES_SSE8 8 +#define MAX_SEARCHES_ALTIVEC8 8#define MAX_SEARCHES_SSE4 4 +#define MAX_SEARCHES_ALTIVEC4 4#define MAX_SEARCHES_SCALAR 2#define GET_NEXT_4BYTES (prm, idx) \
lib/librte_acl/acl_run_altivec.c new file +47 -0
47 lines not on this page · raw message
lib/librte_acl/acl_run_altivec.h new file +328 -0
328 lines not on this page · raw message
lib/librte_acl/rte_acl.c +13 -0
@@ -75,12 +75,23 @@ rte_acl_classify_neon(__rte_unused const struct rte_acl_ctx *ctx,return -ENOTSUP ; } +int __attribute__ ((weak)) +rte_acl_classify_altivec(__rte_unused const struct rte_acl_ctx *ctx, + __rte_unused const uint8_t **data, + __rte_unused uint32_t *results, + __rte_unused uint32_t num, + __rte_unused uint32_t categories) +{ +return -ENOTSUP ; +} +static const rte_acl_classify_t classify_fns[] = { [RTE_ACL_CLASSIFY_DEFAULT ] = rte_acl_classify_scalar, [RTE_ACL_CLASSIFY_SCALAR ] = rte_acl_classify_scalar, [RTE_ACL_CLASSIFY_SSE ] = rte_acl_classify_sse, [RTE_ACL_CLASSIFY_AVX2 ] = rte_acl_classify_avx2, [RTE_ACL_CLASSIFY_NEON ] = rte_acl_classify_neon, + [RTE_ACL_CLASSIFY_ALTIVEC ] = rte_acl_classify_altivec, };/* by default, use always available scalar code path. */
@@ -119,6 +130,8 @@ rte_acl_init(void)#elif defined(RTE_ARCH_ARM )if (rte_cpu_get_flag_enabled (RTE_CPUFLAG_NEON )) alg =RTE_ACL_CLASSIFY_NEON ; +#elif defined(RTE_ARCH_PPC_64 ) + alg =RTE_ACL_CLASSIFY_ALTIVEC ;#else #ifdef CC_AVX2_SUPPORT if (rte_cpu_get_flag_enabled (RTE_CPUFLAG_AVX2 ))
lib/librte_acl/rte_acl.h +1 -0
@@ -271,6 +271,7 @@ enum rte_acl_classify_alg {RTE_ACL_CLASSIFY_SSE =2 ,/**< requires SSE4.1 support. */ RTE_ACL_CLASSIFY_AVX2 =3 ,/**< requires AVX2 support. */ RTE_ACL_CLASSIFY_NEON =4 ,/**< requires NEON support. */ +RTE_ACL_CLASSIFY_ALTIVEC =5 ,/**< requires ALTIVEC support. */ RTE_ACL_CLASSIFY_NUM /* should always be the last one. */ };
Signature · 1 line
1.9.1
PATCH v3 3/6 ip_pipeline: fix lcore mapping for varying SMT threads as in ppc64
In reply to Gowrishankar Muthukrishnanoffline lcore would still refer to original core id and this has to be considered while creating cpu core mask.
--- config/defconfig_ppc_64-power8-linuxapp-gcc | 3 --- examples/ip_pipeline/cpu_core_map.c | 12 +----------- examples/ip_pipeline/init.c | 4 ++++ 3 files changed, 5 insertions(+), 14 deletions(-)
config/defconfig_ppc_64-power8-linuxapp-gcc +0 -3
@@ -58,6 +58,3 @@ CONFIG_RTE_LIBRTE_FM10K_PMD=n # This following libraries are not available on Power. So they're turned off. CONFIG_RTE_LIBRTE_SCHED=n -CONFIG_RTE_LIBRTE_PORT=n -CONFIG_RTE_LIBRTE_TABLE=n -CONFIG_RTE_LIBRTE_PIPELINE=n
examples/ip_pipeline/cpu_core_map.c +1 -11
@@ -351,9 +351,6 @@ cpu_core_map_compute_linux(struct cpu_core_map *map)int lcore_socket_id =cpu_core_map_get_socket_id_linux (lcore_id); -if (lcore_socket_id <0 ) -return -1 ; -if (((uint32_t ) lcore_socket_id) == socket_id) n_detected++; }
@@ -368,18 +365,11 @@ cpu_core_map_compute_linux(struct cpu_core_map *map)cpu_core_map_get_socket_id_linux ( lcore_id); -if (lcore_socket_id <0 ) -return -1 ; -int lcore_core_id =cpu_core_map_get_core_id_linux ( lcore_id); -if (lcore_core_id <0 ) -return -1 ; - -if (((uint32_t ) lcore_socket_id == socket_id) && - ((uint32_t ) lcore_core_id == core_id)) { +if ((uint32_t ) lcore_socket_id == socket_id) { uint32_t pos = cpu_core_map_pos(map, socket_id, core_id_contig,
examples/ip_pipeline/init.c +4 -0
@@ -61,7 +61,11 @@ static void app_init_core_map(struct app_params *app) {APP_LOG (app,HIGH ,"Initializing CPU core map ..." ); +#if defined(RTE_ARCH_PPC_64 ) + app->core_map =cpu_core_map_init (2 ,5 ,1 ,0 ); +#else app->core_map =cpu_core_map_init (4 ,32 ,4 ,0 ); +#endif if (app->core_map ==NULL )rte_panic ("Cannot create CPU core map\n" );
Signature · 1 line
1.9.1
PATCH v3 4/6 table: cache align rte_bucket_4_8
In reply to Gowrishankar MuthukrishnanAlign rte_bucket_4_8 for cache line.
--- lib/librte_table/rte_table_hash_key8.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/librte_table/rte_table_hash_key8.c +1 -1
@@ -68,7 +68,7 @@ struct rte_bucket_4_8 {uint64_t key[4 ];/* Cache line 1 */ -uint8_t data[0 ]; + uint8_t data[0] __rte_cache_aligned; };struct rte_table_hash {
Signature · 1 line
1.9.1
PATCH v3 5/6 sched: enable sched library for ppc64le
In reply to Gowrishankar MuthukrishnanThis patch enables librte_sched in ppc64le.
--- config/defconfig_ppc_64-power8-linuxapp-gcc | 2 -- 1 file changed, 2 deletions(-)
config/defconfig_ppc_64-power8-linuxapp-gcc +0 -2
@@ -56,5 +56,3 @@ CONFIG_RTE_LIBRTE_PMD_BOND=n CONFIG_RTE_LIBRTE_ENIC_PMD=n CONFIG_RTE_LIBRTE_FM10K_PMD=n -# This following libraries are not available on Power. So they're turned off. -CONFIG_RTE_LIBRTE_SCHED=n
Signature · 1 line
1.9.1
PATCH v3 6/6 l3fwd: add altivec support for em_hash_key
In reply to Gowrishankar MuthukrishnanThis patch adds ppc64le port for em_mask_key function.
--- examples/l3fwd/l3fwd_em.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
examples/l3fwd/l3fwd_em.c +9 -1
@@ -259,8 +259,16 @@ em_mask_key(void *key, xmm_t mask)return vandq_s32 (data, mask); } +#elif defined(RTE_MACHINE_CPUFLAG_ALTIVEC ) +static inline xmm_t +em_mask_key (void *key,xmm_t mask) +{ +xmm_t data =vec_ld (0 , (xmm_t *)(key)); + +return vec_and (data, mask); +}#else -#error No vector engine (SSE, NEON) available, check your toolchain +#error No vector engine (SSE, NEON, ALTIVEC) available, check your toolchain#endif static inline uint8_t
Signature · 1 line
1.9.1