From patchwork Wed Mar 6 11:06:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 61401 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CF5F427BBE2; Wed, 6 Mar 2024 11:09:36 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BF98E27BBEC for ; Wed, 6 Mar 2024 11:09:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rhp93-0000wH-Kj; Wed, 06 Mar 2024 06:09:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rhp8V-0000oC-Nb for guix-patches@gnu.org; Wed, 06 Mar 2024 06:08:35 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rhp8U-0007cP-Ah; Wed, 06 Mar 2024 06:08:34 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rhp8w-0005GS-TH; Wed, 06 Mar 2024 06:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69581] [PATCH 03/11] guix: cpu: Be consistent with x86_64 micro-architecture names. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Wed, 06 Mar 2024 11:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69581 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69581@debbugs.gnu.org Cc: Efraim Flashner , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 69581-submit@debbugs.gnu.org id=B69581.170972331120079 (code B ref 69581); Wed, 06 Mar 2024 11:09:02 +0000 Received: (at 69581) by debbugs.gnu.org; 6 Mar 2024 11:08:31 +0000 Received: from localhost ([127.0.0.1]:49801 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhp8R-0005Dm-7O for submit@debbugs.gnu.org; Wed, 06 Mar 2024 06:08:31 -0500 Received: from mail-wm1-f54.google.com ([209.85.128.54]:48563) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhp8O-0005D7-Dc for 69581@debbugs.gnu.org; Wed, 06 Mar 2024 06:08:29 -0500 Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-412e783c94fso21266955e9.1 for <69581@debbugs.gnu.org>; Wed, 06 Mar 2024 03:07:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709723212; x=1710328012; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=jeyHAkGj1d4IfCoXmaF/YB8RAyk4ybXk5xXt+EnPY8c=; b=NstCwubvamF1220gU8yYB5GRzEYB9+b9qqD0u81tl0knAnXglLf1Tdly5dEEnbRAoc jwnlhWuIZSeCOi5o6zrNRuhBUOtw3RcnqcI8+IhlIB+AAD8Dc8EsAUkmC15zjEnAL9p6 CqpCp5TyX6QGDXQpTnWvW/RypwHupvYe/hb4l8ERX6TaWFuIng/kiWWKd7ZNxjEKwHpQ 28QYuDcqZOOL/Oi563u2HDcm/05zDFP3qQXv1N9muQxlxT+9SvnTSRaUshA4IUB/a8H7 2T+GyYFUs8JX+Sp7aGNQ/URGpkuLP/4WFrTA7JpWrIVWlvrg8xoUNsK/kGmLHpMG92Xd W29g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709723212; x=1710328012; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=jeyHAkGj1d4IfCoXmaF/YB8RAyk4ybXk5xXt+EnPY8c=; b=b60az9Wh2CFg6wkbMumCfQOsmn2xmLjXZNMfGOWwZZlCBuH5XpJNMMFieBSNdDKIyG 2OpfGBoO1G/C9YgpFMItGtIjMM1J9O+bm6wukQEYk5EPqcK194T5dyZhUHAquuSJc/6Z xFq2zrNYiJz86Rl9bhQxCUqq17aiby+LfoJ03I9B7F7VIUcD0/XxNiNDodwXwxjwvLCg uKk1DLxgp85tQm2RF5DBycsio/wFVQ9Ickl0zK3pY2gw4USGsYfsaf1ryWz75QUTtMul Z64NOmYkwbardOMeWFd/UXgoW6aa2khUwICIvURIn3lGSlbyjGApO6XkDkWMM0+LItWn M2pA== X-Gm-Message-State: AOJu0YxnNWiBeKDfE+x2raD0U432LKwyChf/RXbMRXq0dM3OuNYGpbr+ bDpu1Oai6wb18bbZNt86f1/yiVrxDff2t+UT8F8GBBZdLieM6UQYiiHp9f1x2tc= X-Google-Smtp-Source: AGHT+IGLrL67LPAue09FfkSnc218xadS7au9KrPSx0UN6JCnE5H1G71zOsCIbYRs7cU42kgbtmMySA== X-Received: by 2002:a05:600c:3148:b0:412:c3f4:a39a with SMTP id h8-20020a05600c314800b00412c3f4a39amr11327665wmo.1.1709723211417; Wed, 06 Mar 2024 03:06:51 -0800 (PST) Received: from localhost ([141.226.12.177]) by smtp.gmail.com with ESMTPSA id q13-20020adfcb8d000000b0033ce06c303csm17154037wrh.40.2024.03.06.03.06.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 03:06:51 -0800 (PST) From: Efraim Flashner Date: Wed, 6 Mar 2024 13:06:04 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/golang.scm (%go-1.18-x86_64-micro-architectures): Rename micro-architectures from x86_64-v* to x86-64-v*. * guix/cpu.scm (cpu->gcc-architecture): Return x86-64 as the fallback. (cpu->micro-architecture-level): Rename micro-architectures from x86_64-v* to x86-64-v*. (gcc-architecture->micro-architecture-level): Same. Change-Id: I37db65970417c22699ae8097b0361bccf76c1267 --- gnu/packages/golang.scm | 2 +- guix/cpu.scm | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 0bcd231a93..d781cc6055 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -870,7 +870,7 @@ (define-public go-1.17 ("powerpc64le" ,@%go-1.17-powerpc64le-micro-architectures)))))) (define %go-1.18-x86_64-micro-architectures - (list "x86_64-v1" "x86_64-v2" "x86_64-v3" "x86_64-v4")) + (list "x86-64-v1" "x86-64-v2" "x86-64-v3" "x86-64-v4")) (define-public go-1.18 (package diff --git a/guix/cpu.scm b/guix/cpu.scm index e80b74f161..b69c9b5360 100644 --- a/guix/cpu.scm +++ b/guix/cpu.scm @@ -200,7 +200,7 @@ (define (cpu->gcc-architecture cpu) ;; TODO: Recognize CENTAUR/CYRIX/NSC? - "x86_64"))) + "x86-64"))) ("aarch64" ;; Transcribed from GCC's list of aarch64 processors in aarch64-cores.def ;; What to do with big.LITTLE cores? @@ -290,12 +290,12 @@ (define (cpu->micro-architecture-level cpu) ;; v2: CMPXCHG16B, LAHF, SAHF, POPCNT, SSE3, SSE4.1, SSE4.2, SSSE3 ("avx512f" "avx512bw" "abx512cd" "abx512dq" "avx512vl" "avx" "avx2" "bmi1" "bmi2" "f16c" "fma" "movbe" - "popcnt" "sse3" "sse4_1" "sse4_2" "ssse3" => "x86_64-v4") + "popcnt" "sse3" "sse4_1" "sse4_2" "ssse3" => "x86-64-v4") ("avx" "avx2" "bmi1" "bmi2" "f16c" "fma" "movbe" - "popcnt" "sse3" "sse4_1" "sse4_2" "ssse3" => "x86_64-v3") - ("popcnt" "sse3" "sse4_1" "sse4_2" "ssse3" => "x86_64-v2") - (_ => "x86_64-v1"))) - "x86_64-v1")) + "popcnt" "sse3" "sse4_1" "sse4_2" "ssse3" => "x86-64-v3") + ("popcnt" "sse3" "sse4_1" "sse4_2" "ssse3" => "x86-64-v2") + (_ => "x86-64-v1"))) + "x86-64-v1")) (architecture ;; TODO: More architectures architecture))) @@ -304,22 +304,22 @@ (define (gcc-architecture->micro-architecture-level gcc-architecture) "Return a matching psABI micro-architecture, allowing optimizations for x86_64 CPUs for compilers which don't allow for more focused optimizing." ;; Matching gcc-architectures isn't an easy task, with the rule-of-thumb being - ;; AVX512F+ for x86_64-v4, AVX+ for x86_64-v3. + ;; AVX512F+ for x86-64-v4, AVX+ for x86-64-v3. ;; https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex (match gcc-architecture ((or "graniterapids-d" "graniterapids" "tigerlake" "sapphirerapids" "cooperlake" "icelake-server" "icelake-client" "cannonlake" "knm" "knl" "skylake-avx512" "znver4") - "x86_64-v4") + "x86-64-v4") ((or "pantherlake" "clearwaterforest" "arrowlake-s" "sierraforest" "alderlake" "skylake" "broadwell" "haswell" "znver3" "znver2" "znver1" "bdver4") - "x86_64-v3") + "x86-64-v3") ((or "sandybridge" "tremont" "goldmont-plus" "goldmont" "silvermont" "nehalem" "bonnell" "core2" "btver2" "athalon" "k8-sse3" "k8" "bdver3" "bdver2" "bdver1" "btver1" "amdfam10" "lujiazui" "yongfeng" "x86-64") - "x86_64-v1") + "x86-64-v1") (_ gcc-architecture)))