From nobody Mon May 20 08:13:34 2024 X-Original-To: dev-commits-src-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 4VjVgy6HWFz5Jg3T; Mon, 20 May 2024 08:13:34 +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 4VjVgy1b5Xz4jvY; Mon, 20 May 2024 08:13:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716192814; 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=8wuoTB0YX+/xXMj2/vsT/oQ7atqRIT796DOYalHlZlA=; b=jytGM7o0dRHhqCY4OM3IU2QI3A/RNew0WPnXzkfb+jt8BXimOKIyvhB0NP6Bnri+s92pgG Hfo1zrAQ4NXJ0vQDeyVw7UHqobj6ZHm8AllzlDwp0LNDYgM+4+qc+C3MprsuHVjohcDI+Q lqMvRoeGXnzqm3MuAI0wGsFUhtcjy80K4G3wkUC6bhMUHndTHsN1EfEuPEUQMQa+KxVVy3 AlbdKWtjmFSwXNSQaY+tYRkhZipEDRj03yL1ez/XwUFIwX8IX6oj9WHlreOdzP/PhfHpkV SLPFXJMwkHzAKc05CkWq98Bvo73SDYsZm8iiPi/94WCU3kJj1H5GI7o6v/OFCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716192814; a=rsa-sha256; cv=none; b=V+2tsxR3EAxYeQu7Pt0cnK1eMclHLZ7O9zwTSvR/s7mLCNaNFTnyfO6T1E4GEuEI1afqaG E49vjt3yknaXByY7CDQd/U38kqfysZY80PdgDLrIfbPwsIprsCDUFefLJKLmHs6fPVrpiy KuFy4xs7xGOJijLSrWN7fej8pZ/V9eKk353hSJDXNOV8umm/mgxkmCq21bIBXBXeo1JoHM 8P8Q/J+6pJ1ocFmU+nTzmizdkeanlz93qWQmRBEHnbVqbFqedGl0/u/E/xzJvIClTdM0hJ Idl/NEBW2qTWb22eUppDSwOHkYfUBfSUv4/PzWFguPsztz1hZcJ0FtH5lKEejQ== 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=1716192814; 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=8wuoTB0YX+/xXMj2/vsT/oQ7atqRIT796DOYalHlZlA=; b=Y5Sb+JTj0dpdWHDHXDnOAbcPxb0BQQEyTbqnmwQpyv+5bipO7iYoe7D/HDx6Io5W0HJrTW I5Bckw5kV4zVsTUIKm9hhUUxcFtBnK8eFphogz1LupC1VI7qe0cJgSZ84dSX24PF3jQTID JSd33Rd2DdY2YP+OLxWBMyurpkELQrvJITjiQHJgaZ7WJrLPuGKtr/Jmq0K2eEbtNHVeUf 00kOru3BXfKc+Q136dbkJx1tUaO7mc/3EBRyzlGunRghnIpSVKlwM9aFXM2Rqm8VQH//88 oGBJ0cOaE6wDJgGeDp89vdt2juznvto8zk3pUozt9XGd8aYb/urB73+6sMI0Zw== 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 4VjVgy16j7zX0W; Mon, 20 May 2024 08:13:34 +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 44K8DYdr004598; Mon, 20 May 2024 08:13:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44K8DYEd004595; Mon, 20 May 2024 08:13:34 GMT (envelope-from git) Date: Mon, 20 May 2024 08:13:34 GMT Message-Id: <202405200813.44K8DYEd004595@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: b6011652be32 - stable/13 - Merge commit 87f3407856e6 from llvm-project (by Phoebe Wang): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-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: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b6011652be3240e9d702f28e572ea7993226aa23 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b6011652be3240e9d702f28e572ea7993226aa23 commit b6011652be3240e9d702f28e572ea7993226aa23 Author: Dimitry Andric AuthorDate: 2024-05-16 18:21:45 +0000 Commit: Dimitry Andric CommitDate: 2024-05-20 08:13:00 +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 (cherry picked from commit fcfb2d6393712dee3f1f8f0c3840d14817dea416) --- 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);