From patchwork Wed Sep 13 14:12:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 28670 X-Patchwork-Delegate: bruce.richardson@intel.com 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 1CC881B1AD; Wed, 13 Sep 2017 17:08:30 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id D65F41B19F for ; Wed, 13 Sep 2017 17:08:20 +0200 (CEST) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Sep 2017 08:08:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,388,1500966000"; d="scan'208";a="311250601" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga004.fm.intel.com with ESMTP; 13 Sep 2017 08:08:18 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: nhorman@tuxdriver.com, luca.boccassi@gmail.com, harry.van.haaren@intel.com, keith.wiles@intel.com, Bruce Richardson Date: Wed, 13 Sep 2017 15:12:11 +0100 Message-Id: <20170913141222.253688-7-bruce.richardson@intel.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170913141222.253688-1-bruce.richardson@intel.com> References: <20170912103809.140473-1-bruce.richardson@intel.com> <20170913141222.253688-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v3 06/17] build: add infrastructure for building PMDs 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 in the top-level drivers meson.build file to start adding in building of PMDs. Since all PMDs are built in pretty much the same way, the logic for building each PMD, including extracting the pmdinfo, is included in the top level build file. This means that each individual driver class only needs to specify its default dependencies and a few naming conventions, and each driver only needs to specify it's source files, headers, etc. Signed-off-by: Bruce Richardson --- drivers/meson.build | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++ meson.build | 3 +- 2 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 drivers/meson.build diff --git a/drivers/meson.build b/drivers/meson.build new file mode 100644 index 000000000..3e5046fe1 --- /dev/null +++ b/drivers/meson.build @@ -0,0 +1,121 @@ +# BSD LICENSE +# +# Copyright(c) 2017 Intel Corporation. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Intel Corporation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +driver_classes = [] + +foreach class:driver_classes + drivers = [] + std_deps = [] + config_flag_fmt = '' # format string used to set the value in dpdk_conf + driver_name_fmt = '' # format string for driver name, used to name + # the library, the dependency and to find the + # version file for linking + + subdir(class) + + foreach drv:drivers + drv_path = join_paths(class, drv) + + # set up empty variables used for build + build = true # set to false to disable, e.g. missing deps + version = 1 + sources = [] + objs = [] + cflags = [] + includes = [include_directories(drv_path)] + # set up internal deps. Drivers can append/override as necessary + deps = std_deps + # ext_deps: Stores external library dependency got + # using dependency() or cc.find_library(). For most cases, we + # probably also need to specify the "-l" flags in + # pkgconfig_extra_libs variable too, so that it can be reflected + # in the pkgconfig output for static builds + ext_deps = [] + pkgconfig_extra_libs = [] + + # pull in driver directory which should assign to each of the above + subdir(drv_path) + + if build + dpdk_conf.set(config_flag_fmt.format(drv.to_upper()),1) + + # get dependency objs from strings + dep_objs = [] + foreach d:deps + dep_objs += [get_variable('dep_rte_' + d)] + endforeach + dep_objs += ext_deps + dpdk_extra_ldflags += pkgconfig_extra_libs + + # generate pmdinfo sources + pmdinfogen_srcs = run_command('grep', '--files-with-matches', + 'RTE_PMD_REGISTER_.*(.*)', sources).stdout().strip().split() + foreach src: pmdinfogen_srcs + out_filename = '@0@.pmd.c'.format(src.split('/')[-1]) + tmp_lib = static_library('tmp_@0@'.format(src.underscorify()), + src, include_directories: includes, + dependencies: dep_objs, + c_args: cflags) + sources += custom_target(out_filename, + command: [pmdinfo, tmp_lib.full_path(), + '@OUTPUT@', pmdinfogen], + output: out_filename, + depends: [pmdinfogen, tmp_lib]) + endforeach + + # now build the driver itself, and add to the drivers list + drv_name = driver_name_fmt.format(drv) + version_map = '@0@/@1@/@2@_version.map'.format( + meson.current_source_dir(), + drv_path, drv_name) + lib = library(drv_name, + sources, + objects: objs, + include_directories: includes, + dependencies: dep_objs, + c_args: cflags, + link_args: '-Wl,--version-script=' + version_map, + link_depends: version_map, + version: '@0@.1'.format(version), + install: true, + install_dir: driver_install_path) + + dpdk_drivers += lib + + # create a dependency object and add it to the global dictionary so + # testpmd or other built-in apps can find it if necessary + set_variable('dep_@0@'.format(drv_name), + declare_dependency(link_with: lib, + include_directories: includes, + dependencies: dep_objs)) + endif # build + endforeach +endforeach diff --git a/meson.build b/meson.build index db9c1631f..ec4f1391a 100644 --- a/meson.build +++ b/meson.build @@ -57,9 +57,10 @@ endif global_inc = include_directories('.', 'config') subdir('config') -# build libs and (TODO) drivers +# build libs and drivers subdir('lib') subdir('buildtools') +subdir('drivers') # TODO build binaries and installable tools