From patchwork Wed Mar 6 11:06:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 61396 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 0252F27BBEA; Wed, 6 Mar 2024 11:09:13 +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 6DC6227BBE9 for ; Wed, 6 Mar 2024 11:09:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rhp8d-0000qJ-0B; Wed, 06 Mar 2024 06:08:43 -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-0000oA-OA 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 1rhp8T-0007Xh-Fu; 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 1rhp8y-0005Gr-4B; Wed, 06 Mar 2024 06:09:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69581] [PATCH 05/11] guix: cpu: Enable tuning for i686-linux. 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:04 +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.170972331920139 (code B ref 69581); Wed, 06 Mar 2024 11:09:04 +0000 Received: (at 69581) by debbugs.gnu.org; 6 Mar 2024 11:08:39 +0000 Received: from localhost ([127.0.0.1]:49809 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhp8V-0005ET-Ol for submit@debbugs.gnu.org; Wed, 06 Mar 2024 06:08:39 -0500 Received: from mail-wm1-f42.google.com ([209.85.128.42]:48284) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhp8R-0005DD-NH for 69581@debbugs.gnu.org; Wed, 06 Mar 2024 06:08:33 -0500 Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-412ffd96107so128715e9.0 for <69581@debbugs.gnu.org>; Wed, 06 Mar 2024 03:08:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709723215; x=1710328015; 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=busqTtQaBQJ9UKgL1yHxShAv1kKg6TJvdPkwbjsQ5gc=; b=FXRFM4raWrOhgkLsQaoD9R51SsOomErBefpy50pRvDLugG6mLlOBCfakG+lvZZNlQR o1LP19TVSp3DLtXuUbqFIfeQw+pAZ8LsP7yeJfilvOiIw6mqSbZAeymgHIMHCIqpqpbA EgycO5RoVQHfJWVziAd4Fc1T9NDSGYdZjkDoqucyVODjPzODR0XgmqWPegGgohMGjdnW MsdEKII9f82arEcCQxx9G2KJ277qE8/5LYb0qQ9WggmZywYQ+O5Onx7e1H/fX0H00o9T dhoJu4PgZeCyJa72FKcd/NX9aEF9GmGyo/IeH5YPrVgeYtlUpBxYbMnNMWbQdtvLQx1y zlBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709723215; x=1710328015; 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=busqTtQaBQJ9UKgL1yHxShAv1kKg6TJvdPkwbjsQ5gc=; b=Gl8EzjOvJu9ldMa+beBwOZsmnT1R6+JDznzFDPMW5jkp4Cxl6isTuVpiuGsfabE3Il GU8Pg1YerYqHIf7RzCP8k/2ZO3JDsSrUGhnJM9dQsNAcXpVBg1QweCi3XjCoLOPUDaU2 G0GRwXTVzshxLtHPVir8TS3deWZaDCTkduKGN1hkJhYCM+j3z1sn0SaIJjTpC86gYaZ9 EkIfwqWsUYIY8qxY/BkYXmPdKifiKtOxDu3uvshGReLPpRpUgZVLGDM1b/7QPjCcHQKV 0VNPVXsA0pOQNQ9nSR1B5hLC4sJn33JhDxRpba132uODIz5hFOLwvAwAOrKrpLFLsnhI LzNQ== X-Gm-Message-State: AOJu0YzzEhTcfVQoH9xUEJlBGUSp0tFbYhbxRT8GgsFHjARVSJpyMBEq /RlX+j+TfVxrvfjV9XhWC4rf+KEYkkW6Efl/bhPGtZO8PHWSinstoundsuz1WLU= X-Google-Smtp-Source: AGHT+IHPsNAadcFSpHCZg1xzfoM4aysIfk3X6r17Z/yxO9/YpYXBe/M+sQ6PRhJi8HBOi1fV2wNg+w== X-Received: by 2002:a05:600c:3591:b0:412:ebd6:3466 with SMTP id p17-20020a05600c359100b00412ebd63466mr3647674wmq.13.1709723215029; Wed, 06 Mar 2024 03:06:55 -0800 (PST) Received: from localhost ([141.226.12.177]) by smtp.gmail.com with ESMTPSA id ay30-20020a05600c1e1e00b00412fc25691bsm408580wmb.38.2024.03.06.03.06.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 03:06:54 -0800 (PST) From: Efraim Flashner Date: Wed, 6 Mar 2024 13:06:06 +0200 Message-ID: <33a8d78738553f464f5974a0d2cba981e65ced78.1709722620.git.efraim@flashner.co.il> 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/gcc.scm (gcc-7, gcc-10, gcc-11, gcc-12, gcc-13) [properties]: In compiler-cpu-architectures use the x86_64-micro-architectures list for i686. * guix/cpu.scm (cpu->gcc-architecture): Expand the x86_64 case to also support i686. Change-Id: I0b820ceb715960db5e702814fa278dc8c619a836 --- gnu/packages/gcc.scm | 5 +++++ guix/cpu.scm | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 3555d12c44..c8902de6a0 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -673,6 +673,7 @@ (define-public gcc-7 `((compiler-cpu-architectures ("aarch64" ,@%gcc-7.5-aarch64-micro-architectures) ("armhf" ,@%gcc-7.5-armhf-micro-architectures) + ("i686" ,@%gcc-7.5-x86_64-micro-architectures) ("x86_64" ,@%gcc-7.5-x86_64-micro-architectures)) ,@(package-properties gcc-6))))) @@ -729,6 +730,7 @@ (define-public gcc-10 `((compiler-cpu-architectures ("aarch64" ,@%gcc-10-aarch64-micro-architectures) ("armhf" ,@%gcc-10-armhf-micro-architectures) + ("i686" ,@%gcc-10-x86_64-micro-architectures) ("x86_64" ,@%gcc-10-x86_64-micro-architectures)) ,@(package-properties gcc-8))))) @@ -764,6 +766,7 @@ (define-public gcc-11 `((compiler-cpu-architectures ("aarch64" ,@%gcc-11-aarch64-micro-architectures) ("armhf" ,@%gcc-11-armhf-micro-architectures) + ("i686" ,@%gcc-11-x86_64-micro-architectures) ("x86_64" ,@%gcc-11-x86_64-micro-architectures)) ,@(package-properties gcc-8))))) @@ -786,6 +789,7 @@ (define-public gcc-12 `((compiler-cpu-architectures ("aarch64" ,@%gcc-12-aarch64-micro-architectures) ("armhf" ,@%gcc-12-armhf-micro-architectures) + ("i686" ,@%gcc-12-x86_64-micro-architectures) ("x86_64" ,@%gcc-12-x86_64-micro-architectures)) ,@(package-properties gcc-11))))) @@ -808,6 +812,7 @@ (define-public gcc-13 `((compiler-cpu-architectures ("aarch64" ,@%gcc-13-aarch64-micro-architectures) ("armhf" ,@%gcc-13-armhf-micro-architectures) + ("i686" ,@%gcc-13-x86_64-micro-architectures) ("x86_64" ,@%gcc-13-x86_64-micro-architectures)) ,@(package-properties gcc-11))))) diff --git a/guix/cpu.scm b/guix/cpu.scm index 6f9e8daa61..840215cff0 100644 --- a/guix/cpu.scm +++ b/guix/cpu.scm @@ -113,7 +113,7 @@ (define (cpu->gcc-architecture cpu) "Return the architecture name, suitable for GCC's '-march' flag, that corresponds to CPU, a record as returned by 'current-cpu'." (match (cpu-architecture cpu) - ("x86_64" + ((or "x86_64" "i686") ;; Transcribed from GCC's 'host_detect_local_cpu' in driver-i386.cc. (letrec-syntax ((if-flags (syntax-rules (=>) ((_) @@ -200,7 +200,9 @@ (define (cpu->gcc-architecture cpu) ;; TODO: Recognize CENTAUR/CYRIX/NSC? - "x86-64"))) + (match (cpu-architecture cpu) + ("x86_64" "x86-64") + (_ "generic"))))) ("aarch64" ;; Transcribed from GCC's list of aarch64 processors in aarch64-cores.def ;; What to do with big.LITTLE cores?