all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Efraim Flashner <efraim@flashner.co.il>
To: 64188@debbugs.gnu.org
Cc: "Efraim Flashner" <efraim@flashner.co.il>,
	"Christopher Baines" <mail@cbaines.net>,
	"Josselin Poiret" <dev@jpoiret.xyz>,
	"Ludovic Courtès" <ludo@gnu.org>,
	"Mathieu Othacehe" <othacehe@gnu.org>,
	"Ricardo Wurmus" <rekado@elephly.net>,
	"Simon Tournier" <zimon.toutoune@gmail.com>,
	"Tobias Geerinckx-Rice" <me@tobias.gr>
Subject: [bug#64188] [PATCH v2 7/7] transformations: Allow tuning go packages.
Date: Mon, 26 Jun 2023 15:38:43 +0300	[thread overview]
Message-ID: <bf0c99781c1258907bd4e7e532ef2d02709fd9d1.1687781377.git.efraim@flashner.co.il> (raw)
In-Reply-To: <cover.1687781377.git.efraim@flashner.co.il>

* guix/transformations.scm (build-system-with-tuning-compiler): When
checking if a microarchitecture is supported by the compiler, also check
if it is a go compiler which supports that psabi.  Add a phase after
'setup-go-environment to set the go microarchitecture.
---
 guix/transformations.scm | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/guix/transformations.scm b/guix/transformations.scm
index a289f81219..92d9c89c0e 100644
--- a/guix/transformations.scm
+++ b/guix/transformations.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2016-2023 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2021 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2023 Sarthak Shah <shahsarthakw@gmail.com>
+;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -32,7 +33,9 @@ (define-module (guix transformations)
   #:autoload   (guix upstream) (package-latest-release
                                 upstream-source-version
                                 upstream-source-signature-urls)
-  #:autoload   (guix cpu) (current-cpu cpu->gcc-architecture)
+  #:autoload   (guix cpu) (current-cpu
+                           cpu->gcc-architecture
+                           gcc-architecture->micro-architecture-level)
   #:use-module (guix utils)
   #:use-module (guix memoization)
   #:use-module (guix gexp)
@@ -516,7 +519,9 @@ (define (build-system-with-tuning-compiler bs micro-architecture)
                                                  'compiler-cpu-architectures)
                                       p))
                                 (_ #f))
-                              (bag-build-inputs lowered))))
+                              (bag-build-inputs lowered)))
+           (psabi        (gcc-architecture->micro-architecture-level
+                           micro-architecture)))
       (unless compiler
         (raise (formatted-message
                 (G_ "failed to determine which compiler is used"))))
@@ -528,8 +533,11 @@ (define (build-system-with-tuning-compiler bs micro-architecture)
                   (G_ "failed to determine whether ~a supports ~a")
                   (package-full-name compiler)
                   micro-architecture)))
-        (unless (member micro-architecture
-                        (or (assoc-ref lst architecture) '()))
+        (unless (or (member micro-architecture
+                            (or (assoc-ref lst architecture) '()))
+                    (and (string=? (package-name compiler) "go")
+                         (member psabi
+                                 (or (assoc-ref lst architecture) '()))))
           (raise
            (make-compound-condition
             (formatted-message
@@ -556,6 +564,27 @@ (define (build-system-with-tuning-compiler bs micro-architecture)
 
       (bag
         (inherit lowered)
+        (arguments
+          (substitute-keyword-arguments (bag-arguments lowered)
+          ;; We add the tuning parameter after the default GO flags are set.
+          ((#:phases phases '%standard-phases)
+             #~(modify-phases #$phases
+                 (add-after 'setup-go-environment 'set-microarchitecture
+                   (lambda _
+                     (cond
+                       ((string-prefix? "arm" #$psabi)
+                        (setenv "GOARM" (string-take-right #$psabi 1))
+                        (format #t "Setting GOARM to ~s."
+                                (getenv "GOARM")))
+                       ((string-prefix? "powerpc" #$psabi)
+                        (setenv "GOPPC64" #$psabi)
+                        (format #t "Setting GOPPC64 to ~s."
+                                (getenv "GOPPC64")))
+                       ((string-prefix? "x86_64" #$psabi)
+                        (setenv "GOAMD" (string-take-right #$psabi 2))
+                        (format #t "Setting GOAMD to ~s.\n"
+                                (getenv "GOAMD")))
+                       (else #t))))))))
         (build-inputs
          ;; Arrange so that the compiler wrapper comes first in $PATH.
          `(("tuning-compiler" ,(tuning-compiler micro-architecture))
-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted





      parent reply	other threads:[~2023-06-26 12:43 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-20  7:48 [bug#64188] [PATCH 0/8] More package tuning Efraim Flashner
2023-06-20  7:51 ` [bug#64188] [PATCH 1/8] gnu: %gcc-11-x86_64-micro-architectures: Add generic options Efraim Flashner
2023-06-25 20:49   ` [bug#64188] [PATCH 0/8] More package tuning Ludovic Courtès
2023-06-20  7:51 ` [bug#64188] [PATCH 2/8] guix: cpu: Add inexact CPU matching Efraim Flashner
2023-06-20  7:51 ` [bug#64188] [PATCH 3/8] guix: cpu: Rewrite fallback for x86_64 cpu->gcc-architecture Efraim Flashner
2023-06-20  7:51 ` [bug#64188] [PATCH 4/8] guix: cpu: Refactor cpu->gcc-architecture Efraim Flashner
2023-06-20  7:51 ` [bug#64188] [PATCH 5/8] gnu: go: Add CPU tuning targets Efraim Flashner
2023-06-20  7:51 ` [bug#64188] [PATCH 6/8] transformations: Allow tuning go packages Efraim Flashner
2023-06-25 20:52   ` [bug#64188] [PATCH 0/8] More package tuning Ludovic Courtès
2023-06-26  8:34     ` Efraim Flashner
2023-07-13 15:27       ` Ludovic Courtès
2023-07-17 12:02         ` Efraim Flashner
2023-07-17 15:41           ` Ludovic Courtès
2023-07-18 11:17             ` Efraim Flashner
2023-07-19  8:39               ` Josselin Poiret via Guix-patches via
2023-08-07  7:33               ` Ludovic Courtès
2023-08-21 16:54                 ` bug#64188: " Ludovic Courtès
2023-06-20  7:51 ` [bug#64188] [PATCH 7/8] guix: cpu: Add gcc-architecture->generic-architecture mapping Efraim Flashner
2023-06-25 20:54   ` [bug#64188] [PATCH 0/8] More package tuning Ludovic Courtès
2023-06-26  8:34     ` Efraim Flashner
2023-06-20  7:51 ` [bug#64188] [PATCH 8/8] transformations: Allow autotuning for go packages Efraim Flashner
2023-06-25 20:47 ` [bug#64188] [PATCH 0/8] More package tuning Ludovic Courtès
2023-06-26  8:34   ` Efraim Flashner
2023-06-26 12:38 ` [bug#64188] [PATCH v2 0/7] " Efraim Flashner
2023-06-26 12:38   ` [bug#64188] [PATCH v2 1/7] gnu: %gcc-11-x86_64-micro-architectures: Add psabi entries Efraim Flashner
2023-06-26 12:38   ` [bug#64188] [PATCH v2 2/7] guix: cpu: Add generalized CPU matching Efraim Flashner
2023-06-26 12:38   ` [bug#64188] [PATCH v2 3/7] guix: cpu: Rewrite fallback for x86_64 cpu->gcc-architecture Efraim Flashner
2023-06-26 12:38   ` [bug#64188] [PATCH v2 4/7] guix: cpu: Refactor cpu->gcc-architecture Efraim Flashner
2023-06-26 12:38   ` [bug#64188] [PATCH v2 5/7] guix: cpu: Add gcc-architecture->micro-architecture-level mapping Efraim Flashner
2023-06-26 12:38   ` [bug#64188] [PATCH v2 6/7] gnu: go: Add CPU tuning targets Efraim Flashner
2023-06-26 12:38   ` Efraim Flashner [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=bf0c99781c1258907bd4e7e532ef2d02709fd9d1.1687781377.git.efraim@flashner.co.il \
    --to=efraim@flashner.co.il \
    --cc=64188@debbugs.gnu.org \
    --cc=dev@jpoiret.xyz \
    --cc=ludo@gnu.org \
    --cc=mail@cbaines.net \
    --cc=me@tobias.gr \
    --cc=othacehe@gnu.org \
    --cc=rekado@elephly.net \
    --cc=zimon.toutoune@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.