From nobody Fri Jun 24 13:59:47 2022 X-Original-To: dev-commits-src-all@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 AA26E870624; Fri, 24 Jun 2022 13:59:47 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LTzJg4Kxlz4g5P; Fri, 24 Jun 2022 13:59:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656079187; 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=rUd02+CiXba2+mKG4B19nuS7zA/XpAw4OnqEAP/ESKI=; b=rNEFNwYZvFLN46+YvqLFQ+k7kGq7p0oVjf3+UJ+gIGU4DVvNHaGkl5xmjWvgEG3yrTzxEC I6z+1iQwHGQ0etksYN3kX5/kCN1BdpAWQmCPz8Tbxbe5FLVkE5xBaDXFNQDx/Ks40YPkVB +DmBNsqqWD4ZeP0mbBmgDkhI6mxC1XdsK0NlWb037Ek2zjGCqfzBaUo8UTtomB8o9WKUJn iMwOQmreQdO9JgVCqWzJrch3xkYzWAbt/09oY0hSiEw5YdEfEuVh2ACdHc9Zq/8fysPKKa pqDodcqLeUJQQrgcp17UXmtxUbulaJG3gJ3bmGkaePsIOyr3YA0cQTM1G32lCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6630D11025; Fri, 24 Jun 2022 13:59:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25ODxlGL020583; Fri, 24 Jun 2022 13:59:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25ODxlnf020582; Fri, 24 Jun 2022 13:59:47 GMT (envelope-from git) Date: Fri, 24 Jun 2022 13:59:47 GMT Message-Id: <202206241359.25ODxlnf020582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 52f6e63ab365 - main - Fix the zfs build for arm64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52f6e63ab3656b417d8dd2b905569707c90c9ecf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656079187; 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=rUd02+CiXba2+mKG4B19nuS7zA/XpAw4OnqEAP/ESKI=; b=gPJe6KlaTU4gIa98d+QNOUgutFVseh/jRQSYQcno3LvPE/jozUhrVm0YDJZIdtKAjljtIs pMDcoMfx5A9XULt7LOnMP6ooazo89ogGEaxplypmg9rWOJUbahPrb3Jr98/9xkWngV4/Ej dI+EA1zoQ0NPuqWm+9fHfzv/uv5kUHLULfOVpqHFtRhmOBUDw1RlPyy1C+hAsyGLK0tO5u WFKzXsBO6yylVSv6EdXA2wAD4MLwOAtwJFRHBufU1rAINUDC/f7zOLvHxMnM2y4X6Ka0VD 2NkES51E1LjGdMhAe7Sj09cdHsvQNuVpBSh9lGR4kSVXlak88tp0MPQwXJjXyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656079187; a=rsa-sha256; cv=none; b=m9ijzZtAYE7Hpxn0NIU5fh8wtMg5XDOuk43E0gPKx00qswnavtpvGaVEkRDd3NL0bS+rsU k/+APSpiTxRTxHSiuGLRDKpIZebL1U5Mywwsnb5l0IZkKXc2XMosybVIpTNkzdNwWnUy5W uf8hmvwTST6fravsz/jFSbvTm+fKQA04jko5syVHAunwetvGEa8HPLWTpcU0nGPzCvqc6F KWufMCU0JAIgy8qP4/u+McaMcVXl3AJOWFmtEmg7Pv1B/6Rd9mAy6YY0j5c9ZNfepZ5wVL yY6wSn0r9q74nJEy/ibm7I+cHl2HXgAiYUGrwQCqEWTIpWrhaCTB72Mjg2lP4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=52f6e63ab3656b417d8dd2b905569707c90c9ecf commit 52f6e63ab3656b417d8dd2b905569707c90c9ecf Author: Andrew Turner AuthorDate: 2022-06-24 13:16:50 +0000 Commit: Andrew Turner CommitDate: 2022-06-24 13:50:12 +0000 Fix the zfs build for arm64 Remove -mgeneral-regs-only when building the arm64 blake3 code. It uses simd instructions so will use non-general purpose registers. Sponsored by: The FreeBSD Foundation --- sys/conf/files.arm64 | 4 ++-- sys/modules/zfs/Makefile | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 52eb4de5fef3..256b67975092 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -156,8 +156,8 @@ cddl/dev/dtrace/aarch64/dtrace_asm.S optional dtrace compile-with "${DTRACE_S}" cddl/dev/dtrace/aarch64/dtrace_subr.c optional dtrace compile-with "${DTRACE_C}" cddl/dev/fbt/aarch64/fbt_isa.c optional dtrace_fbt | dtraceall compile-with "${FBT_C}" -contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse2.S optional zfs compile-with "${ZFS_S}" -contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse41.S optional zfs compile-with "${ZFS_S}" +contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse2.S optional zfs compile-with "${ZFS_S:N-mgeneral-regs-only}" +contrib/openzfs/module/icp/asm-aarch64/blake3/b3_aarch64_sse41.S optional zfs compile-with "${ZFS_S:N-mgeneral-regs-only}" ## ## ASoC support diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index 1a6912fb8ebd..9f54e60f6026 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -445,6 +445,16 @@ CFLAGS.zstd_lazy.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.zstd_ldm.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.zstd_opt.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} +b3_aarch64_sse2.o: b3_aarch64_sse2.S + ${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC} \ + -o ${.TARGET} + ${CTFCONVERT_CMD} + +b3_aarch64_sse41.o: b3_aarch64_sse41.S + ${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC} \ + -o ${.TARGET} + ${CTFCONVERT_CMD} + .endif CFLAGS.zstd.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} CFLAGS.entropy_common.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}