From patchwork Fri Mar 28 09:55:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cayetano Santos X-Patchwork-Id: 40894 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 F35A727BBE9; Fri, 28 Mar 2025 09:57:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 2CE1B27BBE2 for ; Fri, 28 Mar 2025 09:57:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ty6SZ-0002wT-Mk; Fri, 28 Mar 2025 05:57:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ty6SV-0002vt-Ca for guix-patches@gnu.org; Fri, 28 Mar 2025 05:57:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ty6SU-0004SX-SF for guix-patches@gnu.org; Fri, 28 Mar 2025 05:57:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=LLjuf7MQzWmUWxUZ2VHx2p1il4dscHuSDG2oqtoW4Rw=; b=lybwatO8dA/R58wVvIGHByBe04SblUqHJAYxWJzGpYnwBKEcKGnxu2GPHQWHGR4Apni3Yj7gM6EbeDGX6dWU37ECtPcnLshW7VFCqMT301okJq3xIRqANpPXzv0BVBnQgHpfYlh7nd7MNGGOvAbtaovSapWOIPJLrBMp+9Orc4gvWIQXvuozhaPXYloTzc5RFh3hU9fYHYviNxAlBt5VhytMrhyZ5voHx09aCsHRgv7ds4vYYkc/11Gr+AxkZwc6vzWOSylOEz8J3yxmllM3ZR8g42MSAAgDMPwixEBR1XF30lNO0fymFyXi/kK60S8ACGuAz/2wFjDLqoWV+GfwAA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ty6SU-0000j8-NP for guix-patches@gnu.org; Fri, 28 Mar 2025 05:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77114] [PATCH v2] gnu: nextpnr: split devices. References: <5782da67491e120246497cabfba264b0346e4a54.1742379695.git.csantosb@inventati.org> In-Reply-To: <5782da67491e120246497cabfba264b0346e4a54.1742379695.git.csantosb@inventati.org> Resent-From: Cayetano Santos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Mar 2025 09:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77114 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77114@debbugs.gnu.org X-Debbugs-Original-Cc: Cayetano Santos via Guix-patches via Received: via spool by 77114-submit@debbugs.gnu.org id=B77114.17431557862705 (code B ref 77114); Fri, 28 Mar 2025 09:57:02 +0000 Received: (at 77114) by debbugs.gnu.org; 28 Mar 2025 09:56:26 +0000 Received: from localhost ([127.0.0.1]:52934 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ty6Rt-0000hY-Hi for submit@debbugs.gnu.org; Fri, 28 Mar 2025 05:56:26 -0400 Received: from latitanza.investici.org ([2001:888:2000:56::19]:50733) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ty6Rq-0000hO-4s for 77114@debbugs.gnu.org; Fri, 28 Mar 2025 05:56:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org; s=stigmate; t=1743155780; bh=LLjuf7MQzWmUWxUZ2VHx2p1il4dscHuSDG2oqtoW4Rw=; h=From:To:Cc:Subject:Date:From; b=QmApX3czH7GhyfqhuvEYn1TAD5zY2zftYZGncotsSJrguDtBqgLiPLGq/5f6hZl49 1nTMQvVIlY1KPlip1BnVjIIrmOTV9rCdmIRb5C2ROllpT4Nq3ZHqoaas8G1gEZFyQQ o1LiUULpoxv0AccaXBBfsDYq6XFkmg+Blh85Omt8= Received: from mx3.investici.org (unknown [127.0.0.1]) by latitanza.investici.org (Postfix) with ESMTP id 4ZPGBX3cRfzGp55; Fri, 28 Mar 2025 09:56:20 +0000 (UTC) Received: from [82.94.249.234] (mx3.investici.org [82.94.249.234]) (Authenticated sender: cayetano.santos@inventati.org) by localhost (Postfix) with ESMTPSA id 4ZPGBX2cLszGp4P; Fri, 28 Mar 2025 09:56:20 +0000 (UTC) Date: Fri, 28 Mar 2025 10:55:45 +0100 Message-ID: <61bc18673733690a5382207218322b1a99ac9662.1743155745.git.csantosb@inventati.org> X-Mailer: git-send-email 2.49.0 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: , Reply-to: Cayetano Santos X-ACL-Warn: , Cayetano Santos via Guix-patches X-Patchwork-Original-From: Cayetano Santos via Guix-patches via From: Cayetano Santos Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Cayetano Santos via Guix-patches via * gnu/packages/fpga.scm (nextpnr): split-devices. Change-Id: I681dfa90a0ace3b507f3b56f3ac7d90227345606 Replace old nextpnr-ice40 by a common nextpnr package, plus a device specific nextpnr-ice40 which inherits from it. Other device packages will follow. - compliant with #77067 (ice40 depends on icestorm) - update to 0.8 - update substitutions in Makefiles - addapt config and make flags to each package - include tests from icestorm in nextpnr-ice40 Change-Id: Icbf9459347fefdcaaa43e7a6a5682eb0fb33ffe0 --- gnu/packages/fpga.scm | 205 +++++++++++++++++++++++------------------- 1 file changed, 115 insertions(+), 90 deletions(-) base-commit: 0b6d9901ec11c9365f9c77da21c2d0bf4e07c6d9 diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 893e875276..20ee787e0f 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -313,102 +313,127 @@ (define-public icestorm Includes the actual FTDI connector.") (license license:isc)))) -(define-public nextpnr-ice40 - (let* ((version "0.7") - (tag (string-append "nextpnr-" version))) - (package - (name "nextpnr-ice40") - (version version) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/YosysHQ/nextpnr") - (commit tag) - (recursive? #t))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0sbhqscgmlk4q2207rsqsw99qx4fyrxx1hsd669lrk42gmk3s9lm")) - (modules '((guix build utils))) - (snippet - #~(begin - ;; Remove bundled source code for which Guix has packages. - ;; Note the bundled copies of json11 and python-console contain - ;; modifications, while QtPropertyBrowser appears to be - ;; abandoned and without an official source. - ;; fpga-interchange-schema is used only by the - ;; "fpga_interchange" architecture target, which this package - ;; doesn't build. + +(define nextpnr + (package + (name "nextpnr") + (version "0.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/YosysHQ/nextpnr/") + (commit (string-append "nextpnr-" version)) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0p53a2gl89hf3hfwdxs6pykxyrk82j4lqpwd1fqia2y0c9r2gjlm")))) + (build-system qt-build-system) + (arguments + (list + #:cmake cmake + #:out-of-source? #t + #:configure-flags + #~(list "-DBUILD_GUI=OFF" + "-DUSE_OPENMP=yes" + "-DBUILD_TESTS=ON" + (string-append "-DCURRENT_GIT_VERSION=nextpnr-" #$version) + "-DUSE_IPO=OFF") + #:phases + #~(modify-phases %standard-phases + ;; Remove bundled source code for which Guix has packages. + ;; Note the bundled copies of json11 and python-console contain + ;; modifications, while QtPropertyBrowser appears to be + ;; abandoned and without an official source. + ;; fpga-interchange-schema is used only by the + ;; "fpga_interchange" architecture target, which this package + ;; doesn't build. + (add-after 'unpack 'remove-deps + (lambda _ (with-directory-excursion "3rdparty" (for-each delete-file-recursively '("googletest" "imgui" "pybind11" "qtimgui" - "sanitizers-cmake"))) - - ;; Remove references to unbundled code and link against external - ;; libraries instead. + "sanitizers-cmake" "corrosion"))))) + ;; Remove references to unbundled code and link against external + ;; libraries instead. + (add-after 'remove-deps 'patch-source + (lambda* (#:key inputs #:allow-other-keys) (substitute* "CMakeLists.txt" - (("^\\s+add_subdirectory\\(3rdparty/googletest.*") "") - (("^(\\s+target_link_libraries.*)( gtest_main\\))" - _ prefix suffix) - (string-append prefix " gtest" suffix))) + ;; Use the system sanitizers-cmake module. + (("\\$\\{CMAKE_SOURCE_DIR\\}/3rdparty/sanitizers-cmake/cmake") + (string-append #$(this-package-native-input "sanitizers-cmake") + "/share/sanitizers-cmake/cmake")) + ;; Use the system googletest and corrosion modules + (("^\\s+add_subdirectory\\(3rdparty/googletest.*") + "") + (("^\\s+add_subdirectory\\(3rdparty/corrosion.*") + "") + ;; replace gtest_main by gtest + (("^(\\s+target_link_libraries.*)( gtest_main)" _ prefix suffix) + (string-append prefix " gtest"))) + ;; gui (substitute* "gui/CMakeLists.txt" - (("^\\s+../3rdparty/(qt)?imgui.*") "") - (("^(target_link_libraries.*)\\)" _ prefix) - (string-append prefix " imgui qt_imgui_widgets)"))))))) - (native-inputs - (list googletest sanitizers-cmake)) - (inputs - (list boost - eigen - icestorm - imgui-1.86 - pybind11 - python - qtbase-5 - qtwayland-5 - qtimgui - yosys)) - (build-system qt-build-system) - (arguments - (list - #:configure-flags - #~(list "-DARCH=ice40" - "-DBUILD_GUI=ON" - "-DBUILD_TESTS=ON" - (string-append "-DCURRENT_GIT_VERSION=" #$tag) - (string-append "-DICESTORM_INSTALL_PREFIX=" - #$(this-package-input "icestorm")) - "-DUSE_IPO=OFF") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch-source + (("\\$\\{CMAKE_SOURCE_DIR\\}(/3rdparty/imgui)") + (string-append #$(this-package-input "imgui") "/include/imgui")) + (("\\$\\{CMAKE_SOURCE_DIR\\}(/3rdparty/qtimgui)") + (string-append #$(this-package-input "qtimgui") "/include/qtimgui")) + (("^\\s+../3rdparty/(qt)?imgui.*") + ""))))))) + (native-inputs (list googletest sanitizers-cmake)) + (inputs (list boost + eigen + corrosion + imgui + pybind11 + python + qtbase-5 + qtwayland-5 + qtimgui)) + (synopsis "Place-and-Route tool for FPGAs") + (description "Nextpnr is a portable FPGA place and route tool.") + (home-page "https://github.com/YosysHQ/nextpnr/") + (license license:isc))) + +(define-public nextpnr-ice40 + (package + (inherit nextpnr) + (name "nextpnr-ice40") + (arguments + (substitute-keyword-arguments (package-arguments nextpnr) + ;; tests + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + ;; get icestorm/examples + (add-after 'compress-documentation 'get-icestorm (lambda* (#:key inputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - ;; Use the system sanitizers-cmake module. - (("\\$\\{CMAKE_SOURCE_DIR\\}/3rdparty/sanitizers-cmake/cmake") - (string-append - #$(this-package-native-input "sanitizers-cmake") - "/share/sanitizers-cmake/cmake"))) - (substitute* "gui/CMakeLists.txt" - ;; Compile with system imgui and qtimgui headers. - (("^(target_include_directories.*)../3rdparty/imgui(.*)$" - _ prefix suffix) - (string-append prefix - (search-input-directory inputs - "include/imgui") - suffix)) - (("^(target_include_directories.*)../3rdparty/qtimgui/(.*)$" - _ prefix suffix) - (string-append prefix - (search-input-directory inputs - "include/qtimgui") - suffix)))))))) - (synopsis "Place-and-Route tool for FPGAs") - (description "Nextpnr aims to be a vendor neutral, timing driven, FOSS -FPGA place and route tool.") - (home-page "https://github.com/YosysHQ/nextpnr") - (license license:expat)))) + (copy-recursively + #$(origin (inherit (package-source icestorm))) + "icestorm"))) + ;; run all examples as tests + (add-after 'get-icestorm 'test + (lambda* _ + (let ((dir (opendir "icestorm/examples"))) + (do ((entry (readdir dir) + (readdir dir))) + ((eof-object? entry)) + (when (not (member entry '("." ".."))) + (setenv "PATH" + (string-append (string-append #$output "/bin") + ":" + (getenv "PATH"))) + (invoke "make" "-C" + (string-append "icestorm/examples/" entry)))) + (closedir dir)))))) + ((#:configure-flags original-flags #~(list)) + #~(append #$original-flags + `("-DARCH=ice40" + ,(string-append "-DICESTORM_INSTALL_PREFIX=" + #$(this-package-input "icestorm"))))))) + (propagated-inputs (modify-inputs (package-propagated-inputs nextpnr) + (prepend icestorm))) + ;; tests + (native-inputs (modify-inputs (package-native-inputs nextpnr) + (prepend yosys))))) (define-public gtkwave (package