From nobody Sun Apr 21 19:06:39 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 4VMyXv5g59z5HXg3; Sun, 21 Apr 2024 19:06:39 +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 4VMyXv3hqdz4fVV; Sun, 21 Apr 2024 19:06:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713726399; 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=URuQVzJmer07Wx0lAiTqgOMk4dDmf2GYRB5c3G/ZTG4=; b=o0hCDv/qJrdZ0L8UtuZz7JwWY6AlZ0h5E2vinJy2F0U3q/E+J9/9BSPL1ZmL07Xk3vJ5ZD yT7y6p4SKSt4jTvZdptPjTN48q8ohnVZ7bmpJONnFL2uTwvnel3Qe5apqNGY9LA+7tqanu 320kY3URoUvAAQH1noY1EzRkgnl4lbymZEutx1pFtyy5QU38ZERe2wxLyr2m075AjCl9I1 Nwbyg0/Q3ZGYQAats/egAFhY2+6+2tK80bKnVW5kmQo7xrCxVDqs/wLalk+RjcxkaUVhLL FbC3oxviQqHgUqAH67ehgL8njUSX0dgsQxrK88vHztRuZMT1Ud2+8JOW4c5+sQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713726399; a=rsa-sha256; cv=none; b=ocCbkDmCMTbBevrQ7rxPSiqKsSFlBoRQW365mjsiJoezZFiJKbrKVrRZOc/E9CavFBZJaB ZA6FEXEFWfjzG9mxQaBxCVNuYS1or1Nn1urC4l2iuPDTnAF/l2pUaPfIlpMKX1qlj5XkFI NSWwDHR4NGknXvTwBrnxIN0KhTM5SsgrMwjcvtYZ0wex0h2HRcj4jr0eXbSZ0N2HGNMfW+ 6K/nJFNWdZRhJOsE+lnDWoII4eyOiiQOA3MKDznzhTU3lbBf+Gbd1H6SzTCuYAFkNpBCcA NEg7TIPvvr2lCIHUKHo90OIxrR/x5zfchJ5UBQSRm8wpErNn8oZAp6mmqCppzw== 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=1713726399; 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=URuQVzJmer07Wx0lAiTqgOMk4dDmf2GYRB5c3G/ZTG4=; b=vOdvHL94OqVjSE7IsUkNZZqzASdXTxeTbgOH8e4jBD5l6NACZpwqabyPNUDCqxzUz5VNce rg7ziyoejwfjXqukXwJc3MZaJnaROEFfPh4RAV05lRWtmJ0OirqA0k21bXEBJ3+jh9Vdi3 824UqCNl7nKMvVlYblTpN9mG99DXFSwmsxAEvP7fCP1h58F9mjLmhBQxQzf0RfnO1txLDq za/XuMLFDTMuSY4ghb25FqkVmVVQPhhHqcU8xuDQ+dKgu/jP6YDjlPNtfYlU6/N/ChY9Nk PXhdkM/XBNi/Myx9Ap/52JAfV33w9cA4oApdioLDc21vOHb9qYtBdhmrpCErlQ== 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 4VMyXv3JgSzGks; Sun, 21 Apr 2024 19:06:39 +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 43LJ6diQ029231; Sun, 21 Apr 2024 19:06:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43LJ6djJ029228; Sun, 21 Apr 2024 19:06:39 GMT (envelope-from git) Date: Sun, 21 Apr 2024 19:06:39 GMT Message-Id: <202404211906.43LJ6djJ029228@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: 445aa3bcc50c - stable/13 - bsd.cpu.mk: Correct MACHINE_CPU for Intel Alder Lake 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: 445aa3bcc50ca2d924a7d5e9974aa7fc8d3c49cb Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=445aa3bcc50ca2d924a7d5e9974aa7fc8d3c49cb commit 445aa3bcc50ca2d924a7d5e9974aa7fc8d3c49cb Author: Jung-uk Kim AuthorDate: 2021-06-14 23:06:03 +0000 Commit: Dimitry Andric CommitDate: 2024-04-21 19:02:08 +0000 bsd.cpu.mk: Correct MACHINE_CPU for Intel Alder Lake Apparently Intel Alder Lake lacks AVX-512 instructions. Fixes: 09e7341c5ea4 "Catch up with Clang 12" (cherry picked from commit e80145525b54a90672d36c9a168d83d0c7cb8161) --- share/mk/bsd.cpu.mk | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index 51f9547c399f..08b98e824492 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -189,14 +189,14 @@ MACHINE_CPU = 3dnow mmx k6 k5 i586 MACHINE_CPU = mmx k6 k5 i586 . elif ${CPUTYPE} == "k5" MACHINE_CPU = k5 i586 -. 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" +. elif ${CPUTYPE} == "sapphirerapids" || ${CPUTYPE} == "tigerlake" || \ + ${CPUTYPE} == "cooperlake" || ${CPUTYPE} == "cascadelake" || \ + ${CPUTYPE} == "icelake-server" || ${CPUTYPE} == "icelake-client" || \ + ${CPUTYPE} == "cannonlake" || ${CPUTYPE} == "knm" || \ + ${CPUTYPE} == "skylake-avx512" || ${CPUTYPE} == "knl" MACHINE_CPU = avx512 avx2 avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586 -. elif ${CPUTYPE} == "skylake" || ${CPUTYPE} == "broadwell" || \ - ${CPUTYPE} == "haswell" +. elif ${CPUTYPE} == "alderlake" || ${CPUTYPE} == "skylake" || \ + ${CPUTYPE} == "broadwell" || ${CPUTYPE} == "haswell" MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586 . elif ${CPUTYPE} == "ivybridge" || ${CPUTYPE} == "sandybridge" MACHINE_CPU = avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586 @@ -257,14 +257,14 @@ MACHINE_CPU = k8 3dnow sse3 . elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || \ ${CPUTYPE} == "athlon-fx" || ${CPUTYPE} == "k8" MACHINE_CPU = k8 3dnow -. 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" +. elif ${CPUTYPE} == "sapphirerapids" || ${CPUTYPE} == "tigerlake" || \ + ${CPUTYPE} == "cooperlake" || ${CPUTYPE} == "cascadelake" || \ + ${CPUTYPE} == "icelake-server" || ${CPUTYPE} == "icelake-client" || \ + ${CPUTYPE} == "cannonlake" || ${CPUTYPE} == "knm" || \ + ${CPUTYPE} == "skylake-avx512" || ${CPUTYPE} == "knl" MACHINE_CPU = avx512 avx2 avx sse42 sse41 ssse3 sse3 -. elif ${CPUTYPE} == "skylake" || ${CPUTYPE} == "broadwell" || \ - ${CPUTYPE} == "haswell" +. elif ${CPUTYPE} == "alderlake" || ${CPUTYPE} == "skylake" || \ + ${CPUTYPE} == "broadwell" || ${CPUTYPE} == "haswell" MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse3 . elif ${CPUTYPE} == "ivybridge" || ${CPUTYPE} == "sandybridge" MACHINE_CPU = avx sse42 sse41 ssse3 sse3