mirror of
https://github.com/freebsd/freebsd-src.git
synced 2026-10-28 11:25:21 +01:00
zfs: fix SIMD defines to match OpenZFS HAVE_SIMD() macro
The OpenZFS merge 80aae8a3f8 introduced HAVE_SIMD() which checks for
HAVE_TOOLCHAIN_* defines via simd_config.h. The kernel module Makefile
was updated, but kern.pre.mk (static kernel build) and the libzpool/libzfs
Makefiles were missed, still using the old HAVE_SSE2 etc. names. This
caused all vectorized raidz, fletcher, and blake3 implementations to be
compiled out.
This commit is contained in:
1 parent
2a4b8fd1dc
commit
de6872045c
3 files changed
+11
-8
No files matched your search
@@ -69,11 +69,12 @@ ARCH_C =
|
||||
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
|
||||
ARCH_C += zfs_fletcher_intel.c \
|
||||
zfs_fletcher_sse.c
|
||||
CFLAGS += -DHAVE_SSE2
|
||||
CFLAGS += -DHAVE_TOOLCHAIN_SSE2 -DHAVE_TOOLCHAIN_SSSE3
|
||||
.endif
|
||||
.if ${MACHINE_ARCH} == "amd64"
|
||||
ARCH_C += zfs_fletcher_avx512.c
|
||||
CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F
|
||||
CFLAGS+= -D__x86_64 -DHAVE_TOOLCHAIN_AVX2 -DHAVE_TOOLCHAIN_AVX \
|
||||
-DHAVE_TOOLCHAIN_AVX512F
|
||||
.endif
|
||||
.if ${MACHINE_CPUARCH} == "aarch64"
|
||||
ARCH_C += zfs_fletcher_aarch64_neon.c
|
||||
|
||||
@@ -217,12 +217,12 @@ ARCH_C += vdev_raidz_math_sse2.c \
|
||||
vdev_raidz_math_ssse3.c \
|
||||
zfs_fletcher_intel.c \
|
||||
zfs_fletcher_sse.c
|
||||
CFLAGS += -DHAVE_SSE2 -DHAVE_SSE3
|
||||
CFLAGS += -DHAVE_TOOLCHAIN_SSE2 -DHAVE_TOOLCHAIN_SSSE3
|
||||
.endif
|
||||
.if ${MACHINE_ARCH} == "amd64"
|
||||
ARCH_C += zfs_fletcher_avx512.c
|
||||
CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F \
|
||||
-DHAVE_AVX512BW
|
||||
CFLAGS+= -D__x86_64 -DHAVE_TOOLCHAIN_AVX2 -DHAVE_TOOLCHAIN_AVX \
|
||||
-DHAVE_TOOLCHAIN_AVX512F -DHAVE_TOOLCHAIN_AVX512BW
|
||||
.endif
|
||||
.if ${MACHINE_CPUARCH} == "aarch64"
|
||||
ARCH_C += zfs_fletcher_aarch64_neon.c
|
||||
|
||||
Reference in new issue
Block a user