From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7ECE6A052A; Sun, 24 Jan 2021 21:52:21 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 13698140D6A; Sun, 24 Jan 2021 21:52:10 +0100 (CET) Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by mails.dpdk.org (Postfix) with ESMTP id 69CD0140D48 for ; Sun, 24 Jan 2021 21:52:08 +0100 (CET) Received: by mail-lf1-f46.google.com with SMTP id q8so14853317lfm.10 for ; Sun, 24 Jan 2021 12:52:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vqdym5e+UBO2PzJQ1URI92yL6kWjETYN2y0cidYrZoU=; b=he1tncVIzTu/TD9N4dXBYZoYd6G8X30HiiJiNBES4y/8UoldnXcOMCmP+3ErKCZDll JNTxURLCysW18svXZTV+5432F9sSpsvmi0fEL2s8GPaNm7pn4aPnq0/eRxsSYtD6p/lS jkqm7bKqDbXv+JxIzhtx/50qvTmaK2ndymcYAbx7nwx02zj5qGlCTChtZY66vaMBkMOl zPJbEE0sN/h/L9Nd5a9waP6qquR/0sfWqOUCvrnZOwb7xIXIy02r2UfF9xFAWGpiJDRM g2WNl/88O9s7pJm1/5idVm237/PFxDK/UYSkXAWqx7XaLK1QMA6cuzZt3PhNN7jSFAe9 /xIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vqdym5e+UBO2PzJQ1URI92yL6kWjETYN2y0cidYrZoU=; b=WuUvwEuBXXV0s1nrQX5Q2fuTqDGIO2m7X784qkR2Hz96dZaXzy6eZ7+9gR3zXXfzIv Nq98Dat1w7Y0DLXj6ylX3O0N55iPQ3Lgkk0XOcX5WzQGyAVBJlMxkSN9pNAC5xRAaAxj oYEV4l+zhppqkFOeJgPwVm5CVjxRw1NPpUwEvmnTfvUGmmgUDyJ774fVho5b6t7+9wMk esmI/ubSGIH5SyFvJAzR/huN126mjNzVaIHfuLRLqwFM9D+avP6MPPraCv9KN76OLEad EoAy1cxF1XtHdhl7cASafeKpXlTn6j643uYWIxLVp3e6ib72oLYq2NAhTULOFEgyNbH5 UYGg== X-Gm-Message-State: AOAM532aQc8mRK3u9DBRxIZXzA/3IyNjtpqZ3pxuTrQnHrFsGOWfCChH da8aCBhUJ4A/Pw1aGEdrXls0rToe/CZWFw== X-Google-Smtp-Source: ABdhPJxMztxg+yOhJtbh70PQ2wHCqKYEvTtKqbVEV4GqeWPMnKULUBKg2CDtoZYB59/IyPXZOX3unQ== X-Received: by 2002:a19:3f94:: with SMTP id m142mr17438lfa.196.1611521527738; Sun, 24 Jan 2021 12:52:07 -0800 (PST) Received: from localhost.localdomain (broadband-37-110-65-23.ip.moscow.rt.ru. [37.110.65.23]) by smtp.gmail.com with ESMTPSA id r72sm1168551lff.214.2021.01.24.12.52.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Jan 2021 12:52:07 -0800 (PST) From: Dmitry Kozlyuk To: dev@dpdk.org Cc: Maxime Coquelin , Bruce Richardson , Thomas Monjalon , Dmitry Kozlyuk , Aaron Conole , Michael Santana , Ray Kinsella , Neil Horman Date: Sun, 24 Jan 2021 23:51:56 +0300 Message-Id: <20210124205157.14386-3-dmitry.kozliuk@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210124205157.14386-1-dmitry.kozliuk@gmail.com> References: <20210122224327.5621-1-dmitry.kozliuk@gmail.com> <20210124205157.14386-1-dmitry.kozliuk@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v10 2/3] build: use Python pmdinfogen 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 Sender: "dev" Use the same interpreter to run pmdinfogen as for other build scripts. Adjust wrapper script accordingly and also don't suppress stderr from ar and pmdinfogen. Add configure-time check for elftools Python module for Unix hosts. Add pyelftools to CI configuration and build requirements for Linux and FreeBSD. Windows targets are not currently using pmdinfogen. Suppress ABI warnings about generated PMD information strings. Signed-off-by: Dmitry Kozlyuk --- .github/workflows/build.yml | 4 ++-- .travis.yml | 2 +- buildtools/gen-pmdinfo-cfile.sh | 6 +++--- buildtools/meson.build | 15 +++++++++++++++ devtools/libabigail.abignore | 4 ++++ doc/guides/freebsd_gsg/build_dpdk.rst | 3 ++- doc/guides/linux_gsg/sys_reqs.rst | 6 ++++++ drivers/meson.build | 2 +- meson.build | 1 - 9 files changed, 34 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0b72df0eb..a5b579add 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,8 +91,8 @@ jobs: run: sudo apt update - name: Install packages run: sudo apt install -y ccache libnuma-dev python3-setuptools - python3-wheel python3-pip ninja-build libbsd-dev libpcap-dev - libibverbs-dev libcrypto++-dev libfdt-dev libjansson-dev + python3-wheel python3-pip python3-pyelftools ninja-build libbsd-dev + libpcap-dev libibverbs-dev libcrypto++-dev libfdt-dev libjansson-dev - name: Install libabigail build dependencies if no cache is available if: env.ABI_CHECKS == 'true' && steps.libabigail-cache.outputs.cache-hit != 'true' run: sudo apt install -y autoconf automake libtool pkg-config libxml2-dev diff --git a/.travis.yml b/.travis.yml index 5aa7ad49f..4391af1d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ addons: apt: update: true packages: &required_packages - - [libnuma-dev, python3-setuptools, python3-wheel, python3-pip, ninja-build] + - [libnuma-dev, python3-setuptools, python3-wheel, python3-pip, python3-pyelftools, ninja-build] - [libbsd-dev, libpcap-dev, libibverbs-dev, libcrypto++-dev, libfdt-dev, libjansson-dev] _aarch64_packages: &aarch64_packages diff --git a/buildtools/gen-pmdinfo-cfile.sh b/buildtools/gen-pmdinfo-cfile.sh index 43059cf36..109ee461e 100755 --- a/buildtools/gen-pmdinfo-cfile.sh +++ b/buildtools/gen-pmdinfo-cfile.sh @@ -4,11 +4,11 @@ arfile=$1 output=$2 -pmdinfogen=$3 +shift 2 +pmdinfogen=$* # The generated file must not be empty if compiled in pedantic mode echo 'static __attribute__((unused)) const char *generator = "'$0'";' > $output for ofile in `ar t $arfile` ; do - ar p $arfile $ofile | $pmdinfogen - - >> $output 2> /dev/null + ar p $arfile $ofile | $pmdinfogen - - >> $output done -exit 0 diff --git a/buildtools/meson.build b/buildtools/meson.build index 04808dabc..dd4c0f640 100644 --- a/buildtools/meson.build +++ b/buildtools/meson.build @@ -17,3 +17,18 @@ else endif map_to_win_cmd = py3 + files('map_to_win.py') sphinx_wrapper = py3 + files('call-sphinx-build.py') +pmdinfogen = py3 + files('pmdinfogen.py') + +# TODO: starting from Meson 0.51.0 use +# python3 = import('python').find_installation('python', +# modules : python3_required_modules) +python3_required_modules = [] +if host_machine.system() != 'windows' + python3_required_modules = ['elftools'] +endif +foreach module : python3_required_modules + script = 'import importlib.util; import sys; exit(importlib.util.find_spec("@0@") is None)' + if run_command(py3, '-c', script.format(module)).returncode() != 0 + error('missing python module: @0@'.format(module)) + endif +endforeach diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore index 1dc84fa74..05afccc1a 100644 --- a/devtools/libabigail.abignore +++ b/devtools/libabigail.abignore @@ -16,3 +16,7 @@ [suppress_type] name = rte_cryptodev has_data_member_inserted_between = {0, 1023} + +; Ignore all changes in generated PMD information strings. +[suppress_variable] + name_regex = _pmd_info$ diff --git a/doc/guides/freebsd_gsg/build_dpdk.rst b/doc/guides/freebsd_gsg/build_dpdk.rst index e3005a7f3..bed353473 100644 --- a/doc/guides/freebsd_gsg/build_dpdk.rst +++ b/doc/guides/freebsd_gsg/build_dpdk.rst @@ -14,10 +14,11 @@ The following FreeBSD packages are required to build DPDK: * meson * ninja * pkgconf +* py37-pyelftools These can be installed using (as root):: - pkg install meson pkgconf + pkg install meson pkgconf py37-pyelftools To compile the required kernel modules for memory management and working with physical NIC devices, the kernel sources for FreeBSD also diff --git a/doc/guides/linux_gsg/sys_reqs.rst b/doc/guides/linux_gsg/sys_reqs.rst index be714adf2..a05b5bd81 100644 --- a/doc/guides/linux_gsg/sys_reqs.rst +++ b/doc/guides/linux_gsg/sys_reqs.rst @@ -52,6 +52,12 @@ Compilation of the DPDK * If the packaged version is below the minimum version, the latest versions can be installed from Python's "pip" repository: ``pip3 install meson ninja`` +* ``pyelftools`` (version 0.22+) + + * For RHEL/Fedora systems it can be installed using ``dnf install python-pyelftools`` + + * For Ubuntu/Debian it can be installed using ``apt install python3-pyelftools`` + * Library for handling NUMA (Non Uniform Memory Access). * ``numactl-devel`` in RHEL/Fedora; diff --git a/drivers/meson.build b/drivers/meson.build index 77f65fa90..ff5cdb952 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -132,7 +132,7 @@ foreach subpath:subdirs command: [pmdinfo, tmp_lib.full_path(), '@OUTPUT@', pmdinfogen], output: out_filename, - depends: [pmdinfogen, tmp_lib]) + depends: [tmp_lib]) endif # now build the static driver diff --git a/meson.build b/meson.build index 45d974cd2..2b9c37eb4 100644 --- a/meson.build +++ b/meson.build @@ -45,7 +45,6 @@ subdir('buildtools') subdir('config') # build libs and drivers -subdir('buildtools/pmdinfogen') subdir('lib') subdir('drivers') -- 2.29.2