[5/5] app/test-bbdev: enable fpga_lte_fec support in shared builds

Message ID 20191004171913.59574-6-bruce.richardson@intel.com (mailing list archive)
State Accepted, archived
Delegated to: akhil goyal
Headers
Series some bbdev cleanups |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Bruce Richardson Oct. 4, 2019, 5:19 p.m. UTC
  Now that the necessary function is exported from the fpga_lte_fec driver,
we can enable the code paths using it in shared-library builds.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 app/test-bbdev/Makefile          | 3 +++
 app/test-bbdev/test_bbdev_perf.c | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)
  

Comments

Chautru, Nicolas Oct. 7, 2019, 6:29 p.m. UTC | #1
> -----Original Message-----
> From: Richardson, Bruce 
> Sent: Friday, October 4, 2019 10:19 AM
> To: dev@dpdk.org; Chautru, Nicolas <nicolas.chautru@intel.com>
> Cc: Akhil Goyal <akhil.goyal@nxp.com>; Andrzej Ostruszka <amo@semihalf.com>; Richardson, Bruce <bruce.richardson@intel.com>
> Subject: [PATCH 5/5] app/test-bbdev: enable fpga_lte_fec support in shared builds
> 
> Now that the necessary function is exported from the fpga_lte_fec driver, we can enable the code paths using it in shared-library builds.
> 
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
>  app/test-bbdev/Makefile          | 3 +++
>  app/test-bbdev/test_bbdev_perf.c | 2 --
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/app/test-bbdev/Makefile b/app/test-bbdev/Makefile index 6da0c8e0c..c53982ffc 100644
> --- a/app/test-bbdev/Makefile
> +++ b/app/test-bbdev/Makefile
> @@ -21,5 +21,8 @@ SRCS-$(CONFIG_RTE_TEST_BBDEV) += test_bbdev_perf.c
>  SRCS-$(CONFIG_RTE_TEST_BBDEV) += test_bbdev_vector.c
>  
>  LDLIBS += -lm
> +ifeq ($(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC),y)
> +LDLIBS += -lrte_pmd_bbdev_fpga_lte_fec
> +endif
>  
>  include $(RTE_SDK)/mk/rte.app.mk
> diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
> index fb9045fc5..d8db58ea0 100644
> --- a/app/test-bbdev/test_bbdev_perf.c
> +++ b/app/test-bbdev/test_bbdev_perf.c
> @@ -519,7 +519,6 @@ add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info *info,
>  /* Configure fpga lte fec with PF & VF values
>   * if '-i' flag is set and using fpga device
>   */
> -#ifndef RTE_BUILD_SHARED_LIB
>  #ifdef RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC
>  	if ((get_init_device() == true) &&
>  		(!strcmp(info->drv.driver_name, FPGA_PF_DRIVER_NAME))) { @@ -563,7 +562,6 @@ add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info *info,
>  				"Failed to configure 4G FPGA PF for bbdev %s",
>  				info->dev_name);
>  	}
> -#endif
>  #endif
>  	nb_queues = RTE_MIN(rte_lcore_count(), info->drv.max_num_queues);
>  	nb_queues = RTE_MIN(nb_queues, (unsigned int) MAX_QUEUES);
> --
> 2.21.0
> 

Thanks Bruce, I did review the serie and it is better and cleaner this way. 
This is a non backward compatible change due to the rename of driver library but worth the update notably given more similar drivers being upstreamed next quarter.

Acked-by: Nic Chautru <nicolas.chautru@intel.com>
  

Patch

diff --git a/app/test-bbdev/Makefile b/app/test-bbdev/Makefile
index 6da0c8e0c..c53982ffc 100644
--- a/app/test-bbdev/Makefile
+++ b/app/test-bbdev/Makefile
@@ -21,5 +21,8 @@  SRCS-$(CONFIG_RTE_TEST_BBDEV) += test_bbdev_perf.c
 SRCS-$(CONFIG_RTE_TEST_BBDEV) += test_bbdev_vector.c
 
 LDLIBS += -lm
+ifeq ($(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC),y)
+LDLIBS += -lrte_pmd_bbdev_fpga_lte_fec
+endif
 
 include $(RTE_SDK)/mk/rte.app.mk
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index fb9045fc5..d8db58ea0 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -519,7 +519,6 @@  add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info *info,
 /* Configure fpga lte fec with PF & VF values
  * if '-i' flag is set and using fpga device
  */
-#ifndef RTE_BUILD_SHARED_LIB
 #ifdef RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC
 	if ((get_init_device() == true) &&
 		(!strcmp(info->drv.driver_name, FPGA_PF_DRIVER_NAME))) {
@@ -563,7 +562,6 @@  add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info *info,
 				"Failed to configure 4G FPGA PF for bbdev %s",
 				info->dev_name);
 	}
-#endif
 #endif
 	nb_queues = RTE_MIN(rte_lcore_count(), info->drv.max_num_queues);
 	nb_queues = RTE_MIN(nb_queues, (unsigned int) MAX_QUEUES);