baseband/turbo_sw: Remove flexran_sdk meson option
PATCH v4 1/1 baseband/turbo_sw: Remove flexran_sdk meson option
v4: doc update and typo in commit msg
v3: fix mix of space and tabs in meson files
v2: typo in documentation
Hi Thomas,
This is change you requested earlier this year. This is targeting 22.11.
Basically we no longer pass a specific option but rely on pkgconfig.
There is small change to generate the .pc files that Intel will make available by end of year. Still the related change in DPDK is available now.
Thanks
Nic
Nicolas Chautru (1):
baseband/turbo_sw: remove Flexran SDK meson option
doc/guides/bbdevs/turbo_sw.rst | 9 ++++++--- drivers/baseband/turbo_sw/meson.build | 36 +++++++++++++---------------------- meson_options.txt | 2 -- 3 files changed, 19 insertions(+), 28 deletions(-)
Signature · 1 line
1.8.3.1
PATCH v4 1/1 baseband/turbo_sw: remove Flexran SDK meson option
The related dependency to build the PMD based on the SDK libraries is now enabled through pkgconfig.
--- doc/guides/bbdevs/turbo_sw.rst | 9 ++++++--- drivers/baseband/turbo_sw/meson.build | 36 +++++++++++++---------------------- meson_options.txt | 2 -- 3 files changed, 19 insertions(+), 28 deletions(-)
doc/guides/bbdevs/turbo_sw.rst +6 -3
@@ -81,7 +81,8 @@ The following table maps DPDK versions with past FlexRAN SDK releases: ===================== ============================ DPDK version FlexRAN FEC SDK release ===================== ============================ - 19.08 19.04 + 19.08 to 22.07 19.04 + 22.11+ 22.11 ===================== ============================ FlexRAN SDK Installation
@@ -136,7 +137,8 @@ In order to enable this virtual bbdev PMD, the user may: FlexRAN SDK libraries were installed. And ``DIR_WIRELESS_SDK`` to the path where the libraries were extracted. -* Tune the meson build option pointing the location of the FlexRAN SDK libraries ``flexran_sdk`` +* Point pkgconfig towards these libraries so that they can be automatically found by meson. + If not DPDK will still compile but the related functionality would be stubbed out. Example:
@@ -144,8 +146,9 @@ Example: export FLEXRAN_SDK=<path-to-workspace>/FlexRAN-FEC-SDK-19-04/sdk/build-avx2-icc/install export DIR_WIRELESS_SDK=<path-to-workspace>/FlexRAN-FEC-SDK-19-04/sdk/build-avx2-icc/ + export PKG_CONFIG_PATH=$DIR_WIRELESS_SDK/pkgcfg:$PKG_CONFIG_PATH cd build - meson configure -Dflexran_sdk=<path-to-workspace>/FlexRAN-FEC-SDK-19-04/sdk/build-avx512-icc/install + meson configure * For AVX512 machines with SDK libraries installed then both 4G and 5G can be enabled for full real time FEC capability. For AVX2 machines it is possible to only enable the 4G libraries and the PMD capabilities will be limited to 4G FEC.
drivers/baseband/turbo_sw/meson.build +13 -23
@@ -1,38 +1,28 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2019 Intel Corporation -path = get_option('flexran_sdk') +# check for FlexRAN SDK libraries +dep_turbo = dependency('flexran_sdk_turbo', required: false) +dep_dec5g = dependency('flexran_sdk_ldpc_decoder_5gnr', required: false) -# check for FlexRAN SDK libraries for AVX2 -lib4g = cc.find_library('libturbo', dirs: [path + '/lib_turbo'], required: false) -if lib4g.found() - ext_deps += cc.find_library('libturbo', dirs: [path + '/lib_turbo'], required: true) - ext_deps += cc.find_library('libcrc', dirs: [path + '/lib_crc'], required: true) - ext_deps += cc.find_library('librate_matching', dirs: [path + '/lib_rate_matching'], required: true) - ext_deps += cc.find_library('libcommon', dirs: [path + '/lib_common'], required: true) +if dep_turbo.found() ext_deps += cc.find_library('libstdc++', required: true) ext_deps += cc.find_library('libirc', required: true) ext_deps += cc.find_library('libimf', required: true) ext_deps += cc.find_library('libipps', required: true) ext_deps += cc.find_library('libsvml', required: true) - includes += include_directories(path + '/lib_turbo') - includes += include_directories(path + '/lib_crc') - includes += include_directories(path + '/lib_rate_matching') - includes += include_directories(path + '/lib_common') + ext_deps += dep_turbo + ext_deps += dependency('flexran_sdk_crc', required: true) + ext_deps += dependency('flexran_sdk_rate_matching', required: true) + ext_deps += dependency('flexran_sdk_common', required: true) cflags += ['-DRTE_BBDEV_SDK_AVX2'] endif -# check for FlexRAN SDK libraries for AVX512 -lib5g = cc.find_library('libldpc_decoder_5gnr', dirs: [path + '/lib_ldpc_decoder_5gnr'], required: false) -if lib5g.found() - ext_deps += cc.find_library('libldpc_encoder_5gnr', dirs: [path + '/lib_ldpc_encoder_5gnr'], required: true) - ext_deps += cc.find_library('libldpc_decoder_5gnr', dirs: [path + '/lib_ldpc_decoder_5gnr'], required: true) - ext_deps += cc.find_library('libLDPC_ratematch_5gnr', dirs: [path + '/lib_LDPC_ratematch_5gnr'], required: true) - ext_deps += cc.find_library('librate_dematching_5gnr', dirs: [path + '/lib_rate_dematching_5gnr'], required: true) - includes += include_directories(path + '/lib_ldpc_encoder_5gnr') - includes += include_directories(path + '/lib_ldpc_decoder_5gnr') - includes += include_directories(path + '/lib_LDPC_ratematch_5gnr') - includes += include_directories(path + '/lib_rate_dematching_5gnr') +if dep_dec5g.found() + ext_deps += dep_dec5g + ext_deps += dependency('flexran_sdk_ldpc_encoder_5gnr', required: true) + ext_deps += dependency('flexran_sdk_LDPC_ratematch_5gnr', required: true) + ext_deps += dependency('flexran_sdk_rate_dematching_5gnr', required: true) cflags += ['-DRTE_BBDEV_SDK_AVX512'] endif
meson_options.txt +0 -2
@@ -22,8 +22,6 @@ option('enable_kmods', type: 'boolean', value: false, description: 'build kernel modules') option('examples', type: 'string', value: '', description: 'Comma-separated list of examples to build by default') -option('flexran_sdk', type: 'string', value: '', description: - 'Path to FlexRAN SDK optional Libraries for BBDEV device') option('ibverbs_link', type: 'combo', choices : ['static', 'shared', 'dlopen'], value: 'shared', description: 'Linkage method (static/shared/dlopen) for Mellanox PMDs with ibverbs dependencies.') option('include_subdir_arch', type: 'string', value: '', description:
Signature · 1 line
1.8.3.1
RE: [EXT] [PATCH v4] baseband/turbo_sw: remove Flexran SDK meson option
Hi Thomas,
Do you have more comments on this patch?
Quoted 5 lines
The related dependency to build the PMD based on the SDK libraries is now enabled through pkgconfig.
Signed-off-by Nicolas Chautru <[email protected]>---
Re: [EXT] [PATCH v4] baseband/turbo_sw: remove Flexran SDK meson option
22/09/2022 18:40, Akhil Goyal:
Quoted 8 lines
Hi Thomas,
Do you have more comments on this patch?
Quoted 4 lines
The related dependency to build the PMD based on the SDK libraries is now enabled through pkgconfig.
Signed-off-by Nicolas Chautru <[email protected]>
This patch looks OK.
Thank you for switching to pkgconfig.
Akhil Goyal
AppliedRE: [EXT] [PATCH v4] baseband/turbo_sw: remove Flexran SDK meson option
Quoted 5 lines
22/09/2022 18:40, Akhil Goyal:
Quoted 4 lines
Hi Thomas,
Do you have more comments on this patch?
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
The related dependency to build the PMD based on the SDK libraries is now enabled through pkgconfig.
Signed-off-by Nicolas Chautru <[email protected]>This patch looks OK.
Thank you for switching to pkgconfig.
Applied to dpdk-next-crypto
Thanks.