From patchwork Wed Aug 16 21:56:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 130447 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 BD5F043086; Wed, 16 Aug 2023 23:56:45 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 074DC43261; Wed, 16 Aug 2023 23:56:29 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 398E940DDA for ; Wed, 16 Aug 2023 23:56:23 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id 8AD8D211F7A0; Wed, 16 Aug 2023 14:56:22 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 8AD8D211F7A0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1692222982; bh=hyhOi1PLUMo/vil6U1tGQ2N50L23QIuKidgM0SI79zI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CuWc/4Leeus7UBtvmckPPesI/3D3v62PuQRssrDwr7Zergex/4V/bFZPpr15Ov9pe uZsWjn2vf4a8iGnxK/quHbxWvLGVpIW/Sd9VABL75Ff6uzdcotF2vVheRpj8TP35mO TE2uaN7p2NI531RJ1jMHq07zjjXLttxE02mC/aMU= From: Tyler Retzlaff To: dev@dpdk.org Cc: Bruce Richardson , Konstantin Ananyev , david.marchand@redhat.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH v5 1/4] build: unblock the use of the MSVC compiler Date: Wed, 16 Aug 2023 14:56:13 -0700 Message-Id: <1692222976-2908-2-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1692222976-2908-1-git-send-email-roretzla@linux.microsoft.com> References: <1674674707-3094-1-git-send-email-roretzla@linux.microsoft.com> <1692222976-2908-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 --- config/meson.build | 23 +++++++++++++++-------- config/x86/meson.build | 10 ++++++---- lib/meson.build | 13 ++++++++++--- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/config/meson.build b/config/meson.build index d822371..b6c7d48 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 @@ -129,12 +130,14 @@ endif 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 + # 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 + 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..38cc1e3 100644 --- a/config/x86/meson.build +++ b/config/x86/meson.build @@ -24,10 +24,12 @@ if cc.has_argument('-mavx512f') endif 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 + # 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' + endif endif base_flags = ['SSE', 'SSE2', 'SSE3','SSSE3', 'SSE4_1', 'SSE4_2'] diff --git a/lib/meson.build b/lib/meson.build index 92cbd6b..7da3698 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -230,9 +230,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 Wed Aug 16 21:56:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 130444 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 71BA643086; Wed, 16 Aug 2023 23:56:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E8F3F42B8B; Wed, 16 Aug 2023 23:56:25 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 4648A40ED9 for ; Wed, 16 Aug 2023 23:56:23 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id 973A2211F7A1; Wed, 16 Aug 2023 14:56:22 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 973A2211F7A1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1692222982; bh=tFtPwRO1U6JpXiQuWkrmOwTG9wSAqtJWzlOWfFJiZSw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UjrFHkisiW7vs89jY7QRV9cWTQoE9zNJlFUlOjXt0oKhCViHIAiZRcupTAKI9v/uI XV4ryt3S+Ci+UG9ZhT4nAwdh/T3aPKwi5YpzaX86ygooLqYGocAvMXec7KP4vM4Q9C aQgXagDVmA/9pWBTr4PnU6qN+/6faX13FOhcJNzE= From: Tyler Retzlaff To: dev@dpdk.org Cc: Bruce Richardson , Konstantin Ananyev , david.marchand@redhat.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH v5 2/4] build: determine execution environment at config time Date: Wed, 16 Aug 2023 14:56:14 -0700 Message-Id: <1692222976-2908-3-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1692222976-2908-1-git-send-email-roretzla@linux.microsoft.com> References: <1674674707-3094-1-git-send-email-roretzla@linux.microsoft.com> <1692222976-2908-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 b6c7d48..821a1c3 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 0fb974c..9942104 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 Wed Aug 16 21:56:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 130445 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 95EE243086; Wed, 16 Aug 2023 23:56:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E363543257; Wed, 16 Aug 2023 23:56:26 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 50C97410E3 for ; Wed, 16 Aug 2023 23:56:23 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id A41D7211F7A3; Wed, 16 Aug 2023 14:56:22 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com A41D7211F7A3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1692222982; bh=4FkbJGzxa3CpymiatTZ4T8g4oJNziV+iETdCLP5Dps4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DvTt+Ug/RSbFkYVRIjsy0e4IWrnG8qcUlz+LFag36FlzYNXd/t8abGdpp3OffcUkj lyIM11A8GWz1J5RAdqsw9OFVbn4KMVTqEsWy6hAi/8PNO74YszQjrSI8h8nrGVQbHo PE2LLq6DAVSs7qOQi/tu/r7xDmfsKFV74RfejIsY= From: Tyler Retzlaff To: dev@dpdk.org Cc: Bruce Richardson , Konstantin Ananyev , david.marchand@redhat.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH v5 3/4] build: limit what is built when using MSVC compiler Date: Wed, 16 Aug 2023 14:56:15 -0700 Message-Id: <1692222976-2908-4-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1692222976-2908-1-git-send-email-roretzla@linux.microsoft.com> References: <1674674707-3094-1-git-send-email-roretzla@linux.microsoft.com> <1692222976-2908-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 | 4 ++++ drivers/meson.build | 4 ++++ lib/meson.build | 8 ++++++++ usertools/meson.build | 4 ++++ 4 files changed, 20 insertions(+) diff --git a/app/meson.build b/app/meson.build index 4fc1a83..ccf6f78 100644 --- a/app/meson.build +++ b/app/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 + 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 c909070..417b64b 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 7da3698..77c3e74 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -66,6 +66,14 @@ libraries = [ 'node', ] +if is_ms_compiler + libraries = [ + 'log', + 'kvargs', + 'telemetry', + ] +endif + optional_libs = [ 'bitratestats', 'cfgfile', diff --git a/usertools/meson.build b/usertools/meson.build index 0efa4a8..740b483 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 Wed Aug 16 21:56:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 130446 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 2EE7E43086; Wed, 16 Aug 2023 23:56:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 086064325F; Wed, 16 Aug 2023 23:56:28 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 5BC21411F3 for ; Wed, 16 Aug 2023 23:56:23 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id B0959211F7A4; Wed, 16 Aug 2023 14:56:22 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com B0959211F7A4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1692222982; bh=NN2KEvV/wiy6dzxnoQbxniRicEq/DgLfdw6xnWyRhpM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nj+Q2EKiMuV4BjO9fcDjX5lkKi2FiHWWLek7fJExU4n9JR4hqFL2IsBR9UKtYUcv4 QzSxV58l8td6Vv1y6eYwSJBcgrrNwOwrYGdKRV+JaADY7t3jGla4i2M+FhstrBM8HU eV4Pl3XcPdYrt5UDamYK411DaYoJC8vgjpWFdDKA= From: Tyler Retzlaff To: dev@dpdk.org Cc: Bruce Richardson , Konstantin Ananyev , david.marchand@redhat.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH v5 4/4] build: enable MSVC specific compiler options Date: Wed, 16 Aug 2023 14:56:16 -0700 Message-Id: <1692222976-2908-5-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1692222976-2908-1-git-send-email-roretzla@linux.microsoft.com> References: <1674674707-3094-1-git-send-email-roretzla@linux.microsoft.com> <1692222976-2908-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 Acked-by: Bruce Richardson --- config/meson.build | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/config/meson.build b/config/meson.build index 821a1c3..7a04347 100644 --- a/config/meson.build +++ b/config/meson.build @@ -27,6 +27,22 @@ 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) +if is_ms_compiler + # force the use of intrinsics the MSVC compiler (except x86) + # does not support inline assembly + dpdk_conf.set('RTE_FORCE_INTRINSICS', 1) + + # suppress warnings raised for using standard library functions + # the MSVC compiler regards as unsafe but are used by DPDK + dpdk_conf.set('_CRT_SECURE_NO_WARNINGS', 1) + + # enable non-locking atomic operations + add_project_arguments('/experimental:c11atomics', language: 'c') + + # enable typeof operator + 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('.')