From patchwork Wed Sep 25 14:55:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 59761 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A2F481BF4F; Wed, 25 Sep 2019 16:55:41 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 20B131BF33; Wed, 25 Sep 2019 16:55:38 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Sep 2019 07:55:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,548,1559545200"; d="scan'208";a="390235751" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by fmsmga006.fm.intel.com with ESMTP; 25 Sep 2019 07:55:37 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: bluca@debian.org, thomas@monjalon.net, mb@smartsharesystems.com, techboard@dpdk.org, Bruce Richardson Date: Wed, 25 Sep 2019 15:55:29 +0100 Message-Id: <20190925145531.52705-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190925145531.52705-1-bruce.richardson@intel.com> References: <20190925145531.52705-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 1/3] build: align variable names between drivers and libs X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The variable names in the library and drivers meson.build files are slighty different with "static_deps" in one and "static_objs" in the other. Rename to use "static_deps" in both for consistency. Signed-off-by: Bruce Richardson --- drivers/meson.build | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/meson.build b/drivers/meson.build index 2ed2e9541..b54601697 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -79,18 +79,18 @@ foreach class:dpdk_driver_classes endif # get dependency objs from strings - shared_objs = [] - static_objs = [] + shared_deps = [] + static_deps = [] foreach d:deps if not is_variable('shared_rte_' + d) error('Missing dependency ' + d + ' for driver ' + lib_name) endif - shared_objs += [get_variable('shared_rte_' + d)] - static_objs += [get_variable('static_rte_' + d)] + shared_deps += [get_variable('shared_rte_' + d)] + static_deps += [get_variable('static_rte_' + d)] endforeach - shared_objs += ext_deps - static_objs += ext_deps + shared_deps += ext_deps + static_deps += ext_deps dpdk_extra_ldflags += pkgconfig_extra_libs # generate pmdinfo sources by building a temporary @@ -101,7 +101,7 @@ foreach class:dpdk_driver_classes tmp_lib = static_library('tmp_' + lib_name, sources, include_directories: includes, - dependencies: static_objs, + dependencies: static_deps, c_args: cflags) objs += tmp_lib.extract_all_objects() sources = custom_target(out_filename, @@ -123,7 +123,7 @@ foreach class:dpdk_driver_classes sources, objects: objs, include_directories: includes, - dependencies: static_objs, + dependencies: static_deps, c_args: cflags, install: true) @@ -135,7 +135,7 @@ foreach class:dpdk_driver_classes sources, objects: objs, include_directories: includes, - dependencies: shared_objs, + dependencies: shared_deps, c_args: cflags, link_args: '-Wl,--version-script=' + version_map, link_depends: version_map, @@ -148,10 +148,10 @@ foreach class:dpdk_driver_classes # testpmd or other built-in apps can find it if necessary shared_dep = declare_dependency(link_with: shared_lib, include_directories: includes, - dependencies: shared_objs) + dependencies: shared_deps) static_dep = declare_dependency(link_with: static_lib, include_directories: includes, - dependencies: static_objs) + dependencies: static_deps) dpdk_drivers += static_lib From patchwork Wed Sep 25 14:55:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 59762 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4A6CD1BF4E; Wed, 25 Sep 2019 16:55:45 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 5E1E11BF03; Wed, 25 Sep 2019 16:55:41 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Sep 2019 07:55:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,548,1559545200"; d="scan'208";a="390235760" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by fmsmga006.fm.intel.com with ESMTP; 25 Sep 2019 07:55:39 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: bluca@debian.org, thomas@monjalon.net, mb@smartsharesystems.com, techboard@dpdk.org, Bruce Richardson Date: Wed, 25 Sep 2019 15:55:30 +0100 Message-Id: <20190925145531.52705-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190925145531.52705-1-bruce.richardson@intel.com> References: <20190925145531.52705-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 2/3] build: process dependencies before main build check X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" If we want to add support for turning off components because of missing dependencies, then we need to check for those dependencies before we make a determination as to whether a component should be built or not, assuming that the component says it should be built. Signed-off-by: Bruce Richardson --- drivers/meson.build | 27 ++++++++++++++------------- lib/meson.build | 23 +++++++++++++---------- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/drivers/meson.build b/drivers/meson.build index b54601697..ee5db4157 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -59,6 +59,20 @@ foreach class:dpdk_driver_classes # pull in driver directory which should assign to each of the above subdir(drv_path) + if build + # get dependency objs from strings + shared_deps = ext_deps + static_deps = ext_deps + foreach d:deps + if not is_variable('shared_rte_' + d) + error('Missing internal dependency "@0@" for @1@ [@2@]' + .format(d, name, 'drivers/' + drv_path)) + endif + shared_deps += [get_variable('shared_rte_' + d)] + static_deps += [get_variable('static_rte_' + d)] + endforeach + endif + if not build # some driver directories are placeholders which # are never built, so we allow suppression of the @@ -78,19 +92,6 @@ foreach class:dpdk_driver_classes cflags += '-DALLOW_EXPERIMENTAL_API' endif - # get dependency objs from strings - shared_deps = [] - static_deps = [] - foreach d:deps - if not is_variable('shared_rte_' + d) - error('Missing dependency ' + d + - ' for driver ' + lib_name) - endif - shared_deps += [get_variable('shared_rte_' + d)] - static_deps += [get_variable('static_rte_' + d)] - endforeach - shared_deps += ext_deps - static_deps += ext_deps dpdk_extra_ldflags += pkgconfig_extra_libs # generate pmdinfo sources by building a temporary diff --git a/lib/meson.build b/lib/meson.build index e5ff83893..fde2f5a02 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -66,6 +66,19 @@ foreach l:libraries dir_name = 'librte_' + l subdir(dir_name) + if build + shared_deps = ext_deps + static_deps = ext_deps + foreach d:deps + if not is_variable('shared_rte_' + d) + error('Missing internal dependency "@0@" for @1@ [@2@]' + .format(d, name, 'lib/' + dir_name)) + endif + shared_deps += [get_variable('shared_rte_' + d)] + static_deps += [get_variable('static_rte_' + d)] + endforeach + endif + if not build dpdk_libs_disabled += name set_variable(name.underscorify() + '_disable_reason', reason) @@ -82,16 +95,6 @@ foreach l:libraries shared_dep = declare_dependency(include_directories: includes) static_dep = shared_dep else - shared_deps = ext_deps - static_deps = ext_deps - foreach d:deps - if not is_variable('shared_rte_' + d) - error('Missing dependency ' + d + - ' for library ' + libname) - endif - shared_deps += [get_variable('shared_rte_' + d)] - static_deps += [get_variable('static_rte_' + d)] - endforeach if allow_experimental_apis cflags += '-DALLOW_EXPERIMENTAL_API' From patchwork Wed Sep 25 14:55:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 59763 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 648771BF57; Wed, 25 Sep 2019 16:55:47 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 787A51BF52; Wed, 25 Sep 2019 16:55:43 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Sep 2019 07:55:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,548,1559545200"; d="scan'208";a="390235769" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by fmsmga006.fm.intel.com with ESMTP; 25 Sep 2019 07:55:41 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: bluca@debian.org, thomas@monjalon.net, mb@smartsharesystems.com, techboard@dpdk.org, Bruce Richardson Date: Wed, 25 Sep 2019 15:55:31 +0100 Message-Id: <20190925145531.52705-4-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190925145531.52705-1-bruce.richardson@intel.com> References: <20190925145531.52705-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 3/3] build: support disabling drivers with meson X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Add support for a new build option to turn off certain drivers. Any other drivers which depend on the one being disabled will also be disabled with a suitable debug message. Signed-off-by: Bruce Richardson --- drivers/meson.build | 16 ++++++++++++---- meson_options.txt | 2 ++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/meson.build b/drivers/meson.build index ee5db4157..e7a696d52 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -16,6 +16,8 @@ dpdk_driver_classes = ['common', 'baseband', # depends on common and bus. 'raw'] # depends on common, bus, mempool, net and event. +disabled_drivers = get_option('disable_drivers').split(',') + default_cflags = machine_args if cc.has_argument('-Wno-format-truncation') default_cflags += '-Wno-format-truncation' @@ -59,17 +61,23 @@ foreach class:dpdk_driver_classes # pull in driver directory which should assign to each of the above subdir(drv_path) - if build + if drv_path in disabled_drivers + build = false + reason = 'Explicitly disabled via build config' + elif build # get dependency objs from strings shared_deps = ext_deps static_deps = ext_deps foreach d:deps 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, 'drivers/' + drv_path)) + 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 endif diff --git a/meson_options.txt b/meson_options.txt index 448f3e63d..89650b0e9 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -2,6 +2,8 @@ option('allow_invalid_socket_id', type: 'boolean', value: false, description: 'allow out-of-range NUMA socket id\'s for platforms that don\'t report the value correctly') +option('disable_drivers', type: 'string', value: '', + description: 'Comma-separated list of drivers to explicitly disable.') option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-', description: 'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.') option('enable_docs', type: 'boolean', value: false,