From patchwork Tue Apr 25 20:08:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 126517 X-Patchwork-Delegate: david.marchand@redhat.com 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 A9155429D8; Tue, 25 Apr 2023 22:08:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BB44342B8E; Tue, 25 Apr 2023 22:08:52 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id CED6A40ED6 for ; Tue, 25 Apr 2023 22:08:50 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id 3504F21C2B2C; Tue, 25 Apr 2023 13:08:50 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 3504F21C2B2C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1682453330; bh=biM2Y9lxIyG6GjOvd5N4UAUr2SQaeCpJdltVQ3Z9w3M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WZ6hxh3a0K+I0vlf/wSbidDf1jx3wRcn6cWpwCkJUMlGPCyX89yOqIs8kXBhGZpAq mgK4/gAI74UmTga0Jq1w40kO3Nfb+FlhAL48memCymxuGzMegyKcrdh39fzlf3NsGO xDbBnR8dz1aTCPO8bcacF81k0KfXQW11r08C+e1k= From: Tyler Retzlaff To: dev@dpdk.org Cc: bruce.richardson@intel.com, david.marchand@redhat.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH v3 1/4] build: unblock the use of the MSVC compiler Date: Tue, 25 Apr 2023 13:08:46 -0700 Message-Id: <1682453329-20435-2-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1682453329-20435-1-git-send-email-roretzla@linux.microsoft.com> References: <1674674707-3094-1-git-send-email-roretzla@linux.microsoft.com> <1682453329-20435-1-git-send-email-roretzla@linux.microsoft.com> 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 Detect when MSVC toolset is available and tweak toolchain arguments where the meson build system offers no abstraction. Signed-off-by: Tyler Retzlaff Acked-by: Bruce Richardson --- buildtools/meson.build | 10 +++++++--- config/meson.build | 21 ++++++++++++++------- config/x86/meson.build | 8 +++++--- lib/meson.build | 13 ++++++++++--- 4 files changed, 36 insertions(+), 16 deletions(-) diff --git a/buildtools/meson.build b/buildtools/meson.build index e1c600e..838c39f 100644 --- a/buildtools/meson.build +++ b/buildtools/meson.build @@ -4,7 +4,9 @@ pkgconf = find_program('pkg-config', 'pkgconf', required: false) check_symbols = find_program('check-symbols.sh') ldflags_ibverbs_static = find_program('options-ibverbs-static.sh') -objdump = find_program('objdump', 'llvm-objdump') +if cc.get_id() != 'msvc' + objdump = find_program('objdump', 'llvm-objdump') +endif python3 = import('python').find_installation(required: false) if python3.found() @@ -18,8 +20,10 @@ map_to_win_cmd = py3 + files('map_to_win.py') sphinx_wrapper = py3 + files('call-sphinx-build.py') get_cpu_count_cmd = py3 + files('get-cpu-count.py') get_numa_count_cmd = py3 + files('get-numa-count.py') -binutils_avx512_check = (py3 + files('binutils-avx512-check.py') + - [objdump] + cc.cmd_array()) +if cc.get_id() != 'msvc' + binutils_avx512_check = (py3 + files('binutils-avx512-check.py') + + [objdump] + cc.cmd_array()) +endif # select library and object file format pmdinfo = py3 + files('gen-pmdinfo-cfile.py') + [meson.current_build_dir()] diff --git a/config/meson.build b/config/meson.build index fa730a1..9a3f499 100644 --- a/config/meson.build +++ b/config/meson.build @@ -16,7 +16,8 @@ endforeach # MS linker requires special treatment. # TODO: use cc.get_linker_id() with Meson >= 0.54 -is_ms_linker = is_windows and (cc.get_id() == 'clang') +is_ms_compiler = is_windows and (cc.get_id() == 'msvc') +is_ms_linker = is_windows and (cc.get_id() == 'clang' or is_ms_compiler) # set the major version, which might be used by drivers and libraries # depending on the configuration options @@ -130,11 +131,13 @@ dpdk_conf.set('RTE_MACHINE', cpu_instruction_set) machine_args = [] # ppc64 does not support -march= at all, use -mcpu and -mtune for that -if host_machine.cpu_family().startswith('ppc') - machine_args += '-mcpu=' + cpu_instruction_set - machine_args += '-mtune=' + cpu_instruction_set -else - machine_args += '-march=' + cpu_instruction_set +if not is_ms_compiler + if host_machine.cpu_family().startswith('ppc') + machine_args += '-mcpu=' + cpu_instruction_set + machine_args += '-mtune=' + cpu_instruction_set + else + machine_args += '-march=' + cpu_instruction_set + endif endif toolchain = cc.get_id() @@ -253,7 +256,11 @@ if cc.get_id() == 'clang' and dpdk_conf.get('RTE_ARCH_64') == false endif # add -include rte_config to cflags -add_project_arguments('-include', 'rte_config.h', language: 'c') +if is_ms_compiler + add_project_arguments('/FI', 'rte_config.h', language: 'c') +else + add_project_arguments('-include', 'rte_config.h', language: 'c') +endif # enable extra warnings and disable any unwanted warnings # -Wall is added by default at warning level 1, and -Wextra diff --git a/config/x86/meson.build b/config/x86/meson.build index 54345c4..11f0bcc 100644 --- a/config/x86/meson.build +++ b/config/x86/meson.build @@ -25,9 +25,11 @@ if cc.has_argument('-mavx512f') endif # we require SSE4.2 for DPDK -if cc.get_define('__SSE4_2__', args: machine_args) == '' - message('SSE 4.2 not enabled by default, explicitly enabling') - machine_args += '-msse4' +if not is_ms_compiler + if cc.get_define('__SSE4_2__', args: machine_args) == '' + message('SSE 4.2 not enabled by default, explicitly enabling') + machine_args += '-msse4' + endif endif base_flags = ['SSE', 'SSE2', 'SSE3','SSSE3', 'SSE4_1', 'SSE4_2'] diff --git a/lib/meson.build b/lib/meson.build index dc8aa4a..40c632a 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -241,9 +241,16 @@ foreach l:libraries output: '@0@_exports.def'.format(libname)) lk_deps += [def_file] - lk_args = ['-Wl,/def:' + def_file.full_path()] - if meson.version().version_compare('<0.54.0') - lk_args += ['-Wl,/implib:lib\\librte_' + l + '.dll.a'] + if is_ms_compiler + lk_args = ['/def:' + def_file.full_path()] + if meson.version().version_compare('<0.54.0') + lk_args += ['/implib:lib\\librte_' + l + '.dll.a'] + endif + else + lk_args = ['-Wl,/def:' + def_file.full_path()] + if meson.version().version_compare('<0.54.0') + lk_args += ['-Wl,/implib:lib\\librte_' + l + '.dll.a'] + endif endif else if is_windows From patchwork Tue Apr 25 20:08:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 126516 X-Patchwork-Delegate: david.marchand@redhat.com 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 DA43D429D8; Tue, 25 Apr 2023 22:08:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B44E7410D0; Tue, 25 Apr 2023 22:08:51 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id DE041410D0 for ; Tue, 25 Apr 2023 22:08:50 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id 4165621C2B2D; Tue, 25 Apr 2023 13:08:50 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 4165621C2B2D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1682453330; bh=lcnuoYBlxjgHBL6G0UBKvVM6Pb0OUwBtrQm0YiYsaI8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mHpAPzQiR2RZfb/RNdPO4IhGXZ40sMupWfae7zywX/uVijQDD5icT1yITt3u2eMAk c2OG0BYSHLf6i6BVSvJ1Ssy3ddI+36meerdfXAGFwVL4wJWrC+eZR8EntOzuuf/5cJ 7Vpbw9zWnwB0jLEJmKMIEDhOlbX5E6UfJp4lQKaw= From: Tyler Retzlaff To: dev@dpdk.org Cc: bruce.richardson@intel.com, david.marchand@redhat.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH v3 2/4] build: determine execution environment at config time Date: Tue, 25 Apr 2023 13:08:47 -0700 Message-Id: <1682453329-20435-3-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1682453329-20435-1-git-send-email-roretzla@linux.microsoft.com> References: <1674674707-3094-1-git-send-email-roretzla@linux.microsoft.com> <1682453329-20435-1-git-send-email-roretzla@linux.microsoft.com> 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 Move execution environment determination and definitions to config. The RTE_EXEC_ENV macros are actually used by libraries built before EAL. Currently it does not matter that this is determined in lib/eal since the definitions are consumed before anything is built including libs built before lib/eal. By moving this logic to config it allows kvargs and telemetry to be built without EAL. No functional change intended. Signed-off-by: Tyler Retzlaff Acked-by: Bruce Richardson --- config/meson.build | 8 ++++++++ lib/eal/meson.build | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/meson.build b/config/meson.build index 9a3f499..d2b12db 100644 --- a/config/meson.build +++ b/config/meson.build @@ -14,6 +14,14 @@ foreach env:supported_exec_envs set_variable('is_' + env, exec_env == env) endforeach +exec_envs = {'freebsd': 0, 'linux': 1, 'windows': 2} +foreach env, id:exec_envs + dpdk_conf.set('RTE_ENV_' + env.to_upper(), id) + dpdk_conf.set10('RTE_EXEC_ENV_IS_' + env.to_upper(), (exec_env == env)) +endforeach +dpdk_conf.set('RTE_EXEC_ENV', exec_envs[exec_env]) +dpdk_conf.set('RTE_EXEC_ENV_' + exec_env.to_upper(), 1) + # MS linker requires special treatment. # TODO: use cc.get_linker_id() with Meson >= 0.54 is_ms_compiler = is_windows and (cc.get_id() == 'msvc') diff --git a/lib/eal/meson.build b/lib/eal/meson.build index 9aa941a..d5eeb07 100644 --- a/lib/eal/meson.build +++ b/lib/eal/meson.build @@ -10,14 +10,6 @@ if not is_windows subdir('unix') endif -exec_envs = {'freebsd': 0, 'linux': 1, 'windows': 2} -foreach env, id:exec_envs - dpdk_conf.set('RTE_ENV_' + env.to_upper(), id) - dpdk_conf.set10('RTE_EXEC_ENV_IS_' + env.to_upper(), (exec_env == env)) -endforeach -dpdk_conf.set('RTE_EXEC_ENV', exec_envs[exec_env]) - -dpdk_conf.set('RTE_EXEC_ENV_' + exec_env.to_upper(), 1) subdir(exec_env) subdir(arch_subdir) From patchwork Tue Apr 25 20:08:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 126519 X-Patchwork-Delegate: david.marchand@redhat.com 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 B751B429D8; Tue, 25 Apr 2023 22:09:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D873342D16; Tue, 25 Apr 2023 22:08:54 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 01636410EA for ; Tue, 25 Apr 2023 22:08:50 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id 4D8E621C2B2E; Tue, 25 Apr 2023 13:08:50 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 4D8E621C2B2E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1682453330; bh=AEHlQ/DPR59l7wV4E3tRBNZfmFSoPZlEbxXwmG6f+YM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l5kwYLqmsz+KMVSL7yoTnh35Rb21JXVH42/YK1/TX1aE5nQePk6v2dLCWFofkJIrA 8alL5bVA67PhEFliyoZ4aXBta2/qOIujZ1NyFsFScGJeQ38A7YCnvKGbva/WYMSF0S qu+7csGvQHSN8txdRtpTpbYfs2VOSmr0gyhVaSy8= From: Tyler Retzlaff To: dev@dpdk.org Cc: bruce.richardson@intel.com, david.marchand@redhat.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH v3 3/4] build: limit what is built when using MSVC compiler Date: Tue, 25 Apr 2023 13:08:48 -0700 Message-Id: <1682453329-20435-4-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1682453329-20435-1-git-send-email-roretzla@linux.microsoft.com> References: <1674674707-3094-1-git-send-email-roretzla@linux.microsoft.com> <1682453329-20435-1-git-send-email-roretzla@linux.microsoft.com> 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 Build only kvargs and telemetry when is_ms_compiler. Signed-off-by: Tyler Retzlaff Acked-by: Bruce Richardson --- app/meson.build | 5 +++++ drivers/meson.build | 4 ++++ lib/meson.build | 7 +++++++ usertools/meson.build | 4 ++++ 4 files changed, 20 insertions(+) diff --git a/app/meson.build b/app/meson.build index 74d2420..94fd7c9 100644 --- a/app/meson.build +++ b/app/meson.build @@ -1,6 +1,11 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2019 Intel Corporation +if is_ms_compiler + enabled_apps = [] + subdir_done() +endif + disable_apps = ',' + get_option('disable_apps') disable_apps = run_command(list_dir_globs, disable_apps, check: true).stdout().split() diff --git a/drivers/meson.build b/drivers/meson.build index 74ae8cb..749ec20 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -1,6 +1,10 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2019 Intel Corporation +if is_ms_compiler + subdir_done() +endif + fs = import('fs') # Defines the order of dependencies evaluation diff --git a/lib/meson.build b/lib/meson.build index 40c632a..777d3d3 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -66,6 +66,13 @@ libraries = [ 'node', ] +if is_ms_compiler + libraries = [ + 'kvargs', + 'telemetry', + ] +endif + optional_libs = [ 'bitratestats', 'cfgfile', diff --git a/usertools/meson.build b/usertools/meson.build index b6271a2..1a56248 100644 --- a/usertools/meson.build +++ b/usertools/meson.build @@ -1,6 +1,10 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +if is_ms_compiler + subdir_done() +endif + install_data([ 'dpdk-devbind.py', 'dpdk-pmdinfo.py', From patchwork Tue Apr 25 20:08:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 126520 X-Patchwork-Delegate: david.marchand@redhat.com 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 6F90F429D8; Tue, 25 Apr 2023 22:09:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0395342D1D; Tue, 25 Apr 2023 22:08:56 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 52E30410D0 for ; Tue, 25 Apr 2023 22:08:51 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id 59DE121C2B2F; Tue, 25 Apr 2023 13:08:50 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 59DE121C2B2F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1682453330; bh=PtTekxuzCI2IBnW7EyfnXLbM1JfscnL1IuYXg9i9L0Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PFDfwFMX9PTiHtzbuSusLPT2AnDqfuQNY/4RMaIaONZe1XkYRCkfYA5tTj2SF2R60 rcPqpgI1WHPzy2QhKjA9zpgGtY6gYn6O9NeOCWR5sMqXOyIWVnpR2lWe/tQZgcqj9Q Rpu2CABk3OLqdS71gWupvu1817DN5r4xBC1ayPn4= From: Tyler Retzlaff To: dev@dpdk.org Cc: bruce.richardson@intel.com, david.marchand@redhat.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH v3 4/4] build: enable MSVC specific compiler options Date: Tue, 25 Apr 2023 13:08:49 -0700 Message-Id: <1682453329-20435-5-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1682453329-20435-1-git-send-email-roretzla@linux.microsoft.com> References: <1674674707-3094-1-git-send-email-roretzla@linux.microsoft.com> <1682453329-20435-1-git-send-email-roretzla@linux.microsoft.com> 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 * Enable optional use of C11 atomics support. * Enable use of C23 typeof operator. * Explicitly force intrinsics when building with MSVC. * Disable MSVC C runtime checks. Signed-off-by: Tyler Retzlaff --- config/meson.build | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config/meson.build b/config/meson.build index d2b12db..9484449 100644 --- a/config/meson.build +++ b/config/meson.build @@ -27,6 +27,14 @@ dpdk_conf.set('RTE_EXEC_ENV_' + exec_env.to_upper(), 1) is_ms_compiler = is_windows and (cc.get_id() == 'msvc') is_ms_linker = is_windows and (cc.get_id() == 'clang' or is_ms_compiler) +# MS compiler (except x86) does not support inline assembly +if is_ms_compiler + dpdk_conf.set('_CRT_SECURE_NO_WARNINGS', 1) + dpdk_conf.set('RTE_FORCE_INTRINSICS', 1) + add_project_arguments('/experimental:c11atomics', language: 'c') + add_project_arguments('/d1experimental:typeof', language: 'c') +endif + # set the major version, which might be used by drivers and libraries # depending on the configuration options pver = meson.project_version().split('.')