Subject: [PATCH v2 7/7] transformations: Allow tuning go packages.

From: Efraim Flashner <[email-masked]>
Date: Mon, 26 Jun 2023 15:38:43 +0300

* 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 <[email-masked]>
 ;;; Copyright © 2021 Marius Bakke <[email-masked]>
 ;;; Copyright © 2023 Sarthak Shah <[email-masked]>
+;;; Copyright © 2023 Efraim Flashner <[email-masked]>
 ;;;
 ;;; 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   <[email-masked]>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted