From nobody Thu May 16 18:42:02 2024 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 4VgJpy44jQz5Lghd; Thu, 16 May 2024 18:42:02 +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 4VgJpy3f28z4cMp; Thu, 16 May 2024 18:42:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715884922; 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=9qc2V4Wvl3ooQY3lXgyetCoO9B57cvYOvxMaWmlRiYM=; b=tFrzdA+KsCCk2d6SWIA5QJWKzOaSZlNc9ClURROq4u4WDdXsolcyXtGGtbf1OgykYFm6gd AEizEvNCDt9uOD7N4UAGSAOcMhTrvbaMa97yaFEbzife7YbzjHLMptTJf1ZRZCLo/xNtW1 EQb2Aud3wW0S78dKiarvx58NBJ42DCMCIfJI6wsnEh/dj3hNnIXY+U4IgbivTkOEOdLj60 h5si1PCMiO7mDABgS/LHu64eKu9gk6ViF3+DYmNNRJR3CM8UGcXq9pUd1syVckjI7woXQ0 lbheJBrzgHIoWOuevjK4FQx7Z/pypN89z4HFGmLak7sbpzhExY6S5eaVmLP+Wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715884922; a=rsa-sha256; cv=none; b=O5rx82sgcZ9nBsIVkKFQwGzXL7C+oZ4di+UziotDf27uksNzX9RFPB0BcPKMg2opxtYpnU Ck4Sn/SGGIlWrlN1wmAkLNhwFk9R62l1JK2B2jN0au++qpIV8A3bBjGQAjFp8MYGb3VG6y 9uCmAkK7aMA3wLfi93AtPAZfkonbnaYejE13S2NhU1oURef5FY/hiH+TKaK6ia2F9GKiFQ tH2B23LaxD9VxI9Y+LS+lJfr1yMPO7QR3xqj9SmhmPv6a+pB5H/4sLFmn0p6TbCgNWH6ra O4eCzZIAD5NOv3oue1s16acv/igYkYTOr+0UOBHX/SAtlMg1To1X1mqBW1p25w== 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=1715884922; 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=9qc2V4Wvl3ooQY3lXgyetCoO9B57cvYOvxMaWmlRiYM=; b=fmpFSJQ8gwJLQ5JSyga6tZxNRipvIML7A31Cynczsp9oboK2Ck36Pd2yee9xTXH4KIo3x3 rtAmexpjMhSyhikyxjvtRFzOVHC8l6lnrXModrLMhYh148H8G/+3mX/TbDGnq0JpIz5To1 qlHDbEBVePzqpo7aKWE9siZH3Q3d9tWyLcPlB7kiCW3jVKS5MZQ99giMW3v49I8BElRyMq tLiNOxe04URmNwaqvO5FFAklBXmOV+xRvUD0OuiwWy77dsIw7NjXrhmoLhyVRSJWUyO8Za dQ0CeszHBF2xQ51yfBJVZCJW0K3UR7IvBqznEdejJfJBlwhc3DGphxcCqP2Qzg== 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 4VgJpy3FSdz18g6; Thu, 16 May 2024 18:42:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44GIg2kI088437; Thu, 16 May 2024 18:42:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44GIg235088434; Thu, 16 May 2024 18:42:02 GMT (envelope-from git) Date: Thu, 16 May 2024 18:42:02 GMT Message-Id: <202405161842.44GIg235088434@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: fcfb2d639371 - main - Merge commit 87f3407856e6 from llvm-project (by Phoebe Wang): 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fcfb2d6393712dee3f1f8f0c3840d14817dea416 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=fcfb2d6393712dee3f1f8f0c3840d14817dea416 commit fcfb2d6393712dee3f1f8f0c3840d14817dea416 Author: Dimitry Andric AuthorDate: 2024-05-16 18:21:45 +0000 Commit: Dimitry Andric CommitDate: 2024-05-16 18:41:45 +0000 Merge commit 87f3407856e6 from llvm-project (by Phoebe Wang): [X86][Driver] Do not add `-evex512` for `-march=native` when the target doesn't support AVX512 (#91694) This prevents problems with ports that fail to build with CPUTYPE=native, if the native CPU supports AVX512F, resulting in errors like: /wrkdirs/usr/ports/archivers/libdeflate/work/libdeflate-1.20/lib/x86/adler32_template.h:197:21: error: always_inline function '_mm512_set1_epi8' requires target feature 'evex512', but would be inlined into function 'adler32_x86_avx512_vl512_vnni' that is compiled without support for 'evex512' 197 | const vec_t ones = VSET1_8(1); | ^ /wrkdirs/usr/ports/archivers/libdeflate/work/libdeflate-1.20/lib/x86/adler32_template.h:116:23: note: expanded from macro 'VSET1_8' 116 | # define VSET1_8(a) _mm512_set1_epi8(a) | ^ /wrkdirs/usr/ports/archivers/libdeflate/work/libdeflate-1.20/lib/x86/adler32_template.h:197:21: error: AVX vector return of type '__m512i' (vector of 8 'long long' values) without 'evex512' enabled changes the ABI /wrkdirs/usr/ports/archivers/libdeflate/work/libdeflate-1.20/lib/x86/adler32_template.h:116:23: note: expanded from macro 'VSET1_8' 116 | # define VSET1_8(a) _mm512_set1_epi8(a) | ^ Ports known to be affected are: archivers/libdeflate, devel/highway, www/node20, and lang/rust. (For rust itself there is also a similar issue reported at https://github.com/rust-lang/rust/pull/121088). PR: 276104 Reported by: netchild MFC after: 3 days --- contrib/llvm-project/llvm/lib/TargetParser/Host.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/llvm-project/llvm/lib/TargetParser/Host.cpp b/contrib/llvm-project/llvm/lib/TargetParser/Host.cpp index 1adef15771fa..848b531dd8dd 100644 --- a/contrib/llvm-project/llvm/lib/TargetParser/Host.cpp +++ b/contrib/llvm-project/llvm/lib/TargetParser/Host.cpp @@ -1774,7 +1774,8 @@ bool sys::getHostCPUFeatures(StringMap &Features) { Features["rtm"] = HasLeaf7 && ((EBX >> 11) & 1); // AVX512 is only supported if the OS supports the context save for it. Features["avx512f"] = HasLeaf7 && ((EBX >> 16) & 1) && HasAVX512Save; - Features["evex512"] = Features["avx512f"]; + if (Features["avx512f"]) + Features["evex512"] = true; Features["avx512dq"] = HasLeaf7 && ((EBX >> 17) & 1) && HasAVX512Save; Features["rdseed"] = HasLeaf7 && ((EBX >> 18) & 1); Features["adx"] = HasLeaf7 && ((EBX >> 19) & 1);