portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix AVX512 detection and build in blake3 (#3739)

Browse source 
The test for avx512 could result in false-positives because the
_mm256_setr_epi64x intrinsic requires only AVX, not AVX512. Specifically what
is needed here is AVX512VL.
In addition, not passing the -mavx* args to the asm compilation failed the
build on macOS High Sierra and below (Apple LLVM version 10.0.0,
clang-1000.11.45.5)
This commit is contained in:
Florian Märkl 2023-08-12 10:02:30 +02:00 committed by GitHub
parent dc9b57166d
commit 14d607e7fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
subprojects/packagefiles/blake3/meson.build
View file

@ -9,6 +9,8 @@ blake3_files = [
'c' / 'blake3.c', 'c' / 'blake3.c',
] ]
# Meson simd module is not used on purpose because it is unstable and not supported in muon
blake3_simd = [] blake3_simd = []
simd_avx2 = ''' simd_avx2 = '''
@ -19,12 +21,12 @@ simd_avx2 = '''
int main (int argc, char *argv[]) { __m256i add0 = _mm256_set_epi32(7, 6, 5, 4, 3, 2, 1, 0); return 0; } int main (int argc, char *argv[]) { __m256i add0 = _mm256_set_epi32(7, 6, 5, 4, 3, 2, 1, 0); return 0; }
''' '''
simd_avx512 = ''' simd_avx512vl = '''
#if defined(_MSC_VER) #if defined(_MSC_VER)
#include <intrin.h> #include <intrin.h>
#endif #endif
#include <immintrin.h> #include <immintrin.h>
int main (int argc, char *argv[]) { __m256i add0 = _mm256_setr_epi64x(0, 1, 2, 3); return 0; } int main (int argc, char *argv[]) { __m128i v = _mm_ror_epi32(_mm_set_epi32(3, 2, 1, 0), 5); return 0; }
''' '''
simd_sse2 = ''' simd_sse2 = '''
@ -53,24 +55,24 @@ int main (int argc, char *argv[]) { uint32x4_t three = set1_128(3); return 0; }
# msvc can't just compile assembly so we use the intrins directly # msvc can't just compile assembly so we use the intrins directly
# https://github.com/mesonbuild/meson/issues/9889 # https://github.com/mesonbuild/meson/issues/9889
win_msvc_asm = [ win_msvc_asm = [
['c' / 'blake3_avx2.c', '-DBLAKE3_NO_AVX2', 'avx2', simd_avx2, ['/arch:AVX2']], ['c' / 'blake3_avx2.c', '-DBLAKE3_NO_AVX2', 'avx2', simd_avx2, ['/arch:AVX2']],
['c' / 'blake3_avx512.c', '-DBLAKE3_NO_AVX512', 'avx512', simd_avx512, ['/arch:AVX512']], ['c' / 'blake3_avx512.c', '-DBLAKE3_NO_AVX512', 'avx512vl', simd_avx512vl, ['/arch:AVX512']],
['c' / 'blake3_sse2.c', '-DBLAKE3_NO_SSE2', 'sse2', simd_sse2, []], # sse2 extensions are enabled by default ['c' / 'blake3_sse2.c', '-DBLAKE3_NO_SSE2', 'sse2', simd_sse2, []], # sse2 extensions are enabled by default
['c' / 'blake3_sse41.c', '-DBLAKE3_NO_SSE41', 'sse41', simd_sse41, []], # sse41 extensions are enabled by default ['c' / 'blake3_sse41.c', '-DBLAKE3_NO_SSE41', 'sse41', simd_sse41, []], # sse41 extensions are enabled by default
] ]
win_gnu_asm = [ win_gnu_asm = [
['c' / 'blake3_avx2_x86-64_windows_gnu.S', '-DBLAKE3_NO_AVX2', 'avx2', simd_avx2, ['-mavx2']], ['c' / 'blake3_avx2_x86-64_windows_gnu.S', '-DBLAKE3_NO_AVX2', 'avx2', simd_avx2, ['-mavx2']],
['c' / 'blake3_avx512_x86-64_windows_gnu.S', '-DBLAKE3_NO_AVX512', 'avx512', simd_avx512, ['-mavx512f', '-mavx512vl']], ['c' / 'blake3_avx512_x86-64_windows_gnu.S', '-DBLAKE3_NO_AVX512', 'avx512vl', simd_avx512vl, ['-mavx512f', '-mavx512vl']],
['c' / 'blake3_sse2_x86-64_windows_gnu.S', '-DBLAKE3_NO_SSE2', 'sse2', simd_sse2, ['-msse2']], ['c' / 'blake3_sse2_x86-64_windows_gnu.S', '-DBLAKE3_NO_SSE2', 'sse2', simd_sse2, ['-msse2']],
['c' / 'blake3_sse41_x86-64_windows_gnu.S', '-DBLAKE3_NO_SSE41', 'sse41', simd_sse41, ['-msse4.1']], ['c' / 'blake3_sse41_x86-64_windows_gnu.S', '-DBLAKE3_NO_SSE41', 'sse41', simd_sse41, ['-msse4.1']],
] ]
unix_asm = [ unix_asm = [
['c' / 'blake3_avx2_x86-64_unix.S', '-DBLAKE3_NO_AVX2', 'avx2', simd_avx2, ['-mavx2']], ['c' / 'blake3_avx2_x86-64_unix.S', '-DBLAKE3_NO_AVX2', 'avx2', simd_avx2, ['-mavx2']],
['c' / 'blake3_avx512_x86-64_unix.S', '-DBLAKE3_NO_AVX512', 'avx512', simd_avx512, ['-mavx512f', '-mavx512vl']], ['c' / 'blake3_avx512_x86-64_unix.S', '-DBLAKE3_NO_AVX512', 'avx512vl', simd_avx512vl, ['-mavx512f', '-mavx512vl']],
['c' / 'blake3_sse2_x86-64_unix.S', '-DBLAKE3_NO_SSE2', 'sse2', simd_sse2, ['-msse2']], ['c' / 'blake3_sse2_x86-64_unix.S', '-DBLAKE3_NO_SSE2', 'sse2', simd_sse2, ['-msse2']],
['c' / 'blake3_sse41_x86-64_unix.S', '-DBLAKE3_NO_SSE41', 'sse41', simd_sse41, ['-msse4.1']], ['c' / 'blake3_sse41_x86-64_unix.S', '-DBLAKE3_NO_SSE41', 'sse41', simd_sse41, ['-msse4.1']],
] ]
is_x64 = target_machine.cpu_family() == 'x86_64' is_x64 = target_machine.cpu_family() == 'x86_64'
@ -110,17 +112,21 @@ else
endforeach endforeach
endif endif
blake3_libs = []
foreach it : blake3_simd foreach it : blake3_simd
file = it[0] file = it[0]
flag = it[1] disable_flag = it[1]
name = it[2] name = it[2]
code = it[3] code = it[3]
args = it[4] args = it[4]
has_extension = cc.compiles(code, args: args, name: name) has_extension = cc.compiles(code, args: args, name: name)
if has_extension if has_extension
blake3_files += file # https://github.com/mesonbuild/meson/issues/1367
# Individual static libraries are needed to avoid passing the simd flags to the C files,
# which would make functions like memset() use potentially unsupported instructions at runtime.
blake3_libs += static_library('blake3_' + name, file, c_args: args)
else else
add_project_arguments(flag, language: 'c') add_project_arguments(disable_flag, language: 'c')
endif endif
endforeach endforeach
@ -130,6 +136,7 @@ blake3_inc = [
blake3 = static_library('blake3', blake3_files, blake3 = static_library('blake3', blake3_files,
dependencies: [], dependencies: [],
link_with: blake3_libs,
include_directories: blake3_inc, include_directories: blake3_inc,
implicit_include_directories: false implicit_include_directories: false
) )