From patchwork Mon Jun 13 17:23:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 804 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 2D58727BBEA; Mon, 13 Jun 2022 18:24:10 +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_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,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 C1BC527BBE9 for ; Mon, 13 Jun 2022 18:24:09 +0100 (BST) Received: from localhost ([::1]:60314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o0nnM-0008Ci-Te for patchwork@mira.cbaines.net; Mon, 13 Jun 2022 13:24:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59100) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0nnG-0008CR-V1 for guix-patches@gnu.org; Mon, 13 Jun 2022 13:24:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38170) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o0nnG-0008Sr-Mt for guix-patches@gnu.org; Mon, 13 Jun 2022 13:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o0nnG-0001bZ-IY for guix-patches@gnu.org; Mon, 13 Jun 2022 13:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55948] [PATCH 0/2] gnu: Update rocm to 5.1.3. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Jun 2022 17:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55948 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55948@debbugs.gnu.org X-Debbugs-Original-To: Guix-patches Received: via spool by submit@debbugs.gnu.org id=B.16551410236132 (code B ref -1); Mon, 13 Jun 2022 17:24:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Jun 2022 17:23:43 +0000 Received: from localhost ([127.0.0.1]:60300 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o0nmx-0001ap-Gy for submit@debbugs.gnu.org; Mon, 13 Jun 2022 13:23:43 -0400 Received: from lists.gnu.org ([209.51.188.17]:39576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o0nmv-0001ah-N6 for submit@debbugs.gnu.org; Mon, 13 Jun 2022 13:23:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0nmv-0008Al-82 for guix-patches@gnu.org; Mon, 13 Jun 2022 13:23:41 -0400 Received: from mail-40133.protonmail.ch ([185.70.40.133]:57221) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o0nms-0008R1-N1 for guix-patches@gnu.org; Mon, 13 Jun 2022 13:23:40 -0400 Date: Mon, 13 Jun 2022 17:23:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1655141012; x=1655400212; bh=MwVZIVLIRi+zzI/cUNW1PYuXYI/tRB77n/5JN1ULzIw=; h=Date:To:From:Reply-To:Subject:Message-ID:Feedback-ID:From:To:Cc: Date:Subject:Reply-To:Feedback-ID:Message-ID; b=Mslnj940VU/RkNr3s0RX+UoU4Yk2o+NnCLiawo/pFoZnh855bib6F7mSYJeHo4n0m fuW9xpCuRcGR8dJJun4MT+LYk92Mz8ALaH8p63zoRXpcc9hd09i8SUIUwW145Njif7 QQ+7r8j21Qp3FAdqmsL9hN74I9n0juMtMif8WeGw6J7NdYO/XqGPgven7FuGZDitAn j8h9KD6wFc96yDuZ7lQ00GQlRReElWiB/M/NLA1z4jEdRm33maFrp6godYs705eES0 7of6E63aFKtw1Wg9npAj/C11Jvs4e721jtYg1zL3afMfovMJ3gMw/fYo8cy/0Wfj6O z05SnHXYm+gLg== Message-ID: Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.133; envelope-from=john.kehayias@protonmail.com; helo=mail-40133.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Hi Guixers, Incoming are two patches to update the rocm packages (AMD's OpenCL stuff) to the latest version. With this I can use OpenCL in Darktable with my current gen GPU (note: I'm not on linux-libre, which likely impacts what cards can be used). I tested that everything builds and darktable-cltest reports successful output, as well as rocminfo. E.g. running ./pre-inst-env guix shell rocm-opencl-runtime rocm-device-libs opencl-icd-loader darktable -- darktable-cltest A few quick notes on these patches. Most of this was discussed on IRC recently, but for the record: 1. llvm-for-rocm: The first patch updates this to use llvm-14, which is what the current rocm version is based on. 2. rocm: All of the packages are updated in one commit as they share a version number and there some interdependencies. 3. rocclr: This is no longer meant as a standalone package: cmake will output a warning and there is no install to be done. It is meant to be included in packages that use it. I've made a plain origin for the rocclr source that is needed (see rocm-opencl-runtime that uses it) and renamed the old version to rocclr-4 since that will still build/install in case it is of use. This is the commit that changed the build behavior, active since v4.5 at least: https://github.com/ROCm-Developer-Tools/ROCclr/commit/df1449608e92c9e42b4ce5799e6eb51934ae7d4a 4. Relatedly, both Arch and Gentoo build rocclr before building rocm-opencl-runtime, but this doesn't seem to do anything. Unfortunately the rocm readmes are unclear/not up to date on exactly what is needed. From my testing, just setting a configure flag to point to the rocclr source is all that is needed. The Arch and Gentoo recipes are here: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=rocm-opencl-runtime https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.0.2.ebuild We can do the same thing by adding in this phase for rocm-opencl-runtime. I did not see any change in the final output and everything (with Darktable) seemed fine without it. It will take a little longer to build as it does build rocclr explicitly. Anyway, in case it is of use to anyone, here is the code (add-before 'configure 'configure-rocclr (lambda* (#:key inputs #:allow-other-keys) (invoke "cmake" (string-append "-DAMD_OPENCL_PATH=" #$(package-source this-package)) "-B build-rocclr" "-S" #$rocclr-src) (invoke "make" "-C" "build-rocclr"))) Okay, that's it! Overall is mostly updating hashes and some patches, other than the rocclr notes above. I hope I got the (long) commit message correct on the second patch. The changes work well for me locally. Thanks! John