2018-05-17 12:39:57 +00:00
|
|
|
From 4edc0c6290ea4e848c5142b6807ebc5c809fecef Mon Sep 17 00:00:00 2001
|
|
|
|
Message-Id: <4edc0c6290ea4e848c5142b6807ebc5c809fecef.1526409254.git.jan.steffens@gmail.com>
|
|
|
|
In-Reply-To: <a9554de2a6028540fa12a7ebdab4daf2b46010fa.1526409254.git.jan.steffens@gmail.com>
|
|
|
|
References: <a9554de2a6028540fa12a7ebdab4daf2b46010fa.1526409254.git.jan.steffens@gmail.com>
|
2018-04-18 19:39:28 +00:00
|
|
|
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
|
|
|
Date: Sat, 14 Apr 2018 18:43:23 +0200
|
2018-05-17 12:39:57 +00:00
|
|
|
Subject: [PATCH 2/4] meson: Add library versions to swr drivers
|
2018-04-18 19:39:28 +00:00
|
|
|
|
|
|
|
This is for parity with autotools.
|
|
|
|
|
|
|
|
Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
|
|
|
|
---
|
|
|
|
src/gallium/drivers/swr/meson.build | 4 ++++
|
|
|
|
1 file changed, 4 insertions(+)
|
|
|
|
|
|
|
|
diff --git a/src/gallium/drivers/swr/meson.build b/src/gallium/drivers/swr/meson.build
|
|
|
|
index 43e1c5cc50..a6dbd7a3f6 100644
|
|
|
|
--- a/src/gallium/drivers/swr/meson.build
|
|
|
|
+++ b/src/gallium/drivers/swr/meson.build
|
|
|
|
@@ -198,6 +198,7 @@ if with_swr_arches.contains('avx')
|
|
|
|
link_args : [ld_args_gc_sections],
|
|
|
|
include_directories : [swr_incs],
|
|
|
|
dependencies : [dep_thread, dep_llvm],
|
|
|
|
+ version : '0.0.0',
|
|
|
|
install : true,
|
|
|
|
)
|
|
|
|
endif
|
|
|
|
@@ -230,6 +231,7 @@ if with_swr_arches.contains('avx2')
|
|
|
|
link_args : [ld_args_gc_sections],
|
|
|
|
include_directories : [swr_incs],
|
|
|
|
dependencies : [dep_thread, dep_llvm],
|
|
|
|
+ version : '0.0.0',
|
|
|
|
install : true,
|
|
|
|
)
|
|
|
|
endif
|
|
|
|
@@ -257,30 +259,32 @@ if with_swr_arches.contains('knl')
|
|
|
|
link_args : [ld_args_gc_sections],
|
|
|
|
include_directories : [swr_incs],
|
|
|
|
dependencies : [dep_thread, dep_llvm],
|
|
|
|
+ version : '0.0.0',
|
|
|
|
install : true,
|
|
|
|
)
|
|
|
|
endif
|
|
|
|
|
|
|
|
if with_swr_arches.contains('skx')
|
|
|
|
swr_skx_args = cpp.first_supported_argument(
|
|
|
|
'-target-cpu=x86-skylake', '-march=skylake-avx512', '-xCORE-AVX512',
|
|
|
|
prefix : '''
|
|
|
|
#if !defined(__AVX512F__) || !defined(__AVX512BW__)
|
|
|
|
# error
|
|
|
|
#endif ''',
|
|
|
|
)
|
|
|
|
if swr_skx_args == []
|
|
|
|
error('Cannot find SKX support for swr.')
|
|
|
|
endif
|
|
|
|
|
|
|
|
swr_arch_defines += '-DHAVE_SWR_SKX'
|
|
|
|
swr_arch_libs += shared_library(
|
|
|
|
'swrSKX',
|
|
|
|
[files_swr_common, files_swr_arch],
|
|
|
|
cpp_args : [swr_cpp_args, swr_skx_args, '-DKNOB_ARCH=KNOB_ARCH_AVX512'],
|
|
|
|
link_args : [ld_args_gc_sections],
|
|
|
|
include_directories : [swr_incs],
|
|
|
|
dependencies : [dep_thread, dep_llvm],
|
|
|
|
+ version : '0.0.0',
|
|
|
|
install : true,
|
|
|
|
)
|
|
|
|
endif
|
|
|
|
--
|
2018-05-17 12:39:57 +00:00
|
|
|
2.17.0
|
2018-04-18 19:39:28 +00:00
|
|
|
|