From nobody Sun Apr 21 19:06:38 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 4VMyXt3jg0z5HXr7; Sun, 21 Apr 2024 19:06:38 +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 4VMyXt31Zfz4fCs; Sun, 21 Apr 2024 19:06:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713726398; 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=kMBirUWdxQaBpkW+YWDlPmLxDXelztfaesv9Awby2jQ=; b=YpbnafK2XgZJLmjApbbTgzPI8qjF0KE1y2/W6mXyn6jZw18VAm4FzaUi9zhRdknxX59fJC FnADIqd0vPvmSh5KBrjxQ8mt0UVnTw09zW2rStDhl32Bdo7hZ4G9Wi6PvYd67xQtbOvUZz UlaBuXFF/TlHFZLsZoOW0xQjOlZK7fvKMJ2IYmsXvBtUgH8S/zQa8rfyyo4b3QTvZoY3WE Ut3P0GWzwTZnIXXmDIU+D7L0BYi8JQSO0LZOsT0Vx3xJipzNUosFWXEOedWF0QKMRsuhVD dmFjbWQRCtnaZpd7EOIVTpYUrwPti6XyNQmsu7oLSyRBxrX8fSGgSZjrOWUGXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713726398; a=rsa-sha256; cv=none; b=nHOYphf+WF+ZGJaK01K0vHSnntxfpURx3zVuHWn8s6g7yZYuSfrb8rTH4rJEphXbktnxhb xqZQGd5koD4MZ5LuhAHnlKZHMBDcCs7lv7utVmLrPr6tb9eCUEuYQmCII5SXBzu7Mrc/4G sZpqDoJc2JYryVyKpvzQVQYkmiG35N2uoaNZHaoj8emBZY8ohNqkdidBiFXjSS1AUNL/Zx v6hPgsD6TTPFk8zlA9wUPd6/OEV1n5KOqqToye4se6LkHT3lYtu5nqhx8lOTLQlmAfl9Qz eNJZUnila2aHEylzSvfS2YKuJHeUw5a4KpGjqX6J3hFIecWtI3EFVC4LdutzAQ== 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=1713726398; 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=kMBirUWdxQaBpkW+YWDlPmLxDXelztfaesv9Awby2jQ=; b=TfTey10yYso2dMGMKZmyDacllZIZ3JHCzCiOwGqa9MdhWdOBVtHmpcFp2ULDZRgcmB1ujo fnzmG4Pn9Zzw+SM4dubNc6bfCs/eSH69pa4yF/fO++qAKjWt0fd8GDjcDH4CefOkc7/z8R QHg6RqXWyEltElmq1oZdRcSOWGVF6oifyv06SkFqzh+BIifzjdMvXl1MawCqL+5N0BPYD5 eaYgOWpYfblaZrrDRcv5GLKObaws1bOi5eXpqWPnLqhHZ1jt38dJ4GhbaBbwEIXY9GVGCG yhqU8RrO59SeibwKo/ZyP7owm7TFvrpxR5qr3ba68BxQzVsRlnmuCdjBk3VcXA== 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 4VMyXt2cg4zGkr; Sun, 21 Apr 2024 19:06:38 +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 43LJ6cPr029183; Sun, 21 Apr 2024 19:06:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43LJ6c74029180; Sun, 21 Apr 2024 19:06:38 GMT (envelope-from git) Date: Sun, 21 Apr 2024 19:06:38 GMT Message-Id: <202404211906.43LJ6c74029180@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: 562855795e7f - stable/13 - Catch up with Clang 12. 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 562855795e7f5b31e9a361dcd7f9f191cb5fb23f Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=562855795e7f5b31e9a361dcd7f9f191cb5fb23f commit 562855795e7f5b31e9a361dcd7f9f191cb5fb23f Author: Jung-uk Kim AuthorDate: 2021-06-14 22:42:59 +0000 Commit: Dimitry Andric CommitDate: 2024-04-21 19:02:07 +0000 Catch up with Clang 12. Add "znver3" for AMD and "alderlake" and "sapphirerapids" for Intel. (cherry picked from commit 09e7341c5ea40120bd1850c48c44bfbae5475f3f) --- share/examples/etc/make.conf | 18 +++++++++--------- share/mk/bsd.cpu.mk | 12 ++++++++---- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index 6bc14d5be10f..9c3bb4d19442 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -29,19 +29,19 @@ # NO_CPU_CFLAGS variable below. # Currently the following CPU types are recognized: # Intel x86 architecture: -# (AMD CPUs) znver2, znver1, bdver4, bdver3, bdver2, bdver1, +# (AMD CPUs) znver3, znver2, znver1, bdver4, bdver3, bdver2, bdver1, # btver2, btver1, amdfam10, opteron-sse3, athlon64-sse3, # k8-sse3, opteron, athlon64, athlon-fx, k8, athlon-mp, # athlon-xp, athlon-4, athlon-tbird, athlon, k7, geode, # k6-3, k6-2, k6 -# (Intel CPUs) tigerlake, cooperlake, cascadelake, tremont, -# goldmont-plus, icelake-server, icelake-client, -# cannonlake, knm, skylake-avx512, knl, goldmont, -# skylake, broadwell, haswell, ivybridge, sandybridge, -# westmere, nehalem, silvermont, bonnell, core2, core, -# nocona, pentium4m, pentium4, prescott, pentium3m, -# pentium3, pentium-m, pentium2, pentiumpro, pentium-mmx, -# pentium, i486 +# (Intel CPUs) alderlake, sapphirerapids, tigerlake, cooperlake, +# cascadelake, tremont, goldmont-plus, icelake-server, +# icelake-client, cannonlake, knm, skylake-avx512, knl, +# goldmont, skylake, broadwell, haswell, ivybridge, +# sandybridge, westmere, nehalem, silvermont, bonnell, +# core2, core, nocona, pentium4m, pentium4, prescott, +# pentium3m, pentium3, pentium-m, pentium2, pentiumpro, +# pentium-mmx, pentium, i486 # (VIA CPUs) c7, c3-2, c3 # ARM architecture: armv5, armv5te, armv6, armv6t2, arm1176jzf-s, armv7, # armv7-a, armv7ve, generic-armv7-a, cortex-a5, diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index 2e35501c4126..51f9547c399f 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -159,7 +159,8 @@ _CPUCFLAGS = -mcpu=${CPUTYPE} ########## i386 . if ${MACHINE_CPUARCH} == "i386" -. if ${CPUTYPE} == "znver2" || ${CPUTYPE} == "znver1" +. if ${CPUTYPE} == "znver3" || ${CPUTYPE} == "znver2" || \ + ${CPUTYPE} == "znver1" MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586 . elif ${CPUTYPE} == "bdver4" MACHINE_CPU = xop avx2 avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586 @@ -188,7 +189,8 @@ MACHINE_CPU = 3dnow mmx k6 k5 i586 MACHINE_CPU = mmx k6 k5 i586 . elif ${CPUTYPE} == "k5" MACHINE_CPU = k5 i586 -. elif ${CPUTYPE} == "tigerlake" || ${CPUTYPE} == "cooperlake" || \ +. elif ${CPUTYPE} == "alderlake" || ${CPUTYPE} == "sapphirerapids" || \ + ${CPUTYPE} == "tigerlake" || ${CPUTYPE} == "cooperlake" || \ ${CPUTYPE} == "cascadelake" || ${CPUTYPE} == "icelake-server" || \ ${CPUTYPE} == "icelake-client" || ${CPUTYPE} == "cannonlake" || \ ${CPUTYPE} == "knm" || ${CPUTYPE} == "skylake-avx512" || ${CPUTYPE} == "knl" @@ -235,7 +237,8 @@ MACHINE_CPU = mmx MACHINE_CPU += i486 ########## amd64 . elif ${MACHINE_CPUARCH} == "amd64" -. if ${CPUTYPE} == "znver2" || ${CPUTYPE} == "znver1" +. if ${CPUTYPE} == "znver3" || ${CPUTYPE} == "znver2" || \ + ${CPUTYPE} == "znver1" MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse4a sse3 . elif ${CPUTYPE} == "bdver4" MACHINE_CPU = xop avx2 avx sse42 sse41 ssse3 sse4a sse3 @@ -254,7 +257,8 @@ MACHINE_CPU = k8 3dnow sse3 . elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || \ ${CPUTYPE} == "athlon-fx" || ${CPUTYPE} == "k8" MACHINE_CPU = k8 3dnow -. elif ${CPUTYPE} == "tigerlake" || ${CPUTYPE} == "cooperlake" || \ +. elif ${CPUTYPE} == "alderlake" || ${CPUTYPE} == "sapphirerapids" || \ + ${CPUTYPE} == "tigerlake" || ${CPUTYPE} == "cooperlake" || \ ${CPUTYPE} == "cascadelake" || ${CPUTYPE} == "icelake-server" || \ ${CPUTYPE} == "icelake-client" || ${CPUTYPE} == "cannonlake" || \ ${CPUTYPE} == "knm" || ${CPUTYPE} == "skylake-avx512" || ${CPUTYPE} == "knl"