From nobody Tue Aug 27 07:33:46 2024 X-Original-To: dev-commits-ports-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 4WtK6M1Jcfz5VGmS; Tue, 27 Aug 2024 07:33: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WtK6L52cLz4V2b; Tue, 27 Aug 2024 07:33:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724744026; 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=sH3VPxdM0lxb2AANEhYOuPOIBlk2Bo5bmAxraCwndZc=; b=I7vtsm8YNs/vsxPafGuAToef8u32ThQJvKTxEQk2IOlchGK1dfLRrcpgDqc8BS4iN0uMpx opkHTszcBuBakVvcpvzIr5IFjNimfIHcYAoL55uuKJ7nhrcKkTM87pNJv1qfIc8vaddWwP BO60CIzlsq2sTFacxvEVmfRVMmzx2kO5UzS1ZGHZ7s1reCfuogb8pAj6aY9VLyp453DKsM YuymauJScMEeBgx1FFAiqr48J5yPnjzHaYEdvzzPtwJt714aSdxC8+T4eJ9BNzgjcCD/D0 na2GrBDIlOvaGMJdyoBbEgNK0FgedVWLd1FyHAdU3QjE0KB96fSNUGHWUTNGHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724744026; a=rsa-sha256; cv=none; b=GYSmwPyVlGkoMdh243MxuozNnLEYARWWS9JoaP/Qio0Xs1y8/JUa/t6JbwkiO6T+Ch+0zb q4tVIeB/ha55IhnMx3dhOmOmtSeHPQpvK89K68sqMAd1pB1luRwpuJsuNW6F/z8Cate5FF JGAFcVb0CoqkxMycpwZEaGoKIsiVy2BCyR5JqnF4Um+/v0ifWkq6H+dt3qV2jJvE5UcyBn oYXcp0bmp5VO+04fDNZ39HMfY6KOQpffCo1+Kp7QUiVisj5UAILyCqZH/XOnGci9i6hxJ/ iig/3g/SpZaiTDZ20C6Nakd2MNvjVq8a+8PsYNl3vQVtPodNjpQKvG2SvxJ0YA== 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=1724744026; 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=sH3VPxdM0lxb2AANEhYOuPOIBlk2Bo5bmAxraCwndZc=; b=IskKAUuNxAqhVCJ9Ri3T4LuAqolm/3Kr18wpgL5FoOtaahr71PhKQxqqMngjA7f+YL+Uf1 +DCnYJW8O6DRi9L43D/q42xkuhZk3ATcwUAce7xtEkyvT9g7vbvJYVQFA7qzR7UAGjWhnu I/LeKIDlPoEdqlaszNzWu7ysIzcS+15hvB1sAiMeaLQ/1RTJ/ev1nHqDtP6ljswGhA9F0i WNPUu1RwEvMbLuiIE8F4Bu1cRGx4yj9hyijXIBVNBaq5eubmmnBEhi1kxXtMqRl5anFsdq +ZzZxb+Q0SrCh48XWO5sS74txmW1m73MUQyxC61UFk4Ep+5gcuwO/0EWSMj6pw== 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 4WtK6L4L3QzhJB; Tue, 27 Aug 2024 07:33:46 +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 47R7Xku8022747; Tue, 27 Aug 2024 07:33:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47R7XkMa022744; Tue, 27 Aug 2024 07:33:46 GMT (envelope-from git) Date: Tue, 27 Aug 2024 07:33:46 GMT Message-Id: <202408270733.47R7XkMa022744@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 885ff9ed3577 - main - math/blis: fix build with clang 19 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 885ff9ed357775138732cd058046d4e00b77287d Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=885ff9ed357775138732cd058046d4e00b77287d commit 885ff9ed357775138732cd058046d4e00b77287d Author: Dimitry Andric AuthorDate: 2024-08-12 19:31:50 +0000 Commit: Dimitry Andric CommitDate: 2024-08-27 07:33:02 +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 --- 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