[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/07: transformations: Allow tuning go packages.
From: |
guix-commits |
Subject: |
07/07: transformations: Allow tuning go packages. |
Date: |
Wed, 12 Jul 2023 09:51:29 -0400 (EDT) |
efraim pushed a commit to branch master
in repository guix.
commit 691b97aed909d381009c13106e219f909dbda4bd
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Jun 19 16:47:58 2023 +0300
transformations: Allow tuning go packages.
* 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 @@
#: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 @@ system that builds code for MICRO-ARCHITECTURE; otherwise
raise an error."
'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 @@ system that builds code for MICRO-ARCHITECTURE; otherwise
raise an error."
(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 @@ micro-architectures:
(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))
- branch master updated (f2f27c4952 -> 691b97aed9), guix-commits, 2023/07/12
- 03/07: guix: cpu: Rewrite fallback for x86_64 cpu->gcc-architecture., guix-commits, 2023/07/12
- 02/07: guix: cpu: Add generalized CPU matching., guix-commits, 2023/07/12
- 07/07: transformations: Allow tuning go packages.,
guix-commits <=
- 05/07: guix: cpu: Add gcc-architecture->micro-architecture-level mapping., guix-commits, 2023/07/12
- 04/07: guix: cpu: Refactor cpu->gcc-architecture., guix-commits, 2023/07/12
- 06/07: gnu: go: Add CPU tuning targets., guix-commits, 2023/07/12
- 01/07: gnu: %gcc-11-x86_64-micro-architectures: Add psabi entries., guix-commits, 2023/07/12