Skip to contentSkip to conversation

baseband/turbo_sw: update meson for more dynamic compilation

PATCH New Nicolas Chautru 3 participants 4 messages Sep 4, 2020 – Oct 6, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 baseband/turbo_sw: update meson for more dynamic compilation

In parallel of moving to meson by default as part of this serie
https://patches.dpdk.org/project/dpdk/list/?series=11929,
updating the turbo_sw meson so that to no longer rely on toplevel device specific flags, but purely dynamically within meson based on autodetecting the optional libraries.

Nicolas Chautru (1):
baseband/turbo_sw: update meson for more dynamic compilation

 drivers/baseband/turbo_sw/meson.build | 43 ++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 21 deletions(-)
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/1 baseband/turbo_sw: update meson for more dynamic compilation

The meson for the turbo_sw PMD is updated to prevent the requirement for any device specific toplevel flags to be passed down (unlike what used to be the case with make). The linking to the optional libraries is purely auto detected at build time and flags are then set appropriately.

---
 drivers/baseband/turbo_sw/meson.build | 43 ++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 21 deletions(-)
drivers/baseband/turbo_sw/meson.build +22 -21
index f5a1ab3..55ef4e4 100644
@@ -3,28 +3,28 @@
 
 path = get_option('flexran_sdk')
 
-if dpdk_conf.has('RTE_BBDEV_SDK_AVX2')
-	lib = cc.find_library('libturbo', dirs: [path + '/lib_turbo'], required: false)
-	if not lib.found()
-		build = false
-		reason = 'missing dependency, "libturbo"'
-	else
-		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)
-		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')
-	endif
+# 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)
+	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')
+	cflags += ['-DRTE_BBDEV_SDK_AVX2']
 endif
-if dpdk_conf.has('RTE_BBDEV_SDK_AVX512')
+
+# 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)
@@ -33,6 +33,7 @@ if dpdk_conf.has('RTE_BBDEV_SDK_AVX512')
 	includes += include_directories(path + '/lib_ldpc_decoder_5gnr')
 	includes += include_directories(path + '/lib_LDPC_ratematch_5gnr')
 	includes += include_directories(path + '/lib_rate_dematching_5gnr')
+	cflags += ['-DRTE_BBDEV_SDK_AVX512']
 endif
 
 deps += ['bbdev', 'bus_vdev', 'ring']
Signature · 1 line
1.8.3.1
Acked-by on v1 1/1
#2 lore raw
Quoted 11 lines · Nicolas Chautru

The meson for the turbo_sw PMD is updated to prevent the requirement for any device specific toplevel flags to be passed down (unlike what used to be the case with make). The linking to the optional libraries is purely auto detected at build time and flags are then set appropriately.

---
 drivers/baseband/turbo_sw/meson.build | 43 ++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 21 deletions(-)

From a meson viewpoint this all looks good, and glad to see the driver taking advantage of the dynamic probing.

Applied
#3 lore raw
Quoted 11 lines · Nicolas Chautru
Quoted 9 lines

The meson for the turbo_sw PMD is updated to prevent the requirement for any device specific toplevel flags to be passed down (unlike what used to be the case with make). The linking to the optional libraries is purely auto detected at build time and flags are then set appropriately.

---
 drivers/baseband/turbo_sw/meson.build | 43 ++++++++++++++++++------------
Quoted 9 lines

-----

Quoted 2 lines
 1 file changed, 22 insertions(+), 21 deletions(-)

From a meson viewpoint this all looks good, and glad to see the driver taking advantage of the dynamic probing.

Applied to dpdk-next-crypto
Thanks.