* [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/, dev-util/intel-graphics-compiler/files/
@ 2019-07-03 16:12 Marek Szuba
0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2019-07-03 16:12 UTC (permalink / raw
To: gentoo-commits
commit: a4749674721f792eccb5e794a61e1e49ddcc3351
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 3 16:10:40 2019 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Jul 3 16:11:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4749674
dev-util/intel-graphics-compiler: bump to 1.0.9
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
dev-util/intel-graphics-compiler/Manifest | 1 +
.../intel-graphics-compiler-1.0.9-no_Werror.patch | 10 ++++++
.../intel-graphics-compiler-1.0.9.ebuild | 36 ++++++++++++++++++++++
3 files changed, 47 insertions(+)
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 2033ddd9879..606121b059a 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1 +1,2 @@
DIST intel-graphics-compiler-1.0.8.tar.gz 6428984 BLAKE2B 1835f86da24162af0f568794fd084c12cf8950601a74d3aaef928739d7ef942a23b2309713976b2fd67684d7360706155610ee7a80db0dbc217ff5b502b254d2 SHA512 43c54858fcc5ec5941d79ed34774077bcd5ece80d6d2bb28526b15ffe5237dddbcef2c13e4cc21faf35851174ed5a5b1af65db9bdd3281657e1e09456b761c18
+DIST intel-graphics-compiler-1.0.9.tar.gz 5684971 BLAKE2B c3a07773f1ee4ef53bae4af61a85e8ac60f3ddde3573fa853c12c887f94191b344b905bfb0d6ef7e489b2bbb05c01719981199fa85397c87f4ef74b0338bfffe SHA512 67c9efafab1cce4c34fb00cf9b20660c2107daeff27e3837a52c9f24405cb5c11c46366662692d47b4490584890cc5a5791de358196dcabc6e566e22b1aafd53
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.9-no_Werror.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.9-no_Werror.patch
new file mode 100644
index 00000000000..433b0e9caae
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.9-no_Werror.patch
@@ -0,0 +1,10 @@
+--- a/IGC/CMakeLists.txt
++++ b/IGC/CMakeLists.txt
+@@ -2769,7 +2769,6 @@
+ -march=corei7
+ -mstackrealign
+ -fms-extensions
+- -Werror
+ -Wno-unused-parameter
+ -Wno-missing-field-initializers
+ -Wwrite-strings
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9.ebuild
new file mode 100644
index 00000000000..54d2ad4034c
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib llvm
+
+DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]
+ >=dev-libs/opencl-clang-8.0.1:8=[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}"
+
+LLVM_MAX_SLOT=8
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
+)
+
+S="${WORKDIR}"/${PN}-igc-${PV}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_LIBRARY_PATH=$(get_llvm_prefix)/$(get_libdir)
+ -DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
+ -DIGC_PREFERRED_LLVM_VERSION=8
+ )
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/, dev-util/intel-graphics-compiler/files/
@ 2019-10-07 12:23 Marek Szuba
0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2019-10-07 12:23 UTC (permalink / raw
To: gentoo-commits
commit: 9196c0293b8b23f1de5da069ebe5b188254311bb
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 7 12:17:51 2019 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Oct 7 12:22:49 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9196c029
dev-util/intel-graphics-compiler: remove old
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
dev-util/intel-graphics-compiler/Manifest | 3 --
...ompiler-1.0.9-opencl-clang_solib_filename.patch | 14 --------
.../intel-graphics-compiler-1.0.11.ebuild | 36 ---------------------
.../intel-graphics-compiler-1.0.8.ebuild | 34 --------------------
.../intel-graphics-compiler-1.0.9.ebuild | 37 ----------------------
5 files changed, 124 deletions(-)
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
deleted file mode 100644
index 398ef3ea56d..00000000000
--- a/dev-util/intel-graphics-compiler/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST intel-graphics-compiler-1.0.11.tar.gz 5720630 BLAKE2B 1539de7aec3d0c357159a5be6c446ee4e3c98857fb666ab09ceefdb9ae93b430bc164de2f17848f25aeef1a95ce2066441aa0584354c14ed06fbb9179a17ba58 SHA512 2b4b43b152014329e2d9dcba1a5b832fb8c641a3bd004345ddc8d36a237bc15f112ef007894b5adbe175bf08584093adcee655b5e61a9da81d6956974e03248f
-DIST intel-graphics-compiler-1.0.8.tar.gz 6428984 BLAKE2B 1835f86da24162af0f568794fd084c12cf8950601a74d3aaef928739d7ef942a23b2309713976b2fd67684d7360706155610ee7a80db0dbc217ff5b502b254d2 SHA512 43c54858fcc5ec5941d79ed34774077bcd5ece80d6d2bb28526b15ffe5237dddbcef2c13e4cc21faf35851174ed5a5b1af65db9bdd3281657e1e09456b761c18
-DIST intel-graphics-compiler-1.0.9.tar.gz 5684971 BLAKE2B c3a07773f1ee4ef53bae4af61a85e8ac60f3ddde3573fa853c12c887f94191b344b905bfb0d6ef7e489b2bbb05c01719981199fa85397c87f4ef74b0338bfffe SHA512 67c9efafab1cce4c34fb00cf9b20660c2107daeff27e3837a52c9f24405cb5c11c46366662692d47b4490584890cc5a5791de358196dcabc6e566e22b1aafd53
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.9-opencl-clang_solib_filename.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.9-opencl-clang_solib_filename.patch
deleted file mode 100644
index aef204e9055..00000000000
--- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.9-opencl-clang_solib_filename.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/IGC/BiFModule/CMakeLists.txt
-+++ b/IGC/BiFModule/CMakeLists.txt
-@@ -158,11 +158,7 @@
-
- if(UNIX)
- if(NOT ${CCLANG_BUILD_INTREE_LLVM})
-- if(${LLVM_VERSION_MINOR} EQUAL 0 AND ${LLVM_VERSION_PATCH} EQUAL 0)
- set_property(TARGET opencl-clang-lib PROPERTY "IMPORTED_SONAME" "${COMMON_CLANG_LIB_FULL_NAME}.${LLVM_VERSION_MAJOR}")
-- else()
-- set_property(TARGET opencl-clang-lib PROPERTY "IMPORTED_SONAME" "${COMMON_CLANG_LIB_FULL_NAME}.${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}")
-- endif()
- endif()
- if (NOT CCLANG_FROM_SYSTEM)
- install(FILES $<TARGET_FILE:opencl-clang-lib> DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT igc-opencl)
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11.ebuild
deleted file mode 100644
index 54d2ad4034c..00000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib llvm
-
-DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]
- >=dev-libs/opencl-clang-8.0.1:8=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-
-LLVM_MAX_SLOT=8
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
-)
-
-S="${WORKDIR}"/${PN}-igc-${PV}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DCMAKE_LIBRARY_PATH=$(get_llvm_prefix)/$(get_libdir)
- -DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
- -DIGC_PREFERRED_LLVM_VERSION=8
- )
- cmake-utils_src_configure
-}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8.ebuild
deleted file mode 100644
index 9ab4c699762..00000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib llvm
-
-DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]
- <dev-libs/opencl-clang-8.0.1:8=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-
-LLVM_MAX_SLOT=8
-
-S="${WORKDIR}"/${PN}-igc-${PV}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DCMAKE_LIBRARY_PATH=$(get_llvm_prefix)/$(get_libdir)
- -DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
- -DIGC_PREFERRED_LLVM_VERSION=8
- # Until a new official release of opencl-clang
- -DCOMMON_CLANG_LIBRARY_NAME=common_clang
- )
- cmake-utils_src_configure
-}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9.ebuild
deleted file mode 100644
index 6ed0f9a6290..00000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib llvm
-
-DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]
- >=dev-libs/opencl-clang-8.0.1:8=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-
-LLVM_MAX_SLOT=8
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
- "${FILESDIR}"/${PN}-1.0.9-opencl-clang_solib_filename.patch
-)
-
-S="${WORKDIR}"/${PN}-igc-${PV}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DCMAKE_LIBRARY_PATH=$(get_llvm_prefix)/$(get_libdir)
- -DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
- -DIGC_PREFERRED_LLVM_VERSION=8
- )
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/, dev-util/intel-graphics-compiler/files/
@ 2020-03-12 11:33 Marek Szuba
0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2020-03-12 11:33 UTC (permalink / raw
To: gentoo-commits
commit: c9147fb47a788323d9255b092502ab3c90a8e9a5
Author: Jan Vesely <jano.vesely <AT> gmail <DOT> com>
AuthorDate: Wed Mar 11 01:02:25 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Mar 12 11:32:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9147fb4
dev-util/intel-graphics-compiler: Bump version to 1.0.3445
Add patch and enable opencl-clang:9 and llvm:9.
Signed-off-by: Jan Vesely <jano.vesely <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14925
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
dev-util/intel-graphics-compiler/Manifest | 1 +
...-for-building-separated-dynamic-llvm-libs.patch | 45 +++++++++++++++++++++
.../intel-graphics-compiler-1.0.3445.ebuild | 46 ++++++++++++++++++++++
3 files changed, 92 insertions(+)
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index cc17dcf05fc..025fd957a00 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,3 +1,4 @@
DIST intel-graphics-compiler-1.0.2878.tar.gz 5920418 BLAKE2B 99522118d08183836c6e62f80c98b2cc716dd22d7dc82d05841e87e42f10025508c6254cebe2f886da8454cc4cc4b3a9ee06ce5a3bc04246c88f499f63f8f1ae SHA512 3b6dc9b945fddb3d0bc716f4598c4dacb6431c342b580c90f7e9ff8682bdcbde410a960adbfd9e67601d121adc70d2cf23de01bc99c1d0cb86d14b4db77afde5
DIST intel-graphics-compiler-1.0.2990.tar.gz 5930890 BLAKE2B 038761e74dde52de53eed511a74a39d9b4c69a510ef289d2941b859aea018d6776b5179d2be006b12d3245ffe43a06bfacd9d03ee2d227c2ba2ea39805bf40d2 SHA512 65287348e98f09096418afa02262ad6ce07dd918aa040ac1fb49f7176545c0a6449e68c5e74a11c41641d90495edc7be8e24b32e68d798df906ea3b16e675827
DIST intel-graphics-compiler-1.0.3151.tar.gz 5950502 BLAKE2B 8ccbfc5d3cd6307eb5db602822d42e8744e6ca7696494a0dd349847aff0defde2434b9192f17645f1fcbf732ec98a66dbdcc7d03eed48702d90911f912135fc1 SHA512 a6e04a3a90aae9046f2698bf15d5f60862c93e7a87a6e4ae6b6c43c65490583608f201e94a2ef32fc2f72e9fa0da7d6c202f64ef610f03a81384ac537541df14
+DIST intel-graphics-compiler-1.0.3445.tar.gz 6026437 BLAKE2B 4a4708109d125891dfe967186efbc2ebe70ce59dc0302f534dad74c0b1f2af36de0d7ee7cb69059e776ab4669236f5d62750159a44d44a6444ab85a205273563 SHA512 044b941adb921b25a1ab6da3ebe0f7c4d67769b43e5b855ae94871281cf387ce45351b8b46a6e98e3bd573022d7cfd9316629d590327c8f4007e1b1ae9f7071e
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch
new file mode 100644
index 00000000000..931ba4437b1
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch
@@ -0,0 +1,45 @@
+From 5a07111005b570875da8796f91b385edc483c0da Mon Sep 17 00:00:00 2001
+From: "Wesierski, Lukasz" <lukasz.wesierski@intel.com>
+Date: Mon, 24 Feb 2020 05:27:13 -0800
+Subject: [PATCH] Fix for building separated dynamic llvm libs
+
+Change-Id: I3796e7a925e32bfee2dfda60fbaa3f21122e62cb
+---
+ IGC/CMakeLists.txt | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/IGC/CMakeLists.txt b/IGC/CMakeLists.txt
+index 8634c456..891a3f5b 100644
+--- a/IGC/CMakeLists.txt
++++ b/IGC/CMakeLists.txt
+@@ -82,7 +82,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
+
+ # ================================================ Flags ===============================================
+
+-
+ # Escapes text for regular expressions.
+ #
+ # @param retValName Name of variable placeholder where result will be returned.
+@@ -3309,12 +3308,18 @@ else()
+ "LLVMDemangle"
+ )
+
+- if(LLVM_VERSION_MAJOR EQUAL 8)
++ if(LLVM_VERSION_MAJOR GREATER_EQUAL 8)
+ list(APPEND IGC_BUILD__LLVM_LIBS_TO_LINK
+ "LLVMInstCombine"
+ )
+ endif()
+
++ if(LLVM_VERSION_MAJOR GREATER_EQUAL 9)
++ list(APPEND IGC_BUILD__LLVM_LIBS_TO_LINK
++ "LLVMBitstreamReader"
++ )
++ endif()
++
+ endif()
+
+ # ==================================== WrapperLLVM package =============================================
+--
+2.24.1
+
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3445.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3445.ebuild
new file mode 100644
index 00000000000..7076388bbd0
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3445.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib llvm
+
+DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+LLVM_MAX_SLOT=9
+
+COMMON="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
+ <=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
+ "${FILESDIR}"/${PN}-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch
+)
+
+S="${WORKDIR}"/${PN}-igc-${PV}
+
+multilib_src_configure() {
+ # Select the same slot as the best opencl-clang
+ local ocl_clang_ver="$(best_version -d dev-libs/opencl-clang:=)"
+ einfo "Selecting $ocl_clang_ver"
+ local llvm_slot=$(ver_cut 5 $ocl_clang_ver)
+ # opencl-clang brings the right slot as dep
+ has_version -d sys-devel/llvm:$llvm_slot || die "LLVM slot matching $ocl_clang_ver not found ($llvm_slot)"
+ einfo "Selecting LLVM SLOT $llvm_slot: $(best_version -d sys-devel/llvm:$llvm_slot)"
+
+ local mycmakeargs=(
+ -DCMAKE_LIBRARY_PATH=$(get_llvm_prefix ${llvm_slot})/$(get_libdir)
+ -DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
+ -DIGC_PREFERRED_LLVM_VERSION=${llvm_slot}
+ )
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/, dev-util/intel-graphics-compiler/files/
@ 2020-09-07 11:09 Marek Szuba
0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2020-09-07 11:09 UTC (permalink / raw
To: gentoo-commits
commit: d72bc570d77c3aae6ca74a509311be211000919b
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 7 10:56:14 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Sep 7 11:09:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d72bc570
dev-util/intel-graphics-compiler: bypass opencl-clang version check
Ebuilds already make sure we have a new-enough version of
dev-libs/opencl-clang present, besides we have never even had versions
older than 5.0.0 in the tree. No opencl-clang version check in CMake -
no need to call readelf - no more issues on USE=-native-symlinks
systems.
Closes: https://bugs.gentoo.org/739138
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
...cs-compiler-1.0.4111-opencl-clang_version.patch | 27 ++++++++++++++++++++++
.../intel-graphics-compiler-1.0.4111.ebuild | 2 ++
2 files changed, 29 insertions(+)
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.4111-opencl-clang_version.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.4111-opencl-clang_version.patch
new file mode 100644
index 00000000000..8996466275c
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.4111-opencl-clang_version.patch
@@ -0,0 +1,27 @@
+--- a/IGC/BiFModule/CMakeLists.txt
++++ b/IGC/BiFModule/CMakeLists.txt
+@@ -160,20 +160,10 @@
+
+ if(UNIX)
+ if(NOT ${CCLANG_BUILD_INTREE_LLVM})
+- # Get common clang library soname
+- get_target_property(CCLANG_LIB_PATH opencl-clang-lib "IMPORTED_LOCATION")
+- execute_process(
+- COMMAND readelf -d ${CCLANG_LIB_PATH}
+- OUTPUT_VARIABLE CCLANG_READELF_CALL)
+- string(REGEX MATCH "\\[${COMMON_CLANG_LIB_FULL_NAME}\\.([0-9](\\.[0-9]*)*[a-zA-Z0-9]*)\\]" CCLANG_SONAME_VERSION "${CCLANG_READELF_CALL}")
+- set(CCLANG_SONAME_VERSION "${CMAKE_MATCH_1}")
+-
+- # Check if common clang library is newer than 5.0.0 version on which we have SPIR-V support
+- if("${CCLANG_SONAME_VERSION}" VERSION_GREATER "5.0.0")
+- set_property(TARGET opencl-clang-lib PROPERTY "IMPORTED_SONAME" "${COMMON_CLANG_LIB_FULL_NAME}.${CCLANG_SONAME_VERSION}")
+- else()
+- message(FATAL_ERROR "[IGC\\BiFModule] : Version ${CCLANG_SONAME_VERSION} of library ${COMMON_CLANG_LIB_FULL_NAME} is below version 5.0.0 (where it's starts support of SPIR-V), please upgrade this library at least to version 5.0.0")
+- endif()
++ # Workaround for https://bugs.gentoo.org/739138 : instead of checking
++ # the version of opencl-clang, have ebuilds set CCLANG_SONAME_VERSION
++ # for us.
++ set_property(TARGET opencl-clang-lib PROPERTY "IMPORTED_SONAME" "${COMMON_CLANG_LIB_FULL_NAME}.${CCLANG_SONAME_VERSION}")
+ endif()
+ if (NOT CCLANG_FROM_SYSTEM)
+ install(FILES $<TARGET_FILE:opencl-clang-lib> DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT igc-opencl)
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
index 3bdf70d334d..b5113c4912d 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
@@ -27,6 +27,7 @@ RDEPEND="${COMMON}"
PATCHES=(
"${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
+ "${FILESDIR}"/${PN}-1.0.4111-opencl-clang_version.patch
)
S="${WORKDIR}"/${PN}-igc-${PV}
@@ -45,6 +46,7 @@ multilib_src_configure() {
use debug || append-cppflags -DNDEBUG
local mycmakeargs=(
+ -DCCLANG_SONAME_VERSION=${llvm_slot}
-DCMAKE_LIBRARY_PATH=$(get_llvm_prefix ${llvm_slot})/$(get_libdir)
-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
-DIGC_PREFERRED_LLVM_VERSION=${llvm_slot}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/, dev-util/intel-graphics-compiler/files/
@ 2020-09-13 19:17 Marek Szuba
0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2020-09-13 19:17 UTC (permalink / raw
To: gentoo-commits
commit: a8e3b1a013be805fff6aa076d62c32f3be86fa9b
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 13 19:13:29 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 19:16:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8e3b1a0
dev-util/intel-graphics-compiler: bump to 1.0.4427
This is the newest version that I can build successfully on my system
with VC disabled, all the newer ones fail due to missing bits in IGC
code itself which disabling VectorCompute seems to mask out.
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
dev-util/intel-graphics-compiler/Manifest | 1 +
...piler-1.0.4427-noVC_TranslateBuild_retval.patch | 11 ++++
.../intel-graphics-compiler-1.0.4427.ebuild | 72 ++++++++++++++++++++++
3 files changed, 84 insertions(+)
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index bb330148e01..b1dc0c1dfbf 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1 +1,2 @@
DIST intel-graphics-compiler-1.0.4111.tar.gz 5781246 BLAKE2B 6fe47422b31b0c73d24c3cef1265772927a57751bf5648f862f7c73528f2174268fdb2271c30c49ab038b4dfbe530bc088fe727e66babc5db0a41759e7212733 SHA512 8f589ee83a27b7a8f5abcd008e36a73fb704c20c1ae17e1ef265c59641768b75a0a08f2d6f80355442fff7625154603db3ebe9be0a4ba702b45e85db434f8110
+DIST intel-graphics-compiler-1.0.4427.tar.gz 6454774 BLAKE2B 283575b301862114f88d1067c8dddec13694cf6a48d335d83434f47a6e95164df9b5ac4385446472ce2b454244308f63b57d7bb3cadfc8acff9472fc48dca2f9 SHA512 902aa15cf1b8d1760cf9b4d35848b37c2296601625e1f123f9a059c9a87d80e851525e3d943facf14e011cf82670057dbad3f75774d6dbf5b6cd52b55669ed3c
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.4427-noVC_TranslateBuild_retval.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.4427-noVC_TranslateBuild_retval.patch
new file mode 100644
index 00000000000..8822fc54e74
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.4427-noVC_TranslateBuild_retval.patch
@@ -0,0 +1,11 @@
+--- a/IGC/AdaptorOCL/dllInterfaceCompute.cpp
++++ b/IGC/AdaptorOCL/dllInterfaceCompute.cpp
+@@ -1570,7 +1570,7 @@
+ {
+ #if IGC_VC_DISABLED
+ SetErrorMessage("IGC VC explicitly disabled in build", *pOutputArgs);
+- return false;
++ return std::error_code(1, std::generic_category());
+ #else
+
+ llvm::StringRef ApiOptions{pInputArgs->pOptions, pInputArgs->OptionsSize};
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4427.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4427.ebuild
new file mode 100644
index 00000000000..95942f84f47
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4427.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib flag-o-matic llvm
+
+DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+LLVM_MAX_SLOT=10
+
+# Yes, the last dependency does effectively force the use of llvm-10
+# - there are currently no SLOT=9 ebuilds of opencl-clang with mem2reg
+# support. Of course with there being no SLOT=9 ebuilds of vc-intrinsics
+# (which we'll need soon as well) at all either we are limited to llvm-10 anyway.
+COMMON="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
+ <=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
+ >=dev-libs/opencl-clang-10.0.0.2:=[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
+ "${FILESDIR}"/${PN}-1.0.4111-opencl-clang_version.patch
+ "${FILESDIR}"/${PN}-1.0.4427-noVC_TranslateBuild_retval.patch
+)
+
+S="${WORKDIR}"/${PN}-igc-${PV}
+
+find_best_llvm_slot() {
+ local candidate_slot
+
+ # Select the same slot as the best opencl-clang
+ local ocl_clang_ver="$(best_version -d dev-libs/opencl-clang:=)"
+ einfo "Selecting ${ocl_clang_ver}"
+ candidate_slot=$(ver_cut 5 ${ocl_clang_ver})
+
+ # Sanity check - opencl-clang brings the right LLVM slot as its
+ # dependency so if this is missing, something is very wrong.
+ has_version -d sys-devel/llvm:${candidate_slot} || die "LLVM slot matching ${ocl_clang_ver} not found (${candidate_slot})"
+
+ echo ${candidate_slot}
+}
+
+multilib_src_configure() {
+ local llvm_slot=$(find_best_llvm_slot)
+ einfo "Selecting LLVM slot ${llvm_slot}: $(best_version -d sys-devel/llvm:${llvm_slot})"
+ local llvm_prefix=$(get_llvm_prefix ${llvm_slot})
+
+ # Since late March 2020 cmake.eclass does not set -DNDEBUG any more, and the way
+ # IGC uses this definition causes problems for some users (see Bug #718824).
+ use debug || append-cppflags -DNDEBUG
+
+ # VectorCompiler needs work, at the moment upstream only supports building vc-intrinsics in place.
+ local mycmakeargs=(
+ -DCCLANG_SONAME_VERSION=${llvm_slot}
+ -DCMAKE_LIBRARY_PATH="${llvm_prefix}"/$(get_libdir)
+ -DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
+ -DIGC_PREFERRED_LLVM_VERSION=${llvm_slot}
+ -DIGC_BUILD__VC_ENABLED=no
+ )
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/, dev-util/intel-graphics-compiler/files/
@ 2022-03-27 22:23 Conrad Kostecki
0 siblings, 0 replies; 12+ messages in thread
From: Conrad Kostecki @ 2022-03-27 22:23 UTC (permalink / raw
To: gentoo-commits
commit: eb7a87df42143a54309e6c16ec23dccaa430cfc9
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 01:17:54 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 22:21:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb7a87df
dev-util/intel-graphics-compiler: add 1.0.10713
Bug: https://bugs.gentoo.org/817146
Closes: https://bugs.gentoo.org/822438
Closes: https://github.com/gentoo/gentoo/pull/24731
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-util/intel-graphics-compiler/Manifest | 1 +
...713-allow-external-spirv-tools-fix-static.patch | 23 ++++++
...10713-allow-external-spirv-tools-last-fix.patch | 40 ++++++++++
.../intel-graphics-compiler-1.0.10713.ebuild | 87 ++++++++++++++++++++++
4 files changed, 151 insertions(+)
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index a656665cd26a..a84e31babec5 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,2 +1,3 @@
+DIST intel-graphics-compiler-1.0.10713.tar.gz 8489446 BLAKE2B 063b938ae6d32f3a64decf943215c54ea45eafdb828fdec467941f9e4288977332a3e5e0703193c95412c287f20944b5c2951310c6eb678233cd16dfdd3377b0 SHA512 a6c568d339c0316400f88e318a290a92f842eeb2ab92abd0c23ff155e6b90e2d8e012ac8714a9695a66a509ffef66574919d92bc03ff06b773a79896546fe1a6
DIST intel-graphics-compiler-1.0.8744.tar.gz 7586378 BLAKE2B 0f20f99a2659f733521af35c1dd63c2b1398bf4fc5745a217b96ad62cfa53f105d4c9a34eba09651d0f0679d6957820011446f5657170f5ad07d110372b8b1f3 SHA512 dbbe6c08f32b80be305add570187df883aacefbf90b252c70b5705ecc7732f25873732a85558f0aed2ee8db5bcd1a59aec4d7ba110774922dbb19d4d3522a539
DIST intel-graphics-compiler-1.0.9441.tar.gz 7893557 BLAKE2B f050df0eddf63f880757fb04dded4ddc133c11fd7a7c8ceab152ac233ba9953b7efbe948433056654b2b43db2254a1edc15e5aada24fd3873face6f43d1307f9 SHA512 eaccec4213ea7af7deeaf8772784065839bb2f1dc98fb88b49acfcfc2b299f7e6ecb48c5df854448fa7db79f738654db722fcf684e9bbc94051d3bcfe449e20f
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.10713-allow-external-spirv-tools-fix-static.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.10713-allow-external-spirv-tools-fix-static.patch
new file mode 100644
index 000000000000..6abfdfe60d53
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.10713-allow-external-spirv-tools-fix-static.patch
@@ -0,0 +1,23 @@
+From 7e6b78d1ccf5afb4080795aa87029e55b9e5499c Mon Sep 17 00:00:00 2001
+From: Andrey Agrachev <andrey.agrachev@intel.com>
+Date: Thu, 10 Mar 2022 12:51:37 +0000
+Subject: [PATCH] Remove 'static' suffix
+
+Remove 'static' suffix to enable shared lib usage
+---
+ external/SPIRV-Tools/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt
+index f46a6988683..f40605c4b36 100644
+--- a/external/SPIRV-Tools/CMakeLists.txt
++++ b/external/SPIRV-Tools/CMakeLists.txt
+@@ -34,7 +34,7 @@ if(IGC_OPTION__SPIRV_TOOLS_MODE STREQUAL PREBUILDS_MODE_NAME)
+
+ set(INCLUDE_DIRS_LIST "${SPIRV-Tools_ROOT_DIR}/include" "${SPIRV-Headers_INCLUDE_DIR}")
+ set_target_properties(SPIRV-Tools-static PROPERTIES INCLUDE_DIRECTORIES "${INCLUDE_DIRS_LIST}")
+- set(IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools-static)
++ set(IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools)
+
+ else() #By default use build from sources
+ message(STATUS "[SPIRV-Tools] : IGC_OPTION__SPIRV_TOOLS_MODE set to Source")
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.10713-allow-external-spirv-tools-last-fix.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.10713-allow-external-spirv-tools-last-fix.patch
new file mode 100644
index 000000000000..5959a514004c
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.10713-allow-external-spirv-tools-last-fix.patch
@@ -0,0 +1,40 @@
+From acfa99b5aefbebf037e4c939f5a8e592dfaed04e Mon Sep 17 00:00:00 2001
+From: Andrey Agrachev <andrey.agrachev@intel.com>
+Date: Tue, 22 Mar 2022 09:15:54 +0000
+Subject: [PATCH] Fix missprints
+
+Fix misspints in Spirv-Tools CMakeList
+---
+ external/SPIRV-Tools/CMakeLists.txt | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt
+index f40605c4b36..076079f7c86 100644
+--- a/external/SPIRV-Tools/CMakeLists.txt
++++ b/external/SPIRV-Tools/CMakeLists.txt
+@@ -16,7 +16,7 @@ if(IGC_OPTION__SPIRV_TOOLS_MODE STREQUAL PREBUILDS_MODE_NAME)
+ OPTION(IGC__OPTION_USE_PREINSTALLED_SPRIV_HEADERS OFF)
+
+ if(IGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS)
+- message(STATUS "[SPIRV-Tools] : IGC__OPTION_USE_PREINSTALLED_SPRIV_HEADERS set to OFF, using preinstalled SPIRV-Headers")
++ message(STATUS "[SPIRV-Tools] : IGC__OPTION_USE_PREINSTALLED_SPRIV_HEADERS set to ON, using preinstalled SPIRV-Headers")
+ message(STATUS "[SPIRV-Tools] : Using preinstalled SPIRV-Headers")
+ set(SPIRV-Headers_INCLUDE_DIR "/usr/include")
+ else()
+@@ -33,13 +33,13 @@ if(IGC_OPTION__SPIRV_TOOLS_MODE STREQUAL PREBUILDS_MODE_NAME)
+ set(IGC_BUILD__SPIRV-Tools_DIR "${SPIRV-Tools_ROOT_DIR}")
+
+ set(INCLUDE_DIRS_LIST "${SPIRV-Tools_ROOT_DIR}/include" "${SPIRV-Headers_INCLUDE_DIR}")
+- set_target_properties(SPIRV-Tools-static PROPERTIES INCLUDE_DIRECTORIES "${INCLUDE_DIRS_LIST}")
++ set_target_properties(SPIRV-Tools PROPERTIES INCLUDE_DIRECTORIES "${INCLUDE_DIRS_LIST}")
+ set(IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools)
+
+ else() #By default use build from sources
+ message(STATUS "[SPIRV-Tools] : IGC_OPTION__SPIRV_TOOLS_MODE set to Source")
+- message(STATUS "[SPIRV-Tools] : IGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS set to ON")
+- message(STATUS "[SPIRV-Tools] : Using preinstalled packages")
++ message(STATUS "[SPIRV-Tools] : IGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS set to OFF")
++ message(STATUS "[SPIRV-Tools] : Building from source")
+ message(STATUS "[SPIRV-Tools] : Current source dir: ${CMAKE_CURRENT_SOURCE_DIR}")
+
+ set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../SPIRV-Headers") # used in subdirectory
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713.ebuild
new file mode 100644
index 000000000000..906d7de597c5
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_MAX_SLOT="13"
+MY_PN="igc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake flag-o-matic llvm python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+DEPEND="
+ dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
+ dev-util/spirv-tools
+ sys-devel/llvm:${LLVM_MAX_SLOT}=
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+ ${PYTHON_DEPS}
+ >=sys-devel/lld-${LLVM_MAX_SLOT}
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
+ "${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
+ "${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+ "${FILESDIR}/${PN}-1.0.10713-allow-external-spirv-tools-fix-static.patch"
+ "${FILESDIR}/${PN}-1.0.10713-allow-external-spirv-tools-last-fix.patch"
+)
+
+pkg_setup() {
+ llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_configure() {
+ # Get LLVM version
+ local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
+
+ # See https://github.com/intel/intel-graphics-compiler/issues/212
+ append-ldflags -Wl,-z,undefs
+
+ # See https://bugs.gentoo.org/718824
+ ! use debug && append-cppflags -DNDEBUG
+
+ local mycmakeargs=(
+ -DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
+ -DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
+ -DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
+ -DIGC_OPTION__CLANG_MODE="Prebuilds"
+ -DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
+ -DIGC_OPTION__LLD_MODE="Prebuilds"
+ -DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
+ -DIGC_OPTION__LLVM_MODE="Prebuilds"
+ -DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
+ -DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
+ -DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
+ -DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
+ -DINSTALL_GENX_IR="ON"
+ -DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
+
+ # VectorCompiler needs work, as at the moment upstream
+ # only supports building vc-intrinsics in place.
+ -DIGC_BUILD__VC_ENABLED="OFF"
+ # -DIGC_OPTION__VC_INTRINSICS_MODE="Prebuilds"
+
+ # This will suspress some CMake warnings,
+ # which cannot be fixed at the moment.
+ -Wno-dev
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/, dev-util/intel-graphics-compiler/files/
@ 2022-04-23 18:33 Conrad Kostecki
0 siblings, 0 replies; 12+ messages in thread
From: Conrad Kostecki @ 2022-04-23 18:33 UTC (permalink / raw
To: gentoo-commits
commit: d9ced355d625d4580249d197f187972f5267c671
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 23 17:55:08 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 18:33:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9ced355
dev-util/intel-graphics-compiler: drop 1.0.10713-r1, 1.0.10840-r1
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-util/intel-graphics-compiler/Manifest | 2 -
...713-allow-external-spirv-tools-fix-static.patch | 23 ------
.../intel-graphics-compiler-1.0.10713-r1.ebuild | 88 ----------------------
.../intel-graphics-compiler-1.0.10840-r1.ebuild | 87 ---------------------
4 files changed, 200 deletions(-)
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index a23347d60dbd..6be5111d94d1 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,4 +1,2 @@
-DIST intel-graphics-compiler-1.0.10713.tar.gz 8489446 BLAKE2B 063b938ae6d32f3a64decf943215c54ea45eafdb828fdec467941f9e4288977332a3e5e0703193c95412c287f20944b5c2951310c6eb678233cd16dfdd3377b0 SHA512 a6c568d339c0316400f88e318a290a92f842eeb2ab92abd0c23ff155e6b90e2d8e012ac8714a9695a66a509ffef66574919d92bc03ff06b773a79896546fe1a6
DIST intel-graphics-compiler-1.0.10778.tar.gz 8515512 BLAKE2B 56d7a0b54ce026d93179737fe199d006923398b7f85d582487469f1cfa665ae5351bc160c6babda5d8bf2bf6173a051277b2fb11c9ccf4b888cd0e06295161c4 SHA512 e8fcdab3a8c70f8560f49288db42a926f1e8e82d3e433bb897fcd1648acdf0f8fe425a1cd8dae5bfabc7d0a91fe0c985550e35c6396fe46778091852e185e750
-DIST intel-graphics-compiler-1.0.10840.tar.gz 8526951 BLAKE2B 08497e7c3259f33cb5dbdc43a0554f7f83173f43e2d39249d3845e6a4592035c085242d6534719dbb15f14351e301344598618790232db43ea3cee6fa2b7c5af SHA512 268b118732a6e5828a13eddc396b38aef5e7b746f8db0786dce76323fadcfe2a64b0bac87b6557c5bb7ddb000ec31e08f7b2557acfa612d960516e93cec78c81
DIST intel-graphics-compiler-1.0.10988.tar.gz 8571350 BLAKE2B 8f1fcba9016eb607de4604b152e559cae8547c99a618dfc533591165c2da95b466227b75c4ef2b2e9064ec0a30fac711176a7f46f2952df51c06e172fcdcffe4 SHA512 b4de7dc195ee089321a28a428e7604f187552ca161bd08ef245f61740f2ee91e8d48d0718dac17641368113cd8e92ec177a994622f3539dd307542e9dabf5663
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.10713-allow-external-spirv-tools-fix-static.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.10713-allow-external-spirv-tools-fix-static.patch
deleted file mode 100644
index 6abfdfe60d53..000000000000
--- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.10713-allow-external-spirv-tools-fix-static.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 7e6b78d1ccf5afb4080795aa87029e55b9e5499c Mon Sep 17 00:00:00 2001
-From: Andrey Agrachev <andrey.agrachev@intel.com>
-Date: Thu, 10 Mar 2022 12:51:37 +0000
-Subject: [PATCH] Remove 'static' suffix
-
-Remove 'static' suffix to enable shared lib usage
----
- external/SPIRV-Tools/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt
-index f46a6988683..f40605c4b36 100644
---- a/external/SPIRV-Tools/CMakeLists.txt
-+++ b/external/SPIRV-Tools/CMakeLists.txt
-@@ -34,7 +34,7 @@ if(IGC_OPTION__SPIRV_TOOLS_MODE STREQUAL PREBUILDS_MODE_NAME)
-
- set(INCLUDE_DIRS_LIST "${SPIRV-Tools_ROOT_DIR}/include" "${SPIRV-Headers_INCLUDE_DIR}")
- set_target_properties(SPIRV-Tools-static PROPERTIES INCLUDE_DIRECTORIES "${INCLUDE_DIRS_LIST}")
-- set(IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools-static)
-+ set(IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools)
-
- else() #By default use build from sources
- message(STATUS "[SPIRV-Tools] : IGC_OPTION__SPIRV_TOOLS_MODE set to Source")
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713-r1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713-r1.ebuild
deleted file mode 100644
index 1bd12b64e774..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10713-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-LLVM_MAX_SLOT="13"
-MY_PN="igc"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake flag-o-matic llvm python-any-r1
-
-DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-DEPEND="
- dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
- dev-util/spirv-tools
- =sys-devel/lld-${LLVM_MAX_SLOT}*
- sys-devel/llvm:${LLVM_MAX_SLOT}=
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
- =sys-devel/lld-${LLVM_MAX_SLOT}*
- ${PYTHON_DEPS}
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
- "${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
- "${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
- "${FILESDIR}/${PN}-1.0.10713-allow-external-spirv-tools-fix-static.patch"
- "${FILESDIR}/${PN}-1.0.10713-allow-external-spirv-tools-last-fix.patch"
-)
-
-pkg_setup() {
- llvm_pkg_setup
- python-any-r1_pkg_setup
-}
-
-src_configure() {
- # Get LLVM version
- local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
-
- # See https://github.com/intel/intel-graphics-compiler/issues/212
- append-ldflags -Wl,-z,undefs
-
- # See https://bugs.gentoo.org/718824
- ! use debug && append-cppflags -DNDEBUG
-
- local mycmakeargs=(
- -DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
- -DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
- -DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
- -DIGC_OPTION__CLANG_MODE="Prebuilds"
- -DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
- -DIGC_OPTION__LLD_MODE="Prebuilds"
- -DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
- -DIGC_OPTION__LLVM_MODE="Prebuilds"
- -DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
- -DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
- -DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
- -DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
- -DINSTALL_GENX_IR="ON"
- -DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
-
- # Compilation with VectorCompiler causes currently a segfault.
- # See https://github.com/intel/intel-graphics-compiler/issues/236
- -DIGC_BUILD__VC_ENABLED="OFF"
- # -DIGC_OPTION__VC_INTRINSICS_MODE="Prebuilds"
-
- # This will suspress some CMake warnings,
- # which cannot be fixed at the moment.
- -Wno-dev
- )
-
- cmake_src_configure
-}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10840-r1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10840-r1.ebuild
deleted file mode 100644
index 7934a1f20302..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10840-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-LLVM_MAX_SLOT="13"
-MY_PN="igc"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake flag-o-matic llvm python-any-r1
-
-DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-DEPEND="
- dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
- dev-util/spirv-tools
- =sys-devel/lld-${LLVM_MAX_SLOT}*
- sys-devel/llvm:${LLVM_MAX_SLOT}=
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
- =sys-devel/lld-${LLVM_MAX_SLOT}*
- ${PYTHON_DEPS}
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
- "${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
- "${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
- "${FILESDIR}/${PN}-1.0.10713-allow-external-spirv-tools-last-fix.patch"
-)
-
-pkg_setup() {
- llvm_pkg_setup
- python-any-r1_pkg_setup
-}
-
-src_configure() {
- # Get LLVM version
- local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
-
- # See https://github.com/intel/intel-graphics-compiler/issues/212
- append-ldflags -Wl,-z,undefs
-
- # See https://bugs.gentoo.org/718824
- ! use debug && append-cppflags -DNDEBUG
-
- local mycmakeargs=(
- -DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
- -DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
- -DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
- -DIGC_OPTION__CLANG_MODE="Prebuilds"
- -DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
- -DIGC_OPTION__LLD_MODE="Prebuilds"
- -DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
- -DIGC_OPTION__LLVM_MODE="Prebuilds"
- -DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
- -DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
- -DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
- -DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
- -DINSTALL_GENX_IR="ON"
- -DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
-
- # Compilation with VectorCompiler causes currently a segfault.
- # See https://github.com/intel/intel-graphics-compiler/issues/236
- -DIGC_BUILD__VC_ENABLED="OFF"
- # -DIGC_OPTION__VC_INTRINSICS_MODE="Prebuilds"
-
- # This will suspress some CMake warnings,
- # which cannot be fixed at the moment.
- -Wno-dev
- )
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/, dev-util/intel-graphics-compiler/files/
@ 2022-05-21 13:52 Conrad Kostecki
0 siblings, 0 replies; 12+ messages in thread
From: Conrad Kostecki @ 2022-05-21 13:52 UTC (permalink / raw
To: gentoo-commits
commit: 4c91a1974155beae8d79eb265769d00ad3331f46
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 13:10:54 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat May 21 13:51:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c91a197
dev-util/intel-graphics-compiler: drop 1.0.10778-r2, 1.0.10988-r1
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-util/intel-graphics-compiler/Manifest | 2 -
...10713-allow-external-spirv-tools-last-fix.patch | 40 -----------
.../intel-graphics-compiler-1.0.10778-r2.ebuild | 84 ----------------------
.../intel-graphics-compiler-1.0.10988-r1.ebuild | 83 ---------------------
4 files changed, 209 deletions(-)
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 001f0c3661a1..3529a39369ef 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,5 +1,3 @@
-DIST intel-graphics-compiler-1.0.10778.tar.gz 8515512 BLAKE2B 56d7a0b54ce026d93179737fe199d006923398b7f85d582487469f1cfa665ae5351bc160c6babda5d8bf2bf6173a051277b2fb11c9ccf4b888cd0e06295161c4 SHA512 e8fcdab3a8c70f8560f49288db42a926f1e8e82d3e433bb897fcd1648acdf0f8fe425a1cd8dae5bfabc7d0a91fe0c985550e35c6396fe46778091852e185e750
-DIST intel-graphics-compiler-1.0.10988.tar.gz 8571350 BLAKE2B 8f1fcba9016eb607de4604b152e559cae8547c99a618dfc533591165c2da95b466227b75c4ef2b2e9064ec0a30fac711176a7f46f2952df51c06e172fcdcffe4 SHA512 b4de7dc195ee089321a28a428e7604f187552ca161bd08ef245f61740f2ee91e8d48d0718dac17641368113cd8e92ec177a994622f3539dd307542e9dabf5663
DIST intel-graphics-compiler-1.0.11061.tar.gz 8586132 BLAKE2B e8d97622c353e997acea1b9bed34423aaf0044a10d2effbe2c4b146ced1388ca5cf72ff1716e69d378625d674c09e84e7864b6817a0dfd0ba05a29de9f1aca6c SHA512 eb1688ff42c154267b82ffcc9fc58e587d7d52a8157cc8ca692e4d726eb62830fd3812bf391552d43e1d0c17c1ed59a6c3c206a35324c05a12ed943113f1a9d8
DIST intel-graphics-compiler-1.0.11104.tar.gz 8594329 BLAKE2B 15beca4428816686f29ea14c41c55b4ecd9be094f9dd3c004b6b7a521526205d45f7ccae93f32125b4cde16e863dd5b1d832cadab4bf4500b468900ddcae230e SHA512 9c52cde409168c36ac3744a0cf825f10ce59538eac804721dcb23d72ad7a752e587798b55c4da23edc2b7e0a00376ef29ab39ca485de2ab179f04c5b5bc9a8ad
DIST intel-graphics-compiler-1.0.11222_p20220518.tar.gz 8809791 BLAKE2B 1b2bb8322e1c6a226ed84f25d05b5a0dd88571240b264b9e29159a77f19c9207be615788502f0f8ce29b751862102319c2f65e3764e650e94a0dab37544cf0b9 SHA512 58ef8040372bcddd6a8401e48be0806efa4b8c42fe4cffe33226d420224c7ec3bfad446195bb6da1803d7d973b07f41e717ce185c79aa9d2c9a759914546b785
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.10713-allow-external-spirv-tools-last-fix.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.10713-allow-external-spirv-tools-last-fix.patch
deleted file mode 100644
index 5959a514004c..000000000000
--- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.10713-allow-external-spirv-tools-last-fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From acfa99b5aefbebf037e4c939f5a8e592dfaed04e Mon Sep 17 00:00:00 2001
-From: Andrey Agrachev <andrey.agrachev@intel.com>
-Date: Tue, 22 Mar 2022 09:15:54 +0000
-Subject: [PATCH] Fix missprints
-
-Fix misspints in Spirv-Tools CMakeList
----
- external/SPIRV-Tools/CMakeLists.txt | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt
-index f40605c4b36..076079f7c86 100644
---- a/external/SPIRV-Tools/CMakeLists.txt
-+++ b/external/SPIRV-Tools/CMakeLists.txt
-@@ -16,7 +16,7 @@ if(IGC_OPTION__SPIRV_TOOLS_MODE STREQUAL PREBUILDS_MODE_NAME)
- OPTION(IGC__OPTION_USE_PREINSTALLED_SPRIV_HEADERS OFF)
-
- if(IGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS)
-- message(STATUS "[SPIRV-Tools] : IGC__OPTION_USE_PREINSTALLED_SPRIV_HEADERS set to OFF, using preinstalled SPIRV-Headers")
-+ message(STATUS "[SPIRV-Tools] : IGC__OPTION_USE_PREINSTALLED_SPRIV_HEADERS set to ON, using preinstalled SPIRV-Headers")
- message(STATUS "[SPIRV-Tools] : Using preinstalled SPIRV-Headers")
- set(SPIRV-Headers_INCLUDE_DIR "/usr/include")
- else()
-@@ -33,13 +33,13 @@ if(IGC_OPTION__SPIRV_TOOLS_MODE STREQUAL PREBUILDS_MODE_NAME)
- set(IGC_BUILD__SPIRV-Tools_DIR "${SPIRV-Tools_ROOT_DIR}")
-
- set(INCLUDE_DIRS_LIST "${SPIRV-Tools_ROOT_DIR}/include" "${SPIRV-Headers_INCLUDE_DIR}")
-- set_target_properties(SPIRV-Tools-static PROPERTIES INCLUDE_DIRECTORIES "${INCLUDE_DIRS_LIST}")
-+ set_target_properties(SPIRV-Tools PROPERTIES INCLUDE_DIRECTORIES "${INCLUDE_DIRS_LIST}")
- set(IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools)
-
- else() #By default use build from sources
- message(STATUS "[SPIRV-Tools] : IGC_OPTION__SPIRV_TOOLS_MODE set to Source")
-- message(STATUS "[SPIRV-Tools] : IGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS set to ON")
-- message(STATUS "[SPIRV-Tools] : Using preinstalled packages")
-+ message(STATUS "[SPIRV-Tools] : IGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS set to OFF")
-+ message(STATUS "[SPIRV-Tools] : Building from source")
- message(STATUS "[SPIRV-Tools] : Current source dir: ${CMAKE_CURRENT_SOURCE_DIR}")
-
- set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../SPIRV-Headers") # used in subdirectory
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10778-r2.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10778-r2.ebuild
deleted file mode 100644
index 6c079df6172d..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10778-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-LLVM_MAX_SLOT="12"
-MY_PN="igc"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake flag-o-matic llvm python-any-r1
-
-DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="debug"
-
-DEPEND="
- dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
- dev-util/spirv-tools
- =sys-devel/lld-${LLVM_MAX_SLOT}*
- sys-devel/llvm:${LLVM_MAX_SLOT}=
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
- =sys-devel/lld-${LLVM_MAX_SLOT}*
- ${PYTHON_DEPS}
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
- "${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
- "${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
- "${FILESDIR}/${PN}-1.0.10713-allow-external-spirv-tools-last-fix.patch"
-)
-
-pkg_setup() {
- llvm_pkg_setup
- python-any-r1_pkg_setup
-}
-
-src_configure() {
- # Get LLVM version
- local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
-
- # See https://github.com/intel/intel-graphics-compiler/issues/212
- append-ldflags -Wl,-z,undefs
-
- # See https://bugs.gentoo.org/718824
- ! use debug && append-cppflags -DNDEBUG
-
- local mycmakeargs=(
- -DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
- -DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
- -DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
- -DIGC_OPTION__CLANG_MODE="Prebuilds"
- -DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
- -DIGC_OPTION__LLD_MODE="Prebuilds"
- -DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
- -DIGC_OPTION__LLVM_MODE="Prebuilds"
- -DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
- -DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
- -DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
- -DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
- -DINSTALL_GENX_IR="ON"
- -DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
- -Wno-dev
-
- # Compilation with VectorCompiler causes currently a segfault.
- # See https://github.com/intel/intel-graphics-compiler/issues/236
- -DIGC_BUILD__VC_ENABLED="OFF"
- # -DIGC_OPTION__VC_INTRINSICS_MODE="Prebuilds"
- )
-
- cmake_src_configure
-}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10988-r1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10988-r1.ebuild
deleted file mode 100644
index e6c00047ccc6..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.10988-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-LLVM_MAX_SLOT="12"
-MY_PN="igc"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake flag-o-matic llvm python-any-r1
-
-DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-DEPEND="
- dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
- dev-util/spirv-tools
- =sys-devel/lld-${LLVM_MAX_SLOT}*
- sys-devel/llvm:${LLVM_MAX_SLOT}=
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
- =sys-devel/lld-${LLVM_MAX_SLOT}*
- ${PYTHON_DEPS}
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
- "${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
- "${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
-)
-
-pkg_setup() {
- llvm_pkg_setup
- python-any-r1_pkg_setup
-}
-
-src_configure() {
- # Get LLVM version
- local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
-
- # See https://github.com/intel/intel-graphics-compiler/issues/212
- append-ldflags -Wl,-z,undefs
-
- # See https://bugs.gentoo.org/718824
- ! use debug && append-cppflags -DNDEBUG
-
- local mycmakeargs=(
- -DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
- -DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
- -DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
- -DIGC_OPTION__CLANG_MODE="Prebuilds"
- -DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
- -DIGC_OPTION__LLD_MODE="Prebuilds"
- -DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
- -DIGC_OPTION__LLVM_MODE="Prebuilds"
- -DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
- -DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
- -DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
- -DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
- -DINSTALL_GENX_IR="ON"
- -DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
- -Wno-dev
-
- # Compilation with VectorCompiler causes currently a segfault.
- # See https://github.com/intel/intel-graphics-compiler/issues/236
- -DIGC_BUILD__VC_ENABLED="OFF"
- # -DIGC_OPTION__VC_INTRINSICS_MODE="Prebuilds"
- )
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/, dev-util/intel-graphics-compiler/files/
@ 2022-06-30 21:46 Conrad Kostecki
0 siblings, 0 replies; 12+ messages in thread
From: Conrad Kostecki @ 2022-06-30 21:46 UTC (permalink / raw
To: gentoo-commits
commit: ff79850f5ff41c74cf8a70cab355a5803bfa648c
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 21:35:06 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 21:45:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff79850f
dev-util/intel-graphics-compiler: add 1.0.11485
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-util/intel-graphics-compiler/Manifest | 1 +
...aphics-compiler-1.0.11485-fix-BiF-caching.patch | 49 ++++++
...phics-compiler-1.0.11485-include-opencl-c.patch | 11 ++
...mpiler-1.0.11485-update-raytracing-llvm14.patch | 186 +++++++++++++++++++++
...compiler-1.0.11485-wrap-getNumArgOperands.patch | 24 +++
.../intel-graphics-compiler-1.0.11485.ebuild | 88 ++++++++++
6 files changed, 359 insertions(+)
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 0abfe62ca8e0..42d67d67a296 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1 +1,2 @@
DIST intel-graphics-compiler-1.0.11378.tar.gz 8809420 BLAKE2B d503b962193daf3731864739bc0efb753baed3603795e04941d17dcdcaf9e971787ffa877e8295054de41d889a39e2bdbf8119fb7d60110580acea3c24cefc58 SHA512 f3daedfe36badfe07f187b38c9a4da98116533940f4d910fbbd060813aeb1e3ffaa627a72180e66736748830a80cfca4c2a6dc9c8e9507884629e3e55add1cbb
+DIST intel-graphics-compiler-1.0.11485.tar.gz 8831925 BLAKE2B 7e2bcb37b4c34bb01788a8d75fc42498223b6193421cb726c21ce7949181757a10d112ae151736cd9283ba6ed8f0625597fb1f2a61229a7352e7f1f5ec34d1d0 SHA512 03fb571fdd61daea3a5c61ff75a146bd98b9b92dfd8bc1957143fe127977f5111df680ac86769d3c1fa1801ba2012b600b1ff844b318ce64460f2d042c4ae65b
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-fix-BiF-caching.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-fix-BiF-caching.patch
new file mode 100644
index 000000000000..7ad261e0aa6c
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-fix-BiF-caching.patch
@@ -0,0 +1,49 @@
+From 12c99343388eba6e6275856b25e0fa8978585dfb Mon Sep 17 00:00:00 2001
+From: Marcin Naczk <marcin.naczk@intel.com>
+Date: Mon, 13 Jun 2022 08:28:24 +0000
+Subject: [PATCH] Find OpenCl-c.h when clang is take from system.
+
+Find OpenCl-c.h when clang is take from system.
+---
+ IGC/cmake/igc_find_opencl_clang.cmake | 24 +++++++++++++++---------
+ 1 file changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/IGC/cmake/igc_find_opencl_clang.cmake b/IGC/cmake/igc_find_opencl_clang.cmake
+index dc8924fb7ee..0a54ac68249 100644
+--- a/IGC/cmake/igc_find_opencl_clang.cmake
++++ b/IGC/cmake/igc_find_opencl_clang.cmake
+@@ -94,19 +94,25 @@ if(CCLANG_FROM_SYSTEM)
+ else()
+ set_property(TARGET opencl-clang-lib PROPERTY "IMPORTED_LOCATION" "${SYSTEM_COMMON_CLANG}")
+ endif()
+- find_program(CLANG_GE7 clang-${LLVM_VERSION_MAJOR})
+- if(CLANG_GE7)
+- message(STATUS "[IGC] Found clang-${LLVM_VERSION_MAJOR} executable: ${CLANG_GE7}")
++ find_program(CLANG_EXE clang-${LLVM_VERSION_MAJOR})
++ if(CLANG_EXE)
++ message(STATUS "[IGC] Found clang-${LLVM_VERSION_MAJOR} executable: ${CLANG_EXE}")
+
+ add_executable(clang-tool IMPORTED GLOBAL)
+- set_property(TARGET clang-tool PROPERTY "IMPORTED_LOCATION" "${CLANG_GE7}")
++ set_property(TARGET clang-tool PROPERTY "IMPORTED_LOCATION" "${CLANG_EXE}")
+ set(CL_OPTIONS "-finclude-default-header")
+- if(LLVM_VERSION_MAJOR VERSION_EQUAL 7)
+- message(WARNING "[IGC] : clang-7 should be patched with VME patch (https://reviews.llvm.org/D51484). Assuming that it is. If not, please add -DVME_TYPES_DEFINED=FALSE.")
+- endif()
+- else(CLANG_GE7)
++
++ # Get parent dir of the location of CLANG_EXE
++ get_filename_component(CLANG_EXE_PARENT_DIR ${CLANG_EXE} DIRECTORY)
++ file(GLOB_RECURSE opencl-header ${CLANG_EXE_PARENT_DIR}/../*opencl-c.h)
++ if(opencl-header)
++ message(STATUS "[IGC] Found opencl-c.h: ${opencl-header}")
++ else(opencl-header)
++ message(FATAL_ERROR "[IGC] : Couldn't find opencl-c.h, please provide it.")
++ endif(opencl-header)
++ else(CLANG_EXE)
+ message(FATAL_ERROR "[IGC] : Couldn't find clang-${LLVM_VERSION_MAJOR} executable, please install it.")
+- endif(CLANG_GE7)
++ endif(CLANG_EXE)
+ ###
+ #2. CCLANG_BUILD_PREBUILDS - use prebuilt opencl-clang toolchain
+ elseif(${CCLANG_BUILD_PREBUILDS})
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-include-opencl-c.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-include-opencl-c.patch
new file mode 100644
index 000000000000..dbf4188ad0bc
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-include-opencl-c.patch
@@ -0,0 +1,11 @@
+--- a/IGC/cmake/igc_find_opencl_clang.cmake
++++ b/IGC/cmake/igc_find_opencl_clang.cmake
+@@ -104,7 +104,7 @@
+
+ # Get parent dir of the location of CLANG_EXE
+ get_filename_component(CLANG_EXE_PARENT_DIR ${CLANG_EXE} DIRECTORY)
+- file(GLOB_RECURSE opencl-header ${CLANG_EXE_PARENT_DIR}/../*opencl-c.h)
++ file(GLOB_RECURSE opencl-header ${CCLANG_INCLUDE_PREBUILDS_DIR}/*opencl-c.h)
+ if(opencl-header)
+ message(STATUS "[IGC] Found opencl-c.h: ${opencl-header}")
+ else(opencl-header)
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-update-raytracing-llvm14.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-update-raytracing-llvm14.patch
new file mode 100644
index 000000000000..248f8244e32f
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-update-raytracing-llvm14.patch
@@ -0,0 +1,186 @@
+From d9535cc5c3e54b21d56c492d4e21cb13c80b9b7a Mon Sep 17 00:00:00 2001
+From: Artem Gindinson <artem.gindinson@intel.com>
+Date: Wed, 22 Jun 2022 11:53:02 +0000
+Subject: [PATCH] Update RayTracing for full LLVM 14 buildability
+
+- Address further casting issues
+- Use pre-existing LLVM wrappers for function argument manipulations
+- Create & use LLVM wrappers for `AAQueryInfo` and
+ `CallBase::getRetDereferenceableBytes()`
+---
+ IGC/AdaptorCommon/RayTracing/AllocaTracking.cpp | 3 ++-
+ IGC/AdaptorCommon/RayTracing/InlineDataPass.cpp | 3 ++-
+ IGC/AdaptorCommon/RayTracing/LowerIntersectionAnyHit.cpp | 2 +-
+ IGC/AdaptorCommon/RayTracing/RTSpillShrinkPass.cpp | 4 ++--
+ IGC/AdaptorCommon/RayTracing/RayTracingFinalizePass.cpp | 4 ++--
+ IGC/AdaptorCommon/RayTracing/StackIDSchedulingPass.cpp | 3 ++-
+ IGC/AdaptorCommon/TypesLegalizationPass.cpp | 2 +-
+ .../include/llvmWrapper/Analysis/AliasAnalysis.h | 7 +++++++
+ IGC/WrapperLLVM/include/llvmWrapper/IR/InstrTypes.h | 9 +++++++++
+ 9 files changed, 28 insertions(+), 9 deletions(-)
+
+diff --git a/IGC/AdaptorCommon/RayTracing/AllocaTracking.cpp b/IGC/AdaptorCommon/RayTracing/AllocaTracking.cpp
+index b5ad27e32ca..67cf302495c 100644
+--- a/IGC/AdaptorCommon/RayTracing/AllocaTracking.cpp
++++ b/IGC/AdaptorCommon/RayTracing/AllocaTracking.cpp
+@@ -19,6 +19,7 @@ SPDX-License-Identifier: MIT
+ #include "common/LLVMWarningsPush.hpp"
+ #include <llvm/IR/Instruction.h>
+ #include <llvm/IR/IntrinsicInst.h>
++#include <llvmWrapper/IR/Instructions.h>
+ #include "common/LLVMWarningsPop.hpp"
+
+ using namespace llvm;
+@@ -129,7 +130,7 @@ void rewriteTypes(
+ "Only handles void right now!");
+
+ SmallVector<Type*, 4> Tys;
+- for (auto &Op : II->arg_operands())
++ for (auto &Op : IGCLLVM::args(II))
+ Tys.push_back(Op->getType());
+
+ auto* NewFTy = FunctionType::get(
+diff --git a/IGC/AdaptorCommon/RayTracing/InlineDataPass.cpp b/IGC/AdaptorCommon/RayTracing/InlineDataPass.cpp
+index 5e4df4e1a86..9433340d259 100644
+--- a/IGC/AdaptorCommon/RayTracing/InlineDataPass.cpp
++++ b/IGC/AdaptorCommon/RayTracing/InlineDataPass.cpp
+@@ -46,6 +46,7 @@ SPDX-License-Identifier: MIT
+ #include <vector>
+ #include "common/LLVMWarningsPush.hpp"
+ #include <llvm/IR/InstIterator.h>
++#include <llvmWrapper/IR/InstrTypes.h>
+ #include "common/LLVMWarningsPop.hpp"
+
+ using namespace llvm;
+@@ -155,7 +156,7 @@ bool BindlessInlineDataPass::runOnModule(Module &M)
+ // the size of the Shader Identifier + the size of the Local arguments
+ const uint64_t dereferenceable_size =
+ sizeof(ShaderIdentifier) +
+- local_buffer_ptr->getDereferenceableBytes(AttributeList::ReturnIndex);
++ IGCLLVM::getRetDereferenceableBytes(local_buffer_ptr);
+
+ // Return a CallInst* representing the InlinedData intrinsic call
+ // In the shader dumps,
+diff --git a/IGC/AdaptorCommon/RayTracing/LowerIntersectionAnyHit.cpp b/IGC/AdaptorCommon/RayTracing/LowerIntersectionAnyHit.cpp
+index 8b6bba69f23..2c3a98d04e3 100644
+--- a/IGC/AdaptorCommon/RayTracing/LowerIntersectionAnyHit.cpp
++++ b/IGC/AdaptorCommon/RayTracing/LowerIntersectionAnyHit.cpp
+@@ -449,7 +449,7 @@ CallInst* LowerIntersectionAnyHit::codeGenReportHit(
+ CustomHitAttrPtr,
+ 4,
+ Attrs,
+- std::min(4U, DL.getABITypeAlignment(AttrTy->getPointerElementType())),
++ std::min(4U, (unsigned)DL.getABITypeAlignment(AttrTy->getPointerElementType())),
+ IRB.getInt64(DL.getTypeAllocSize(AttrTy->getPointerElementType())));
+ }
+
+diff --git a/IGC/AdaptorCommon/RayTracing/RTSpillShrinkPass.cpp b/IGC/AdaptorCommon/RayTracing/RTSpillShrinkPass.cpp
+index 4d42b32af36..d8d7ac3c54f 100644
+--- a/IGC/AdaptorCommon/RayTracing/RTSpillShrinkPass.cpp
++++ b/IGC/AdaptorCommon/RayTracing/RTSpillShrinkPass.cpp
+@@ -61,9 +61,9 @@ class RTSpillShrinkPass : public FunctionPass
+
+ unsigned getAlignment(const DataLayout& DL, StoreInst* ST) const
+ {
+- unsigned Align = ST->getAlignment();
++ unsigned Align = (unsigned)ST->getAlignment();
+ if (Align == 0)
+- Align = DL.getABITypeAlignment(ST->getType());
++ Align = (unsigned)DL.getABITypeAlignment(ST->getType());
+ return Align;
+ }
+
+diff --git a/IGC/AdaptorCommon/RayTracing/RayTracingFinalizePass.cpp b/IGC/AdaptorCommon/RayTracing/RayTracingFinalizePass.cpp
+index 87549a6ce85..797e77a548d 100644
+--- a/IGC/AdaptorCommon/RayTracing/RayTracingFinalizePass.cpp
++++ b/IGC/AdaptorCommon/RayTracing/RayTracingFinalizePass.cpp
+@@ -114,7 +114,7 @@ bool RayTracingFinalizePass::runOnModule(Module &M)
+ {
+ // Temporary WA to ensure we don't page fault on unaligned
+ // acceses.
+- uint32_t Align = LI->getAlignment();
++ uint32_t Align = (uint32_t)LI->getAlignment();
+ if (Align == 0)
+ Align = (uint32_t)DL.getTypeAllocSize(LI->getType());
+
+@@ -125,7 +125,7 @@ bool RayTracingFinalizePass::runOnModule(Module &M)
+ {
+ // Temporary WA to ensure we don't page fault on unaligned
+ // acceses.
+- uint32_t Align = SI->getAlignment();
++ uint32_t Align = (uint32_t)SI->getAlignment();
+ if (Align == 0)
+ Align = (uint32_t)DL.getTypeAllocSize(
+ SI->getValueOperand()->getType());
+diff --git a/IGC/AdaptorCommon/RayTracing/StackIDSchedulingPass.cpp b/IGC/AdaptorCommon/RayTracing/StackIDSchedulingPass.cpp
+index db5490267fd..d352b67a50f 100644
+--- a/IGC/AdaptorCommon/RayTracing/StackIDSchedulingPass.cpp
++++ b/IGC/AdaptorCommon/RayTracing/StackIDSchedulingPass.cpp
+@@ -49,6 +49,7 @@ SPDX-License-Identifier: MIT
+ #include <llvm/IR/Dominators.h>
+ #include <llvm/Analysis/PostDominators.h>
+ #include <llvm/Analysis/LoopInfo.h>
++#include "llvmWrapper/Analysis/AliasAnalysis.h"
+ #include "llvmWrapper/Analysis/MemoryLocation.h"
+ #include "common/LLVMWarningsPop.hpp"
+
+@@ -175,7 +176,7 @@ BasicBlock* StackIDSchedulingPass::schedule(
+ ModRefInfo StackIDSchedulingPass::getModRefInfo(
+ const CallBase* Call, const MemoryLocation& Loc)
+ {
+- AAQueryInfo AAQIP;
++ AAQueryInfo AAQIP = IGCLLVM::makeAAQueryInfo();
+ return AA->getModRefInfo(Call, Loc, AAQIP);
+ }
+
+diff --git a/IGC/AdaptorCommon/TypesLegalizationPass.cpp b/IGC/AdaptorCommon/TypesLegalizationPass.cpp
+index c3570f39d31..10da29ee242 100644
+--- a/IGC/AdaptorCommon/TypesLegalizationPass.cpp
++++ b/IGC/AdaptorCommon/TypesLegalizationPass.cpp
+@@ -207,7 +207,7 @@ TypesLegalizationPass::ResolveValue( Instruction *ip,Value *val,SmallVector<unsi
+ {
+ IGCLLVM::IRBuilder<> builder( ld );
+ Value* gep = CreateGEP( builder,ld->getOperand( 0 ),indices );
+- unsigned alignment = ld->getAlignment();
++ unsigned alignment = (unsigned)ld->getAlignment();
+ unsigned pointerTypeSize = gep->getType()->getPointerElementType()->getScalarSizeInBits() / 8;
+ if ( alignment && pointerTypeSize == alignment )
+ return builder.CreateAlignedLoad( gep, IGCLLVM::getAlign(alignment) );
+diff --git a/IGC/WrapperLLVM/include/llvmWrapper/Analysis/AliasAnalysis.h b/IGC/WrapperLLVM/include/llvmWrapper/Analysis/AliasAnalysis.h
+index 873886cc860..385c04db970 100644
+--- a/IGC/WrapperLLVM/include/llvmWrapper/Analysis/AliasAnalysis.h
++++ b/IGC/WrapperLLVM/include/llvmWrapper/Analysis/AliasAnalysis.h
+@@ -19,6 +19,13 @@ namespace IGCLLVM
+ #else
+ using AliasResultEnum = llvm::AliasResult::Kind;
+ #endif
++inline llvm::AAQueryInfo makeAAQueryInfo() {
++#if LLVM_VERSION_MAJOR >= 14
++ return llvm::AAQueryInfo(new llvm::SimpleCaptureInfo());
++#else
++ return llvm::AAQueryInfo();
++#endif
++}
+ }
+
+ #endif
+diff --git a/IGC/WrapperLLVM/include/llvmWrapper/IR/InstrTypes.h b/IGC/WrapperLLVM/include/llvmWrapper/IR/InstrTypes.h
+index 569eece3fb5..1050c842271 100644
+--- a/IGC/WrapperLLVM/include/llvmWrapper/IR/InstrTypes.h
++++ b/IGC/WrapperLLVM/include/llvmWrapper/IR/InstrTypes.h
+@@ -50,6 +50,15 @@ namespace IGCLLVM
+ CI->addFnAttr(Kind);
+ #else
+ CI->addAttribute(llvm::AttributeList::FunctionIndex, Kind);
++#endif
++ }
++
++ inline uint64_t getRetDereferenceableBytes(llvm::CallBase* Call)
++ {
++#if LLVM_VERSION_MAJOR >= 14
++ return Call->getRetDereferenceableBytes();
++#else
++ return Call->getDereferenceableBytes(llvm::AttributeList::ReturnIndex);
+ #endif
+ }
+ }
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-wrap-getNumArgOperands.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-wrap-getNumArgOperands.patch
new file mode 100644
index 000000000000..23754ccb6b4b
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-wrap-getNumArgOperands.patch
@@ -0,0 +1,24 @@
+From 1d5ceafdbc005f3adc58be5af1dc92f068908e16 Mon Sep 17 00:00:00 2001
+From: Artem Gindinson <artem.gindinson@intel.com>
+Date: Mon, 20 Jun 2022 12:38:04 +0000
+Subject: [PATCH] Wrap CallInst::getNumArgOperands calls for LLVM 14
+
+Rework all remaining call sites to rely on the already-existing wrapper
+function.
+---
+ IGC/Compiler/CISACodeGen/HFpackingOpt.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/IGC/Compiler/CISACodeGen/HFpackingOpt.cpp b/IGC/Compiler/CISACodeGen/HFpackingOpt.cpp
+index 69d6151f8bf..e24362d7791 100644
+--- a/IGC/Compiler/CISACodeGen/HFpackingOpt.cpp
++++ b/IGC/Compiler/CISACodeGen/HFpackingOpt.cpp
+@@ -825,7 +825,7 @@ bool HFpackingOpt::findStoreSequence(std::vector<Instruction*>& path, std::vecto
+ uint srciCount = inst->getNumOperands();
+ if (CallInst* cinst = dyn_cast<CallInst>(inst))
+ {
+- srciCount = cinst->getNumArgOperands();
++ srciCount = IGCLLVM::getNumArgOperands(cinst);
+ }
+
+ for (uint srci = 0; srci < srciCount; srci++)
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11485.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11485.ebuild
new file mode 100644
index 000000000000..74f02de2f3a1
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11485.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_MAX_SLOT="13"
+MY_PN="igc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake flag-o-matic llvm python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+DEPEND="
+ dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
+ dev-util/spirv-tools
+ =sys-devel/lld-${LLVM_MAX_SLOT}*
+ sys-devel/llvm:${LLVM_MAX_SLOT}=
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+ =sys-devel/lld-${LLVM_MAX_SLOT}*
+ ${PYTHON_DEPS}
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
+ "${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
+ "${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+ "${FILESDIR}/${PN}-1.0.11485-fix-BiF-caching.patch"
+ "${FILESDIR}/${PN}-1.0.11485-update-raytracing-llvm14.patch"
+ "${FILESDIR}/${PN}-1.0.11485-wrap-getNumArgOperands.patch"
+ "${FILESDIR}/${PN}-1.0.11485-include-opencl-c.patch"
+)
+
+pkg_setup() {
+ llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_configure() {
+ # Get LLVM version
+ local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
+
+ # See https://github.com/intel/intel-graphics-compiler/issues/212
+ append-ldflags -Wl,-z,undefs
+
+ # See https://bugs.gentoo.org/718824
+ ! use debug && append-cppflags -DNDEBUG
+
+ local mycmakeargs=(
+ -DCCLANG_INCLUDE_PREBUILDS_DIR="/usr/lib/clang/${llvm_version##*-}/include"
+ -DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
+ -DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
+ -DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
+ -DIGC_OPTION__CLANG_MODE="Prebuilds"
+ -DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
+ -DIGC_OPTION__LLD_MODE="Prebuilds"
+ -DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
+ -DIGC_OPTION__LLVM_MODE="Prebuilds"
+ -DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
+ -DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
+ -DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
+ -DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
+ -DINSTALL_GENX_IR="ON"
+ -DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
+ -Wno-dev
+
+ # Compilation with VectorCompiler causes currently a segfault.
+ # See https://github.com/intel/intel-graphics-compiler/issues/236
+ -DIGC_BUILD__VC_ENABLED="OFF"
+ # -DIGC_OPTION__VC_INTRINSICS_MODE="Prebuilds"
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/, dev-util/intel-graphics-compiler/files/
@ 2023-02-21 20:03 Conrad Kostecki
0 siblings, 0 replies; 12+ messages in thread
From: Conrad Kostecki @ 2023-02-21 20:03 UTC (permalink / raw
To: gentoo-commits
commit: a10b2daf2b312afbe89e6b99f7a8b829bf3cb994
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 21 19:57:25 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Feb 21 20:03:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a10b2daf
dev-util/intel-graphics-compiler: add 1.0.13230.7
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-util/intel-graphics-compiler/Manifest | 1 +
...graphics-compiler-1.0.13230.7-spirv-tools.patch | 26 +++++++
.../intel-graphics-compiler-1.0.13230.7.ebuild | 88 ++++++++++++++++++++++
3 files changed, 115 insertions(+)
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 99b68e0c031f..e393adfeee42 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,3 +1,4 @@
DIST intel-graphics-compiler-1.0.12260.1.tar.gz 8887984 BLAKE2B 626b5f2bd189ba9b2933b9d65227ca1552484f73f7398b2a763744d21a4ea189987e4eb08e9e7f09898fb49568b59a2c45298363495c1759fec9927a95cf4478 SHA512 4223e9c8213c7e6cf3539d955394a0a4a39cb8d2114ce18ccaeeb0b36a91ca6fc6a314fa9d9db24929fa7cd6b86ff8b82f369f35dd80e5df49b23ac9cd3a519b
DIST intel-graphics-compiler-1.0.12504.5.tar.gz 8941924 BLAKE2B 6441cc50c2449524c800c73736f8963bc0011c6b87eefa03575cf09d00a8e812c9961bd50fb9801b77452da2d993e76196beb0a2093a249a87d7182e1c1e8707 SHA512 32a94b213a591f9ceb8ca08674c9fb8994b50818c51a6bfd412c4cd30bb9433b938eb7b49ba0afac9f2900a3dcbc7dd79e3e66fb444c7fd5723b6b50c5d1ab89
DIST intel-graphics-compiler-1.0.12812.26.tar.gz 8796229 BLAKE2B 8880f0efa47ea90de403c32a9a66fe0f2d1cd6b71b2c57ea38d01f2836892dc36e4e859b19def015f22eb0415be2ff8999a49256830059499b0ae654482cd21f SHA512 13a9f57cf744c38145e2b3d45099a6d54b6d792780dc3a2ab352484975c899f1a5c4f6072c96e786ce3bdf4690bdcf04cecebcf56f9bef4409e3cc3f27ec8458
+DIST intel-graphics-compiler-1.0.13230.7.tar.gz 8813719 BLAKE2B 5cc6ef816b030d786dfcf6296b39f6c2bfcc9db4c4a12db84456a508bd7d8998d4dfc9e6993e05167a3f797287176dda31e5fd43bbc3284fa26d4c8ca89f6164 SHA512 774f62ff8f5b7bd95fd766c88bc62ff66498c23d020dbfdfd18734e532e7d701652325cb7aca00f7ab3cfdd051d37e56939d7978db127e9044cd5b6c077979ac
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.13230.7-spirv-tools.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.13230.7-spirv-tools.patch
new file mode 100644
index 000000000000..d33f9eb2021f
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.13230.7-spirv-tools.patch
@@ -0,0 +1,26 @@
+From 8068732355d18464a9fcb6846c225929349b450c Mon Sep 17 00:00:00 2001
+From: Jakub Czarnecki <jakub.czarnecki@intel.com>
+Date: Thu, 26 Jan 2023 11:35:03 +0000
+Subject: [PATCH] Preinstalled SPIRV-Tools CMakeFile - target fix
+
+Added checking if SPIRV-Tools isn't already set as target before adding
+it as a custom target to avoid errors.
+---
+ external/SPIRV-Tools/CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt
+index 9afa5746c4d..3b768c1b772 100644
+--- a/external/SPIRV-Tools/CMakeLists.txt
++++ b/external/SPIRV-Tools/CMakeLists.txt
+@@ -33,7 +33,9 @@ if(IGC_OPTION__SPIRV_TOOLS_MODE STREQUAL PREBUILDS_MODE_NAME)
+ set(IGC_BUILD__SPIRV-Tools_DIR "${SPIRV-Tools_ROOT_DIR}")
+
+ set(INCLUDE_DIRS_LIST "${SPIRV-Tools_ROOT_DIR}/include" "${SPIRV-Headers_INCLUDE_DIR}")
+- add_custom_target(SPIRV-Tools)
++ if(NOT TARGET SPIRV-Tools)
++ add_custom_target(SPIRV-Tools)
++ endif()
+ set_target_properties(SPIRV-Tools PROPERTIES INCLUDE_DIRECTORIES "${INCLUDE_DIRS_LIST}")
+ set(IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools)
+
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7.ebuild
new file mode 100644
index 000000000000..4a48c5cff382
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_MAX_SLOT="14"
+MY_PN="igc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake flag-o-matic llvm python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug vc"
+
+DEPEND="
+ dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
+ dev-util/spirv-tools
+ sys-devel/lld:${LLVM_MAX_SLOT}=
+ sys-devel/llvm:${LLVM_MAX_SLOT}=
+ vc? (
+ >=dev-libs/intel-vc-intrinsics-0.11.0
+ dev-util/spirv-llvm-translator:${LLVM_MAX_SLOT}=
+ )
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+ =sys-devel/lld-${LLVM_MAX_SLOT}*
+ ${PYTHON_DEPS}
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
+ "${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
+ "${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+ "${FILESDIR}/${PN}-1.0.11485-include-opencl-c.patch"
+ "${FILESDIR}/${PN}-1.0.13230.7-spirv-tools.patch"
+)
+
+pkg_setup() {
+ llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_configure() {
+ # Get LLVM version
+ local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
+ local llvm_version="${llvm_version%%-r*}"
+
+ # See https://github.com/intel/intel-graphics-compiler/issues/212
+ append-ldflags -Wl,-z,undefs
+
+ # See https://bugs.gentoo.org/718824
+ ! use debug && append-cppflags -DNDEBUG
+
+ local mycmakeargs=(
+ -DCCLANG_INCLUDE_PREBUILDS_DIR="/usr/lib/clang/${llvm_version##*-}/include"
+ -DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
+ -DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
+ -DIGC_BUILD__VC_ENABLED="$(usex vc)"
+ -DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
+ -DIGC_OPTION__CLANG_MODE="Prebuilds"
+ -DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
+ -DIGC_OPTION__LLD_MODE="Prebuilds"
+ -DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
+ -DIGC_OPTION__LLVM_MODE="Prebuilds"
+ -DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
+ -DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
+ -DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
+ -DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
+ $(usex vc '-DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds' '')
+ -DINSTALL_GENX_IR="ON"
+ -DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
+ -Wno-dev
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/, dev-util/intel-graphics-compiler/files/
@ 2023-04-09 19:35 Conrad Kostecki
0 siblings, 0 replies; 12+ messages in thread
From: Conrad Kostecki @ 2023-04-09 19:35 UTC (permalink / raw
To: gentoo-commits
commit: d0733ed0854e86c1eb51524b4f833c130ce36dc4
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 9 19:25:46 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Apr 9 19:34:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0733ed0
dev-util/intel-graphics-compiler: drop 1.0.13230.7-r1
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-util/intel-graphics-compiler/Manifest | 1 -
...phics-compiler-1.0.11485-include-opencl-c.patch | 11 ---
...graphics-compiler-1.0.13230.7-spirv-tools.patch | 26 -------
.../intel-graphics-compiler-1.0.13230.7-r1.ebuild | 90 ----------------------
4 files changed, 128 deletions(-)
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 4883c6acad77..f32bfe6db88d 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,2 +1 @@
-DIST intel-graphics-compiler-1.0.13230.7.tar.gz 8813719 BLAKE2B 5cc6ef816b030d786dfcf6296b39f6c2bfcc9db4c4a12db84456a508bd7d8998d4dfc9e6993e05167a3f797287176dda31e5fd43bbc3284fa26d4c8ca89f6164 SHA512 774f62ff8f5b7bd95fd766c88bc62ff66498c23d020dbfdfd18734e532e7d701652325cb7aca00f7ab3cfdd051d37e56939d7978db127e9044cd5b6c077979ac
DIST intel-graphics-compiler-1.0.13463.1.tar.gz 8283903 BLAKE2B abe9f2a8cc0c648d985890d65782db2df61966d25b740ee735b0198cee701e79fcd33267b8284002f049cc2582db13c3b33481131570c0d69435a3dc4ada64d4 SHA512 3edafc7cadb946b62b5afa44bf81663c83ad6eab15c2825b60cfb5120da94d66898d3f073af13a747cdf2db586085de14ee75fcdda0e16a1ca7197d5645fe1a9
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-include-opencl-c.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-include-opencl-c.patch
deleted file mode 100644
index dbf4188ad0bc..000000000000
--- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-include-opencl-c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/IGC/cmake/igc_find_opencl_clang.cmake
-+++ b/IGC/cmake/igc_find_opencl_clang.cmake
-@@ -104,7 +104,7 @@
-
- # Get parent dir of the location of CLANG_EXE
- get_filename_component(CLANG_EXE_PARENT_DIR ${CLANG_EXE} DIRECTORY)
-- file(GLOB_RECURSE opencl-header ${CLANG_EXE_PARENT_DIR}/../*opencl-c.h)
-+ file(GLOB_RECURSE opencl-header ${CCLANG_INCLUDE_PREBUILDS_DIR}/*opencl-c.h)
- if(opencl-header)
- message(STATUS "[IGC] Found opencl-c.h: ${opencl-header}")
- else(opencl-header)
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.13230.7-spirv-tools.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.13230.7-spirv-tools.patch
deleted file mode 100644
index d33f9eb2021f..000000000000
--- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.13230.7-spirv-tools.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8068732355d18464a9fcb6846c225929349b450c Mon Sep 17 00:00:00 2001
-From: Jakub Czarnecki <jakub.czarnecki@intel.com>
-Date: Thu, 26 Jan 2023 11:35:03 +0000
-Subject: [PATCH] Preinstalled SPIRV-Tools CMakeFile - target fix
-
-Added checking if SPIRV-Tools isn't already set as target before adding
-it as a custom target to avoid errors.
----
- external/SPIRV-Tools/CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt
-index 9afa5746c4d..3b768c1b772 100644
---- a/external/SPIRV-Tools/CMakeLists.txt
-+++ b/external/SPIRV-Tools/CMakeLists.txt
-@@ -33,7 +33,9 @@ if(IGC_OPTION__SPIRV_TOOLS_MODE STREQUAL PREBUILDS_MODE_NAME)
- set(IGC_BUILD__SPIRV-Tools_DIR "${SPIRV-Tools_ROOT_DIR}")
-
- set(INCLUDE_DIRS_LIST "${SPIRV-Tools_ROOT_DIR}/include" "${SPIRV-Headers_INCLUDE_DIR}")
-- add_custom_target(SPIRV-Tools)
-+ if(NOT TARGET SPIRV-Tools)
-+ add_custom_target(SPIRV-Tools)
-+ endif()
- set_target_properties(SPIRV-Tools PROPERTIES INCLUDE_DIRECTORIES "${INCLUDE_DIRS_LIST}")
- set(IGC_BUILD__PROJ__SPIRV-Tools SPIRV-Tools)
-
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7-r1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7-r1.ebuild
deleted file mode 100644
index 2dd387059629..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-LLVM_MAX_SLOT="14"
-MY_PN="igc"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake flag-o-matic llvm python-any-r1
-
-DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="debug vc"
-
-DEPEND="
- dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
- dev-util/spirv-tools
- sys-devel/lld:${LLVM_MAX_SLOT}=
- sys-devel/llvm:${LLVM_MAX_SLOT}=
- vc? (
- >=dev-libs/intel-vc-intrinsics-0.11.0
- dev-util/spirv-llvm-translator:${LLVM_MAX_SLOT}=
- )
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
- =sys-devel/lld-${LLVM_MAX_SLOT}*
- ${PYTHON_DEPS}
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
- "${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
- "${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
- "${FILESDIR}/${PN}-1.0.11485-include-opencl-c.patch"
- "${FILESDIR}/${PN}-1.0.13230.7-spirv-tools.patch"
-)
-
-pkg_setup() {
- llvm_pkg_setup
- python-any-r1_pkg_setup
-}
-
-src_configure() {
- # Get LLVM version
- local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
- local llvm_version="${llvm_version%%-r*}"
-
- # See https://github.com/intel/intel-graphics-compiler/issues/212
- append-ldflags -Wl,-z,undefs
-
- # See bug #893370 and https://github.com/intel/intel-graphics-compiler/issues/282
- append-flags -U_GLIBCXX_ASSERTIONS
-
- # See https://bugs.gentoo.org/718824
- ! use debug && append-cppflags -DNDEBUG
-
- local mycmakeargs=(
- -DCCLANG_INCLUDE_PREBUILDS_DIR="/usr/lib/clang/${llvm_version##*-}/include"
- -DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
- -DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
- -DIGC_BUILD__VC_ENABLED="$(usex vc)"
- -DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
- -DIGC_OPTION__CLANG_MODE="Prebuilds"
- -DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
- -DIGC_OPTION__LLD_MODE="Prebuilds"
- -DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
- -DIGC_OPTION__LLVM_MODE="Prebuilds"
- -DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
- -DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
- -DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
- $(usex vc '-DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds' '')
- -DINSTALL_GENX_IR="ON"
- -DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
- -Wno-dev
- )
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/, dev-util/intel-graphics-compiler/files/
@ 2024-02-08 21:49 Conrad Kostecki
0 siblings, 0 replies; 12+ messages in thread
From: Conrad Kostecki @ 2024-02-08 21:49 UTC (permalink / raw
To: gentoo-commits
commit: 6fe5b053b206ab89b5c964868548c8249217a5fe
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 8 18:47:16 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Feb 8 21:47:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fe5b053
dev-util/intel-graphics-compiler: drop 1.0.15368.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-util/intel-graphics-compiler/Manifest | 1 -
.../intel-graphics-compiler-1.0.14062.11-vc.patch | 73 ---------------
.../intel-graphics-compiler-1.0.15368.3.ebuild | 102 ---------------------
3 files changed, 176 deletions(-)
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 64b66ddba0e6..2b88a520bf1e 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,2 +1 @@
-DIST intel-graphics-compiler-1.0.15368.3.tar.gz 8991895 BLAKE2B 93da50357052d4711c2bb2b49335aa5f3c27162ab478c8482ba491bda1d2fa4562abd612d052799f71942483256eeb94684db7b248ed6f3ae16c3f898cfa5981 SHA512 43415186f6be8c7821d7b0d5803070e6e707bcf1be64aca2d6f4d8f575e0d8ef0b1ea1b999f9b5ef32ace625feb889c6c875b4d8c66c7de3680ea91b9ae0da6a
DIST intel-graphics-compiler-1.0.15770.7.tar.gz 9111574 BLAKE2B 41c180693c15759d26110a083e3f0354c3f771c7815b7e82c2493f73eb2fc79f9130e354ba5caf5636426e9f696f6fa6c42944aa1ff1008a916b25e04c90ef80 SHA512 c386eb03bb3c03eba649dec67b3ccc8d5fa0238e622586d095a3e4d5aa6c52e8bdc5dbf85bc95533f13d97f15cddadc925f3518a37b223e18c03653519058f2c
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.14062.11-vc.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.14062.11-vc.patch
deleted file mode 100644
index 7fc8e4f82c11..000000000000
--- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.14062.11-vc.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 9be3363c1f9f97627566d88a56e6e612a74691b3 Mon Sep 17 00:00:00 2001
-From: Igor Gorban <igor.gorban@intel.com>
-Date: Mon, 9 Oct 2023 13:13:57 +0000
-Subject: [PATCH] Fix regression in release-build
-
-Thanks @frantisekz for point and triage problem
----
- .../lib/GenXCodeGen/GenXSimdCFConformance.cpp | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFConformance.cpp b/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFConformance.cpp
-index ade15972379d..c5572e758833 100644
---- a/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFConformance.cpp
-+++ b/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFConformance.cpp
-@@ -1867,11 +1867,12 @@ void GenXSimdCFConformance::ensureConformance() {
- IID != GenXIntrinsic::genx_simdcf_unmask &&
- IID != GenXIntrinsic::genx_simdcf_remask) {
- EMValsStack.insert(*i);
-+#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
- LLVM_DEBUG(if (auto *Inst = dyn_cast<Instruction>(i->getValue())) {
- auto FuncName = Inst->getFunction()->getName();
-- dbgs() << "Entry EMVals " << FuncName << " - ";
-- i->getValue()->dump();
-+ dbgs() << "Entry EMVals " << FuncName << " - " << *Inst << "\n";
- });
-+#endif
- }
- }
- for (auto i = EMVals.begin(), e = EMVals.end(); i != e; ++i) {
-@@ -1919,6 +1920,7 @@ void GenXSimdCFConformance::ensureConformance() {
- // been identified in the early pass, unless passes in between have
- // transformed the code in an unexpected way that has made the simd CF
- // non-conformant. Give an error here if this has happened.
-+#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
- if (!GotosToLower.empty()) {
- dbgs() << "Not empty GotosToLower:";
- for (auto *Dump : GotosToLower)
-@@ -1929,6 +1931,7 @@ void GenXSimdCFConformance::ensureConformance() {
- for (auto *Dump : JoinsToLower)
- Dump->dump();
- }
-+#endif
- IGC_ASSERT_EXIT_MESSAGE(
- GotosToLower.empty(),
- "unexpected non-conformant SIMD CF in late SIMD CF conformance pass");
-@@ -2460,9 +2463,9 @@ static bool checkAllUsesAreSelectOrWrRegion(Value *V) {
- auto User2 = cast<Instruction>(ui2->getUser());
- unsigned OpNum = ui2->getOperandNo();
- ++ui2;
-- LLVM_DEBUG(dbgs() << "checkAllUsesAreSelectOrWrRegion: for user ";
-- User2->dump());
--
-+#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
-+ LLVM_DEBUG(dbgs() << "checkAllUsesAreSelectOrWrRegion: for user " << *User2 << "\n");
-+#endif
- if (isa<SelectInst>(User2))
- continue;
-
-@@ -3006,12 +3009,14 @@ bool GenXSimdCFConformance::getConnectedVals(
- }
- } else {
- if (!UsersToLower.empty()) {
-+#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
- LLVM_DEBUG(dbgs() << "getConnectedVals: find bad users:\n";
- for (auto &BadUser
- : UsersToLower) {
- dbgs() << " ";
- BadUser.dump();
- });
-+#endif
- return false;
- }
- }
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15368.3.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15368.3.ebuild
deleted file mode 100644
index 3c62be7bf3f4..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15368.3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-LLVM_MAX_SLOT="15"
-MY_PN="igc"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{9..12} )
-
-inherit cmake flag-o-matic llvm python-any-r1
-
-DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="debug vc"
-
-DEPEND="
- dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
- dev-util/spirv-tools
- sys-devel/lld:${LLVM_MAX_SLOT}=
- sys-devel/llvm:${LLVM_MAX_SLOT}=
- vc? (
- >=dev-libs/intel-vc-intrinsics-0.12.1-r1
- dev-util/spirv-llvm-translator:${LLVM_MAX_SLOT}=
- )
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
- $(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
- =sys-devel/lld-${LLVM_MAX_SLOT}*
- ${PYTHON_DEPS}
-"
-
-python_check_deps() {
- python_has_version "dev-python/mako[${PYTHON_USEDEP}]"
-}
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
- "${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
- "${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
- "${FILESDIR}/${PN}-1.0.14062.11-vc.patch"
-)
-
-pkg_setup() {
- llvm_pkg_setup
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # Don't hardcode FORTIFY_SOURCE
- sed -e '/-D_FORTIFY_SOURCE=2/d' -i IGC/CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- # Get LLVM version
- local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
- local llvm_version="${llvm_version%%-r*}"
-
- # See https://github.com/intel/intel-graphics-compiler/issues/212
- append-ldflags -Wl,-z,undefs
-
- # See bug #893370 and https://github.com/intel/intel-graphics-compiler/issues/282
- append-flags -U_GLIBCXX_ASSERTIONS
-
- # See https://bugs.gentoo.org/718824
- ! use debug && append-cppflags -DNDEBUG
-
- local mycmakeargs=(
- -DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
- -DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
- -DIGC_BUILD__VC_ENABLED="$(usex vc)"
- -DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
- -DIGC_OPTION__CLANG_MODE="Prebuilds"
- -DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
- -DIGC_OPTION__LLD_MODE="Prebuilds"
- -DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
- -DIGC_OPTION__LLVM_MODE="Prebuilds"
- -DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
- -DIGC_OPTION__OPENCL_HEADER_PATH="/usr/lib/clang/${llvm_version##*-}/include/opencl-c.h"
- -DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
- -DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
- $(usex vc '-DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds' '')
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DINSTALL_GENX_IR="ON"
- -DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
- -Wno-dev
- )
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2024-02-08 21:50 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-13 19:17 [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/, dev-util/intel-graphics-compiler/files/ Marek Szuba
-- strict thread matches above, loose matches on Subject: below --
2024-02-08 21:49 Conrad Kostecki
2023-04-09 19:35 Conrad Kostecki
2023-02-21 20:03 Conrad Kostecki
2022-06-30 21:46 Conrad Kostecki
2022-05-21 13:52 Conrad Kostecki
2022-04-23 18:33 Conrad Kostecki
2022-03-27 22:23 Conrad Kostecki
2020-09-07 11:09 Marek Szuba
2020-03-12 11:33 Marek Szuba
2019-10-07 12:23 Marek Szuba
2019-07-03 16:12 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox