From patchwork Fri Apr 12 22:52:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 139275 X-Patchwork-Delegate: jerinj@marvell.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 097A243E55; Sat, 13 Apr 2024 00:52:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8FB7D40263; Sat, 13 Apr 2024 00:52:24 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 2A10F4014F for ; Sat, 13 Apr 2024 00:52:23 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id 7916020F069B; Fri, 12 Apr 2024 15:52:22 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 7916020F069B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1712962342; bh=U6/sxUiNT9K/hmt5/+SQbUVXnAOO+7g3DiEWW9vEERA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ye8YTe7Oc/ISCKbovrlENRboWtkQ+gzRfNf6JbtHG+rESb3PGL0FHa/19XFaetstm ++OKIcu89Yk1W3pbXa97kY18vgiX5RLaevnqsxYgZ9leWb36Uw2YSvrA9gtzQyhxxt 6nJtBeYbnqUTFr92V+nY5ez8lEl8D+d06kykJZfQ= From: Tyler Retzlaff To: dev@dpdk.org Cc: Bruce Richardson , Harman Kalra , Tyler Retzlaff Subject: [PATCH v3 1/2] build: build only one library type on Windows Date: Fri, 12 Apr 2024 15:52:12 -0700 Message-Id: <1712962333-14355-2-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1712962333-14355-1-git-send-email-roretzla@linux.microsoft.com> References: <1710445477-23848-1-git-send-email-roretzla@linux.microsoft.com> <1712962333-14355-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 MSVC is the only compiler that can produce usable shared libraries for DPDK on Windows because of the use of exported TLS variables. Disable building of shared libraries with LLVM and MinGW so that remaining __declspec macros needed for the functional libraries built by MSVC can be used without triggering errors in LLVM and MinGW builds. For Windows only install the default_library type to avoid confusion. Windows builds cannot build both shared and static in a single pass so install only the functional variant. Signed-off-by: Tyler Retzlaff --- app/meson.build | 6 +++ config/meson.build | 20 ++++++++++ drivers/meson.build | 64 +++++++++++++++---------------- drivers/net/octeontx/base/meson.build | 2 +- examples/meson.build | 6 +++ lib/meson.build | 72 +++++++++++++++-------------------- 6 files changed, 94 insertions(+), 76 deletions(-) diff --git a/app/meson.build b/app/meson.build index 21b6da2..f4ed0f1 100644 --- a/app/meson.build +++ b/app/meson.build @@ -46,6 +46,8 @@ default_cflags = machine_args + ['-DALLOW_EXPERIMENTAL_API'] default_ldflags = [] if get_option('default_library') == 'static' and not is_windows default_ldflags += ['-Wl,--export-dynamic'] +elif get_option('default_library') == 'shared' and is_ms_compiler + default_ldflags += ['/experimental:tlsDllInterface'] endif foreach app:apps @@ -104,6 +106,10 @@ foreach app:apps link_libs = dpdk_static_libraries + dpdk_drivers endif + if is_windows and is_shared_enabled + cflags += '-DRTE_BUILD_SHARED_LIB' + endif + exec = executable('dpdk-' + name, sources, c_args: cflags, diff --git a/config/meson.build b/config/meson.build index 8c8b019..e949240 100644 --- a/config/meson.build +++ b/config/meson.build @@ -53,6 +53,9 @@ if is_ms_compiler # enable statement expressions extension add_project_arguments('/experimental:statementExpressions', language: 'c') + + # enable export of thread_local variables + add_project_arguments('/experimental:tlsDllInterface', language: 'c') endif # set the major version, which might be used by drivers and libraries @@ -516,4 +519,21 @@ if get_option('default_library') == 'both' NOTE: DPDK always builds both shared and static libraries. Please set "default_library" to either "static" or "shared" to select default linkage for apps and any examples.''') +elif get_option('default_library') == 'shared' and is_windows and not is_ms_compiler + error( ''' + Unsupported value "shared" for "default_library" option. + + NOTE: DPDK Windows shared is only supported when building with MSVC. Please set + "default_library" to either "static" or use MSVC.''') +endif + +is_shared_enabled=true +install_static = true +install_shared = true +if is_windows + install_static = get_option('default_library') == 'static' + install_shared = get_option('default_library') == 'shared' + if not is_ms_compiler or not install_shared + is_shared_enabled = false + endif endif diff --git a/drivers/meson.build b/drivers/meson.build index 66931d4..751a295 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -208,6 +208,9 @@ foreach subpath:subdirs enabled_drivers += name lib_name = '_'.join(['rte', class, name]) cflags += '-DRTE_LOG_DEFAULT_LOGTYPE=' + '.'.join([log_prefix, name]) + if is_windows and is_shared_enabled + cflags += '-DRTE_BUILD_SHARED_LIB' + endif if annotate_locks and cc.get_id() == 'clang' and cc.version().version_compare('>=3.5.0') cflags += '-DRTE_ANNOTATE_LOCKS' cflags += '-Wthread-safety' @@ -247,7 +250,7 @@ foreach subpath:subdirs include_directories: includes, dependencies: static_deps, c_args: cflags, - install: true) + install: install_static) # now build the shared driver version_map = '@0@/@1@/version.map'.format(meson.current_source_dir(), drv_path) @@ -271,48 +274,41 @@ foreach subpath:subdirs endif endif - if is_windows - if is_ms_linker + if is_shared_enabled + if is_ms_compiler def_file = custom_target(lib_name + '_def', command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'], input: version_map, output: '@0@_exports.def'.format(lib_name)) lk_deps += [def_file] - - lk_args = ['-Wl,/def:' + def_file.full_path()] - if meson.version().version_compare('<0.54.0') - lk_args += ['-Wl,/implib:drivers\\lib' + lib_name + '.dll.a'] - endif + lk_args = ['/experimental:tlsDllInterface', '/def:' + def_file.full_path()] else - mingw_map = custom_target(lib_name + '_mingw', - command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'], - input: version_map, - output: '@0@_mingw.map'.format(lib_name)) - lk_deps += [mingw_map] - - lk_args = ['-Wl,--version-script=' + mingw_map.full_path()] + lk_args = ['-Wl,--version-script=' + version_map] endif - else - lk_args = ['-Wl,--version-script=' + version_map] endif - shared_lib = shared_library(lib_name, sources, - objects: objs, - include_directories: includes, - dependencies: shared_deps, - c_args: cflags, - link_args: lk_args, - link_depends: lk_deps, - version: abi_version, - soversion: so_version, - install: true, - install_dir: driver_install_path) - - # create a dependency object and add it to the global dictionary so - # testpmd or other built-in apps can find it if necessary - shared_dep = declare_dependency(link_with: shared_lib, - include_directories: includes, - dependencies: shared_deps) + if is_shared_enabled + shared_lib = shared_library(lib_name, sources, + objects: objs, + include_directories: includes, + dependencies: shared_deps, + c_args: cflags, + link_args: lk_args, + link_depends: lk_deps, + version: abi_version, + soversion: so_version, + install: install_shared, + install_dir: driver_install_path) + + # create a dependency object and add it to the global dictionary so + # testpmd or other built-in apps can find it if necessary + shared_dep = declare_dependency(link_with: shared_lib, + include_directories: includes, + dependencies: shared_deps) + + else + shared_dep = {} + endif static_dep = declare_dependency( include_directories: includes, dependencies: static_deps) diff --git a/drivers/net/octeontx/base/meson.build b/drivers/net/octeontx/base/meson.build index 8e5e8c1..a793c19 100644 --- a/drivers/net/octeontx/base/meson.build +++ b/drivers/net/octeontx/base/meson.build @@ -10,7 +10,7 @@ sources = [ depends = ['ethdev', 'mempool_octeontx'] static_objs = [] foreach d: depends - if not is_variable('shared_rte_' + d) + if not is_variable('static_rte_' + d) subdir_done() endif static_objs += get_variable('static_rte_' + d) diff --git a/examples/meson.build b/examples/meson.build index 8e8968a..e08a169 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -85,6 +85,8 @@ endif default_ldflags = dpdk_extra_ldflags if get_option('default_library') == 'static' and not is_windows default_ldflags += ['-Wl,--export-dynamic'] +elif is_ms_compiler + default_ldflags += ['/experimental:tlsDllInterface'] endif foreach example: examples @@ -121,6 +123,10 @@ foreach example: examples continue endif + if is_windows and is_shared_enabled + cflags += '-DRTE_BUILD_SHARED_LIB' + endif + if allow_experimental_apis cflags += '-DALLOW_EXPERIMENTAL_API' endif diff --git a/lib/meson.build b/lib/meson.build index 179a272..3b0f632 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -235,6 +235,10 @@ foreach l:libraries cflags += '-Wthread-safety' endif + if is_windows and is_shared_enabled + cflags += '-DRTE_BUILD_SHARED_LIB' + endif + # first build static lib static_lib = static_library(libname, sources, @@ -242,11 +246,13 @@ foreach l:libraries c_args: cflags, dependencies: static_deps, include_directories: includes, - install: true) + install: install_static) static_dep = declare_dependency( include_directories: includes, dependencies: static_deps) + dpdk_static_libraries = [static_lib] + dpdk_static_libraries + if not use_function_versioning or is_windows # use pre-build objects to build shared lib sources = [] @@ -260,33 +266,14 @@ foreach l:libraries version_map = '@0@/@1@/version.map'.format(meson.current_source_dir(), l) lk_deps = [version_map] - if is_ms_linker - def_file = custom_target(libname + '_def', - command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'], - input: version_map, - output: '@0@_exports.def'.format(libname)) - lk_deps += [def_file] - + if is_shared_enabled 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 - mingw_map = custom_target(libname + '_mingw', + def_file = custom_target(libname + '_def', command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'], input: version_map, - output: '@0@_mingw.map'.format(libname)) - lk_deps += [mingw_map] - - lk_args = ['-Wl,--version-script=' + mingw_map.full_path()] + output: '@0@_exports.def'.format(libname)) + lk_deps += [def_file] + lk_args = ['/experimental:tlsDllInterface', '/def:' + def_file.full_path()] else lk_args = ['-Wl,--version-script=' + version_map] endif @@ -304,23 +291,26 @@ foreach l:libraries output: name + '.sym_chk') endif - shared_lib = shared_library(libname, - sources, - objects: objs, - c_args: cflags, - dependencies: shared_deps, - include_directories: includes, - link_args: lk_args, - link_depends: lk_deps, - version: abi_version, - soversion: so_version, - install: true) - shared_dep = declare_dependency(link_with: shared_lib, - include_directories: includes, - dependencies: shared_deps) + if is_shared_enabled + shared_lib = shared_library(libname, + sources, + objects: objs, + c_args: cflags, + dependencies: shared_deps, + include_directories: includes, + link_args: lk_args, + link_depends: lk_deps, + version: abi_version, + soversion: so_version, + install: install_shared) + shared_dep = declare_dependency(link_with: shared_lib, + include_directories: includes, + dependencies: shared_deps) - dpdk_libraries = [shared_lib] + dpdk_libraries - dpdk_static_libraries = [static_lib] + dpdk_static_libraries + dpdk_libraries = [shared_lib] + dpdk_libraries + else + shared_dep = {} + endif set_variable('shared_rte_' + name, shared_dep) set_variable('static_rte_' + name, static_dep)