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 8/8] transformations: Allow autotuning for go packages.
Date: Tue, 20 Jun 2023 10:51:09 +0300 [thread overview]
Message-ID: <08188fe179fbbbe815ad75d39b14c6c8f6cca678.1687247150.git.efraim@flashner.co.il> (raw)
In-Reply-To: <cover.1687247150.git.efraim@flashner.co.il>
* guix/transformations.scm (tuned-package)[build-system]: When the
inherited package uses the go-build-system, use a generic
micro-architecture.
[arguments]: Adjust the 'set-microarchitecture phase for changes in the
code.
---
guix/transformations.scm | 50 ++++++++++++++++++++++------------------
1 file changed, 27 insertions(+), 23 deletions(-)
diff --git a/guix/transformations.scm b/guix/transformations.scm
index 47eb4b0515..122b0e74aa 100644
--- a/guix/transformations.scm
+++ b/guix/transformations.scm
@@ -33,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->generic-architecture)
#:use-module (guix utils)
#:use-module (guix memoization)
#:use-module (guix gexp)
@@ -568,16 +570,19 @@ (define (build-system-with-tuning-compiler bs micro-architecture)
(define (tuned-package p micro-architecture)
"Return package P tuned for MICRO-ARCHITECTURE."
+ (let ((generic-micro-arch (gcc-architecture->generic-architecture
+ micro-architecture)))
(package
(inherit p)
(build-system
- ;; The go compiler doesn't need to be wrapped.
- ;; XXX: This is where we check for supported micro-architectures.
- (if (eq? (build-system-name (package-build-system p))
- 'go)
+ ;; The go compiler doesn't need to be wrapped but we want the error
+ ;; checking to make sure we're targeting a recognized optimization target.
+ (build-system-with-tuning-compiler
(package-build-system p)
- (build-system-with-tuning-compiler (package-build-system p)
- micro-architecture)))
+ (if (eq? (build-system-name (package-build-system p))
+ 'go)
+ generic-micro-arch
+ micro-architecture)))
(arguments
;; The machine building this package may or may not be able to run code
;; for MICRO-ARCHITECTURE. Because of that, skip tests; they are run for
@@ -591,21 +596,20 @@ (define (tuned-package p micro-architecture)
#~(modify-phases #$phases
(add-after 'setup-go-environment 'set-microarchitecture
(lambda _
- (let ((microarch #$micro-architecture))
- (cond
- ((string-prefix? "arm" microarch)
- (setenv "GOARM" (string-take-right microarch 1))
- (format #t "Setting GOARM to ~s."
- (getenv "GOARM")))
- ((string-prefix? "powerpc" microarch)
- (setenv "GOPPC64" microarch)
- (format #t "Setting GOPPC64 to ~s."
- (getenv "GOPPC64")))
- ((string-prefix? "x86_64" microarch)
- (setenv "GOAMD" (string-take-right microarch 2))
- (format #t "Setting GOAMD to ~s.\n"
- (getenv "GOAMD")))
- (else #t))))))
+ (cond
+ ((string-prefix? "arm" #$generic-micro-arch)
+ (setenv "GOARM" (string-take-right #$generic-micro-arch 1))
+ (format #t "Setting GOARM to ~s."
+ (getenv "GOARM")))
+ ((string-prefix? "powerpc" #$generic-micro-arch)
+ (setenv "GOPPC64" #$generic-micro-arch)
+ (format #t "Setting GOPPC64 to ~s."
+ (getenv "GOPPC64")))
+ ((string-prefix? "x86_64" #$generic-micro-arch)
+ (setenv "GOAMD" (string-take-right #$generic-micro-arch 2))
+ (format #t "Setting GOAMD to ~s.\n"
+ (getenv "GOAMD")))
+ (else #t)))))
phases))))
(properties
@@ -613,7 +617,7 @@ (define (tuned-package p micro-architecture)
;; Remove the 'tunable?' property so that 'package-tuning' does not
;; call 'tuned-package' again on this one.
- ,@(alist-delete 'tunable? (package-properties p))))))
+ ,@(alist-delete 'tunable? (package-properties p)))))))
(define (tunable-package? package)
"Return true if package PACKAGE is \"tunable\"--i.e., if tuning it for the
--
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
next prev parent reply other threads:[~2023-06-20 7:52 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 ` Efraim Flashner [this message]
2023-06-25 20:47 ` 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 ` [bug#64188] [PATCH v2 7/7] transformations: Allow tuning go packages Efraim Flashner
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=08188fe179fbbbe815ad75d39b14c6c8f6cca678.1687247150.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.