From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 YOT/KbLaEWLc5wAAgWs5BA (envelope-from ) for ; Sun, 20 Feb 2022 07:07:46 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 2I+iIrLaEWIZHgAAG6o9tA (envelope-from ) for ; Sun, 20 Feb 2022 07:07:46 +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 4E92012DED for ; Sun, 20 Feb 2022 07:07:45 +0100 (CET) Received: from localhost ([::1]:58212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nLfNo-0005Jf-37 for larch@yhetil.org; Sun, 20 Feb 2022 01:07:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nLfN9-0005HT-NB for guix-patches@gnu.org; Sun, 20 Feb 2022 01:07:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37052) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nLfN9-0003zW-Di for guix-patches@gnu.org; Sun, 20 Feb 2022 01:07:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nLfN9-0005NV-7g; Sun, 20 Feb 2022 01:07:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53878] [PATCH v4 04/15] gnu: chez-and-racket-bootstrap: Add utilities for Chez machine types. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: philip@philipmcgrath.com, guix-patches@gnu.org Resent-Date: Sun, 20 Feb 2022 06:07: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 , Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: Attila Lendvai , Malte Gerdes , raingloom , zimoun , Philip McGrath X-Debbugs-Original-Xcc: Philip McGrath Received: via spool by 53878-submit@debbugs.gnu.org id=B53878.164533720020530 (code B ref 53878); Sun, 20 Feb 2022 06:07:03 +0000 Received: (at 53878) by debbugs.gnu.org; 20 Feb 2022 06:06:40 +0000 Received: from localhost ([127.0.0.1]:59160 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLfMl-0005Ky-JE for submit@debbugs.gnu.org; Sun, 20 Feb 2022 01:06:40 -0500 Received: from mail-qk1-f169.google.com ([209.85.222.169]:46625) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nLfMh-0005KR-8l for 53878@debbugs.gnu.org; Sun, 20 Feb 2022 01:06:35 -0500 Received: by mail-qk1-f169.google.com with SMTP id f21so1300125qke.13 for <53878@debbugs.gnu.org>; Sat, 19 Feb 2022 22:06:35 -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=voen33luSuZnifO97fQiqSCtXHVzAz6OmjDwr/H6AjE=; b=LtXCXxXJ/fRCo+MBxR7Mbf0+vi3tVPODey1hFJX8tWbmNahYiLIOxl/n1Ov7BO4JZ1 WLX1z74XqbL0AopWfqyw6NtzliQqrEgg+spThBFXgXnC9j+lJ+BnRD4wU2EQFgoKfbGN 3iIy2OE3NoLpswpTJiQn7XeFS6aq1eNdSzN1SLSXkZWfGFAU6b4LAedOcVTcS2KhioFS iNOcsNkiBbnDc2M2LqWF4VTxk5k5vLHIURvtYhH6fA7rsCp8xeOgcmhcjQzOqe7kdfpa 7ngIfK5r/U+t/nEjTuOnruk0Dkan7m8pGQn9JsQnQm+tzCqh/+btMWXInfDZ1IFNFFCJ FSGw== 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=voen33luSuZnifO97fQiqSCtXHVzAz6OmjDwr/H6AjE=; b=4e1legmIbeAJ2IU6pZAZlYpJC61Ho8Fey/8BQllR+svqpPwO4kuiaRgqzzheary/Er ZojdlzXIL6DP2OANKfWmxhw8/H051/w+lcOa7Zl+uRY4SeyF6ueXJjRA+puvoYp0i+BB uEzVNnAs9fxJ0MvJxwDENC5+e6Sw1D/axj/OjoQ4nmO4Vt6j795CINDJhtbZeVoI67r8 9LdGwFFAS/OtW23wdG7jK9by/GhRDrIXsFCNtL9rvR1FumjJXB/8T8hadUSOY7wZOdmd Zl5UAAhs+KSBwbD92V3DaLor0H4mPtFk0zH90sMugDNAV2iIQYyWlUxVjRUQjEXe1vRV QDGg== X-Gm-Message-State: AOAM533sS/0FAPaIv9Xj0gK6R3SJN0GbD/md9HQ5bo03l2pTRGUuEjTE KfXm3tVU2jk8365epBW1/5ZfSnu7zs12b+QChtc= X-Google-Smtp-Source: ABdhPJxuUCnSIErWxLOASiKBR0z2Msv1SHLHdHr0BhmXxAGrAoiLiKrNyLntLCl28cAhj1WjbcEG6g== X-Received: by 2002:a37:610c:0:b0:5f1:83b8:a6c9 with SMTP id v12-20020a37610c000000b005f183b8a6c9mr8776498qkb.196.1645337189678; Sat, 19 Feb 2022 22:06:29 -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 c3sm21149986qkp.39.2022.02.19.22.06.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 19 Feb 2022 22:06:29 -0800 (PST) From: Philip McGrath Date: Sun, 20 Feb 2022 01:05:59 -0500 Message-Id: <20220220060610.178131-5-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220220060610.178131-1-philip@philipmcgrath.com> References: <20220208151316.1897345-1-philip@philipmcgrath.com> <20220220060610.178131-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=1645337265; 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=voen33luSuZnifO97fQiqSCtXHVzAz6OmjDwr/H6AjE=; b=DiEDNB9jj0ZXdIqDBCx9tyDyCHoW7QJJ+tdCIQDWxFVg7+4GzmPgCY+oez035VC1FOOiLO TlGVFoChrtRn9Qh2yXWL5H0PXQbee6XX+9IVFdvAcv3+m3bwa4uaGWheGLf8TsliqqMxbr LXLRbgFPmiArP+PbbEPc9LmNlCar7dJoP4eWMTCAOiRYqIV1/BXnywobwdbg5CcVqUTukC e6WNNkWn0VfP8yf7p611AnEaauIakTTegEqAL0DJowDNCKjl60lu9gT9bHRbVY9AAqmIlC P2KZqdvjCk8gbj7juSEmHp5odcBa5YFXifi6vWpkRlCep9OqMiIu/oSiYMtBLw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1645337265; a=rsa-sha256; cv=none; b=lV187anoFR4r0UVHuQIYb5UCyQtHcd+27nhj9efGOXCERRuuNe7N3K/3wGz/JzYPc4R1Bp jNh8TzoSRHUieip1CWs93WHD2IwRw1STdESSieDdtiaD9AdDCB1wP5WZ9+B62Ak6APsakI N/Xx/fKpmzEGiAxGbQSOErD8EcIISLNjMLdEDE6Jq2eu5b8U5Rz5dLXtgmigooL0wojQg/ JmPng+P/1m7NcrzgG237LIu4blMyjhVEGL9rmAw5/GC6rbJ169VVmnfJGnKPgh1y8VC3Qx LvxtTr9510yDcJZ4DebPMBh/HpDBKjeAoUpnas6KU2yj9dzUuh2/0OMwC6lgHQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=google header.b=LtXCXxXJ; 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: 0.37 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=google header.b=LtXCXxXJ; 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: 4E92012DED X-Spam-Score: 0.37 X-Migadu-Scanner: scn0.migadu.com X-TUID: 2Dk19OdUDGjP * gnu/packages/chez-and-racket-bootstrap.scm (chez-machine->nonthreaded, chez-machine->threaded, chez-machine->nix-system, nix-system->chez-machine, chez-upstream-features-for-system): New private 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'. --- gnu/packages/chez-and-racket-bootstrap.scm | 118 ++++++++++++++++++++- 1 file changed, 116 insertions(+), 2 deletions(-) diff --git a/gnu/packages/chez-and-racket-bootstrap.scm b/gnu/packages/chez-and-racket-bootstrap.scm index 11d570059b..1a923fe62d 100644 --- a/gnu/packages/chez-and-racket-bootstrap.scm +++ b/gnu/packages/chez-and-racket-bootstrap.scm @@ -28,7 +28,9 @@ (define-module (gnu packages chez-and-racket-bootstrap) #:use-module (guix utils) #:use-module (guix gexp) #:use-module (ice-9 match) + #:use-module (ice-9 regex) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages compression) @@ -61,6 +63,115 @@ (define-module (gnu packages chez-and-racket-bootstrap) ;; ;; Code: +(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")) (origin @@ -264,8 +375,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 -- 2.32.0