From 64eee69a291eced246cd62cc08ecd04a3d3b9dcc Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 22 Oct 2019 16:43:05 +0100 Subject: [PATCH] examples/performance-thread: add l3fwd-thread to meson Limited to x86_64 systems, as it fails to compile on any others and is disabled in the examples makefile for non-x86_64 systems. Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- examples/meson.build | 3 ++- .../l3fwd-thread/meson.build | 27 +++++++++++++++++++ examples/performance-thread/meson.build | 10 ------- 3 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 examples/performance-thread/l3fwd-thread/meson.build delete mode 100644 examples/performance-thread/meson.build diff --git a/examples/meson.build b/examples/meson.build index 968c4b179b..940ec7a427 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -30,7 +30,8 @@ all_examples = [ 'multi_process/simple_mp', 'multi_process/symmetric_mp', 'ntb', 'packet_ordering', - 'performance-thread', 'ptpclient', + 'performance-thread/l3fwd-thread', + 'ptpclient', 'qos_meter', 'qos_sched', 'rxtx_callbacks', 'server_node_efd', 'service_cores', diff --git a/examples/performance-thread/l3fwd-thread/meson.build b/examples/performance-thread/l3fwd-thread/meson.build new file mode 100644 index 0000000000..185fa59a42 --- /dev/null +++ b/examples/performance-thread/l3fwd-thread/meson.build @@ -0,0 +1,27 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2019 Intel Corporation + +# meson file, for building this example as part of a main DPDK build. +# +# To build this example as a standalone application with an already-installed +# DPDK instance, use 'make' + +build = dpdk_conf.has('RTE_ARCH_X86_64') +deps += ['timer', 'lpm'] + +# get the performance thread (pt) architecture subdir +if dpdk_conf.has('RTE_ARCH_ARM64') + pt_arch_dir = '../common/arch/arm64' +else + pt_arch_dir = '../common/arch/x86' +endif +sources += files('main.c', + '../common/lthread.c', + '../common/lthread_cond.c', + '../common/lthread_diag.c', + '../common/lthread_mutex.c', + '../common/lthread_sched.c', + '../common/lthread_tls.c', + pt_arch_dir + '/ctx.c') + +includes += include_directories('../common', pt_arch_dir) diff --git a/examples/performance-thread/meson.build b/examples/performance-thread/meson.build deleted file mode 100644 index c370d7476f..0000000000 --- a/examples/performance-thread/meson.build +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018 Intel Corporation - -# meson file, for building this example as part of a main DPDK build. -# -# To build this example as a standalone application with an already-installed -# DPDK instance, use 'make' - -# Example app currently unsupported by meson build -build = false -- 2.20.1