From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2194415815E for ; Thu, 8 Feb 2024 21:50:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B3C41E2A1E; Thu, 8 Feb 2024 21:50:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9901DE2A1E for ; Thu, 8 Feb 2024 21:50:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D80CB3430EE for ; Thu, 8 Feb 2024 21:50:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EBA6514D4 for ; Thu, 8 Feb 2024 21:49:59 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1707428852.6fe5b053b206ab89b5c964868548c8249217a5fe.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/, dev-util/intel-graphics-compiler/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/intel-graphics-compiler/Manifest dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.14062.11-vc.patch dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.15368.3.ebuild X-VCS-Directories: dev-util/intel-graphics-compiler/files/ dev-util/intel-graphics-compiler/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 6fe5b053b206ab89b5c964868548c8249217a5fe X-VCS-Branch: master Date: Thu, 8 Feb 2024 21:49:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 62c63084-58b1-4a9a-8784-5a9387532655 X-Archives-Hash: 69f661424885822819523b1ea5e3ed35 commit: 6fe5b053b206ab89b5c964868548c8249217a5fe Author: Conrad Kostecki gentoo org> AuthorDate: Thu Feb 8 18:47:16 2024 +0000 Commit: Conrad Kostecki gentoo 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 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 -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 -}