From nobody Wed Jul 1 17:16:16 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gr69y0dHgz6kDgr for ; Wed, 01 Jul 2026 17:16:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gr69r4wcMz3gGD for ; Wed, 01 Jul 2026 17:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782926176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/dnJU/dldzHpHnY6vhNjygyy/9szxNqwod23Gw3qa4c=; b=VNXSVLQ6oNP+vv5gTFw6zoV1mgPMwRrXHYTKIXUBnVUPcg9CGDfV0d5WYIVdsy37BASiMk G6kskf9JhhBjOQczEtFB5cGT7ciBaY8uw0WjKEkIC4PBYJnszfsK7CXStR+s56tTB7ywnN nroXTf6+dxTh/9h13LWlLn0L1qZevWtS6Gyjn8yq/NwU2dtuULpWQs4fmc44xqDLiqdGlZ GuJODwwFnY8AIfhbF8G7jA/oV4lQ1ay8ECTAphTOolZq51V36ovdPyUpy+5GMObP9BxVAn mPhV1pMzhb8gxTr23hzNley1yftobpKysR/oU71GoE6NnCthfg4T565zxYgWmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782926176; a=rsa-sha256; cv=none; b=g5dRQNZQTqzLrqu61PbxE9m78kycmKwOMEGAHUC8G9ylFgQqyPmjZkmZjMLyZweInb58rz ZoalSbVW7dOAc+O8z4DpaYRiwWq0m58tFCclsYv4WLE1DSgHTE0rhbvbcnMZZLFOTpr2DY YGbySm6SCIxl3HlOhyJZm/VLqtQ7gqEqiv+pbVJmc6V0Utl1+Z8OBwETLacVqNr2rgxWS6 6GSfD1bvGq+Sq6yyXwzmynKes6jKu0OKg8bJIQfdvV3H6bjrvJssjp71wym/t2i2NIArLS WMa9oMKSQQXcNwtkHYHjjoFECHxuJSOV9czE8jz2/27ceGnKRfwtXDbNYa0HdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782926176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/dnJU/dldzHpHnY6vhNjygyy/9szxNqwod23Gw3qa4c=; b=DhOiM5ekC+1MMQ+fgjcf97SPb0DAyLDUHJQTOKbSwNKL5DYbhpTNfURRuBT9VSADXiuP6n t2CJwbilNYAs/PZIa4G55L1PRf4NP13nwmZ21Y/Lm8BTjoDGICz1T4IIlG0hUGan/RAc4F Up1sP2Q8acZqZuNz4hQDJfTACPc/hS1zR+FQxhb+5Dv3Rh3rlnyq7SdpHKDPzKjdxVmgO0 TYgvB5OxZlgpbNmQEMJGNjnExBe62seuqjwMXrVRCQCfWdFnaAbFVoddmCzEXCDHvwtmuz X4nl5RpNA2KfnQyhoYIVwtOEJYoR63/naSOSJY/oJFp2pmE5EuHNPkhirKCKNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gr69r3FB1z84V for ; Wed, 01 Jul 2026 17:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ef90 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 01 Jul 2026 17:16:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: de6872045c07 - main - zfs: fix SIMD defines to match OpenZFS HAVE_SIMD() macro List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de6872045c07b7eeffe66cba40e7feed23eefc9e Auto-Submitted: auto-generated Date: Wed, 01 Jul 2026 17:16:16 +0000 Message-Id: <6a454b60.1ef90.11f88ef5@gitrepo.freebsd.org> The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=de6872045c07b7eeffe66cba40e7feed23eefc9e commit de6872045c07b7eeffe66cba40e7feed23eefc9e Author: Alexander Motin AuthorDate: 2026-07-01 17:09:49 +0000 Commit: Alexander Motin CommitDate: 2026-07-01 17:09:49 +0000 zfs: fix SIMD defines to match OpenZFS HAVE_SIMD() macro The OpenZFS merge 80aae8a3f8aa 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. --- cddl/lib/libzfs/Makefile | 5 +++-- cddl/lib/libzpool/Makefile | 6 +++--- sys/conf/kern.pre.mk | 8 +++++--- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index d28424a353e5..83f93ec4276b 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -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 diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 0c2030faa3d6..68908fcb0241 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -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 diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index d1556660094a..19a7b45f4b6a 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -209,9 +209,11 @@ ZFS_CFLAGS+= -I$S/contrib/openzfs/module/icp/include \ -DWITH_NETDUMP -D__KERNEL__ -D_SYS_CONDVAR_H_ -DSMP .if ${MACHINE_ARCH} == "amd64" -ZFS_CFLAGS+= -D__x86_64 -DHAVE_SSE2 -DHAVE_SSSE3 -DHAVE_SSE4_1 -DHAVE_SSE4_2 \ - -DHAVE_AVX -DHAVE_AVX2 -DHAVE_AVX512F -DHAVE_AVX512VL -DHAVE_AVX512BW \ - -DHAVE_VAES -DHAVE_VPCLMULQDQ +ZFS_CFLAGS+= -D__x86_64 -DHAVE_TOOLCHAIN_SSE2 -DHAVE_TOOLCHAIN_SSSE3 \ + -DHAVE_TOOLCHAIN_SSE4_1 -DHAVE_TOOLCHAIN_AVX -DHAVE_TOOLCHAIN_AVX2 \ + -DHAVE_TOOLCHAIN_AVX512F -DHAVE_TOOLCHAIN_AVX512VL \ + -DHAVE_TOOLCHAIN_AVX512BW \ + -DHAVE_TOOLCHAIN_VAES -DHAVE_TOOLCHAIN_VPCLMULQDQ .endif .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \