From patchwork Thu Jan 13 17:39:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 105791 X-Patchwork-Delegate: thomas@monjalon.net 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 4CA3EA0093; Thu, 13 Jan 2022 18:39:56 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4B7ED4274F; Thu, 13 Jan 2022 18:39:53 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id 73FD84274C for ; Thu, 13 Jan 2022 18:39:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642095591; x=1673631591; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=i34zhAHcV4/kPJp3da/6hjdU7aIUcBKc6wuaEA2VpbY=; b=Rw2e3LqbFeFhbdEnQtAIL0ozOjmx4LGgCsPwvQuTo55HupQ8dcCz+XxG oAwgkw91k96obPs8ebhcH9RibewlNIBK3dL3whBlgAznWnQ55s8kZYZZo 8iPXztIJO+kQoOL5DOPUww+ck75Dql9cPajYLf38mDTMnti3sadBxLMDj 5CwOTOi7rvU2HmOyayBwxIgaOx2F4VJOwWIiqMav8orny7bCz/TMeq0vw 8hhISPTJzLggIX5kKnCSHUhzcdjuf6PPXVj8uAThTyrZ847STG+P80kwh gB7RZIAfL2bRJXGMtbfd5mBdjt2Cve8+DHvIFQIPsQqcbMTgMo61oyaA9 A==; X-IronPort-AV: E=McAfee;i="6200,9189,10226"; a="244275464" X-IronPort-AV: E=Sophos;i="5.88,286,1635231600"; d="scan'208";a="244275464" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jan 2022 09:39:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,286,1635231600"; d="scan'208";a="475418188" Received: from silpixa00399126.ir.intel.com ([10.237.223.86]) by orsmga006.jf.intel.com with ESMTP; 13 Jan 2022 09:39:34 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Subject: [PATCH 1/6] lib: allow recursive disabling of libs in build Date: Thu, 13 Jan 2022 17:39:13 +0000 Message-Id: <20220113173918.2700651-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220113173918.2700651-1-bruce.richardson@intel.com> References: <20220113173918.2700651-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 --- 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 Thu Jan 13 17:39:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 105792 X-Patchwork-Delegate: thomas@monjalon.net 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 314C5A0093; Thu, 13 Jan 2022 18:40:02 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 400A942756; Thu, 13 Jan 2022 18:39:54 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id 487D14274F for ; Thu, 13 Jan 2022 18:39:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642095592; x=1673631592; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JMuKGNsQo3A6isSEkOXWGQCdmkuWWKTt8RBy6Zq1l7E=; b=IlG/1bDzEhuLkr1KaJhPP383e66A11GdOfqnyGPJmmr/vKApHcAmJAZW rFSonWu1v0YUtr5SVKC4vREfG9u9V5VSxM0Az3sMfgE+EUqDnhw9iXs1i FLh7oV3Vaflhn4oWZlcErWLaZ3GwJdHy6Fq/oCfuj3a7dDCKKsEpNmOkC 8cd9b9H494XJOv+dSet/dqhoJii/zgIneDhd1714y7D5ny1qvG+qhL2tF kOxc4prEDqon95q+r9j5I19omM96frxKBlB5hbrJZ8yfmAkf9IOPN6HdW BSVNxcHuER9PhJMPyZYhRK4GwRy05xViXd/30X0ZEqjcZ2jMSfAQ2By7E w==; X-IronPort-AV: E=McAfee;i="6200,9189,10226"; a="244275473" X-IronPort-AV: E=Sophos;i="5.88,286,1635231600"; d="scan'208";a="244275473" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jan 2022 09:39:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,286,1635231600"; d="scan'208";a="475418210" Received: from silpixa00399126.ir.intel.com ([10.237.223.86]) by orsmga006.jf.intel.com with ESMTP; 13 Jan 2022 09:39:39 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Subject: [PATCH 2/6] app/test: link unit test binary against all available libs Date: Thu, 13 Jan 2022 17:39:14 +0000 Message-Id: <20220113173918.2700651-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220113173918.2700651-1-bruce.richardson@intel.com> References: <20220113173918.2700651-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 --- app/test/meson.build | 47 +------------------------------------------- 1 file changed, 1 insertion(+), 46 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index 344a609a4d..9919de4307 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -157,39 +157,7 @@ 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 # Each test is marked with flag true/false # to indicate whether it can run in no-huge mode. @@ -380,7 +348,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 +377,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 +398,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 +418,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 Thu Jan 13 17:39:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 105793 X-Patchwork-Delegate: thomas@monjalon.net 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 C31E4A0093; Thu, 13 Jan 2022 18:40:07 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2E3944275B; Thu, 13 Jan 2022 18:39:55 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id EA8F742750 for ; Thu, 13 Jan 2022 18:39:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642095593; x=1673631593; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ZLzxgwBNsrXyqTX6+7taTdKjHjewMM6BgYanwmVoQQM=; b=N7qgInV88f8t3cmWx0m+gyXlSEiJdGU78hn8B4LJHRPnennHSIjMdt24 0tZ9U4ypb36ov8PCQGLHjEefNzLQSn6h6VOR1pFQDZ6laC0oU3LMO2b60 HJJoeMaPK+5Cp0D84yTWs2nlP/HYdXtXlyHpOMXPee/XPjwdBjwc1fSZB a9mgBhJHVKQ30tJ9LbHZPOBFyokP4bU5RTFC9pdbwRO6L2RDXvalo+vLk 3gPXZEcUb/HzySXTTFruh9V+24e2M4l5jKUgUD+PlVGUA6LXl2sRIslyj vxlMYY/0I43T055gGmSM4FNsAruv8HLvvvjBqp0QlweSEpK3fxedOOLqv A==; X-IronPort-AV: E=McAfee;i="6200,9189,10226"; a="244275481" X-IronPort-AV: E=Sophos;i="5.88,286,1635231600"; d="scan'208";a="244275481" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jan 2022 09:39:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,286,1635231600"; d="scan'208";a="475418228" Received: from silpixa00399126.ir.intel.com ([10.237.223.86]) by orsmga006.jf.intel.com with ESMTP; 13 Jan 2022 09:39:42 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Subject: [PATCH 3/6] build: add node library to optional list Date: Thu, 13 Jan 2022 17:39:15 +0000 Message-Id: <20220113173918.2700651-4-bruce.richardson@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220113173918.2700651-1-bruce.richardson@intel.com> References: <20220113173918.2700651-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 --- 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 Thu Jan 13 17:39:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 105794 X-Patchwork-Delegate: thomas@monjalon.net 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 85BCEA0093; Thu, 13 Jan 2022 18:40:13 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1ADDA42761; Thu, 13 Jan 2022 18:39:56 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id AC28742753 for ; Thu, 13 Jan 2022 18:39:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642095594; x=1673631594; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=oT2w2Tc/JOhXj+jIa0v4u3sesLPyeisRT1DIzKJ3W8s=; b=kVmG+8NNaIApEDYrQf/lj7mV1MkPM9qGrQ6Ar65a8H/dfhWH4a5QrZCH oTnSwdbebQ6sG6rVp6eW9rz6HRfzeKqTFjinhpAQL3jVypsjriSSYJgY9 IHTQugq5XsDsVFUytjqVg9U57xE4sKZNELtH5DlowcvGxKvFlT78jZS7Z hZZ5uGZcZu3f2ZEowKFH7w2hFcoPIXxf9bibm8aOIek6SYLe9pBxC1Ccg qbRtO9KqBbcuAmaZLfh0d8DHuSDRzytgn9DIKHETB2fBruvtdZQMCXoa0 ISJKTxM0E+/2+2ell0eckx4IXg1qypTrHeVIBEMoEqRX3d4lHL6zEPRed g==; X-IronPort-AV: E=McAfee;i="6200,9189,10226"; a="244275489" X-IronPort-AV: E=Sophos;i="5.88,286,1635231600"; d="scan'208";a="244275489" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jan 2022 09:39:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,286,1635231600"; d="scan'208";a="475418238" Received: from silpixa00399126.ir.intel.com ([10.237.223.86]) by orsmga006.jf.intel.com with ESMTP; 13 Jan 2022 09:39:44 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Subject: [PATCH 4/6] build: add flow classification library to optional list Date: Thu, 13 Jan 2022 17:39:16 +0000 Message-Id: <20220113173918.2700651-5-bruce.richardson@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220113173918.2700651-1-bruce.richardson@intel.com> References: <20220113173918.2700651-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 --- 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 9919de4307..a92dd0c1f0 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', @@ -194,7 +193,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], @@ -347,6 +345,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 Thu Jan 13 17:39:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 105795 X-Patchwork-Delegate: thomas@monjalon.net 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 BE53FA0093; Thu, 13 Jan 2022 18:40:21 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5B5364276B; Thu, 13 Jan 2022 18:39:57 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id 103264275F for ; Thu, 13 Jan 2022 18:39:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642095596; x=1673631596; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=C6H9ujrHxgDt2ZWgEMR/5TLdD2KO58W2+vDnam92Uac=; b=Nuvob1Mdnwqptq/wYWkbIy+oyM16pyJmb/dRu1F1DNnYPfGLqSeoPK2V WCLwMIgu2Eq3avDmIN6ZdJkQg89e3NomHuzo9Tii3tD6beveEH9bsYVSf gt35/If76lOXyJ48oE4/hEy936ZoTPIiSrHh7zYMqknH7nsNmnLBmVPfo 49bgWXYXrsglksuaBF3d/tBVfE/tURGYkJzB8rwXFTn1Dn12PfQ8hVcF5 ocYQ4KUgMegHIcwcw1/hbTkLxcvWm8PblFw7fVn5Imn+WhXGAgpe6qCXl mWN1FccOgrvGrk1Bg/cPdJ9eAaEhp2T66zwXLtKH05ZIotXXRFGFZiY2e g==; X-IronPort-AV: E=McAfee;i="6200,9189,10226"; a="244275501" X-IronPort-AV: E=Sophos;i="5.88,286,1635231600"; d="scan'208";a="244275501" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jan 2022 09:39:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,286,1635231600"; d="scan'208";a="475418257" Received: from silpixa00399126.ir.intel.com ([10.237.223.86]) by orsmga006.jf.intel.com with ESMTP; 13 Jan 2022 09:39:47 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Subject: [PATCH 5/6] build: add "packet framework" libs to optional list Date: Thu, 13 Jan 2022 17:39:17 +0000 Message-Id: <20220113173918.2700651-6-bruce.richardson@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220113173918.2700651-1-bruce.richardson@intel.com> References: <20220113173918.2700651-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 --- 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 a92dd0c1f0..ba62e5e98c 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', @@ -227,7 +221,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], @@ -358,6 +351,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 Thu Jan 13 17:39:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 105796 X-Patchwork-Delegate: thomas@monjalon.net 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 C0CDDA0093; Thu, 13 Jan 2022 18:40:27 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 51B8642770; Thu, 13 Jan 2022 18:39:58 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id E0AA54275C for ; Thu, 13 Jan 2022 18:39:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642095597; x=1673631597; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=isljBDyTkdDsfiW+2aqvApwmjjRzAEcitVOYO8PHiWM=; b=nCin4tYxe9FbSfSvvp2dL2dW2N2kElcASAX7nEdAB/U4KIbSXQdvXUay TeCzUL1q9zvat2SnHV3jFSbDRnp2uq1jIlu6avKGmmzcfV85S6aSAX4wy iUwzp24BgBPsZzJB5wF7gWX7Gm33sw0p4zVVpiWwvydJG9EhpP3ZsH/F2 65FxiAPBRlfTRZyECte6rcP/DcwMpvh+igEWMjnBLqGnhTJ5rSiddi8oV eL2GsE5fbty+B3kYxw3hO/G5c/XGxpnHIRCejw9yM1Dl1v2GD4mlfitQE eSqwr0SLM/Dt8RfvFdCDint3GhQ6O2r5FKttk6HxW6l1tj+TPV1pE6bhg w==; X-IronPort-AV: E=McAfee;i="6200,9189,10226"; a="244275512" X-IronPort-AV: E=Sophos;i="5.88,286,1635231600"; d="scan'208";a="244275512" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jan 2022 09:39:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,286,1635231600"; d="scan'208";a="475418276" Received: from silpixa00399126.ir.intel.com ([10.237.223.86]) by orsmga006.jf.intel.com with ESMTP; 13 Jan 2022 09:39:49 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Subject: [PATCH 6/6] build: add cfgfile library to optional list Date: Thu, 13 Jan 2022 17:39:18 +0000 Message-Id: <20220113173918.2700651-7-bruce.richardson@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220113173918.2700651-1-bruce.richardson@intel.com> References: <20220113173918.2700651-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 --- 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',