aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/libs/hyperscan
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.com>2023-11-03 12:41:08 +0300
committerthegeorg <thegeorg@yandex-team.com>2023-11-03 13:09:53 +0300
commit56b80b3a36ea713d11c31a9c898f5d7e43c84d23 (patch)
tree4d8c0692fad1cee0d8478bcce88456182bf1409e /contrib/libs/hyperscan
parenta020d3047031674dacf4fb87fbbbf82df29fe152 (diff)
downloadydb-56b80b3a36ea713d11c31a9c898f5d7e43c84d23.tar.gz
Default to clang-cl when targeting Windows
As announced [in Atushka](https://clubs.at.yandex-team.ru/arcadia/29556).
Diffstat (limited to 'contrib/libs/hyperscan')
-rw-r--r--contrib/libs/hyperscan/runtime_avx2/CMakeLists.windows-x86_64.txt15
-rw-r--r--contrib/libs/hyperscan/runtime_avx512/CMakeLists.windows-x86_64.txt22
-rw-r--r--contrib/libs/hyperscan/runtime_corei7/CMakeLists.windows-x86_64.txt6
3 files changed, 24 insertions, 19 deletions
diff --git a/contrib/libs/hyperscan/runtime_avx2/CMakeLists.windows-x86_64.txt b/contrib/libs/hyperscan/runtime_avx2/CMakeLists.windows-x86_64.txt
index 53cc46d2b9..85764417b7 100644
--- a/contrib/libs/hyperscan/runtime_avx2/CMakeLists.windows-x86_64.txt
+++ b/contrib/libs/hyperscan/runtime_avx2/CMakeLists.windows-x86_64.txt
@@ -9,17 +9,18 @@
add_library(libs-hyperscan-runtime_avx2)
target_compile_options(libs-hyperscan-runtime_avx2 PRIVATE
- /D__SSE4_1__=1
+ -msse4.1
-DHAVE_SSE41
- /D__SSE4_2__=1
+ -msse4.2
-DHAVE_SSE42
- /D__POPCNT__=1
+ -mpopcnt
-DHAVE_POPCOUNT_INSTR
- /arch:AVX
- /DAVX_ENABLED=1
+ -mavx
-DHAVE_AVX
- /arch:AVX2
- /DAVX2_ENABLED=1
+ -mavx2
+ -mfma
+ -mbmi
+ -mbmi2
-DHAVE_AVX2
-DCrc32c_ComputeBuf=avx2_Crc32c_ComputeBuf
-DblockInitSufPQ=avx2_blockInitSufPQ
diff --git a/contrib/libs/hyperscan/runtime_avx512/CMakeLists.windows-x86_64.txt b/contrib/libs/hyperscan/runtime_avx512/CMakeLists.windows-x86_64.txt
index bf75f07d09..e11134a46a 100644
--- a/contrib/libs/hyperscan/runtime_avx512/CMakeLists.windows-x86_64.txt
+++ b/contrib/libs/hyperscan/runtime_avx512/CMakeLists.windows-x86_64.txt
@@ -9,20 +9,24 @@
add_library(libs-hyperscan-runtime_avx512)
target_compile_options(libs-hyperscan-runtime_avx512 PRIVATE
- /D__SSE4_1__=1
+ -msse4.1
-DHAVE_SSE41
- /D__SSE4_2__=1
+ -msse4.2
-DHAVE_SSE42
-DHAVE_POPCOUNT_INSTR
- /D__POPCNT__=1
- /arch:AVX
- /DAVX_ENABLED=1
+ -mpopcnt
+ -mavx
-DHAVE_AVX
- /arch:AVX2
- /DAVX2_ENABLED=1
+ -mavx2
+ -mfma
+ -mbmi
+ -mbmi2
-DHAVE_AVX2
- /arch:AVX512
- /DAVX512_ENABLED=1
+ -mavx512f
+ -mavx512cd
+ -mavx512bw
+ -mavx512dq
+ -mavx512vl
-DHAVE_AVX512
-DCrc32c_ComputeBuf=avx512_Crc32c_ComputeBuf
-DblockInitSufPQ=avx512_blockInitSufPQ
diff --git a/contrib/libs/hyperscan/runtime_corei7/CMakeLists.windows-x86_64.txt b/contrib/libs/hyperscan/runtime_corei7/CMakeLists.windows-x86_64.txt
index c66f3c8131..c3088fa842 100644
--- a/contrib/libs/hyperscan/runtime_corei7/CMakeLists.windows-x86_64.txt
+++ b/contrib/libs/hyperscan/runtime_corei7/CMakeLists.windows-x86_64.txt
@@ -9,11 +9,11 @@
add_library(libs-hyperscan-runtime_corei7)
target_compile_options(libs-hyperscan-runtime_corei7 PRIVATE
- /D__SSE4_1__=1
+ -msse4.1
-DHAVE_SSE41
- /D__SSE4_2__=1
+ -msse4.2
-DHAVE_SSE42
- /D__POPCNT__=1
+ -mpopcnt
-DHAVE_POPCOUNT_INSTR
-DCrc32c_ComputeBuf=corei7_Crc32c_ComputeBuf
-DblockInitSufPQ=corei7_blockInitSufPQ