From patchwork Mon Jun 26 12:38:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 51355 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 1E59727BBE9; Mon, 26 Jun 2023 13:47:00 +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 D1B5027BBE2 for ; Mon, 26 Jun 2023 13:46:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qDlWK-0000F3-Mc; Mon, 26 Jun 2023 08:40:40 -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 1qDlVq-0008K6-Vq for guix-patches@gnu.org; Mon, 26 Jun 2023 08:40:12 -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 1qDlVo-0005xt-DK; Mon, 26 Jun 2023 08:40:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qDlVj-0004IR-Le; Mon, 26 Jun 2023 08:40:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64188] [PATCH v2 3/7] guix: cpu: Rewrite fallback for x86_64 cpu->gcc-architecture. 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: Mon, 26 Jun 2023 12:40:03 +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.168778315316369 (code B ref 64188); Mon, 26 Jun 2023 12:40:03 +0000 Received: (at 64188) by debbugs.gnu.org; 26 Jun 2023 12:39:13 +0000 Received: from localhost ([127.0.0.1]:44762 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDlUu-0004Fr-QI for submit@debbugs.gnu.org; Mon, 26 Jun 2023 08:39:13 -0400 Received: from mail-lf1-f44.google.com ([209.85.167.44]:46162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qDlUp-0004Eo-KO for 64188@debbugs.gnu.org; Mon, 26 Jun 2023 08:39:08 -0400 Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-4f957a45b10so3990141e87.0 for <64188@debbugs.gnu.org>; Mon, 26 Jun 2023 05:39:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687783142; x=1690375142; 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=Q3SrNB3/9BknWXrVXQY1Lo9YB8E8g/DrbnvvbG6ob7w=; b=l+Xq46yrqW1kFcI2yxrg6goPt5HxGJusMUJYK+fYwDdjtk3xrY9zb7Tel72gVKJxDh O8MP92BthQjFgkPoegtPE1ZHmB8QFzOuEls5732Mak/jjZ0bpJPjxHX361TukoGPeoNb hOP/Z4D0+7mfhHBEzglJZHR83Davtivw2jRe/vLsXSdnekrdJBdsqr65G4IftDQz7qIU cAVqm62eCeDPed1yOx5/E20LohodDgRM5eA66/wyxXFeXnzEBTBcXOqQhsWuwp5Mlzow EV5qRhlYju+5HqNATqeEr4cBll7+IsHslKfWo8XgatSdYFYOAUVlfNrDgetIZbYG1zKT PFAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687783142; x=1690375142; 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=Q3SrNB3/9BknWXrVXQY1Lo9YB8E8g/DrbnvvbG6ob7w=; b=lPNkg8dQs22qEpPJw9fx9S/Jf2CsI2xV1TQ7ONLDZZbbUN0at3Tet/IOj6r45texvb JRpjT4hhZyrk+ADGtpbNCelagHu3GBBQ64ufWsE4tTh8LhEiJBm0zeXlBIksRlIMZLKB F0/q35LviWFLyszzc7Rrx7eoWVQOdgnEwWc4UYNOEnd/ssdmeq9IjPnzJifW7yXBZqRO jyV+RSU56EqU5FqogbdtNdLP4D/pSzMLmiQHzYY0TTe6WddKYnaqNnJh/zIHsP1ZIldc Kw1W27tar/7q3fqkfFBOPrF6urvUOp2efOkLItFPz8txI2gFntIOdjTNq2lSQkSGJedc KRcw== X-Gm-Message-State: AC+VfDw5Nrcxtrph0OjnP3C45I18vnKy+lMBn8ZsV6MtleMu0TuViC4O Eb98I6VqY/UJXy7AQYumT1cJKfZOmTmRrA== X-Google-Smtp-Source: ACHHUZ6dN7rxn4nRHGKrbLaCdqr7ZzbAcdorsG2oeLpiOCa4Vr99JWJ/imABCTdOffzIz+aEPJBm3A== X-Received: by 2002:a05:6512:2314:b0:4fa:21d4:b3ca with SMTP id o20-20020a056512231400b004fa21d4b3camr2744761lfu.2.1687783141645; Mon, 26 Jun 2023 05:39:01 -0700 (PDT) Received: from localhost ([188.120.129.124]) by smtp.gmail.com with ESMTPSA id y17-20020a1c4b11000000b003f9b24cf881sm10515134wma.16.2023.06.26.05.39.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 05:39:01 -0700 (PDT) From: Efraim Flashner Date: Mon, 26 Jun 2023 15:38:39 +0300 Message-Id: <4a54a8434bd741fb7bf2d3067fd8dcec106b3ece.1687781377.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 (cpu->gcc-architecture): Adjust the fallback case to use cpu->micro-architecture-level. --- guix/cpu.scm | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/guix/cpu.scm b/guix/cpu.scm index 3fc12327ed..1a75b8ac62 100644 --- a/guix/cpu.scm +++ b/guix/cpu.scm @@ -209,21 +209,7 @@ (define (cpu->gcc-architecture cpu) (if (and (= 7 (cpu-family cpu)) (= #x3b (cpu-model cpu))) "lujiazui" - (if-flags ("avx512" => "knl") - ("adx" => "broadwell") - ("avx2" => "haswell") - ;; TODO: tigerlake, cooperlake, etc. - ("avx" => "sandybridge") - ("sse4_2" "gfni" => "tremont") - ("sse4_2" "sgx" => "goldmont-plus") - ("sse4_2" "xsave" => "goldmont") - ("sse4_2" "movbe" => "silvermont") - ("sse4_2" => "nehalem") - ("ssse3" "movbe" => "bonnell") - ("ssse3" "sse3" "longmode" => "nocona") - ("ssse3" "sse3" "lm" => "nocona") - ("ssse3" "sse3" => "prescott") - ("ssse3" => "core2")))) + (cpu->micro-architecture-level cpu)) ;; TODO: Recognize CENTAUR/CYRIX/NSC?