From nobody Thu Feb 24 00:52:52 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6F79B19CE032; Thu, 24 Feb 2022 00:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K3vX42hqkz3Mvm; Thu, 24 Feb 2022 00:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645663972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qrNqmjV357MuIO5g9pTioDsGSTp4rQh2LHQ/PBEVcN8=; b=vT8VKjGXHJKe2TYnpNYAgJmYx4x0dverHPxroassIQgnkIl18Mffvn+TDJAbPc5uWsADoh gJWPgxS92sldAKyf/4R0Wjxg6lzc6V0xrS8qbUqUt2S4/4BQC8ozZH/lJXbx8XEUt2ueJ7 Gr/Y1+fFMml+AFyDYRTMx/X9WC7hXBZQ0QUZfEG+cKeykMWo0IePIlvdj8UpEVR/SIx1Z3 9IwgeF4tekovDh6O3smF3Tq58gflZaAqmM6fHSqd9e5UUag0tEKEK8rjnGYMzxKU1DXKJQ qsw78p3+8PuEuFDFf1Z8V9PXmjf1TmBDIiZWRcp5JmGug0yFnpySNBVtybJ9xA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3C40122691; Thu, 24 Feb 2022 00:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21O0qqKN065148; Thu, 24 Feb 2022 00:52:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21O0qqGc065147; Thu, 24 Feb 2022 00:52:52 GMT (envelope-from git) Date: Thu, 24 Feb 2022 00:52:52 GMT Message-Id: <202202240052.21O0qqGc065147@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 1f5b63db91a8 - main - devel/intel-graphics-compiler: switch 0b8840600bb3 to upstream version List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f5b63db91a8cc1b13fc9d464cc8e97c699c39fd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645663972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qrNqmjV357MuIO5g9pTioDsGSTp4rQh2LHQ/PBEVcN8=; b=egPsXiVkO3RUq/XSTKU8pWhnzx7zs/RIzAeAgxaARHYeOrO/rk3Hdw9w7x0r1lR6o1gE74 55ASbTvzktdl8o8Tifs5gjr87KZ3FES+ZQgIs96HglQoETv4fhmYOTJ6CYC/ot0Gu58KAP sIKDoWFL5PM+TG4UaJpI2GvSWxlDUNTTRQzstwm5MTDnGrUQrw/EucC4Rhgm1ZPjhzs8v3 IsPj9dWnMq9NpglNJD+sycVQCv7rmRoAUCFFVe1EG1g2N5iitzAiQElZWA9Wcau3fldSm4 fHXSMY7ReyOU3re3csihS+gj3v+XITLCFo2NQIWFZZZUI98H++9OFFZgAXOLJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645663972; a=rsa-sha256; cv=none; b=BjsNXM/jeomVuiAEehLX/3QCRcsbKp+TStnT1S0aMdmaXo+ABBuMwEJo0HwY+9hgevH2dz trdTw4zsENz9snSJpizjBJPnY3wusMc5oCOz/b5qXM1NXKJH2O7ACbXPWx2jrSMqBQbngD fMXN52dDopIrPqV5GiWQG3m1z4l3ofURXIOHXx4P2/XJZ0mvxnRZw2EFoEwsGGzJtqoF3r Y2utk0chOsseXtgmVzrpZTVU58lHUv5gS7GrOT70tpKTbFN73q5wnrT5l0j3XK16XnUBaa nzSFJI50X95wIqlNy/EufbJMS+KOoXoPiZNL+0RXzYXHE4AAKrxRJhAJ//2V6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f5b63db91a8cc1b13fc9d464cc8e97c699c39fd commit 1f5b63db91a8cc1b13fc9d464cc8e97c699c39fd Author: Jan Beich AuthorDate: 2022-02-23 23:54:23 +0000 Commit: Jan Beich CommitDate: 2022-02-24 00:51:34 +0000 devel/intel-graphics-compiler: switch 0b8840600bb3 to upstream version --- devel/intel-graphics-compiler/Makefile | 4 +++- devel/intel-graphics-compiler/distinfo | 2 ++ .../files/patch-system-vc-intrinsics | 21 --------------------- 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/devel/intel-graphics-compiler/Makefile b/devel/intel-graphics-compiler/Makefile index 2c4b1437810d..3c592dd465d1 100644 --- a/devel/intel-graphics-compiler/Makefile +++ b/devel/intel-graphics-compiler/Makefile @@ -6,6 +6,7 @@ PKGNAMESUFFIX= -${FLAVOR} PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= aa7df33aebe0.patch:-p1 # https://github.com/intel/intel-graphics-compiler/pull/210 +PATCHFILES+= 35c947c2631e.patch:-p1 # https://github.com/intel/intel-graphics-compiler/issues/142 MAINTAINER= jbeich@FreeBSD.org COMMENT= Intel Graphics Compiler for OpenCL @@ -32,7 +33,8 @@ GH_ACCOUNT= intel GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-123-g814e728:headers/../SPIRV-Headers \ KhronosGroup:SPIRV-Tools:v2021.4:tools/../SPIRV-Tools CMAKE_ARGS= -DCMAKE_PREFIX_PATH:PATH="${LOCALBASE}/${FLAVOR}" \ - -DIGC_OPTION__LLVM_PREFERRED_VERSION:STRING="${FLAVOR:S/llvm//}" + -DIGC_OPTION__LLVM_PREFERRED_VERSION:STRING="${FLAVOR:S/llvm//}" \ + -DIGC_OPTION__VC_INTRINSICS_MODE:STRING=Prebuilds CFLAGS+= -Wno-macro-redefined # __fastcall PLIST_SUB= ARCH_SUFX=${ARCH:S/i386/32/:S/amd//:S/x86_//} diff --git a/devel/intel-graphics-compiler/distinfo b/devel/intel-graphics-compiler/distinfo index b593827831ab..ee91257b8635 100644 --- a/devel/intel-graphics-compiler/distinfo +++ b/devel/intel-graphics-compiler/distinfo @@ -7,3 +7,5 @@ SHA256 (KhronosGroup-SPIRV-Tools-v2021.4_GH0.tar.gz) = d68de260708dda785d109ff1c SIZE (KhronosGroup-SPIRV-Tools-v2021.4_GH0.tar.gz) = 2887505 SHA256 (aa7df33aebe0.patch) = b2da1a00ac59ce7e98fd6cfb554f8974b1500bc1b9973387181414ffa4cffea5 SIZE (aa7df33aebe0.patch) = 2242 +SHA256 (35c947c2631e.patch) = fea59a67ebba1debed6d4948139184ba8677989c1b966794ac60161936846153 +SIZE (35c947c2631e.patch) = 3354 diff --git a/devel/intel-graphics-compiler/files/patch-system-vc-intrinsics b/devel/intel-graphics-compiler/files/patch-system-vc-intrinsics deleted file mode 100644 index 9aed7b874894..000000000000 --- a/devel/intel-graphics-compiler/files/patch-system-vc-intrinsics +++ /dev/null @@ -1,21 +0,0 @@ -https://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/tree/dynamic-layers/clang-layer/recipes-opencl/igc/files/link-to-LLVMGenXIntrinsics.patch - ---- IGC/VectorCompiler/CMakeLists.txt.orig 2021-07-18 10:00:28 UTC -+++ IGC/VectorCompiler/CMakeLists.txt -@@ -44,6 +44,8 @@ endif() - - # --- VC Intrinsics --- - -+find_package(LLVMGenXIntrinsics) -+if(NOT LLVMGenXIntrinsics_FOUND) - if(DEFINED VC_INTRINSICS_SRC) - set(INTRSRC "${VC_INTRINSICS_SRC}/GenXIntrinsics") - endif() -@@ -58,6 +61,7 @@ set(BUILD_EXTERNAL YES) - # We are using prebuilt SPIRV and building intrinsics. - set(INTRBUILD "${CMAKE_CURRENT_BINARY_DIR}/intrbuild") - add_subdirectory(${INTRSRC} ${INTRBUILD} EXCLUDE_FROM_ALL) -+endif(NOT LLVMGenXIntrinsics_FOUND) - - include(cmake/spirv.cmake) -