From nobody Tue Aug 27 07:39:28 2024 X-Original-To: dev-commits-ports-branches@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 4WtKDx1ckTz5VGtP; Tue, 27 Aug 2024 07:39:29 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WtKDx04wjz4VSQ; Tue, 27 Aug 2024 07:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724744369; 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=uOvehvXHbAcEEbmpjQSjWIFV7WjHW2qVuZG21U+UhhM=; b=C33DyH/oeDMnYZpzb3OGZUOCBHXclmyFRaAlk/ZJfsFJ8htHA6IxibF2Fv/zPN5lU03hgE Kj0++wQEASstuScdKpmMTp5t/T3V9n2TdLQhBKMemPTGMK3TgBC/mPhw/shygyoy7DQgCk xcbb6ea8fVqkq/5Yplm/TbDZ/UyAOBqTbRgzJ8XEroX6/RURSRYhqGi2WUcK+V14aDCkzB UnBNoiE+VlrGBjPwTxQSTDtw3Ur6fUWbxIuxxHx6Yy2N9Ej6TO8I8oACgttAyw9LZsBUMJ 5pW1XaERaSPP4Eif/gBIgKAbVAtvimL96ryRB3wzH16QEIcJ5sJF6sRE632Wdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724744369; a=rsa-sha256; cv=none; b=cQxxWIYq9n3iGmFW7PdORmrh+kD8D3sVmKGuqcaVPBibILwDECssUK8cT5fuSm6Pq5iN+s 1x97vy1/o4xshCrEyROWWODe6CKdeZDpiOAOKmGqhHLPDyQUE1m7UXuuTSY85wCsr+EjV+ laQk4bVaiz/JFO1uGPOgWYkeKW9kbgizLXNlFZHfO5mcDqeR8KbrE1Sn1q1KCX1kYb1iRm wTjVcaVrLu7e3hikUK3kTYJhdb2EwTdonrVQDp405s/KuTza3zqp7YyOT0jpujVg557NSo s8ShS/UQe5TRH1S/OktfzbFTd/tX0lzsWKXdpHeb3g8vnlotVY4RiJmN/DD/Fw== 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=1724744369; 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=uOvehvXHbAcEEbmpjQSjWIFV7WjHW2qVuZG21U+UhhM=; b=KBXIK86YqPPM/m4725vypnVo2gN8VsCVr1fLvrg+3SmqJ07bHJcSLTn+p5KFBUTy3Op+Qy /t0QHac2kj41+9VcMjw0KfcFV2UE5a6MtXm8jL1DOIWXKfvyQCZ1SNTR7Lx2ZAcnYMa+gw SRnRuIWt6WNAlkvQe0RlE+/Zoj1gDYHVnyvatV55SsKVxIgZ5W1ffjsNeDwrFAkl19xpJ2 sDXbpJ/OJCi+y9z217c5ZbkMKdzT+cVSoEDNk7sAIa/byaKKnWyNQbYW+RqYmwPsbTlg2I k2+mHeitgaJqszNaopJRA0mTG1RQAw+c8OouNVvhuM/U3kt4FWDb7DOIYwQqMQ== 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 4WtKDw5m8Szh84; Tue, 27 Aug 2024 07:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47R7dSB0023630; Tue, 27 Aug 2024 07:39:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47R7dSuB023627; Tue, 27 Aug 2024 07:39:28 GMT (envelope-from git) Date: Tue, 27 Aug 2024 07:39:28 GMT Message-Id: <202408270739.47R7dSuB023627@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dimitry Andric Subject: git: 37d0117bb4ca - 2024Q3 - math/blis: fix build with clang 19 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: 37d0117bb4ca5b6e25c9575688b56258362bfdb4 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=37d0117bb4ca5b6e25c9575688b56258362bfdb4 commit 37d0117bb4ca5b6e25c9575688b56258362bfdb4 Author: Dimitry Andric AuthorDate: 2024-08-12 19:31:50 +0000 Commit: Dimitry Andric CommitDate: 2024-08-27 07:39:04 +0000 math/blis: fix build with clang 19 Clang 19 has removed support for the -mavx512pf and -mavx512er flags, for the Intel Xeon Phi (aka "Knights Landing"/knl or "Knights Mill"/knm) [1] [2]. This causes fatal errors during configuration of math/blis: Compiling obj/x86_64/kernels/knl/1m/bli_dpackm_knl_asm_24x8.o ('knl' CFLAGS for kernels) cc: fatal error: unknown argument '-mavx512pf'; did you mean '-mavx512f'? gmake: *** [Makefile:653: obj/x86_64/kernels/knl/1m/bli_dpackm_knl_asm_24x8.o] Error 1 Add an EXTRA_PATCHES entry to deal with this situation. Note that in the future, this may also have to be done for gcc 15 and later. In that case, the patch might be done unconditionally. [1] https://github.com/llvm/llvm-project/pull/75580 [2] https://github.com/llvm/llvm-project/pull/92883 PR: 280783 Approved by: maintainer timeout (2 weeks) MFH: 2024Q3 (cherry picked from commit 885ff9ed357775138732cd058046d4e00b77287d) --- math/blis/Makefile | 4 ++++ math/blis/files/extra-patch-config_knl_make__defs.mk | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/math/blis/Makefile b/math/blis/Makefile index 2793d3538f46..baa73955f9e3 100644 --- a/math/blis/Makefile +++ b/math/blis/Makefile @@ -61,6 +61,10 @@ PLIST_SUB+= ARCH="generic" .include +.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 190 +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-config_knl_make__defs.mk +.endif + .if ${CHOSEN_COMPILER_TYPE} == gcc USE_GCC= yes .endif diff --git a/math/blis/files/extra-patch-config_knl_make__defs.mk b/math/blis/files/extra-patch-config_knl_make__defs.mk new file mode 100644 index 000000000000..e2b980ba641d --- /dev/null +++ b/math/blis/files/extra-patch-config_knl_make__defs.mk @@ -0,0 +1,20 @@ +--- config/knl/make_defs.mk.orig 2022-04-01 13:12:06 UTC ++++ config/knl/make_defs.mk +@@ -81,7 +81,7 @@ ifeq ($(CC_VENDOR),clang) + CKVECFLAGS := -xMIC-AVX512 + else + ifeq ($(CC_VENDOR),clang) +-CKVECFLAGS := -mavx512f -mavx512pf -mfpmath=sse -march=knl ++CKVECFLAGS := -mavx512f -mfpmath=sse -march=knl + else + $(error gcc, icc, or clang is required for this configuration.) + endif +@@ -105,7 +105,7 @@ ifeq ($(CC_VENDOR),clang) + CRVECFLAGS := -xMIC-AVX512 + else + ifeq ($(CC_VENDOR),clang) +-CRVECFLAGS := -march=knl -mno-avx512f -mno-avx512pf -mno-avx512er -mno-avx512cd -funsafe-math-optimizations -ffp-contract=fast ++CRVECFLAGS := -march=knl -mno-avx512f -mno-avx512cd -funsafe-math-optimizations -ffp-contract=fast + else + $(error gcc, icc, or clang is required for this configuration.) + endif