From 4b63fd37a73007a6502ac56db4fc2c1c25c335fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 9 Feb 2024 03:59:01 +0000 Subject: gentoo auto-resync : 09:02:2024 - 03:59:01 --- dev-util/intel-graphics-compiler/Manifest | 7 +- .../intel-graphics-compiler-1.0.14062.11-vc.patch | 73 --------------- .../intel-graphics-compiler-1.0.15368.3.ebuild | 102 --------------------- .../intel-graphics-compiler-1.0.15770.15.ebuild | 101 ++++++++++++++++++++ .../intel-graphics-compiler-1.0.15770.7.ebuild | 4 +- 5 files changed, 106 insertions(+), 181 deletions(-) delete mode 100644 dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.14062.11-vc.patch delete mode 100644 dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15368.3.ebuild create mode 100644 dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15770.15.ebuild (limited to 'dev-util/intel-graphics-compiler') diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest index 3dc6d6012bcc..ce4cfd70e93c 100644 --- a/dev-util/intel-graphics-compiler/Manifest +++ b/dev-util/intel-graphics-compiler/Manifest @@ -1,9 +1,8 @@ -AUX intel-graphics-compiler-1.0.14062.11-vc.patch 3035 BLAKE2B fb1e087985d84e7cabcb34ae19f3af3aaf4c05a485f58243cc9c3c2fc60b1ae002fd1ec126d926cfe5afc9233676dc0bd1231370a1b19e23df1fb9d743280e4d SHA512 1963161e696d4f926975faa795741bab24075bbf5537e99915ae4bfa402bd791499e658ea62cc56f8b3975671f9e91ddadca1424950bf1b39c57408617fed6e6 AUX intel-graphics-compiler-1.0.8173-opencl-clang_version.patch 1807 BLAKE2B ec6aac8c78d7584e043a258585cbae6218fd8aa167d853e1eea96313298df7347ab7652ec2bf83199129e07e534d52fcd200858036e3d0af2c4f79ff249104f2 SHA512 1a0db341aab280aa205965dfc82d17b29f681bde76932f8291243afad985523f601c7279b1fb772ebc4d9197e5016941a1ad07cea2b6d7199710a7ee22fd81dc AUX intel-graphics-compiler-1.0.8365-disable-git.patch 1140 BLAKE2B f870def1128c30c3e50a71e9eac39eccbcc9bc798be574324016c6c31ed3a3f82e1499f1aada5a2c475bd6b6c467b1b236635fdd6b5145904bc63dc53f8d75e5 SHA512 d1d53a6f4a47031ec4cdcf3f57c059536ccf571a72929da3d9070487686f91f4202d20c4d626da616250f66b31815b61fafa82b903b1f5157a226ee748097bda AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d -DIST intel-graphics-compiler-1.0.15368.3.tar.gz 8991895 BLAKE2B 93da50357052d4711c2bb2b49335aa5f3c27162ab478c8482ba491bda1d2fa4562abd612d052799f71942483256eeb94684db7b248ed6f3ae16c3f898cfa5981 SHA512 43415186f6be8c7821d7b0d5803070e6e707bcf1be64aca2d6f4d8f575e0d8ef0b1ea1b999f9b5ef32ace625feb889c6c875b4d8c66c7de3680ea91b9ae0da6a +DIST intel-graphics-compiler-1.0.15770.15.tar.gz 9105504 BLAKE2B 6b5bbb0b32dabcc93c62b8d0f53a4c3fc0a2830e4ab685e471902ae3cff2f30ced5df5cada015f19be500972b982334f1a3b5ce4befc72de207b83420cdc8768 SHA512 4da1882834338c6dd51aa10f64eb6cdadc65ed2c5772c0c9083dcc378df62adfe1fd8fd0d7e8623bf9447112e76d334334689ed03a84b1680a858f29c0036ffc DIST intel-graphics-compiler-1.0.15770.7.tar.gz 9111574 BLAKE2B 41c180693c15759d26110a083e3f0354c3f771c7815b7e82c2493f73eb2fc79f9130e354ba5caf5636426e9f696f6fa6c42944aa1ff1008a916b25e04c90ef80 SHA512 c386eb03bb3c03eba649dec67b3ccc8d5fa0238e622586d095a3e4d5aa6c52e8bdc5dbf85bc95533f13d97f15cddadc925f3518a37b223e18c03653519058f2c -EBUILD intel-graphics-compiler-1.0.15368.3.ebuild 2872 BLAKE2B 408edc41973ba22f466dd7aac95867127488cd4d7762e9949eb1c987239f11eb89e472bc532e84a8c1f76a1d5ef42706a950ee3b7b619832b2fdb33d1195c88b SHA512 4fde88d8f25951f851c5e9aaf2e7d1361afcf7cc80f15738e963dd2ffc4d3e892018d1ab7c54993c277572cd7a9e5bc2c02bc7a1efd085b1d4ae616e26bfb7b2 -EBUILD intel-graphics-compiler-1.0.15770.7.ebuild 2828 BLAKE2B c81fd5095bd2d8fc412ba258ff7d75cc0f6f00c65f8aea48171352d37eabd85fc8652d5d2051c8620d1963ac702d1385b455560c70b5a09e338509a1ef2c0ae4 SHA512 5044da7d71a19ca64d973da5eddc5a8497f787de4214eb9d1a1f4f7ac53b25546e78c8b98f24c5f1fac4e03f26bcf1837c4df4572b680691bea33411eb2fd90a +EBUILD intel-graphics-compiler-1.0.15770.15.ebuild 2828 BLAKE2B fd3ecefa76f2de0817adde86f61a276822d143817f540bef24a33214837545bb5d7a45e76217f41d24719a7d80abd1393a09024940e0b89f39e1eebc1321f20f SHA512 bc449c267302d4f9b25428c33cf8bc76020d48b0f39653f0692e8005e7b978d802eef2af2f6633513469d07e8a9510c2f55d946ece88ae0f7f8a6cec42c6e5ef +EBUILD intel-graphics-compiler-1.0.15770.7.ebuild 2827 BLAKE2B 32965b9946ecf65edd76589c2722b54951c31d2805e62db62fcd5a181af80d0564121019110af3980648d5f0b741f7e60a933f61a1d6661b0919d550a6d127a3 SHA512 813b904125301cc5162b5b50ba5bf23ee4bc85ddc876b5cf70dd084a21104f0bbca4700cefefee51ff8f97125b1837fe1aaedebdb30fef39b59364d3cf89c243 MISC metadata.xml 682 BLAKE2B c5e74bbb1a5aca5eed7cb75a19820dc9d78d7ef7a15687924d16863a82a535403ca67103ac458d4b86f380244e726a3bd20fb496f8048f999abdf89950a7092c SHA512 d5a35d2104e9aa5caaf903a9f61ca8a8c4f8b5bff3e993c9964dd63196e64b88e3e7bde2e0cff9dcee9c66bdda0cabb43c5ac8c121796626bb0e7f4013929fb3 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 -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(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(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(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 -} diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15770.15.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15770.15.ebuild new file mode 100644 index 000000000000..b360debf8771 --- /dev/null +++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15770.15.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2024 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_{10..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.16.0 + 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" +) + +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 +} diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15770.7.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15770.7.ebuild index 2f72895347fc..e0ea95be051e 100644 --- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15770.7.ebuild +++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15770.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_P}" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="debug vc" DEPEND=" -- cgit v1.2.3