From patchwork Sun Mar 12 09:37:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 47917 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 A589D16D1A; Sun, 12 Mar 2023 09:38:16 +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=-1.7 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED, URIBL_SBL_A 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 2A3A916C75 for ; Sun, 12 Mar 2023 09:38:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pbI9T-0005IH-VL; Sun, 12 Mar 2023 05:38:03 -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 1pbI9S-0005I9-Bg for guix-patches@gnu.org; Sun, 12 Mar 2023 05:38:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pbI9S-0007JV-3m for guix-patches@gnu.org; Sun, 12 Mar 2023 05:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pbI9R-0005E6-Mi for guix-patches@gnu.org; Sun, 12 Mar 2023 05:38:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62070] [PATCH v3] gnu: pocl: Update to 3.1 References: <20230309090624.765-1-atai@atai.org> In-Reply-To: <20230309090624.765-1-atai@atai.org> Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Mar 2023 09:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62070 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62070@debbugs.gnu.org Cc: Andy Tai Received: via spool by 62070-submit@debbugs.gnu.org id=B62070.167861384120010 (code B ref 62070); Sun, 12 Mar 2023 09:38:01 +0000 Received: (at 62070) by debbugs.gnu.org; 12 Mar 2023 09:37:21 +0000 Received: from localhost ([127.0.0.1]:59236 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbI8m-0005Ce-TY for submit@debbugs.gnu.org; Sun, 12 Mar 2023 05:37:21 -0400 Received: from mail-pj1-f50.google.com ([209.85.216.50]:42498) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbI8l-0005CO-9Q for 62070@debbugs.gnu.org; Sun, 12 Mar 2023 05:37:19 -0400 Received: by mail-pj1-f50.google.com with SMTP id h17-20020a17090aea9100b0023739b10792so8981912pjz.1 for <62070@debbugs.gnu.org>; Sun, 12 Mar 2023 01:37:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678613833; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=XI3YQx6nEQn0H0Ds9W07YHnYOT/VLK74ArQSDymbbZQ=; b=VuJx0Kdz2AkplgLyfkl2+f6VMyhOW9QcJudXU8DTAKxBcPJTr+A6vb6P75jHHH90v7 o1jxtP2srYQdJB2b6htF06pzeP7Xei7QpMATRtzMf9rO86IztVy0KrLq7K0IkIP+xGrZ TG9EFOmCxbmluw1z3hroR+ZHA9oW5UHbXLNu9jDEkOXrjdvOyPqU9BKbwgoTmrHJpR63 mEgjNvnATnHyIDGKE5Nxx3l0HencjSgUYvPjV1xGfNji74MG47rt4plbwDy/KKeptyvK /7KpPLkVh3qEwmaxnkMdcv6wNIQfzswJWU5y8SL2KAgwEGSxozLXFqGXJQakC80km7xx F4Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678613833; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=XI3YQx6nEQn0H0Ds9W07YHnYOT/VLK74ArQSDymbbZQ=; b=J0dWxCId8op6UIjFYV0/LNj7RTKc0NLqoz6R1SXq+HPTUtI9hv9OUeQohACsqvy6iT H3W0sMi6prL3oQ0YIkW0Be4czLZjf4S5zRlmW7OTUZBtCyC0xF3GP8O5tcfc+jdf+F9u GEtWDYtgj2uASfRH5ke8Wtsd+k1bIKdpCEyWVTzr0eehHc71UuxE5MXzAH2xPbbjMFVr CIk/WstC4ePKmgm+Vp65LwG2xN/+y6TnNEW6TJbmiWR+NhcR6TafKCqUsZk7FMIQ9GMR ciuYrMWt1c3Ep6DuFgB6Np1dTnbbbB8KlXr2IFttY3R3ZnSDX0u5FATICubMPgpRd68T XpXw== X-Gm-Message-State: AO0yUKUCRLV57LZ7v39a12giQ55MpPB7BcaYMv4hL8rCoXuiq5GOQb7m TKQQIkB4Y1gv1mEaqO6jb4ZwdwRKqg8= X-Google-Smtp-Source: AK7set8X5js8ZcCv5+przaOm5GN+pTrNLlpgxR6noTn4nGgAMNVJX8ufB5+KEvCCnbQUrb0bAIPsmw== X-Received: by 2002:a05:6a20:1582:b0:cb:c266:3f6b with SMTP id h2-20020a056a20158200b000cbc2663f6bmr31979846pzj.12.1678613832982; Sun, 12 Mar 2023 01:37:12 -0800 (PST) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id z13-20020aa785cd000000b005a8a5be96b2sm430991pfn.104.2023.03.12.01.37.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Mar 2023 01:37:12 -0800 (PST) From: Andy Tai Date: Sun, 12 Mar 2023 01:37:08 -0800 Message-Id: <20230312093708.11986-1-atai@atai.org> X-Mailer: git-send-email 2.39.1 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/opencl.scm (pocl): Update to 3.1 [native-inputs]: Add python-3 [arguments]: Update RPATH. Handle failed tests on aarch64 --- gnu/packages/opencl.scm | 71 ++++++++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 29 deletions(-) base-commit: 7001cc68b6d5785a8dd6aa202d4acbb2ea9364e5 diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index 2e506156b2..703746c1d0 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -279,38 +279,51 @@ (define-public beignet (define-public pocl (package (name "pocl") - (version "1.4") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/pocl/pocl") - (commit (string-append "v" version)))) - (sha256 - (base32 "1c4y69zks6hkq5fqh9waxgb8g4ka7y6h3vacmsm720kba0h57g8a")) - (file-name (git-file-name name version)))) + (version "3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pocl/pocl") + (commit (string-append "v" version)))) + (sha256 + (base32 + "1pw4q0hi5ynx34fvzryravz3jbh89f9cg60fkjj77sxh9xw8phdd")) + (file-name (git-file-name name version)))) (build-system cmake-build-system) - (native-inputs - (list libltdl pkg-config)) - (inputs - (list clang-9 llvm-9 `(,hwloc-2 "lib") opencl-icd-loader)) + (native-inputs (list libltdl pkg-config python-3)) + (inputs (list clang-15 llvm-15 + `(,hwloc-2 "lib") opencl-icd-loader)) (arguments - `(#:configure-flags - (list "-DENABLE_ICD=ON" - "-DENABLE_TESTSUITES=ON" - ;; We are not developers, don't run conformance suite. - "-DENABLE_CONFORMANCE=OFF" - (string-append "-DEXTRA_HOST_LD_FLAGS=-L" - (assoc-ref %build-inputs "libc") "/lib")) - #:phases - (modify-phases %standard-phases - (add-before 'check 'set-HOME - (lambda _ - (setenv "HOME" "/tmp") + `(#:configure-flags (let* ((libdir (string-append (assoc-ref %outputs + "out") + "/lib"))) + (list "-DENABLE_ICD=ON" + "-DENABLE_TESTSUITES=ON" + ;; We are not developers, don't run conformance suite. + "-DENABLE_CONFORMANCE=OFF" + (string-append "-DEXTRA_HOST_LD_FLAGS=-L" + (assoc-ref %build-inputs + "libc") "/lib") + ;; We need both libdir and libdir/pocl in RUNPATH. + (string-append "-DCMAKE_INSTALL_RPATH=" + libdir ";" libdir "/pocl"))) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'make-failed-tests-on-aarch64-expected-for-cmake + (lambda _ + (substitute* "tests/kernel/CMakeLists.txt" + ;; "kernel/test_printf_vectors" and + ;; "kernel/test_printf_vectors_ulongn" + ;; also fail on aarch54, so let them be marked + ;; "WILL_FAIL" as well in CMakeLists.txt + (("aarch64-linux-gnu") + "")))) + (add-before 'check 'set-HOME + (lambda _ + (setenv "HOME" "/tmp") - ;; Since 2.9.0, hwloc fails when /sys is missing, so provide a - ;; fake topology. - (setenv "HWLOC_SYNTHETIC" "4")))))) + ;; Since 2.9.0, hwloc fails when /sys is missing, so provide a + ;; fake topology. + (setenv "HWLOC_SYNTHETIC" "4")))))) (home-page "http://portablecl.org/") (synopsis "Portable Computing Language (pocl), an OpenCL implementation") (description