From nobody Mon May 20 17:06:53 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 4VjkWK34Mjz5LfR2; Mon, 20 May 2024 17:06:53 +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 4VjkWK2ZdWz42vC; Mon, 20 May 2024 17:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716224813; 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=MmvBxwUq03por5hDYHyyuhWbVTjShZpM7nXtG5SdzPk=; b=TjUVzVcAsjW63RJUeljJ6pEfa0Vm+5PCQ76VHs1xNVidlcJKgQxF1yu/A01Z7zmoquWQJU iYw0vw6KmTg8X9lO0z2VLldrOmT+7PDi9F1QiLxFV2PdS08btomHVcIzAdHHK1YKLqgqvu 5196gHdOBCc0+EjTvYDruporbLnSJWrcwrpl7DNsRv7HbjZw/EI3oLIStXjUjaaXBPMYwK BEk4GAUZQQL7UsU4ipVU5NhqsdpdSMP7CFNlwoRpAHKoGzetYOo9Z2k/F8cWQQWs+tOa1t WVNkq/lVbYhhAEv/3lFg4mNC3E1LaqA8800YxVtMsTSxjzjOhw7WeSAk9NUVJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716224813; a=rsa-sha256; cv=none; b=nb3AaFu26FB0lYxZSxk89B36D8UPPB4wHr5p1p4HUZT0Nkj9CbBaZuOH0GpqHUb02HwXcQ tRjZt9+Eg6zE/O7U2LcVbdqCo5Y7Iq8ITtVgIGUY5O+RR+FirQsUStogxk+ITPUpJIJuMe NrEd9kN1qsb0OY+20SrjuBT+UrUlmfr6LbujyX5kgW9ePh53ofHu3EsHsm1yUhC6slzeBG SEJctg4OvcCSjkphwin2HK9j13YlroOlKKhOxrftpxBFcWcfKGvvlyB5vxfNLs/fi19dMu sk7E8j4hXSMxPHF58SnE/piI22A40N7Dw0pOwO9+6WQjJOEz8yQn9vbzdajLvg== 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=1716224813; 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=MmvBxwUq03por5hDYHyyuhWbVTjShZpM7nXtG5SdzPk=; b=OAw1eO+WHoLcw/VfFDXqTHDgCXt/8E39b1A92F21udnuxo9IS/WGjUc8Z2v/EN2QMb69Gh xulAiq1seKtOuQEF/KZ/8BoeYbNEUppPQw+iqSmMaz8nn1d+YTqKuaxafOabx5HR9b7jBF bcICYjn0WYD9zbGeT7TgyrmbsDknntrVaOfdNOjFhG4TSDH182Uln09a5PPK3lkKuut7OV boSe5xJcej+3gAem+P0HiMDhH/V/pK5vr2s4SFe+xo4wDh8BZuPmzldw9DQYPu81uTf+E1 9Yr3XwvDuKLnCN1fIqX9kKVcK0Kvphp7ELHJPKg/iMCqTQZKf8Sgq1fFsOs1rg== 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 4VjkWK23LCzm7T; Mon, 20 May 2024 17:06:53 +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 44KH6rNg003397; Mon, 20 May 2024 17:06:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44KH6rnP003394; Mon, 20 May 2024 17:06:53 GMT (envelope-from git) Date: Mon, 20 May 2024 17:06:53 GMT Message-Id: <202405201706.44KH6rnP003394@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: 2f9bf48e797e - releng/14.1 - 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/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 2f9bf48e797e095df48d4668ab48347baaf9fc88 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=2f9bf48e797e095df48d4668ab48347baaf9fc88 commit 2f9bf48e797e095df48d4668ab48347baaf9fc88 Author: Dimitry Andric AuthorDate: 2024-05-16 18:21:45 +0000 Commit: Dimitry Andric CommitDate: 2024-05-20 17:06:20 +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 Approved by: re (cperciva) MFC after: 3 days (cherry picked from commit fcfb2d6393712dee3f1f8f0c3840d14817dea416) (cherry picked from commit 14efb9bb710486a6fba349ec1b4b1b94a9a5a089) --- 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);