From owner-dev-commits-ports-main@freebsd.org Mon Aug 9 23:36:02 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B4D5565E0B6; Mon, 9 Aug 2021 23:36:02 +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 4GkCBp4HjPz4T2v; Mon, 9 Aug 2021 23:36:02 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 7BFF710C7F; Mon, 9 Aug 2021 23:36:02 +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 179Na20N067674; Mon, 9 Aug 2021 23:36:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 179Na2KX067673; Mon, 9 Aug 2021 23:36:02 GMT (envelope-from git) Date: Mon, 9 Aug 2021 23:36:02 GMT Message-Id: <202108092336.179Na2KX067673@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: 0b8840600bb3 - main - devel/intel-graphics-compiler: unbundle vc-intrinsics after 338664054163 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: 0b8840600bb3bc2d14a930e4f8f6eff425ae3347 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Aug 2021 23:36:02 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=0b8840600bb3bc2d14a930e4f8f6eff425ae3347 commit 0b8840600bb3bc2d14a930e4f8f6eff425ae3347 Author: Jan Beich AuthorDate: 2021-08-09 22:33:27 +0000 Commit: Jan Beich CommitDate: 2021-08-09 23:34:26 +0000 devel/intel-graphics-compiler: unbundle vc-intrinsics after 338664054163 --- devel/intel-graphics-compiler/Makefile | 2 +- devel/intel-graphics-compiler/distinfo | 2 -- .../files/patch-system-vc-intrinsics | 21 +++++++++++++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/devel/intel-graphics-compiler/Makefile b/devel/intel-graphics-compiler/Makefile index 83e81935c5e6..5beb433e66cb 100644 --- a/devel/intel-graphics-compiler/Makefile +++ b/devel/intel-graphics-compiler/Makefile @@ -18,13 +18,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= Only Intel GPUs on x86 are supported +BUILD_DEPENDS= vc-intrinsics-llvm11>=s20210730:devel/vc-intrinsics@llvm11 LIB_DEPENDS= libopencl-clang.so.11:devel/opencl-clang@llvm11 USES= bison cmake compiler:c++17-lang python:build USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= intel -GH_TUPLE= intel:vc-intrinsics:05d3f3d:vcintrin/../vc-intrinsics CMAKE_OFF= INSTALL_SPIRVDLL CMAKE_ARGS= -DCMAKE_PREFIX_PATH:PATH="${LOCALBASE}/${LIB_DEPENDS:M*@llvm*:C/.*@//}" \ -DIGC_OPTION__LLVM_PREFERRED_VERSION:STRING="${LIB_DEPENDS:M*@llvm*:C/.*so\.//:C/:.*//}" diff --git a/devel/intel-graphics-compiler/distinfo b/devel/intel-graphics-compiler/distinfo index c4a07aa66e33..6d419323ab99 100644 --- a/devel/intel-graphics-compiler/distinfo +++ b/devel/intel-graphics-compiler/distinfo @@ -1,8 +1,6 @@ TIMESTAMP = 1626602428 SHA256 (intel-intel-graphics-compiler-igc-1.0.8173_GH0.tar.gz) = 20794f1451b971c82ed824dd65723a6c562158e8061644e596b53417e9daa045 SIZE (intel-intel-graphics-compiler-igc-1.0.8173_GH0.tar.gz) = 7471884 -SHA256 (intel-vc-intrinsics-05d3f3d_GH0.tar.gz) = 7d3df322a91ea9d95ef606b9d5a2580d6deb426f779ba921ae3a799a5e642c4f -SIZE (intel-vc-intrinsics-05d3f3d_GH0.tar.gz) = 126560 SHA256 (b7f29ee948b9.patch) = f47c5d7b37d4ae264eef37646afbcbaadd370ad91035895630bd52da7cf82452 SIZE (b7f29ee948b9.patch) = 1199 SHA256 (a69ee09275fe.patch) = e3f293844338d50e6c6d8f0213377637dc1eefc79bfd07c92e889ed8a8d8dd1f diff --git a/devel/intel-graphics-compiler/files/patch-system-vc-intrinsics b/devel/intel-graphics-compiler/files/patch-system-vc-intrinsics new file mode 100644 index 000000000000..9aed7b874894 --- /dev/null +++ b/devel/intel-graphics-compiler/files/patch-system-vc-intrinsics @@ -0,0 +1,21 @@ +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) +