From patchwork Wed Jan 19 18:09:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 106086 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 48D19A0032; Wed, 19 Jan 2022 19:33:59 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E98BF4118A; Wed, 19 Jan 2022 19:33:58 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id AE25941147 for ; Wed, 19 Jan 2022 19:33:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642617237; x=1674153237; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LNP4neOjs5U3YeV8uUMmGc6TgdtZtJMPPtHEuhrXh3A=; b=QvAmagP3PUqoYoHkGDyjr8HpNvcMkIo5iHS+aOhHXP74ZqyLY/SE+ve+ +qkO7dxq5HI7POsecQQXV3VIzUYf0dUOOUYvH4h2+53R0Bgg+eINkp9x8 Gpq9jiKMRaGwePZZCU219MOnvSBjAsCuag8swj2J3RTRj5NCZJstPzZbz Nuk32fvFkmnUqE1Tlph1A5o+wIHiXkl19CTc8xStFI4KQMlbb0VQIwJxw qtjtrJ/JBOVWOsK0uk7tcG5SDoq3N4i+hb2bKwD3IVJxIt9TxUA4GrWOE S4r+FXqa0ywOzLKQYcKkB8ExD+j2E640pvXnloQf7ojsGKrFfzvCL9TPm g==; X-IronPort-AV: E=McAfee;i="6200,9189,10231"; a="331496392" X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="331496392" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 10:10:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="578907358" Received: from silpixa00399126.ir.intel.com ([10.237.223.86]) by fmsmga008.fm.intel.com with ESMTP; 19 Jan 2022 10:10:20 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , Stephen Hemminger , =?utf-8?q?Morten_Br=C3=B8ru?= =?utf-8?q?p?= Subject: [PATCH v2 1/6] lib: allow recursive disabling of libs in build Date: Wed, 19 Jan 2022 18:09:57 +0000 Message-Id: <20220119181002.471195-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220119181002.471195-1-bruce.richardson@intel.com> References: <20220113173918.2700651-1-bruce.richardson@intel.com> <20220119181002.471195-1-bruce.richardson@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Align the code in lib/meson.build with that in drivers/meson.build to enable recursive disabling of libraries, i.e. if library b depends on library a, disable library b if a is disabled (either explicitly or implicitly). This allows libraries to be optional even if other DPDK libs depend on them, something that was not previously possible. Signed-off-by: Bruce Richardson Acked-by: Stephen Hemminger Acked-by: Morten Brørup --- lib/meson.build | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/lib/meson.build b/lib/meson.build index fbaa6ef7c2..af4662e942 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -134,23 +134,29 @@ foreach l:libraries warning('Library name, "@0@", and directory name, "@1@", do not match'.format(name, l)) endif - if not build - dpdk_libs_disabled += name - set_variable(name.underscorify() + '_disable_reason', reason) - continue - endif - shared_deps = ext_deps static_deps = ext_deps foreach d:deps + if not build + break + endif if not is_variable('shared_rte_' + d) - error('Missing internal dependency "@0@" for @1@ [@2@]' + build = false + reason = 'missing internal dependency, "@0@"'.format(d) + message('Disabling @1@ [@2@]: missing internal dependency "@0@"' .format(d, name, 'lib/' + l)) + else + shared_deps += [get_variable('shared_rte_' + d)] + static_deps += [get_variable('static_rte_' + d)] endif - shared_deps += [get_variable('shared_rte_' + d)] - static_deps += [get_variable('static_rte_' + d)] endforeach + if not build + dpdk_libs_disabled += name + set_variable(name.underscorify() + '_disable_reason', reason) + continue + endif + enabled_libs += name dpdk_conf.set('RTE_LIB_' + name.to_upper(), 1) install_headers(headers) From patchwork Wed Jan 19 18:09:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 106087 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 21457A0032; Wed, 19 Jan 2022 19:34:06 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 10DB241190; Wed, 19 Jan 2022 19:34:06 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id CEE6941147 for ; Wed, 19 Jan 2022 19:34:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642617245; x=1674153245; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LS7QyT0QGqu8jsTfd5PmhQljUGSuMMrRSg7aqq6K+U8=; b=fRorJ+8IKNiMNswyPZQfSAjray9tinuOJ9DquWNJ3tFQx8hmMmuh/2cO O1me3kfn6NCu2Y2jSYU7+u0k+1mBWW3De6V+HODDCDLeg/8mj6mQkF1vs Aq/PN0gh7WlFpDbrUkH/U+ME2MlrxGj5I8xbGe/2Ix8eDue0yv/GZgZh6 i7ZKmZxx2YXVGS2S+iv2sdrxfIlHwuLgxZPwfj/+72cyrwrxkDYrN1mbx zo6c+JVqXih7duhTU6rSK8aPSpvvEj+TOhF28aNbekXvgKb0br7AJMDdm ylZB8gpEm6kng/F00KE0g/2UftIDUYMfnY8hG/jKdMB/o5aWngn+8+LGG w==; X-IronPort-AV: E=McAfee;i="6200,9189,10231"; a="331496452" X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="331496452" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 10:10:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="578907370" Received: from silpixa00399126.ir.intel.com ([10.237.223.86]) by fmsmga008.fm.intel.com with ESMTP; 19 Jan 2022 10:10:23 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , Stephen Hemminger , =?utf-8?q?Morten_Br=C3=B8ru?= =?utf-8?q?p?= Subject: [PATCH v2 2/6] app/test: link unit test binary against all available libs Date: Wed, 19 Jan 2022 18:09:58 +0000 Message-Id: <20220119181002.471195-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220119181002.471195-1-bruce.richardson@intel.com> References: <20220113173918.2700651-1-bruce.richardson@intel.com> <20220119181002.471195-1-bruce.richardson@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Rather than maintaining a list of the libraries the unit tests need, and having to conditionally include/omit optional libs from the list, we can just link against all available libraries, simplifying the code considerably. Signed-off-by: Bruce Richardson Acked-by: Stephen Hemminger Acked-by: Morten Brørup --- app/test/meson.build | 49 +++----------------------------------------- 1 file changed, 3 insertions(+), 46 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index 344a609a4d..210e03fbff 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -157,39 +157,9 @@ test_sources = files( 'virtual_pmd.c', ) -test_deps = [ - 'acl', - 'bus_pci', - 'bus_vdev', - 'bpf', - 'cfgfile', - 'cmdline', - 'cryptodev', - 'distributor', - 'dmadev', - 'efd', - 'ethdev', - 'eventdev', - 'fib', - 'flow_classify', - 'graph', - 'hash', - 'ipsec', - 'lpm', - 'member', - 'node', - 'pipeline', - 'port', - 'rawdev', - 'rcu', - 'reorder', - 'rib', - 'ring', - 'security', - 'stack', - 'telemetry', - 'timer', -] +test_deps = enabled_libs +# as well as libs, the pci and vdev bus drivers are needed for a lot of tests +test_deps += ['bus_pci', 'bus_vdev'] # Each test is marked with flag true/false # to indicate whether it can run in no-huge mode. @@ -380,7 +350,6 @@ if dpdk_conf.has('RTE_EVENT_SKELETON') test_deps += 'event_skeleton' endif if dpdk_conf.has('RTE_LIB_METRICS') - test_deps += 'metrics' test_sources += ['test_metrics.c'] fast_tests += [['metrics_autotest', true]] endif @@ -410,17 +379,14 @@ if dpdk_conf.has('RTE_NET_RING') perf_test_names += 'ring_pmd_perf_autotest' fast_tests += [['event_eth_tx_adapter_autotest', false]] if dpdk_conf.has('RTE_LIB_BITRATESTATS') - test_deps += 'bitratestats' test_sources += 'test_bitratestats.c' fast_tests += [['bitratestats_autotest', true]] endif if dpdk_conf.has('RTE_LIB_LATENCYSTATS') - test_deps += 'latencystats' test_sources += 'test_latencystats.c' fast_tests += [['latencystats_autotest', true]] endif if dpdk_conf.has('RTE_LIB_PDUMP') - test_deps += 'pdump' test_sources += 'test_pdump.c' fast_tests += [['pdump_autotest', true]] endif @@ -434,18 +400,10 @@ endif if dpdk_conf.has('RTE_HAS_LIBPCAP') ext_deps += pcap_dep if dpdk_conf.has('RTE_LIB_PCAPNG') - test_deps += 'pcapng' test_sources += 'test_pcapng.c' endif endif -if dpdk_conf.has('RTE_LIB_POWER') - test_deps += 'power' -endif -if dpdk_conf.has('RTE_LIB_KNI') - test_deps += 'kni' -endif - if cc.has_argument('-Wno-format-truncation') cflags += '-Wno-format-truncation' endif @@ -462,7 +420,6 @@ if dpdk_conf.has('RTE_LIB_COMPRESSDEV') if compress_test_dep.found() test_dep_objs += compress_test_dep test_sources += 'test_compressdev.c' - test_deps += 'compressdev' fast_tests += [['compressdev_autotest', false]] endif endif From patchwork Wed Jan 19 18:09:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 106088 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 41DB4A0032; Wed, 19 Jan 2022 19:34:14 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 30BEB411CB; Wed, 19 Jan 2022 19:34:14 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id 6EC8D41147 for ; Wed, 19 Jan 2022 19:34:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642617252; x=1674153252; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MOTkU+XxowyRkD5QvPOCeaIgMFT78bjp+3RFub2ztRY=; b=Gxa4gCjpVBpzAG3RG6p+yL14ABbzYRh7w/XBqtbxEuAVlEK92ENodgHb irhBZNeRUHla6W9xvxWtgdU1EXu+e8f6SSM7Im8J4VrYPjWOhbc2IXvKE qmtprTG7ish4ZKzxaAJMFPPC2CpSyEzSUhC2cJ94+QUk81RC5GieXll15 vVuLUju8ZF5WvsfMVCCDLu4qr4cyOvOOOwvrsxx0fEXLOfcih4MfLKRQi JIRJgKGxVxaW7FU39m9wbsC3AtiQUmI9Pxgc4DC9T+pUNb75PyvEh8T6O CsxZ35+92zXYpnyMRcc5UWH2I6aN5WrmABQXLNuPoQwZnhcFAGctiqZmC w==; X-IronPort-AV: E=McAfee;i="6200,9189,10231"; a="331496512" X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="331496512" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 10:10:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="578907375" Received: from silpixa00399126.ir.intel.com ([10.237.223.86]) by fmsmga008.fm.intel.com with ESMTP; 19 Jan 2022 10:10:25 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , Stephen Hemminger , =?utf-8?q?Morten_Br=C3=B8ru?= =?utf-8?q?p?= Subject: [PATCH v2 3/6] build: add node library to optional list Date: Wed, 19 Jan 2022 18:09:59 +0000 Message-Id: <20220119181002.471195-4-bruce.richardson@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220119181002.471195-1-bruce.richardson@intel.com> References: <20220113173918.2700651-1-bruce.richardson@intel.com> <20220119181002.471195-1-bruce.richardson@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Allow the 'node' library to be disabled in builds Signed-off-by: Bruce Richardson Acked-by: Stephen Hemminger Acked-by: Morten Brørup --- lib/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/meson.build b/lib/meson.build index af4662e942..dd20fe70a6 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -74,6 +74,7 @@ optional_libs = [ 'jobstats', 'latencystats', 'metrics', + 'node', 'pdump', 'power', 'vhost', From patchwork Wed Jan 19 18:10:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 106089 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 39951A0032; Wed, 19 Jan 2022 19:34:20 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2C00C411CE; Wed, 19 Jan 2022 19:34:20 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id 0F2D641147 for ; Wed, 19 Jan 2022 19:34:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642617258; x=1674153258; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CoTvZtROoeilLRfZq/nYtF/XRouXT6+ZHxXcQWBQhJs=; b=TfKzh2cVsOuUFjJ2FKiZPOigInB5nzCtuFbdWaU4/Xd/yb0DshrudW9T Z1UZ6152JZ5uc6h7jRsSj3KuY/rwqMTIbrQ88QiW5C4X+ILAqJ/NfISwf /oAKhFnzW8qp2wOXPSDE1ftRH2cY4KLUDO9KucAq1zPeSj5SLaYQT5vcH vPEgeyrkgxn32yeKiusztA5zGa4FgbMWl8ulMY1B+BgFJdngKoHJb+9jG Q7K1kz+Jltw3TyAXWNXbU1hktqtO5SwHQcQaOMy5PPTgsKuJW4ubCfLuO 5p7s/xLiRgk9Iq2DMWqj9PmahOWBjCnXKT/9Jg5MIjbFkSWBqSVxDhM73 A==; X-IronPort-AV: E=McAfee;i="6200,9189,10231"; a="331496566" X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="331496566" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 10:10:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="578907380" Received: from silpixa00399126.ir.intel.com ([10.237.223.86]) by fmsmga008.fm.intel.com with ESMTP; 19 Jan 2022 10:10:27 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , Stephen Hemminger , =?utf-8?q?Morten_Br=C3=B8ru?= =?utf-8?q?p?= Subject: [PATCH v2 4/6] build: add flow classification library to optional list Date: Wed, 19 Jan 2022 18:10:00 +0000 Message-Id: <20220119181002.471195-5-bruce.richardson@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220119181002.471195-1-bruce.richardson@intel.com> References: <20220113173918.2700651-1-bruce.richardson@intel.com> <20220119181002.471195-1-bruce.richardson@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add the flow_classify library to the list of optional libraries, and ensure tests can build with it disabled. Signed-off-by: Bruce Richardson Acked-by: Stephen Hemminger Acked-by: Morten Brørup --- app/test/meson.build | 7 +++++-- lib/meson.build | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index 210e03fbff..a39dd68934 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -65,7 +65,6 @@ test_sources = files( 'test_fib6.c', 'test_fib6_perf.c', 'test_func_reentrancy.c', - 'test_flow_classify.c', 'test_graph.c', 'test_graph_perf.c', 'test_hash.c', @@ -196,7 +195,6 @@ fast_tests = [ ['fib_autotest', true], ['fib6_autotest', true], ['func_reentrancy_autotest', false], - ['flow_classify_autotest', false], ['hash_autotest', true], ['interrupt_autotest', true], ['ipfrag_autotest', false], @@ -349,6 +347,11 @@ endif if dpdk_conf.has('RTE_EVENT_SKELETON') test_deps += 'event_skeleton' endif + +if dpdk_conf.has('RTE_LIB_FLOW_CLASSIFY') + test_sources += 'test_flow_classify.c' + fast_tests += [['flow_classify_autotest', false]] +endif if dpdk_conf.has('RTE_LIB_METRICS') test_sources += ['test_metrics.c'] fast_tests += [['metrics_autotest', true]] diff --git a/lib/meson.build b/lib/meson.build index dd20fe70a6..ede5199374 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -67,6 +67,7 @@ libraries = [ optional_libs = [ 'bitratestats', + 'flow_classify', 'gpudev', 'gro', 'gso', From patchwork Wed Jan 19 18:10:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 106090 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 29338A0032; Wed, 19 Jan 2022 19:34:27 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1374F411C9; Wed, 19 Jan 2022 19:34:27 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id 089E8411B5 for ; Wed, 19 Jan 2022 19:34:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642617265; x=1674153265; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AmrkSoCYsnKla2GPB7FQFCtPRbvFa+8CaHp1U28fCW4=; b=LBimOWQx+L5srFhz8cIy9jdp/bd23rhKcfG0rUtNajiQmYpROd7GTvl3 3T+pciR/2Tl9oRoHalU0F/LuwNZsiiShH8vEUdUBzvvkrCDbvLCspkyOL rv1JvzoGpKxdIkzdNnQwVmmCAMiSge5ltnQV3wDfE6MTKJ/7kM29c1ON9 DwbJ7nnrtpHxf9z8mLIuOVw8cHDdpD8dd0H9r/AYSEMcyCbBDI1j+PjEP lgUs9hoCgSm/opMHhOCB9Iq7iMijjVu75BQ3D71Hy1EIvwcwbBqk7Xj7s hwwzRgdYkleMqOfQYqCRAgd99rtHzYX7NcS9DMiTfnBKKnSMr2x5EQ6qE g==; X-IronPort-AV: E=McAfee;i="6200,9189,10231"; a="331496623" X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="331496623" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 10:10:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="578907393" Received: from silpixa00399126.ir.intel.com ([10.237.223.86]) by fmsmga008.fm.intel.com with ESMTP; 19 Jan 2022 10:10:29 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , Stephen Hemminger , =?utf-8?q?Morten_Br=C3=B8ru?= =?utf-8?q?p?= Subject: [PATCH v2 5/6] build: add "packet framework" libs to optional list Date: Wed, 19 Jan 2022 18:10:01 +0000 Message-Id: <20220119181002.471195-6-bruce.richardson@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220119181002.471195-1-bruce.richardson@intel.com> References: <20220113173918.2700651-1-bruce.richardson@intel.com> <20220119181002.471195-1-bruce.richardson@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add port, table and pipeline libraries - collectively often known as the "packet framework" - to the list of optional libraries, and ensure tests can build with them disabled. Signed-off-by: Bruce Richardson Acked-by: Stephen Hemminger Acked-by: Morten Brørup --- app/test/meson.build | 20 +++++++++++++------- lib/meson.build | 3 +++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index a39dd68934..aac2b98800 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -135,12 +135,6 @@ test_sources = files( 'test_stack.c', 'test_stack_perf.c', 'test_string_fns.c', - 'test_table.c', - 'test_table_acl.c', - 'test_table_combined.c', - 'test_table_pipeline.c', - 'test_table_ports.c', - 'test_table_tables.c', 'test_tailq.c', 'test_thash.c', 'test_thash_perf.c', @@ -229,7 +223,6 @@ fast_tests = [ ['stack_autotest', false], ['stack_lf_autotest', false], ['string_autotest', true], - ['table_autotest', true], ['tailq_autotest', true], ['ticketlock_autotest', true], ['timer_autotest', false], @@ -360,6 +353,19 @@ if dpdk_conf.has('RTE_LIB_TELEMETRY') test_sources += ['test_telemetry_json.c', 'test_telemetry_data.c'] fast_tests += [['telemetry_json_autotest', true], ['telemetry_data_autotest', true]] endif +if dpdk_conf.has('RTE_LIB_PIPELINE') +# pipeline lib depends on port and table libs, so those must be present +# if pipeline library is. + test_sources += [ + 'test_table.c', + 'test_table_acl.c', + 'test_table_combined.c', + 'test_table_pipeline.c', + 'test_table_ports.c', + 'test_table_tables.c', + ] + fast_tests += [['table_autotest', true]] +endif # The following linkages of drivers are required because # they are used via a driver-specific API. diff --git a/lib/meson.build b/lib/meson.build index ede5199374..dcc1b4d835 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -77,7 +77,10 @@ optional_libs = [ 'metrics', 'node', 'pdump', + 'pipeline', + 'port', 'power', + 'table', 'vhost', ] From patchwork Wed Jan 19 18:10:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 106091 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 25A1CA0032; Wed, 19 Jan 2022 19:34:33 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 182BC411B5; Wed, 19 Jan 2022 19:34:33 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id 3C889411AE for ; Wed, 19 Jan 2022 19:34:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642617271; x=1674153271; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Q48Z2u+6DJe2EQudkuT+myLHN91+FF7mNlRT5F4U5dg=; b=idlKHCFntqDtOK69ywIIMncKneQwaOO5SrVSX7De2UBtRjj2Q8DB7ikF 9w2edgjbyucg35Idn2kA4IOzOU16rDOTnepci7IwLELPj9juPVUC3yUIv GjGzZeo9h0TkUNnmn+7R7nfynNyVwE/oUFhaiX4tB+pHyR7FL3hz/sd1L PYLZOC268zFjYQ0NAsGL5QypbEvw7tXAAwrhieyWI1jSTsmgHUK/owOjl IbfUmK2YusT2KhPrFFl0j74kQIIBuVknahWz8Xey/NsxLtEnIpRLQguzX mlWMLwRtz61EjTY5XHp8PxJ7c/HH0j6RvnluOe9aqfXtlfibVr1epXYS1 Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10231"; a="331496689" X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="331496689" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 10:10:33 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="578907405" Received: from silpixa00399126.ir.intel.com ([10.237.223.86]) by fmsmga008.fm.intel.com with ESMTP; 19 Jan 2022 10:10:32 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , Stephen Hemminger , =?utf-8?q?Morten_Br=C3=B8ru?= =?utf-8?q?p?= Subject: [PATCH v2 6/6] build: add cfgfile library to optional list Date: Wed, 19 Jan 2022 18:10:02 +0000 Message-Id: <20220119181002.471195-7-bruce.richardson@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220119181002.471195-1-bruce.richardson@intel.com> References: <20220113173918.2700651-1-bruce.richardson@intel.com> <20220119181002.471195-1-bruce.richardson@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Allow disabling of the cfgfile library in builds. Signed-off-by: Bruce Richardson Acked-by: Stephen Hemminger Acked-by: Morten Brørup --- lib/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/meson.build b/lib/meson.build index dcc1b4d835..8e5acd7819 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -67,6 +67,7 @@ libraries = [ optional_libs = [ 'bitratestats', + 'cfgfile', 'flow_classify', 'gpudev', 'gro',