From patchwork Mon Sep 26 19:12:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Rodriguez X-Patchwork-Id: 42995 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5131927BBEA; Mon, 26 Sep 2022 20:15:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7D28C27BBE9 for ; Mon, 26 Sep 2022 20:15:13 +0100 (BST) Received: from localhost ([::1]:46088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1octZQ-0004Cp-KA for patchwork@mira.cbaines.net; Mon, 26 Sep 2022 15:15:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1octXK-0001kp-QQ for guix-patches@gnu.org; Mon, 26 Sep 2022 15:13:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52700) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1octXK-0008Ka-Hh for guix-patches@gnu.org; Mon, 26 Sep 2022 15:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1octXJ-0004sx-U7 for guix-patches@gnu.org; Mon, 26 Sep 2022 15:13:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58100] [PATCH] gnu: cbqn: factor out singeli into derivative package. References: <878rm6hs4d.fsf@gmail.com> In-Reply-To: <878rm6hs4d.fsf@gmail.com> Resent-From: Christopher Rodriguez Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Sep 2022 19:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58100 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 58100@debbugs.gnu.org Cc: Christopher Rodriguez Received: via spool by 58100-submit@debbugs.gnu.org id=B58100.166421955118739 (code B ref 58100); Mon, 26 Sep 2022 19:13:01 +0000 Received: (at 58100) by debbugs.gnu.org; 26 Sep 2022 19:12:31 +0000 Received: from localhost ([127.0.0.1]:51778 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1octWp-0004sB-E9 for submit@debbugs.gnu.org; Mon, 26 Sep 2022 15:12:31 -0400 Received: from mail-qt1-f180.google.com ([209.85.160.180]:39567) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1octWm-0004rx-7s for 58100@debbugs.gnu.org; Mon, 26 Sep 2022 15:12:30 -0400 Received: by mail-qt1-f180.google.com with SMTP id s18so4740485qtx.6 for <58100@debbugs.gnu.org>; Mon, 26 Sep 2022 12:12:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=dIS/y2rp7I65RhjjKzBiynavj4N6VWEdOUyUqxZWRLA=; b=NtIdCDCyPZZ1Gcubm3N6x5FUCBIScDUHXQdie9Gw7SiQyWrPIoTAFKWtyJGeZ7ZZXX L8mvIYeH772UYRzF8Vp7kpOdeKcUFr5YWagqIJ5Ayhj0+3If9RkFBOTEvre//tX5XVDo /jGRbt6LqyC01/XY3XJm0PvJoQr0/tfamzK8WyR3lvhCOoW0enhqnF83VnFjadVw8fCs Y1OxrbtbTkRjOwOn0xF1y9Ho6/XKNUZ8cxDSQMGdmZq89givFK1nhJZ036sTlWrKYjcW cNiA4zFDwuf67UrEQUc1iTZIQBPxUdZPWmqs2OuOEpkLUdSiRv5olXZ+BxhKhkKACeyg JxMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=dIS/y2rp7I65RhjjKzBiynavj4N6VWEdOUyUqxZWRLA=; b=pdn/1JlaMDWkDu++BQjWdq40HhT+jrCXvSBXa1lfkEYSX0a0ykr7h7yogAZpdYNcEL 1Ku9IPBHJ550a+L3qpgI+37siPdbo5VyCkfHOMTG88eThKUy7cnD/91/28UWdUWsrLTf 0boCsDbZs/bY63N6y3vNMvYClWI4pzjs74VXBrONKLJkudnzTCzyU6WHHBrkCav8Ut/k q/NdfWX2Hmr/J1bTuiW1KGNDy+bIbYu6GvJMD8fkmw+EKqYfYRo11kxBWL3K4fRT2ztV XBuwYbX+h+ZIkWE8lyD1YLB0K/ebMb/QYajMp4Dds+9NitirwD/YSA1HNc13329eSUk8 5ETA== X-Gm-Message-State: ACrzQf1JwsFsb+gYGiAVEH2m8A6iXBijxfhTEPYbEkf4V2V9zMV9VRMH Nj1UBBNoYk6nTW/v+aJluAOHQZhzqs+igw== X-Google-Smtp-Source: AMsMyM4L39zDGEuZZ+WpOBW1sPYUKcKI2OindhJfUukQSG4ScwdI+S8ByWlbNjJu+pMBe94ccp/EWQ== X-Received: by 2002:a05:622a:1a1b:b0:35c:d51b:505b with SMTP id f27-20020a05622a1a1b00b0035cd51b505bmr20269298qtb.308.1664219542395; Mon, 26 Sep 2022 12:12:22 -0700 (PDT) Received: from gmail.com (ec2-44-193-142-136.compute-1.amazonaws.com. [44.193.142.136]) by smtp.gmail.com with ESMTPSA id a3-20020a05622a02c300b0035d430d4315sm1944280qtx.19.2022.09.26.12.12.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 12:12:21 -0700 (PDT) From: Christopher Rodriguez Date: Mon, 26 Sep 2022 15:12:12 -0400 Message-Id: <20220926191212.30609-1-yewscion@gmail.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Persuant to a recent conversation[1] with upstream, I've factored the AVX2-dependent builds into their own package (defaulting to a generic build instead). + gnu/packages/bqn.scm: cbqn-singeli ~ gnu/packages/bqn.scm: cbqn: changed make flags, inputs, and commit. --- gnu/packages/bqn.scm | 45 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/gnu/packages/bqn.scm b/gnu/packages/bqn.scm index c4e0f39efb..56705beede 100644 --- a/gnu/packages/bqn.scm +++ b/gnu/packages/bqn.scm @@ -126,7 +126,7 @@ (define bqn-sources (define cbqn-bootstrap (let* ((revision "1") - (commit "9c1cbdc99863b1da0116df61cd832137b196dc5c")) + (commit "bd823839feaf42af4013e5a245981f58f563e659")) (package (name "cbqn-bootstrap") (version (git-version "0" "1" commit)) @@ -138,7 +138,7 @@ (define cbqn-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "0w38fhwf20drkyijy6nfnhmc5g5gw0zmzgmy1q605x57znlj85a2")))) + "0735mixvpgp2g1jsmbg7aaw35r4xs348y7djkwdvb0193ais6xz2")))) (build-system gnu-build-system) (arguments (list #:tests? #f ;skipping tests for bootstrap @@ -182,12 +182,9 @@ (define-public cbqn (name "cbqn") (outputs '("out" "lib")) (arguments - (list #:make-flags '(list "shared-o3" "o3n-singeli") + (list #:make-flags '(list "shared-o3" "o3") #:phases #~(modify-phases %standard-phases (delete 'configure) - (add-before 'build 'link-singeli - (lambda* (#:key inputs #:allow-other-keys) - (symlink #+singeli-sources "Singeli"))) (add-before 'build 'generate-bytecode (lambda* (#:key inputs #:allow-other-keys) (system (string-append #+dbqn @@ -222,3 +219,39 @@ (define-public cbqn libffi clang-toolchain linux-libre-headers)))) +(define-public cbqn-singeli + (package + (inherit cbqn) + (name "cbqn-singeli") + (outputs '("out")) + (arguments + (list #:make-flags '(list "singeli=1 f='-mavx2 -mbmi2 -O3' c") + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'link-singeli + (lambda* (#:key inputs #:allow-other-keys) + (symlink #+singeli-sources "Singeli"))) + (add-before 'build 'generate-bytecode + (lambda* (#:key inputs #:allow-other-keys) + (system (string-append #+dbqn + "/bin/dbqn ./genRuntime " + #+bqn-sources)))) + (replace 'check + (lambda* (#:key inputs tests? #:allow-other-keys) + (when tests? + (system (string-append "./BQN -M 1000 \"" + #+bqn-sources + "/test/this.bqn\"")) + (map (lambda (x) + (system (string-append "./BQN ./test/" x + ".bqn"))) + '("cmp" "equal" "copy" "random"))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((bin (string-append (assoc-ref outputs + "out") + "/bin"))) + (mkdir-p bin) + (copy-recursively "BQN" + (string-append bin "/bqn")))))))))) +