From patchwork Tue Jun 20 07:51:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 51096 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 D974F27BBEA; Tue, 20 Jun 2023 08:52:42 +0100 (BST) 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 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 9A80127BBE2 for ; Tue, 20 Jun 2023 08:52:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qBW9p-0003nh-1S; Tue, 20 Jun 2023 03:52:09 -0400 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 1qBW9n-0003mt-3W for guix-patches@gnu.org; Tue, 20 Jun 2023 03:52:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qBW9m-0006O9-Nu; Tue, 20 Jun 2023 03:52:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qBW9k-00056j-Fs; Tue, 20 Jun 2023 03:52:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64188] [PATCH 7/8] guix: cpu: Add gcc-architecture->generic-architecture mapping. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: mail@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: Tue, 20 Jun 2023 07:52:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64188@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 64188-submit@debbugs.gnu.org id=B64188.168724748819528 (code B ref 64188); Tue, 20 Jun 2023 07:52:04 +0000 Received: (at 64188) by debbugs.gnu.org; 20 Jun 2023 07:51:28 +0000 Received: from localhost ([127.0.0.1]:57965 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBW9A-00054o-6x for submit@debbugs.gnu.org; Tue, 20 Jun 2023 03:51:28 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:44348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBW95-00053u-UI for 64188@debbugs.gnu.org; Tue, 20 Jun 2023 03:51:24 -0400 Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-3f8fa2cf847so41801115e9.1 for <64188@debbugs.gnu.org>; Tue, 20 Jun 2023 00:51:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687247478; x=1689839478; 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=rPluJ7odc7AC6rHWh4OctnBPj2llW0xVIDr/xBgkVyI=; b=X/uih4B7MPKgLDRI8x3ng7kAryL4dYIjyaEfA3HNopq71zGa6BD32dVDQX2Gez4ZOc 7rGJy592hMiO2zwl+eyKmfkrS2NIhdNEc4O3kpccyTDZi0458s4EqTcaMUfUOMLUVgPV Lx103zhEll8cJp2vxdtZ0xjJbDM5QYZC79mV9+DVgcKkDkKHpIuSCKoeXdTa2W5GogW/ xjae7NWH9pbAxSJ1yhAy9YuJIRumh3H48IH7XSOQTnTa0f9Spkmq8lFNDIYG1X72Q3FK hvahnTcvAE+36qHiRvq7VAUdQXEL4nrpb9hihqpc9dqvhXe0AySi95tMrjv3uuAGx2D5 Hr3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687247478; x=1689839478; 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=rPluJ7odc7AC6rHWh4OctnBPj2llW0xVIDr/xBgkVyI=; b=Tx6SOLayutRb+Dv4kQAorFytPQ9oM/MTPvd6w+jbrTQQCShF+8BgPv+yO1lJBhPt2o dx7V/HPqDX2jBa1/TmAGCJbQyHVQCaNGXjgQcX+8DmVfggUN/6S0l32tyMIK8PnRZIck vMvRgVGK/BUZpkMFoZPbTNN4AH175Z19eTHppyuDCMiqgjPEIvIji6C7vOt4X0gYGNBP Vkd5Naygg+vDiXCY4VTRlkENlSYmKxMbr0nwsgx756okOXu/LvWd6BBYWMZ8UtsRnegu BcYDfvqslTl8MUe0q/G3Dqirj83fwNbktTWz5ULrIWUzD1+R8BK2jsA90H46OM/BFy6e mtow== X-Gm-Message-State: AC+VfDxjTKY0Jhv+6/JV17Xnaj7LsB2p//nY2Gwjr8GwM9+lFmih6tjG 5cAhwVt6qya0ZFHPEXWj29Hnwc9NkKnPtbkG X-Google-Smtp-Source: ACHHUZ5sFRICEXIpDdAO1hOyWNtnMYZYnIV4WHyMQTIYfV+XqPwNxkm9E/NuEu+tmSzS8ipTuS0P0g== X-Received: by 2002:a1c:7211:0:b0:3f9:206:c3a6 with SMTP id n17-20020a1c7211000000b003f90206c3a6mr7315291wmc.20.1687247478054; Tue, 20 Jun 2023 00:51:18 -0700 (PDT) Received: from localhost ([188.120.129.124]) by smtp.gmail.com with ESMTPSA id t20-20020a1c7714000000b003f900678815sm1603581wmi.39.2023.06.20.00.51.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 00:51:17 -0700 (PDT) From: Efraim Flashner Date: Tue, 20 Jun 2023 10:51:08 +0300 Message-Id: <12026d29411b4ef0597d2f40d874ad2fcc49a087.1687247150.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.40.1 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 * guix/cpu.scm (gcc-architecture->generic-architecture): New variable. --- guix/cpu.scm | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/guix/cpu.scm b/guix/cpu.scm index ddfa4f20bb..af26e2280b 100644 --- a/guix/cpu.scm +++ b/guix/cpu.scm @@ -33,7 +33,8 @@ (define-module (guix cpu) cpu-flags cpu->gcc-architecture - cpu->generic-architecture)) + cpu->generic-architecture + gcc-architecture->generic-architecture)) ;;; Commentary: ;;; @@ -284,3 +285,21 @@ (define (cpu->generic-architecture cpu) (architecture ;; TODO: More architectures architecture))) + +(define (gcc-architecture->generic-architecture gcc-architecture) + "Return a generalized micro-architecture, using an inexact matching to provide +'good enough' optimizations." + (match gcc-architecture + ((or "grandridge" "graniterapids" "sierraforest" "tigerlake" + "sapphirerapids" "cooperlake" "icelake-server" "icelake-client" + "cannonlake" "knm" "knl" "skylake-avx512" "alderlake" "skylake" + "broadwell" "haswell" + "znver4" "znver3" "znver2" "znver1" "bdver4") + "x86_64-v3") + ((or "sandybridge" "tremont" "goldmont-plus" "goldmont" "silvermont" + "nehalem" "bonnell" "core2" + "btver2" "athalon" "k8-sse3" "k8" "bdver3" "bdver2" "bdver1" "btver1" + "amdfam10" + "lujiazui" "x86-64") + "x86_64-v1") + (_ gcc-architecture)))