generalize builds apps using meson
cover generalize builds apps using meson
Put the building of the apps into a foreach loop as is done with the libs and drivers in the DPDK meson build. This will reduce the path needed to call the compiled binaries in the build directory by one level, while the main benefit is reduced code duplication between the different apps.
Bruce Richardson (3):
app: generalize building of apps using meson app/proc_info: rename folder to remove underscore
app: add all remaining apps to meson build
app/meson.build | 47 +++++++++++++++++++++++++++++++++--
app/pdump/meson.build | 6 +++++
app/{proc_info => proc-info}/Makefile | 0
app/{proc_info => proc-info}/main.c | 0
app/proc-info/meson.build | 6 +++++
app/test-bbdev/meson.build | 9 +++++++
app/test-crypto-perf/meson.build | 14 +++++++++++
app/test-eventdev/meson.build | 15 +----------
app/test-pmd/meson.build | 20 ++-------------
9 files changed, 83 insertions(+), 34 deletions(-)
create mode 100644 app/pdump/meson.build
rename app/{proc_info => proc-info}/Makefile (100%)
rename app/{proc_info => proc-info}/main.c (100%)
create mode 100644 app/proc-info/meson.build
create mode 100644 app/test-bbdev/meson.build
create mode 100644 app/test-crypto-perf/meson.buildSignature · 1 line
2.14.3
PATCH 1/3 app: generalize building of apps using meson
Since most apps are built in largely the same way, generalize the logic into a foreach loop in app/meson.build file.
--- app/meson.build | 52 +++++++++++++++++++++++++++++++++++++++++-- app/test-eventdev/meson.build | 18 ++------------- app/test-pmd/meson.build | 22 +++--------------- 3 files changed, 55 insertions(+), 37 deletions(-)
app/meson.build +50 -2
@@ -1,5 +1,53 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -subdir('test-pmd') -subdir('test-eventdev') +apps = ['test-eventdev', + 'test-pmd'] + +# for BSD only +lib_execinfo = cc.find_library('execinfo', required: false) + +foreach app:apps + build = true + name = app + allow_experimental_apis = false + sources = [] + includes = [] + cflags = machine_args + objs = [] # other object files to link against, used e.g. for + # instruction-set optimized versions of code + + # use "deps" for internal DPDK dependencies, and "ext_deps" for + # external package/library requirements + ext_deps = [] + deps = [] + + subdir(name) + + if build + dep_objs = [] + foreach d:deps + dep_objs += get_variable(get_option('default_library') + + '_rte_' + d) + endforeach + dep_objs += lib_execinfo + + link_libs = [] + if get_option('default_library') == 'static' + link_libs = dpdk_drivers + endif + + if allow_experimental_apis + cflags += '-DALLOW_EXPERIMENTAL_API' + endif + + executable('dpdk-' + name, + sources, + c_args: cflags, + link_whole: link_libs, + dependencies: dep_objs, + install_rpath: join_paths(get_option('prefix'), + driver_install_path), + install: true) + endif +endforeach
app/test-eventdev/meson.build +2 -16
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Cavium, Inc +allow_experimental_apis = true sources = files('evt_main.c', 'evt_options.c', 'evt_test.c',
@@ -11,19 +12,4 @@ sources = files('evt_main.c', 'test_perf_common.c', 'test_perf_atq.c', 'test_perf_queue.c') - -dep_objs = [get_variable(get_option('default_library') + '_rte_eventdev')] -dep_objs += cc.find_library('execinfo', required: false) # BSD only - -link_libs = [] -if get_option('default_library') == 'static' - link_libs = dpdk_drivers -endif - -executable('dpdk-test-eventdev', - sources, - c_args: [machine_args, '-DALLOW_EXPERIMENTAL_API'], - link_whole: link_libs, - dependencies: dep_objs, - install_rpath: join_paths(get_option('prefix'), driver_install_path), - install: true) +deps += 'eventdev'
app/test-pmd/meson.build +3 -19
@@ -1,6 +1,9 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +# override default name to drop the hyphen +name = 'testpmd' +allow_experimental_apis = true sources = files('cmdline.c', 'cmdline_flow.c', 'cmdline_mtr.c',
@@ -32,22 +35,3 @@ if dpdk_conf.has('RTE_LIBRTE_SOFTNIC_PMD') sources += files('tm.c') deps += 'pmd_softnic' endif - -dep_objs = [] -foreach d:deps - dep_objs += get_variable(get_option('default_library') + '_rte_' + d) -endforeach -dep_objs += cc.find_library('execinfo', required: false) # for BSD only - -link_libs = [] -if get_option('default_library') == 'static' - link_libs = dpdk_drivers -endif - -executable('dpdk-testpmd', - sources, - c_args: [machine_args, '-DALLOW_EXPERIMENTAL_API'], - link_whole: link_libs, - dependencies: dep_objs, - install_rpath: join_paths(get_option('prefix'), driver_install_path), - install: true)
Signature · 1 line
2.14.3
Re: [PATCH 1/3] app: generalize building of apps using meson
Quoted 10 lines
From: dev [mailto:[email protected]] On Behalf Of Bruce Richardson
Sent: Friday, February 16, 2018 4:54 PM
To: [email protected]
Cc: Richardson, Bruce <[email protected]>
Subject: [dpdk-dev] [PATCH 1/3] app: generalize building of apps using mesonSince most apps are built in largely the same way, generalize the logic into a foreach loop in app/meson.build file.
Signed-off-by Bruce Richardson <[email protected]>
PATCH 2/3 app/proc_info: rename folder to remove underscore
In reply to Bruce RichardsonAll other apps in the app folder use "-" rather than "_" to separate words in the app name, so rename proc_info to be consistent.
---
app/Makefile | 2 +-
app/{proc_info => proc-info}/Makefile | 0
app/{proc_info => proc-info}/main.c | 0
3 files changed, 1 insertion(+), 1 deletion(-)
rename app/{proc_info => proc-info}/Makefile (100%)
rename app/{proc_info => proc-info}/main.c (100%)app/Makefile +1 -1
@@ -4,7 +4,7 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-$(CONFIG_RTE_TEST_PMD) += test-pmd -DIRS-$(CONFIG_RTE_PROC_INFO) += proc_info +DIRS-$(CONFIG_RTE_PROC_INFO) += proc-info DIRS-$(CONFIG_RTE_LIBRTE_PDUMP) += pdump ifeq ($(CONFIG_RTE_LIBRTE_BBDEV),y)
app/proc-info/Makefile renamed from app/proc_info/Makefile +0 -0
app/proc-info/main.c renamed from app/proc_info/main.c +0 -0
Signature · 1 line
2.14.3
Re: [PATCH 2/3] app/proc_info: rename folder to remove underscore
Quoted 11 lines
From: dev [mailto:[email protected]] On Behalf Of Bruce Richardson
Sent: Friday, February 16, 2018 4:54 PM
To: [email protected]
Cc: Richardson, Bruce <[email protected]>
Subject: [dpdk-dev] [PATCH 2/3] app/proc_info: rename folder to remove underscoreAll other apps in the app folder use "-" rather than "_" to separate words in the app name, so rename
proc_infoto be consistent.Signed-off-by Bruce Richardson <[email protected]>
PATCH 3/3 app: add all remaining apps to meson build
In reply to Bruce RichardsonAdd remaining subdirectories in the app folder to the meson build.
--- app/meson.build | 6 +++++- app/pdump/meson.build | 6 ++++++ app/proc-info/meson.build | 6 ++++++ app/test-bbdev/meson.build | 9 +++++++++ app/test-crypto-perf/meson.build | 14 ++++++++++++++ 5 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 app/pdump/meson.build create mode 100644 app/proc-info/meson.build create mode 100644 app/test-bbdev/meson.build create mode 100644 app/test-crypto-perf/meson.build
app/meson.build +5 -1
@@ -1,7 +1,11 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -apps = ['test-eventdev', +apps = ['pdump', + 'proc-info', + 'test-bbdev', + 'test-crypto-perf', + 'test-eventdev', 'test-pmd'] # for BSD only
app/pdump/meson.build new file +6 -0
@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Intel Corporation + +sources = files('main.c') +allow_experimental_apis = true +deps = ['ethdev', 'kvargs', 'pdump']
app/proc-info/meson.build new file +6 -0
@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Intel Corporation + +sources = files('main.c') +allow_experimental_apis = true +deps = ['ethdev', 'metrics']
app/test-bbdev/meson.build new file +9 -0
@@ -0,0 +1,9 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Intel Corporation + +sources = files('main.c', + 'test_bbdev.c', + 'test_bbdev_perf.c', + 'test_bbdev_vector.c') +allow_experimental_apis = true +deps = ['bbdev', 'bus_vdev']
app/test-crypto-perf/meson.build new file +14 -0
@@ -0,0 +1,14 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Intel Corporation + +sources = files('cperf_ops.c', + 'cperf_options_parsing.c', + 'cperf_test_common.c', + 'cperf_test_latency.c', + 'cperf_test_pmd_cyclecount.c', + 'cperf_test_throughput.c', + 'cperf_test_vector_parsing.c', + 'cperf_test_vectors.c', + 'cperf_test_verify.c', + 'main.c') +deps = ['cryptodev']
Signature · 1 line
2.14.3
Re: [PATCH 3/3] app: add all remaining apps to meson build
Quoted 9 lines
From: dev [mailto:[email protected]] On Behalf Of Bruce Richardson
Sent: Friday, February 16, 2018 4:54 PM
To: [email protected]
Cc: Richardson, Bruce <[email protected]>
Subject: [dpdk-dev] [PATCH 3/3] app: add all remaining apps to meson buildAdd remaining subdirectories in the app folder to the meson build.
Signed-off-by Bruce Richardson <[email protected]>
Quoted 10 lines · Bruce Richardson
Put the building of the apps into a foreach loop as is done with the libs and drivers in the DPDK meson build. This will reduce the path needed to call the compiled binaries in the build directory by one level, while the main benefit is reduced code duplication between the different apps.
Bruce Richardson (3):
app: generalize building of apps using meson app/proc_info: rename folder to remove underscore
app: add all remaining apps to meson build
Series applied to dpdk-next-build
/Bruce