From patchwork Thu Jan 25 11:14:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 34470 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 1FDB47CD8; Thu, 25 Jan 2018 12:15:03 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 6D1602BF3 for ; Thu, 25 Jan 2018 12:15:01 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Jan 2018 03:15:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,411,1511856000"; d="scan'208";a="12514372" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by orsmga007.jf.intel.com with ESMTP; 25 Jan 2018 03:14:59 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Thu, 25 Jan 2018 11:14:43 +0000 Message-Id: <20180125111443.231999-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.14.3 Subject: [dpdk-dev] [PATCH] drivers: improve pmdinfo generation when using 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" Since meson 0.44, changing any file inside a PMD directory (quite correctly) triggers a full re-run of meson on build, rather than an incremental build as with earlier versions. This rerun is needed because we use "grep" in meson to search for files on which to run pmdinfogen, and changing any of those files means that grep and, therefore meson, needs to be rerun. [Previous versions of meson did not track this dependency on the grep command, and so did incremental builds only.] If, however, we take advantage of pmdinfogen's ability to use stdin and stdout instead of files, we can instead use a shell script to process an entire static archive and generate a single .c file from it. This eliminates the need for grep, and means that changes to a PMD file only need an incremental build - a significant time saving. Signed-off-by: Bruce Richardson --- NOTE: this patch depends upon http://dpdk.org/dev/patchwork/patch/34469/ buildtools/gen-pmdinfo-cfile.sh | 9 +++++---- drivers/meson.build | 31 +++++++++++++++---------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/buildtools/gen-pmdinfo-cfile.sh b/buildtools/gen-pmdinfo-cfile.sh index 565e08913..c721bd1c4 100755 --- a/buildtools/gen-pmdinfo-cfile.sh +++ b/buildtools/gen-pmdinfo-cfile.sh @@ -6,7 +6,8 @@ arfile=$1 output=$2 pmdinfogen=$3 -tmp_o=${output%.c.pmd.c}.tmp.o - -ar p $arfile > $tmp_o && \ - $pmdinfogen $tmp_o $output +echo > $output +for ofile in `ar t $arfile` ; do + ar p $arfile $ofile | $pmdinfogen - - >> $output 2> /dev/null +done +exit 0 diff --git a/drivers/meson.build b/drivers/meson.build index 604384f07..234be62d6 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -44,6 +44,7 @@ foreach class:driver_classes if build dpdk_conf.set(config_flag_fmt.format(name.to_upper()),1) + lib_name = driver_name_fmt.format(name) # get dependency objs from strings shared_objs = [] @@ -56,21 +57,22 @@ foreach class:driver_classes static_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, + # generate pmdinfo sources by building a temporary + # lib and then running pmdinfogen on the contents of + # that lib. The final lib reuses the object files and + # adds in the new source file. + out_filename = lib_name + '.pmd.c' + tmp_lib = static_library('tmp_' + lib_name, + sources, + include_directories: includes, dependencies: static_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 + objs += tmp_lib.extract_all_objects() + sources = custom_target(out_filename, + command: [pmdinfo, tmp_lib.full_path(), + '@OUTPUT@', pmdinfogen], + output: out_filename, + depends: [pmdinfogen, tmp_lib]) if get_option('per_library_versions') lib_version = '@0@.1'.format(version) @@ -83,7 +85,6 @@ foreach class:driver_classes endif # now build the static driver - lib_name = driver_name_fmt.format(name) static_lib = static_library(lib_name, sources, objects: objs, @@ -93,8 +94,6 @@ foreach class:driver_classes install: true) # now build the shared driver - sources = [] - objs += static_lib.extract_all_objects() version_map = '@0@/@1@/@2@_version.map'.format( meson.current_source_dir(), drv_path, lib_name)