From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kM0KM+3tG2JIZAAAgWs5BA (envelope-from ) for ; Sun, 27 Feb 2022 22:32:29 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id ALd3MO3tG2KPIAAA9RJhRA (envelope-from ) for ; Sun, 27 Feb 2022 22:32:29 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 52999C069 for ; Sun, 27 Feb 2022 22:32:29 +0100 (CET) Received: from localhost ([::1]:59328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOR9Y-0000Z9-IV for larch@yhetil.org; Sun, 27 Feb 2022 16:32:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOR9A-0000Wt-Ah for guix-patches@gnu.org; Sun, 27 Feb 2022 16:32:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37244) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nOR9A-0005f9-0k for guix-patches@gnu.org; Sun, 27 Feb 2022 16:32:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nOR99-0008Hm-TV for guix-patches@gnu.org; Sun, 27 Feb 2022 16:32:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53878] [PATCH v7 12/24] gnu: chez: Add utilities for Chez machine types. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Feb 2022 21:32:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53878 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53878@debbugs.gnu.org, Liliana Marie Prikler , zimoun Cc: Philip McGrath , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxime Devos , raingloom , Liliana Marie Prikler , Attila Lendvai , Malte Gerdes Received: via spool by 53878-submit@debbugs.gnu.org id=B53878.164599747431727 (code B ref 53878); Sun, 27 Feb 2022 21:32:03 +0000 Received: (at 53878) by debbugs.gnu.org; 27 Feb 2022 21:31:14 +0000 Received: from localhost ([127.0.0.1]:59361 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOR8L-0008Fa-Dj for submit@debbugs.gnu.org; Sun, 27 Feb 2022 16:31:14 -0500 Received: from mail-vs1-f42.google.com ([209.85.217.42]:44626) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nOR87-0008DP-Nx for 53878@debbugs.gnu.org; Sun, 27 Feb 2022 16:31:00 -0500 Received: by mail-vs1-f42.google.com with SMTP id y4so11045925vsd.11 for <53878@debbugs.gnu.org>; Sun, 27 Feb 2022 13:30:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Mlc/qhGedBkcO/u3jAnfRZ74tW1eDlJyXNhnlOfQlJM=; b=RBzRjCkF2Dme39f6OpQ9RHC2lvJimDSrerWEyeN40Kh9QLVmf/OLVyzxHKVT/jAZ0R WtcoPPx/MJxJvQR0XCqQWOArjni/Ecr/H+4mGgS2HaOPL9fhWW7IYfdAwudg2yxRyVWu 8tklA1XA3dOAdrk2J4wo4fTJd+xhbTV6Vlj9mQVovC5ry/MDZs+HQs24i2Kbu5jbiuBN KjFJsVK9ZDKUqzxRxe56RXNX/BpSDPuKWPEOIxbyuDIXobdeGCK1bSJDwer1f8ATbT+B UTuDb0g1BdIpQAnv3B2VvZAeO1fDnk8ZmQxd5ao3KeUKEV3vuO6wyJupE8AR/tZ4x1Ru rDMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Mlc/qhGedBkcO/u3jAnfRZ74tW1eDlJyXNhnlOfQlJM=; b=iXni2EoMAWY9sjVDOCmIrpgW4uVYXMjJrlHXp/RcJPk7J1Ywz0+OCr75e/sOJxFYxT L75nhi5QN6QcMR/1Gy2StHIZZn5XLrVN0+wRgD2OnmgL7Ak8zF0TW60X89syeO6h28Xz ZcK6XALGCFZe/acT6ao1ogoaskCb2T+ekeHXX7Lh+56wGD3YRmcwKZKcdsN5/lNckd0k l/qOqelipzzNz8wi17zAWAa5VXGtruzslwMsLB4vpghAxHnk848In/YVAkTI4SL0zPgX 5f0tCyBpFWuFQ5Q3KPbzOlAXRzCLez1qgk2io2oVOHGciJ797lPoD4qdZyn5TucKFZo3 smNA== X-Gm-Message-State: AOAM530q6IQ+0TcYzPXmf9SpBLGaGChyyobeexpUZSnyfrFsnMrk51DE grQz1kpNYAKe2yaoQZO3Foq+FnWkGNfIUWd+LGE= X-Google-Smtp-Source: ABdhPJxdQQa3UgWe/kNs4bgO+RF1rGzWumCACGlSbX7mNvU1EYIaZmvdLrx75iByRMV4UC4JAV90eg== X-Received: by 2002:a67:d29c:0:b0:31b:e21b:b4f8 with SMTP id z28-20020a67d29c000000b0031be21bb4f8mr5409843vsi.79.1645997454154; Sun, 27 Feb 2022 13:30:54 -0800 (PST) Received: from localhost (c-73-125-98-51.hsd1.fl.comcast.net. [73.125.98.51]) by smtp.gmail.com with UTF8SMTPSA id k16-20020a0561023f1000b0031cc171e9a8sm1020277vsv.4.2022.02.27.13.30.53 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 27 Feb 2022 13:30:53 -0800 (PST) From: Philip McGrath Date: Sun, 27 Feb 2022 16:29:08 -0500 Message-Id: <20220227212920.2009000-13-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220227212920.2009000-1-philip@philipmcgrath.com> References: <20220220060610.178131-1-philip@philipmcgrath.com> <20220227212920.2009000-1-philip@philipmcgrath.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1645997549; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Mlc/qhGedBkcO/u3jAnfRZ74tW1eDlJyXNhnlOfQlJM=; b=Yz9Xdlli9gxEbASg3Kaaf9cC6hJ1F99yGcBFiUSkO0Lj+Eg2YDwqkTu+nG59tXX892BoR7 YhJavuvwLxGlHBIOew4x33RwUfe4E2NZ2IFRFNaoGWioYBoA7Uv2MwxDevIWqqwSfOuwTd 50E0wCwjatK6PoRdFOlY2z5daDpHAH4bNQWorkFJV93Su/0ur+T31XjIg6lgceX58QTtz1 RH/Z4Y+k9xtWNq7PIeRDR+Xl5oHdSXOFaARqUU6dgorcBQ62G55m90vZVrVDiV+6IVfA31 sy0N4IRWb7x1WTScy8xJqTluQp56JZfXmU5dRIYW+KCsxk604Bml5GDxtI1ebg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1645997549; a=rsa-sha256; cv=none; b=Ots8ItFkYVxpYYcIaD0BZkmVKTbZ9wUYFlUvdaV1t6dsiHnrwIya50wF64zWvC1IONsc/8 uAbcjL2BqeEfxsTLtVaGAd6gBsgkSd/3+1mZkQDwPZ0PqZvssJXhZZnyEaBXAIuhxh562s Akg9Kg8BSvsd+3zj4VovlBWHV7XsLFpsWkZFUAXaTx2EZOmWoXqGTmhFF4o8m3NFKuJKza L3XOa5E1jE+8ngonLcZpqNIB/crt4Hf9WFpagHCG7wJ9YzgEM4kX74VvTSvAMFuKQOFpeO 7/ca515QNDZJeO6tqJTuIcmej3PP5NSnUMK7icCrybfFIn2Kv73T+Z++uudbcw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=google header.b=RBzRjCkF; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 3.40 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=google header.b=RBzRjCkF; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 52999C069 X-Spam-Score: 3.40 X-Migadu-Scanner: scn0.migadu.com X-TUID: 3Z2PjXLmubCf * gnu/packages/chez.scm (chez-machine->nonthreaded, chez-machine->threaded, chez-machine->nix-system, nix-system->chez-machine, chez-upstream-features-for-system): New functions. (%nix-arch-to-chez-alist, %nix-os-to-chez-alist): New private constants. (chez-scheme)[supported-systems]: Compute based on 'nix-system->chez-machine' and 'chez-upstream-features-for-system'. (chez-scheme-for-racket-bootstrap-bootfiles)[supported-systems]: Compute based on 'nix-system->chez-machine'. --- gnu/packages/chez.scm | 127 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 3 deletions(-) diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 046bb3dcdc..603fc4201e 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -44,7 +44,119 @@ (define-module (gnu packages chez) #:use-module (gnu packages image) #:use-module (gnu packages xorg) #:use-module (ice-9 match) - #:use-module (srfi srfi-1)) + #:use-module (srfi srfi-1) + #:export (nix-system->chez-machine + chez-machine->nonthreaded + chez-machine->threaded)) + +(define (chez-machine->nonthreaded machine) + "Given a string MACHINE naming a Chez Scheme machine type, returns a string +naming the nonthreaded machine type for the same architecture and OS as +MACHINE. The returned string may share storage with MACHINE." + ;; Chez Scheme documentation consistently uses "nonthreaded" rather than + ;; e.g. "unthreaded" + (if (eqv? #\t (string-ref machine 0)) + (substring machine 1) + machine)) +(define (chez-machine->threaded machine) + "Like @code{chez-machine->nonthreaded}, but returns the threaded machine +type." + (if (eqv? #\t (string-ref machine 0)) + machine + (string-append "t" machine))) + +;; Based on the implementation from raco-cross-lib/private/cross/platform.rkt +;; in https://github.com/racket/raco-cross. +;; For supported platforms, refer to release_notes/release_notes.stex in the +;; upstream Chez Scheme repository or to racket/src/ChezScheme/README.md +;; in https://github.com/racket/racket. +(define %nix-arch-to-chez-alist + `(("x86_64" . "a6") + ("i386" . "i3") + ("aarch64" . "arm64") + ("armhf" . "arm32") ;; Chez supports ARM v6+ + ("ppc" . "ppc32"))) +(define %nix-os-to-chez-alist + `(("w64-mingw32" . "nt") + ("darwin" . "osx") + ("linux" . "le") + ("freebsd" . "fb") + ("openbsd" . "ob") + ("netbsd" . "nb") + ("solaris" . "s2"))) + +(define (chez-machine->nix-system machine) + "Return the Nix system type corresponding to the Chez Scheme machine type +MACHINE. If MACHINE is not a string representing a known machine type, an +exception is raised. This function does not distinguish between threaded and +nonthreaded variants of MACHINE. + +Note that this function only handles Chez Scheme machine types in the +strictest sense, not other kinds of descriptors sometimes used in place of a +Chez Scheme machine type by Racket, such as @code{\"pb\"}, @code{#f}, or +@code{\"racket\"}. (When using such extensions, the Chez Scheme machine type +for the host system is often still relevant.)" + (let ((machine (chez-machine->nonthreaded machine))) + (let find-arch ((alist %nix-arch-to-chez-alist)) + (match alist + (((nix . chez) . alist) + (if (string-prefix? chez machine) + (string-append + nix "-" (let ((machine-os + (substring machine (string-length chez)))) + (let find-os ((alist %nix-os-to-chez-alist)) + (match alist + (((nix . chez) . alist) + (if (equal? chez machine-os) + nix + (find-os alist))))))) + (find-arch alist))))))) + +(define* (nix-system->chez-machine #:optional + (system (or (%current-target-system) + (%current-system)))) + "Return the Chez Scheme machine type corresponding to the Nix system +identifier SYSTEM, or @code{#f} if the translation of SYSTEM to a Chez Scheme +machine type is undefined. + +It is unspecified whether the resulting string will name a threaded or a +nonthreaded machine type: when the distinction is relevant, use +@code{chez-machine->nonthreaded} or @code{chez-machine->threaded} to adjust +the result." + (let* ((hyphen (string-index system #\-)) + (nix-arch (substring system 0 hyphen)) + (nix-os (substring system (+ 1 hyphen))) + (chez-arch (assoc-ref %nix-arch-to-chez-alist nix-arch)) + (chez-os (assoc-ref %nix-os-to-chez-alist nix-os))) + (and chez-arch chez-os (string-append chez-arch chez-os)))) + +(define* (chez-upstream-features-for-system #:optional + (system + (or (%current-target-system) + (%current-system)))) + "Return a list of symbols naming features supported by upstream Chez Scheme +for the Nix system identifier SYSTEM, or @code{#f} if upstream Chez Scheme +does not support SYSTEM at all. + +If native threads are supported, the returned list will include +@code{'threads}. Other feature symbols may be added in the future." + (cond + ((not (nix-system->chez-machine system)) + #f) + ((target-aarch64? system) + #f) + ((target-arm32? system) + (and (target-linux? system) + '())) + ((target-ppc32? system) + (and (target-linux? system) + '(threads))) + (else + '(threads)))) + +;; +;; Chez Scheme: +;; (define nanopass (let ((version "1.9.2")) @@ -251,8 +363,11 @@ (define* (stex-make #:optional (suffix "")) ;; We should too. It is the Chez machine type arm32le ;; (no threaded version upstream yet, though there is in ;; Racket's fork), more specifically (per the release notes) ARMv6. - (supported-systems (fold delete %supported-systems - '("mips64el-linux" "armhf-linux"))) + (supported-systems + (delete + "armhf-linux" ;; <-- should work, but reportedly broken + (filter chez-upstream-features-for-system + %supported-systems))) (home-page "https://cisco.github.io/ChezScheme/") (synopsis "R6RS Scheme compiler and run-time") (description @@ -300,6 +415,8 @@ (define-public chez-scheme-for-racket-bootstrap-bootfiles (invoke (search-input-file (or native-inputs inputs) "/opt/racket-vm/bin/racket") "rktboot/main.rkt"))))))) + (supported-systems (filter nix-system->chez-machine + %supported-systems)) (home-page "https://github.com/racket/ChezScheme") ;; ^ This is downstream of https://github.com/racket/racket, ;; but it's designed to be a friendly landing place for people @@ -322,6 +439,10 @@ (define-public chez-scheme-for-racket-bootstrap-bootfiles Chez Scheme.") (license (list asl2.0)))) +;; +;; Packages: +;; + (define-public chez-srfi (package (name "chez-srfi") -- 2.32.0