From patchwork Tue Jun 20 07:51:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 51097 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 DA73D27BBE9; Tue, 20 Jun 2023 08:52:44 +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=ham 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 6273227BBE2 for ; Tue, 20 Jun 2023 08:52:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qBW9o-0003nK-27; Tue, 20 Jun 2023 03:52:08 -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 1qBW9l-0003mB-EU for guix-patches@gnu.org; Tue, 20 Jun 2023 03:52:06 -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 1qBW9k-0006NS-R4; Tue, 20 Jun 2023 03:52:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qBW9i-000565-Po; Tue, 20 Jun 2023 03:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64188] [PATCH 3/8] 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: Tue, 20 Jun 2023 07:52:02 +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.168724747919468 (code B ref 64188); Tue, 20 Jun 2023 07:52:02 +0000 Received: (at 64188) by debbugs.gnu.org; 20 Jun 2023 07:51:19 +0000 Received: from localhost ([127.0.0.1]:57953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBW91-00053v-DA for submit@debbugs.gnu.org; Tue, 20 Jun 2023 03:51:19 -0400 Received: from mail-wm1-f45.google.com ([209.85.128.45]:53375) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBW8y-000538-50 for 64188@debbugs.gnu.org; Tue, 20 Jun 2023 03:51:16 -0400 Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-3f8c65020dfso47319465e9.2 for <64188@debbugs.gnu.org>; Tue, 20 Jun 2023 00:51:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687247470; x=1689839470; 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=6rB6+88bEE0VUXQmBy2pUIf2SRFPVhTx0NwrBSxwUb0=; b=pi0sMtgr8ymlFJJzA53Ri1lpehR+RlnH77/MLaiR3LhGEGCmu2s6S5O6xE4xLeIFMW CFIjcbGVL92DGtt5EmPLNNjwPNgaWUkul0VUEUPIVyTXUJP5vzOKDq5gqM9gpz9vu3zs 0q6Ivq1MYKj2DRqY5sijiWDr41/DGNjM55z67eYHTrgmyyBQfNmwnMRLwHN+xe5Jp2Ob OAEVzZxeKPpxh8jdCUAwR0ObiIxhCeQ2DIRpDp9LUdwqQjQsPeRWZWMYmlfFuluB7Ahl CyjpBdyk2yDudDbblLgrArG3aYm+Ds9C2Nhnwc+gI9x8FVBrlwb+C997hmnMX88jXcqk 7BDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687247470; x=1689839470; 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=6rB6+88bEE0VUXQmBy2pUIf2SRFPVhTx0NwrBSxwUb0=; b=LPjXOa8UBlz8897V5PGtkhVxNc9y6C7I3pZHEOE68TGpqjuQzDEQHlMdh1CVsAWUsK W8HchZgwNV/VB7N3T6kC1XouRYYdYk7fOna3Df479vqa6r9k5NQFBTxszeR7r7/2z3w2 BXWHdSHPrRh9QCQaRlrzQ7TSb/RTsYG45yWvxc1Gph+0+iuQchjlWbWi6B4ZlxzXxwC2 t7m5vBx8sxIis3icVUR84fb/aMqwWAWg8c9TuHkf7x0TqgPXEdE1mqK8AgWuuupI42NE 1+JrwSK30c1qoZxWM87c/x2YtIULB0G6tP/Us60Jj6/9c/Hcf0Ci1HTjdP3r1DlX1OrQ n+Eg== X-Gm-Message-State: AC+VfDxVCg/gI0BbGc7CwgGQJ/k/efEY0DhNubVBIkkUQV/flD7PJlrv zjxtP745AK5qdb8jInwWlkOHUTfBcxZkrHVe X-Google-Smtp-Source: ACHHUZ6PqHuGA3lAc2Hhys5vxLK7Bgg/2JoAXDTTd4M+AqeCGsvYLlRmKbPD+GS2d0vClicdtIWyRw== X-Received: by 2002:a05:600c:22d8:b0:3f8:f884:ebec with SMTP id 24-20020a05600c22d800b003f8f884ebecmr9197668wmg.17.1687247470358; Tue, 20 Jun 2023 00:51:10 -0700 (PDT) Received: from localhost ([188.120.129.124]) by smtp.gmail.com with ESMTPSA id f20-20020a1c6a14000000b003f8f884ebe5sm1686468wmc.2.2023.06.20.00.51.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 00:51:10 -0700 (PDT) From: Efraim Flashner Date: Tue, 20 Jun 2023 10:51:04 +0300 Message-Id: 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->generic-architecture. --- guix/cpu.scm | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/guix/cpu.scm b/guix/cpu.scm index e6102e3d14..e500664503 100644 --- a/guix/cpu.scm +++ b/guix/cpu.scm @@ -210,21 +210,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->generic-architecture cpu))) ;; TODO: Recognize CENTAUR/CYRIX/NSC?