[gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/files/

2023-10-11 Thread Conrad Kostecki 
commit: 8830054b879fa06e9ae0f5a1330ca563faef5241
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Wed Oct 11 23:55:59 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Oct 11 23:55:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8830054b

dev-util/intel-graphics-compiler: update vc patch

Update VC patch to use upstreams commited version.

Signed-off-by: Conrad Kostecki  gentoo.org>

 .../intel-graphics-compiler-1.0.14062.11-vc.patch  | 52 ++
 1 file changed, 33 insertions(+), 19 deletions(-)

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
index 778505f08068..7fc8e4f82c11 100644
--- 
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
@@ -1,59 +1,73 @@
+From 9be3363c1f9f97627566d88a56e6e612a74691b3 Mon Sep 17 00:00:00 2001
+From: Igor Gorban 
+Date: Mon, 9 Oct 2023 13:13:57 +
+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,13 @@ void GenXSimdCFConformance::ensureConformance() {
+@@ -1867,11 +1867,12 @@ void GenXSimdCFConformance::ensureConformance() {
  IID != GenXIntrinsic::genx_simdcf_unmask &&
  IID != GenXIntrinsic::genx_simdcf_remask) {
EMValsStack.insert(*i);
-+  #ifdef DEBUG_VERBOSE_ON
++#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 << " - ";
+-i->getValue()->dump();
++dbgs() << "Entry EMVals " << FuncName << " - " << *Inst << "\n";
});
-+  #endif
++#endif
  }
}
for (auto i = EMVals.begin(), e = EMVals.end(); i != e; ++i) {
-@@ -1919,6 +1921,7 @@ void GenXSimdCFConformance::ensureConformance() {
+@@ -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.
-+#ifdef DEBUG_VERBOSE_ON
++#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
  if (!GotosToLower.empty()) {
dbgs() << "Not empty GotosToLower:";
for (auto *Dump : GotosToLower)
-@@ -1929,6 +1932,7 @@ void GenXSimdCFConformance::ensureConformance() {
+@@ -1929,6 +1931,7 @@ void GenXSimdCFConformance::ensureConformance() {
for (auto *Dump : JoinsToLower)
  Dump->dump();
  }
-+#endif
++#endif
  IGC_ASSERT_EXIT_MESSAGE(
  GotosToLower.empty(),
  "unexpected non-conformant SIMD CF in late SIMD CF conformance pass");
-@@ -2460,8 +2464,10 @@ static bool checkAllUsesAreSelectOrWrRegion(Value *V) {
+@@ -2460,9 +2463,9 @@ static bool checkAllUsesAreSelectOrWrRegion(Value *V) {
  auto User2 = cast(ui2->getUser());
  unsigned OpNum = ui2->getOperandNo();
  ++ui2;
-+#ifdef DEBUG_VERBOSE_ON
- LLVM_DEBUG(dbgs() << "checkAllUsesAreSelectOrWrRegion: for user ";
-User2->dump());
-+#endif
- 
+-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 +3012,14 @@ bool GenXSimdCFConformance::getConnectedVals(
+ 
+@@ -3006,12 +3009,14 @@ bool GenXSimdCFConformance::getConnectedVals(
  }
} else {
  if (!UsersToLower.empty()) {
-+  #ifdef DEBUG_VERBOSE_ON
++#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
LLVM_DEBUG(dbgs() << "getConnectedVals: find bad users:\n";
   for (auto 
: UsersToLower) {
 dbgs() << "";
 BadUser.dump();
   });
-+  #endif
++#endif
return false;
  }
}
---

[gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/files/

2023-04-01 Thread Conrad Kostecki 
commit: 4db89b71fd7b5a871edf62bdc97d4e494601b3a7
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Mar 26 09:11:28 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Apr  1 19:11:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4db89b71

dev-util/intel-graphics-compiler: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30349
Signed-off-by: Conrad Kostecki  gentoo.org>

 ...phics-compiler-1.0.12504.5-vectorcompiler.patch | 165 -
 1 file changed, 165 deletions(-)

diff --git 
a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.12504.5-vectorcompiler.patch
 
b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.12504.5-vectorcompiler.patch
deleted file mode 100644
index ec75efc22b97..
--- 
a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.12504.5-vectorcompiler.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From 753a6a4efd5fcb42a86a5f62b64c29393513d807 Mon Sep 17 00:00:00 2001
-From: Victor Mustya 
-Date: Thu, 29 Dec 2022 05:03:39 +
-Subject: [PATCH]  Fix open source build for some configurations
-
-When building for some Linux distros, cmake configures IGC to build all
-the libraries as shared by default. So we have to explicitly configure
-all the libraries as static or object.

- IGC/Options/CMakeLists.txt   | 2 +-
- IGC/VectorCompiler/CMCL/lib/Support/CMakeLists.txt   | 2 +-
- IGC/VectorCompiler/lib/BiF/CMakeLists.txt| 2 +-
- IGC/VectorCompiler/lib/Driver/CMakeLists.txt | 2 +-
- IGC/VectorCompiler/lib/GenXCodeGen/CMakeLists.txt| 2 +-
- IGC/VectorCompiler/lib/GenXCodeGen/TargetInfo/CMakeLists.txt | 2 +-
- IGC/VectorCompiler/lib/GenXOpts/CMakeLists.txt   | 2 +-
- IGC/VectorCompiler/lib/InternalIntrinsics/CMakeLists.txt | 2 +-
- IGC/VectorCompiler/lib/Support/CMakeLists.txt| 2 +-
- IGC/VectorCompiler/lib/Utils/GenX/CMakeLists.txt | 2 +-
- IGC/VectorCompiler/lib/Utils/General/CMakeLists.txt  | 2 +-
- 11 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/IGC/Options/CMakeLists.txt b/IGC/Options/CMakeLists.txt
-index 834d74d37ce..1dc079d1c1e 100644
 a/IGC/Options/CMakeLists.txt
-+++ b/IGC/Options/CMakeLists.txt
-@@ -6,7 +6,7 @@
- #
- # end_copyright_notice 
=
- 
--add_library(IGCOptions "")
-+add_library(IGCOptions STATIC "")
- 
- add_subdirectory(src)
- add_subdirectory(include/igc/Options)
-diff --git a/IGC/VectorCompiler/CMCL/lib/Support/CMakeLists.txt 
b/IGC/VectorCompiler/CMCL/lib/Support/CMakeLists.txt
-index ebab3db0005..eda77667ddf 100644
 a/IGC/VectorCompiler/CMCL/lib/Support/CMakeLists.txt
-+++ b/IGC/VectorCompiler/CMCL/lib/Support/CMakeLists.txt
-@@ -12,7 +12,7 @@ set(CM_CL_SUPPORT_SOURCES
-   InitializePasses.cpp
-   )
- 
--add_library(CMCLSupport ${CM_CL_SUPPORT_SOURCES})
-+add_library(CMCLSupport STATIC ${CM_CL_SUPPORT_SOURCES})
- 
- # LLVM dependencies
- igc_get_llvm_targets(LLVM_LIBS
-diff --git a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt 
b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
-index 6235fc1d21e..c439f334a98 100644
 a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
-+++ b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
-@@ -275,7 +275,7 @@ add_custom_target(VCBiFPreparation
-   ${SPIRV_EXEC_BUILTINS_SRC_PATH}
-   ${SPIRV_ATOMIC_BUILTINS_SRC_PATH})
- 
--add_library(VCEmbeddedBiF
-+add_library(VCEmbeddedBiF OBJECT
-   ${PRINTF_OCL_32_CPP_PATH}
-   ${PRINTF_OCL_64_CPP_PATH}
-   ${PRINTF_ZE_32_CPP_PATH}
-diff --git a/IGC/VectorCompiler/lib/Driver/CMakeLists.txt 
b/IGC/VectorCompiler/lib/Driver/CMakeLists.txt
-index 74e4e661e74..fc14937a1c6 100644
 a/IGC/VectorCompiler/lib/Driver/CMakeLists.txt
-+++ b/IGC/VectorCompiler/lib/Driver/CMakeLists.txt
-@@ -11,7 +11,7 @@ set(DRIVER_SOURCES
-   SPIRVWrapper.cpp
-   )
- 
--add_library(VCDriver ${DRIVER_SOURCES})
-+add_library(VCDriver STATIC ${DRIVER_SOURCES})
- igc_get_llvm_targets(LLVM_LIBS
-   Analysis
-   BitReader
-diff --git a/IGC/VectorCompiler/lib/GenXCodeGen/CMakeLists.txt 
b/IGC/VectorCompiler/lib/GenXCodeGen/CMakeLists.txt
-index 185a7533a89..4c3eada26fb 100644
 a/IGC/VectorCompiler/lib/GenXCodeGen/CMakeLists.txt
-+++ b/IGC/VectorCompiler/lib/GenXCodeGen/CMakeLists.txt
-@@ -88,7 +88,7 @@ set(CODEGEN_SOURCES
-   GenXFixInvalidFuncName.cpp
- )
- 
--add_library(VCCodeGen ${CODEGEN_SOURCES})
-+add_library(VCCodeGen STATIC ${CODEGEN_SOURCES})
- add_dependencies(VCCodeGen
-   GenXUtilBuild
-   GenXCommonTableGen_target
-diff --git a/IGC/VectorCompiler/lib/GenXCodeGen/TargetInfo/CMakeLists.txt 
b/IGC/VectorCompiler/lib/GenXCodeGen/TargetInfo/CMakeLists.txt
-index dca9455f464..8a0b66f7b55 100644
 a/IGC/VectorCompiler/lib/GenXCodeGen/TargetInfo/CMakeLists.txt
-+++

[gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/files/, dev-util/intel-graphics-compiler/

2022-12-30 Thread Conrad Kostecki 
commit: 1451c6c95bf08ce6a4c14b2790622abcac338baa
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Fri Dec 30 22:47:31 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Fri Dec 30 23:38:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1451c6c9

dev-util/intel-graphics-compiler: add vectorcompiler

Signed-off-by: Conrad Kostecki  gentoo.org>

 ...phics-compiler-1.0.12504.5-vectorcompiler.patch | 165 +
 ... intel-graphics-compiler-1.0.12504.5-r1.ebuild} |  14 +-
 dev-util/intel-graphics-compiler/metadata.xml  |   3 +
 3 files changed, 176 insertions(+), 6 deletions(-)

diff --git 
a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.12504.5-vectorcompiler.patch
 
b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.12504.5-vectorcompiler.patch
new file mode 100644
index ..ec75efc22b97
--- /dev/null
+++ 
b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.12504.5-vectorcompiler.patch
@@ -0,0 +1,165 @@
+From 753a6a4efd5fcb42a86a5f62b64c29393513d807 Mon Sep 17 00:00:00 2001
+From: Victor Mustya 
+Date: Thu, 29 Dec 2022 05:03:39 +
+Subject: [PATCH]  Fix open source build for some configurations
+
+When building for some Linux distros, cmake configures IGC to build all
+the libraries as shared by default. So we have to explicitly configure
+all the libraries as static or object.
+---
+ IGC/Options/CMakeLists.txt   | 2 +-
+ IGC/VectorCompiler/CMCL/lib/Support/CMakeLists.txt   | 2 +-
+ IGC/VectorCompiler/lib/BiF/CMakeLists.txt| 2 +-
+ IGC/VectorCompiler/lib/Driver/CMakeLists.txt | 2 +-
+ IGC/VectorCompiler/lib/GenXCodeGen/CMakeLists.txt| 2 +-
+ IGC/VectorCompiler/lib/GenXCodeGen/TargetInfo/CMakeLists.txt | 2 +-
+ IGC/VectorCompiler/lib/GenXOpts/CMakeLists.txt   | 2 +-
+ IGC/VectorCompiler/lib/InternalIntrinsics/CMakeLists.txt | 2 +-
+ IGC/VectorCompiler/lib/Support/CMakeLists.txt| 2 +-
+ IGC/VectorCompiler/lib/Utils/GenX/CMakeLists.txt | 2 +-
+ IGC/VectorCompiler/lib/Utils/General/CMakeLists.txt  | 2 +-
+ 11 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/IGC/Options/CMakeLists.txt b/IGC/Options/CMakeLists.txt
+index 834d74d37ce..1dc079d1c1e 100644
+--- a/IGC/Options/CMakeLists.txt
 b/IGC/Options/CMakeLists.txt
+@@ -6,7 +6,7 @@
+ #
+ # end_copyright_notice 
=
+ 
+-add_library(IGCOptions "")
++add_library(IGCOptions STATIC "")
+ 
+ add_subdirectory(src)
+ add_subdirectory(include/igc/Options)
+diff --git a/IGC/VectorCompiler/CMCL/lib/Support/CMakeLists.txt 
b/IGC/VectorCompiler/CMCL/lib/Support/CMakeLists.txt
+index ebab3db0005..eda77667ddf 100644
+--- a/IGC/VectorCompiler/CMCL/lib/Support/CMakeLists.txt
 b/IGC/VectorCompiler/CMCL/lib/Support/CMakeLists.txt
+@@ -12,7 +12,7 @@ set(CM_CL_SUPPORT_SOURCES
+   InitializePasses.cpp
+   )
+ 
+-add_library(CMCLSupport ${CM_CL_SUPPORT_SOURCES})
++add_library(CMCLSupport STATIC ${CM_CL_SUPPORT_SOURCES})
+ 
+ # LLVM dependencies
+ igc_get_llvm_targets(LLVM_LIBS
+diff --git a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt 
b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
+index 6235fc1d21e..c439f334a98 100644
+--- a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
 b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
+@@ -275,7 +275,7 @@ add_custom_target(VCBiFPreparation
+   ${SPIRV_EXEC_BUILTINS_SRC_PATH}
+   ${SPIRV_ATOMIC_BUILTINS_SRC_PATH})
+ 
+-add_library(VCEmbeddedBiF
++add_library(VCEmbeddedBiF OBJECT
+   ${PRINTF_OCL_32_CPP_PATH}
+   ${PRINTF_OCL_64_CPP_PATH}
+   ${PRINTF_ZE_32_CPP_PATH}
+diff --git a/IGC/VectorCompiler/lib/Driver/CMakeLists.txt 
b/IGC/VectorCompiler/lib/Driver/CMakeLists.txt
+index 74e4e661e74..fc14937a1c6 100644
+--- a/IGC/VectorCompiler/lib/Driver/CMakeLists.txt
 b/IGC/VectorCompiler/lib/Driver/CMakeLists.txt
+@@ -11,7 +11,7 @@ set(DRIVER_SOURCES
+   SPIRVWrapper.cpp
+   )
+ 
+-add_library(VCDriver ${DRIVER_SOURCES})
++add_library(VCDriver STATIC ${DRIVER_SOURCES})
+ igc_get_llvm_targets(LLVM_LIBS
+   Analysis
+   BitReader
+diff --git a/IGC/VectorCompiler/lib/GenXCodeGen/CMakeLists.txt 
b/IGC/VectorCompiler/lib/GenXCodeGen/CMakeLists.txt
+index 185a7533a89..4c3eada26fb 100644
+--- a/IGC/VectorCompiler/lib/GenXCodeGen/CMakeLists.txt
 b/IGC/VectorCompiler/lib/GenXCodeGen/CMakeLists.txt
+@@ -88,7 +88,7 @@ set(CODEGEN_SOURCES
+   GenXFixInvalidFuncName.cpp
+ )
+ 
+-add_library(VCCodeGen ${CODEGEN_SOURCES})
++add_library(VCCodeGen STATIC ${CODEGEN_SOURCES})
+ add_dependencies(VCCodeGen
+   GenXUtilBuild
+   GenXCommonTableGen_target
+diff --git a/IGC/VectorCompiler/lib/GenXCodeGen/TargetInfo/CMakeLists.txt 
b/IGC/VectorCompiler/lib/GenXCodeGen/TargetInfo/CMakeLists.txt
+index dca9455f464..8a0b66f7b55 100644
+--- a/IGC/VectorCompiler/lib/GenXCodeGen/TargetInfo/CMakeLists.txt

[gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/files/, dev-util/intel-graphics-compiler/

2022-09-25 Thread Conrad Kostecki 
commit: 94cf195ebe7b78124863237f8452a6cc983a1778
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Sep 25 22:29:54 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Sep 25 23:11:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94cf195e

dev-util/intel-graphics-compiler: drop 1.0.11485-r2

Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-util/intel-graphics-compiler/Manifest  |   1 -
 ...aphics-compiler-1.0.11485-fix-BiF-caching.patch |  49 --
 ...mpiler-1.0.11485-update-raytracing-llvm14.patch | 186 -
 ...compiler-1.0.11485-wrap-getNumArgOperands.patch |  24 ---
 .../intel-graphics-compiler-1.0.11485-r2.ebuild|  88 --
 5 files changed, 348 deletions(-)

diff --git a/dev-util/intel-graphics-compiler/Manifest 
b/dev-util/intel-graphics-compiler/Manifest
index e8fdf2d8233b..d191cf9cf1d5 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,2 +1 @@
-DIST intel-graphics-compiler-1.0.11485.tar.gz 8831925 BLAKE2B 
7e2bcb37b4c34bb01788a8d75fc42498223b6193421cb726c21ce7949181757a10d112ae151736cd9283ba6ed8f0625597fb1f2a61229a7352e7f1f5ec34d1d0
 SHA512 
03fb571fdd61daea3a5c61ff75a146bd98b9b92dfd8bc1957143fe127977f5111df680ac86769d3c1fa1801ba2012b600b1ff844b318ce64460f2d042c4ae65b
 DIST intel-graphics-compiler-1.0.11702.1.tar.gz 8734601 BLAKE2B 
7cc8a4f9fc820d822c3b435d172ca27145d916fd25fedf20d13b2d7041cba36fc4416e17307ab0cbf6b9785f5958a53c58486fb6fb4776025b696f5dfb195161
 SHA512 
cd7d27a3a13462517c3e75c43d7d951afa53ef77875f479304da43b93fd40ae19680c11dc5bcf2ec3fecf6dbe56daa954ccb88b9f99f3af4c53d3141ef0b93f5

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
deleted file mode 100644
index 7ad261e0aa6c..
--- 
a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-fix-BiF-caching.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 12c99343388eba6e6275856b25e0fa8978585dfb Mon Sep 17 00:00:00 2001
-From: Marcin Naczk 
-Date: Mon, 13 Jun 2022 08:28:24 +
-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-update-raytracing-llvm14.patch
 
b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-update-raytracing-llvm14.patch
deleted file mode 100644
index 248f8244e32f..
--- 
a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.11485-update-raytracing-llvm14.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-From d9535cc5c3e54b21d56c492d4e21cb13c80b9b7a Mon Sep 17 00:00:00 2001
-From: Artem Gindinson 
-Date: Wed, 22 Jun 2022 11:53:02 +
-Subject:

[gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/files/, dev-util/intel-graphics-compiler/

2022-04-23 Thread Conrad Kostecki 
commit: 6e00f009e778e29f48c9af77ba39546f07498851
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sat Apr 23 17:53:23 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Apr 23 18:33:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e00f009

dev-util/intel-graphics-compiler: drop 1.0.8744

Closes: https://bugs.gentoo.org/827651
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-util/intel-graphics-compiler/Manifest  |  1 -
 ...-graphics-compiler-1.0.8365-cmake-project.patch | 27 
 .../intel-graphics-compiler-1.0.8744.ebuild| 79 --
 3 files changed, 107 deletions(-)

diff --git a/dev-util/intel-graphics-compiler/Manifest 
b/dev-util/intel-graphics-compiler/Manifest
index b23ec92763df..a23347d60dbd 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -2,4 +2,3 @@ DIST intel-graphics-compiler-1.0.10713.tar.gz 8489446 BLAKE2B 
063b938ae6d32f3a64
 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
-DIST intel-graphics-compiler-1.0.8744.tar.gz 7586378 BLAKE2B 
0f20f99a2659f733521af35c1dd63c2b1398bf4fc5745a217b96ad62cfa53f105d4c9a34eba09651d0f0679d6957820011446f5657170f5ad07d110372b8b1f3
 SHA512 
dbbe6c08f32b80be305add570187df883aacefbf90b252c70b5705ecc7732f25873732a85558f0aed2ee8db5bcd1a59aec4d7ba110774922dbb19d4d3522a539

diff --git 
a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-project.patch
 
b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-project.patch
deleted file mode 100644
index 92683cdfb942..
--- 
a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-project.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f883dc94360af37ce85c8a9215c861fdc0431dee Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki 
-Date: Sat, 28 Aug 2021 00:09:09 +0200
-Subject: [PATCH] IGC: CMakeLists: add project
-
-If project is not added, CMake will warn about it:
-No project() command is present. The top-level CMakeLists.txt file
-must contain a literal, direct call to the project() command.
-
-Signed-off-by: Conrad Kostecki 

- CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bfbcf52eca4..5b04555b21f 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,6 +8,8 @@
- 
- cmake_minimum_required(VERSION 3.13.4 FATAL_ERROR)
- 
-+project(IGC)
-+
- add_subdirectory(IGC)
- 
- list(APPEND IGC__IGC_TARGETS "igc_dll")

diff --git 
a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8744.ebuild 
b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8744.ebuild
deleted file mode 100644
index 21d5303b49fa..
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8744.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE="Release"
-LLVM_MAX_SLOT="11"
-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}=
-   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.8365-cmake-project.patch"
-)
-
-pkg_setup() {
-   llvm_pkg_setup
-   python-any-r1_pkg_setup
-}
-
-src_configure() {
-   # Since late March 2020

[gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/files/, dev-util/intel-graphics-compiler/

2021-10-21 Thread Conrad Kostecki 
commit: ab7e3053c574cb472cb2196c3c47d6f654dca410
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Thu Oct 21 22:29:10 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Oct 21 22:29:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab7e3053

dev-util/intel-graphics-compiler: drop old version

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-util/intel-graphics-compiler/Manifest  |  1 -
 ...hics-compiler-1.0.8173-fix-missing-limits.patch | 23 --
 ...s-compiler-1.0.8365-cmake-minimum-version.patch | 43 
 ...hics-compiler-1.0.8517-fix-missing-limits.patch | 21 --
 .../intel-graphics-compiler-1.0.8517-r1.ebuild | 82 --
 5 files changed, 170 deletions(-)

diff --git a/dev-util/intel-graphics-compiler/Manifest 
b/dev-util/intel-graphics-compiler/Manifest
index 3f15cdaed17..4e859bfa6a9 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,3 +1,2 @@
-DIST intel-graphics-compiler-1.0.8517.tar.gz 7539946 BLAKE2B 
034d2e3dcfc25186e29eebfabffbca7b8a5adab1f766c7515b4a3206c9c52eca3dd766e17320ea0c40067385fc6235d92eec13f1d12909915b86fb42a7862825
 SHA512 
35f09d1f6b117e78814cc235d03b1f1164f11a2d2a5d188b6658677c4b759422048764e765f7690f4789dc8b8c068714a68642c2d956ccc84b387a959f9af07f
 DIST intel-graphics-compiler-1.0.8708.tar.gz 7574517 BLAKE2B 
578b29a103d3d0b7f481971a801fa11bc14430b7ecd00c99492f5d80ce713b84d00d278726a425edf5884ac15f4877c96a39a3f3f3f1c22bc972db039be28dc2
 SHA512 
3685c2fe0750d860facd7f378a1de4ac21127e7720d7a8889ac0ae8ab9e58dfacfc50b5bbe37d5744c9a17958b057512871125b58784a8c62ddffc2997f80ba8
 DIST intel-graphics-compiler-1.0.8744.tar.gz 7586378 BLAKE2B 
0f20f99a2659f733521af35c1dd63c2b1398bf4fc5745a217b96ad62cfa53f105d4c9a34eba09651d0f0679d6957820011446f5657170f5ad07d110372b8b1f3
 SHA512 
dbbe6c08f32b80be305add570187df883aacefbf90b252c70b5705ecc7732f25873732a85558f0aed2ee8db5bcd1a59aec4d7ba110774922dbb19d4d3522a539

diff --git 
a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8173-fix-missing-limits.patch
 
b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8173-fix-missing-limits.patch
deleted file mode 100644
index 406262d2d91..000
--- 
a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8173-fix-missing-limits.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix compilation with >=gcc-11, taken from upstream:
-https://github.com/intel/intel-graphics-compiler/pull/190
-
-From 8e1a461d3e6b85a6cf018caf6abf4a3ba9a1758d Mon Sep 17 00:00:00 2001
-From: Bruno Pagani 
-Date: Wed, 4 Aug 2021 20:54:21 +0200
-Subject: [PATCH] Fix missing include
-

- visa/iga/IGALibrary/IR/RegDeps.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/visa/iga/IGALibrary/IR/RegDeps.cpp 
b/visa/iga/IGALibrary/IR/RegDeps.cpp
-index 83c226a316..585896631e 100644
 a/visa/iga/IGALibrary/IR/RegDeps.cpp
-+++ b/visa/iga/IGALibrary/IR/RegDeps.cpp
-@@ -10,6 +10,7 @@ SPDX-License-Identifier: MIT
- #include "../asserts.hpp"
- #include "../bits.hpp"
- 
-+#include 
- #include 
- #include 

diff --git 
a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-minimum-version.patch
 
b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-minimum-version.patch
deleted file mode 100644
index dcf762872a1..000
--- 
a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-minimum-version.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 419ae48d0e2cb932a6618e9012b4164e93e58279 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki 
-Date: Sat, 28 Aug 2021 00:16:23 +0200
-Subject: [PATCH] IGC: CMakeLists: adjust minimum_version
-
-As CMake warns about possible compatibility problems,
-the minimum version should be updated, as it should be compatible.
-
-Otherwise, the warning is printed:
-Compatibility with CMake < 2.8.12 will be removed from a future version of 
CMake.
-
-Signed-off-by: Conrad Kostecki 

- visa/CMakeLists.txt | 2 +-
- visa/iga/GEDLibrary/GED_external/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/visa/CMakeLists.txt b/visa/CMakeLists.txt
-index c70d80d5726..3e54bd93079 100644
 a/visa/CMakeLists.txt
-+++ b/visa/CMakeLists.txt
-@@ -68,7 +68,7 @@ if(WIN32)
-   cmake_minimum_required(VERSION 3.1)
-   cmake_policy(SET CMP0043 OLD)
- else()
--  cmake_minimum_required(VERSION 2.8)
-+  cmake_minimum_required(VERSION 2.8.12)
- endif(WIN32)
- 
- # In the case where this is the IGC build we need to add a dummy custom 
target check_headers
-diff --git a/visa/iga/GEDLibrary/GED_external/CMakeLists.txt 
b/visa/iga/GEDLibrary/GED_external/CMakeLists.txt
-index d3011ddae6a..e40313fc194 100644
 a/visa/iga/GEDLibrary/GED_external/CMakeLists.txt
-+++ b/visa/iga/GEDLibrary/GED_external/CMakeLists.txt
-@@ -10,7 +10,7 @@
- if(WIN32)
-

[gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/files/, dev-util/intel-graphics-compiler/

2021-09-21 Thread Conrad Kostecki 
commit: 1f593e6c6545c9447d2adc9c03b166b6cd658ce5
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Tue Sep 21 18:05:52 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Sep 21 18:25:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f593e6c

dev-util/intel-graphics-compiler: drop old versions

Closes: https://bugs.gentoo.org/774009
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-util/intel-graphics-compiler/Manifest  |  4 --
 ...cs-compiler-1.0.4111-opencl-clang_version.patch | 27 
 .../intel-graphics-compiler-1.0.4111.ebuild| 61 
 .../intel-graphics-compiler-1.0.4944.ebuild| 72 ---
 .../intel-graphics-compiler-1.0.5353.ebuild| 73 ---
 .../intel-graphics-compiler-1.0.8173.ebuild| 74 
 .../intel-graphics-compiler-1.0.8365.ebuild| 81 --
 .../intel-graphics-compiler-1.0.8517.ebuild| 79 -
 8 files changed, 471 deletions(-)

diff --git a/dev-util/intel-graphics-compiler/Manifest 
b/dev-util/intel-graphics-compiler/Manifest
index e7569a94df0..2d2471a91dc 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,6 +1,2 @@
-DIST intel-graphics-compiler-1.0.4111.tar.gz 5781246 BLAKE2B 
6fe47422b31b0c73d24c3cef1265772927a57751bf5648f862f7c73528f2174268fdb2271c30c49ab038b4dfbe530bc088fe727e66babc5db0a41759e7212733
 SHA512 
8f589ee83a27b7a8f5abcd008e36a73fb704c20c1ae17e1ef265c59641768b75a0a08f2d6f80355442fff7625154603db3ebe9be0a4ba702b45e85db434f8110
-DIST intel-graphics-compiler-1.0.4944.tar.gz 6632351 BLAKE2B 
a3d72730b8c10fd3810fdb8206d9d92da325a094627b678bb9f8d0941e29c1697994a2d98a1b49780fae62dc421e623dea4c3a7e3061347de5f5b644cfb5e105
 SHA512 
34fafd5387f3b86bef17511015ff1e8daef75ebdff5d1d14ff2000b58968bb502a9ec1aee988858a2992414f6cdb222e7de19c2d877f7fc8cd84a79417e9a85e
-DIST intel-graphics-compiler-1.0.5353.tar.gz 6642256 BLAKE2B 
34b80b30f33dbd57bcea15852c80cdf8bdbf4630a7904946c7ce84481789e7db42f5216ba14140d445e9b0adbfcfe224468e462ea27768f0e8d31525ce56cde1
 SHA512 
e9f20e2261c5cb79d365d5d8257e8f4830b2364962c48413cc80154469db34c1c844ae5d576cbce2e3c5e5cbe22c7c3710ebd0a7fe7208e5412e81ce20077c80
-DIST intel-graphics-compiler-1.0.8173.tar.gz 7471884 BLAKE2B 
2248a8d5f23d4578c5bd04a799af65767916b3705e16a8145149794a2cf16e5a0e16c21669336151a241cc52e7672b05eb892ac4925f2c2d0b22673af4ebf67f
 SHA512 
bebccee0699dea48e98ddcdb320cacacda0cdcd36b68e51d932791756b0a8e2171a78cc1921ca2a092b9fe7dbd7a783d4898ada08c58bf856dd29bfc08334fa0
 DIST intel-graphics-compiler-1.0.8365.tar.gz 7509633 BLAKE2B 
ffe18d18b409db36bd24215d841daaa36d5055d61b9021e385fe9178351b6a92383839e271a12d1e5017150b9697060fe37f803c5153d2f107813aeb2e7a74cf
 SHA512 
6597afbab2c101d69e6a991b5b065ebbded7ccc6227c0ed82b6b0bd33fec26489c30a0a7a9558617578a767ca6d7382a6ab36144f4c64df742c6bd545ce991e9
 DIST intel-graphics-compiler-1.0.8517.tar.gz 7539946 BLAKE2B 
034d2e3dcfc25186e29eebfabffbca7b8a5adab1f766c7515b4a3206c9c52eca3dd766e17320ea0c40067385fc6235d92eec13f1d12909915b86fb42a7862825
 SHA512 
35f09d1f6b117e78814cc235d03b1f1164f11a2d2a5d188b6658677c4b759422048764e765f7690f4789dc8b8c068714a68642c2d956ccc84b387a959f9af07f

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
deleted file mode 100644
index 8996466275c..000
--- 
a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.4111-opencl-clang_version.patch
+++ /dev/null
@@ -1,27 +0,0 @@
 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

[gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/files/, dev-util/intel-graphics-compiler/

2021-09-03 Thread Conrad Kostecki 
commit: ec5cbbffdf1930b657578af501687a2e0c3eb329
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Fri Sep  3 18:19:47 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Fri Sep  3 18:24:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec5cbbff

dev-util/intel-graphics-compiler: fix compilation

This patch adds missing limits include,
so compilation won't fail with GCC11.

Closes: https://bugs.gentoo.org/811360
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 ...phics-compiler-1.0.8517-fix-missing-limits.patch | 21 +
 .../intel-graphics-compiler-1.0.8517.ebuild |  1 +
 2 files changed, 22 insertions(+)

diff --git 
a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8517-fix-missing-limits.patch
 
b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8517-fix-missing-limits.patch
new file mode 100644
index 000..fa7e86806d0
--- /dev/null
+++ 
b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8517-fix-missing-limits.patch
@@ -0,0 +1,21 @@
+From 212e98dd569187455976a8d2b26ce6398a9c3cc1 Mon Sep 17 00:00:00 2001
+From: Troels Nielsen 
+Date: Tue, 31 Aug 2021 23:02:08 +0200
+Subject: [PATCH] Include limits
+
+---
+ visa/Passes/InstCombine.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/visa/Passes/InstCombine.cpp b/visa/Passes/InstCombine.cpp
+index 10152aaab36..29b9d5e50e2 100644
+--- a/visa/Passes/InstCombine.cpp
 b/visa/Passes/InstCombine.cpp
+@@ -7,6 +7,7 @@ SPDX-License-Identifier: MIT
+ = end_copyright_notice 
===*/
+ #include "InstCombine.hpp"
+ 
++#include 
+ #include 
+ #include 
+ 

diff --git 
a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8517.ebuild 
b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8517.ebuild
index 5f73442c79b..fff9a377a38 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8517.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8517.ebuild
@@ -40,6 +40,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
"${FILESDIR}/${PN}-1.0.8365-cmake-project.patch"
"${FILESDIR}/${PN}-1.0.8365-cmake-minimum-version.patch"
+   "${FILESDIR}/${PN}-1.0.8517-fix-missing-limits.patch"
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/files/, dev-util/intel-graphics-compiler/

2021-08-27 Thread Conrad Kostecki 
commit: 64d9c9ea8fa22a2160a4479c940bcc691f322d33
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sat Aug 28 01:47:50 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Aug 28 01:56:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64d9c9ea

dev-util/intel-graphics-compiler: update llvm handling

The current llvm handling was broken and the wrong cmake variables were
used to setup the toolchain, which has been now corrected.

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 ...s-compiler-1.0.8365-cmake-minimum-version.patch | 43 +
 ...-graphics-compiler-1.0.8365-cmake-project.patch | 27 +
 ...el-graphics-compiler-1.0.8365-disable-git.patch | 37 
 .../intel-graphics-compiler-1.0.8365-r1.ebuild | 70 ++
 4 files changed, 177 insertions(+)

diff --git 
a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-minimum-version.patch
 
b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-minimum-version.patch
new file mode 100644
index 000..dcf762872a1
--- /dev/null
+++ 
b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-minimum-version.patch
@@ -0,0 +1,43 @@
+From 419ae48d0e2cb932a6618e9012b4164e93e58279 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki 
+Date: Sat, 28 Aug 2021 00:16:23 +0200
+Subject: [PATCH] IGC: CMakeLists: adjust minimum_version
+
+As CMake warns about possible compatibility problems,
+the minimum version should be updated, as it should be compatible.
+
+Otherwise, the warning is printed:
+Compatibility with CMake < 2.8.12 will be removed from a future version of 
CMake.
+
+Signed-off-by: Conrad Kostecki 
+---
+ visa/CMakeLists.txt | 2 +-
+ visa/iga/GEDLibrary/GED_external/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/visa/CMakeLists.txt b/visa/CMakeLists.txt
+index c70d80d5726..3e54bd93079 100644
+--- a/visa/CMakeLists.txt
 b/visa/CMakeLists.txt
+@@ -68,7 +68,7 @@ if(WIN32)
+   cmake_minimum_required(VERSION 3.1)
+   cmake_policy(SET CMP0043 OLD)
+ else()
+-  cmake_minimum_required(VERSION 2.8)
++  cmake_minimum_required(VERSION 2.8.12)
+ endif(WIN32)
+ 
+ # In the case where this is the IGC build we need to add a dummy custom 
target check_headers
+diff --git a/visa/iga/GEDLibrary/GED_external/CMakeLists.txt 
b/visa/iga/GEDLibrary/GED_external/CMakeLists.txt
+index d3011ddae6a..e40313fc194 100644
+--- a/visa/iga/GEDLibrary/GED_external/CMakeLists.txt
 b/visa/iga/GEDLibrary/GED_external/CMakeLists.txt
+@@ -10,7 +10,7 @@
+ if(WIN32)
+ cmake_minimum_required(VERSION 3.1)
+ else()
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 2.8.12)
+ endif(WIN32)
+ 
+ project(GEDLibrary)

diff --git 
a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-project.patch
 
b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-project.patch
new file mode 100644
index 000..92683cdfb94
--- /dev/null
+++ 
b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-cmake-project.patch
@@ -0,0 +1,27 @@
+From f883dc94360af37ce85c8a9215c861fdc0431dee Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki 
+Date: Sat, 28 Aug 2021 00:09:09 +0200
+Subject: [PATCH] IGC: CMakeLists: add project
+
+If project is not added, CMake will warn about it:
+No project() command is present. The top-level CMakeLists.txt file
+must contain a literal, direct call to the project() command.
+
+Signed-off-by: Conrad Kostecki 
+---
+ CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bfbcf52eca4..5b04555b21f 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -8,6 +8,8 @@
+ 
+ cmake_minimum_required(VERSION 3.13.4 FATAL_ERROR)
+ 
++project(IGC)
++
+ add_subdirectory(IGC)
+ 
+ list(APPEND IGC__IGC_TARGETS "igc_dll")

diff --git 
a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-disable-git.patch
 
b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-disable-git.patch
new file mode 100644
index 000..4a9a8988c5b
--- /dev/null
+++ 
b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8365-disable-git.patch
@@ -0,0 +1,37 @@
+From d0f801a178755504c2f8956841823b2aa6a124c4 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki 
+Date: Sat, 28 Aug 2021 00:57:59 +0200
+Subject: [PATCH] IGC: CMakeLists: drop git
+
+Dropping git, as we don't have any git release.
+
+Signed-off-by: Conrad Kostecki 
+---
+ visa/iga/IGALibrary/CMakeLists.txt | 11 ---
+ 1 file changed, 11 deletions(-)
+
+diff --git a/visa/iga/IGALibrary/CMakeLists.txt 
b/visa/iga/IGALibrary/CMakeLists.txt
+index 061476d94..2fd44807c 100644
+--- a/visa/iga/IGALibrary/CMakeLists.txt
 b/visa/iga/IGALibrary/CMakeLists.txt
+@@ -14,17 +14,6 @@

[gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/files/, dev-util/intel-graphics-compiler/

2021-08-16 Thread Conrad Kostecki 
commit: 169a449987cebdd7bdce2ca70974b56a7ae4a532
Author: Jan Henke  taujhe  de>
AuthorDate: Sun Aug  8 16:17:27 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Mon Aug 16 17:09:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=169a4499

dev-util/intel-graphics-compiler: Version bump 1.0.8173

Also fixes compilation on GCC 11 and call to python during building.

Bug: https://github.com/gentoo/gentoo/pull/21917
Closes: https://bugs.gentoo.org/789027
Closes: https://bugs.gentoo.org/763651
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Jan Henke  taujhe.de>
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-util/intel-graphics-compiler/Manifest  |  1 +
 ...hics-compiler-1.0.8173-fix-missing-limits.patch | 23 +++
 ...cs-compiler-1.0.8173-opencl-clang_version.patch | 31 +
 .../intel-graphics-compiler-1.0.8173.ebuild| 74 ++
 dev-util/intel-graphics-compiler/metadata.xml  |  9 ++-
 5 files changed, 137 insertions(+), 1 deletion(-)

diff --git a/dev-util/intel-graphics-compiler/Manifest 
b/dev-util/intel-graphics-compiler/Manifest
index fe838e9e4a2..420b17b3c1f 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.4111.tar.gz 5781246 BLAKE2B 
6fe47422b31b0c73d24c3cef1265772927a57751bf5648f862f7c73528f2174268fdb2271c30c49ab038b4dfbe530bc088fe727e66babc5db0a41759e7212733
 SHA512 
8f589ee83a27b7a8f5abcd008e36a73fb704c20c1ae17e1ef265c59641768b75a0a08f2d6f80355442fff7625154603db3ebe9be0a4ba702b45e85db434f8110
 DIST intel-graphics-compiler-1.0.4944.tar.gz 6632351 BLAKE2B 
a3d72730b8c10fd3810fdb8206d9d92da325a094627b678bb9f8d0941e29c1697994a2d98a1b49780fae62dc421e623dea4c3a7e3061347de5f5b644cfb5e105
 SHA512 
34fafd5387f3b86bef17511015ff1e8daef75ebdff5d1d14ff2000b58968bb502a9ec1aee988858a2992414f6cdb222e7de19c2d877f7fc8cd84a79417e9a85e
 DIST intel-graphics-compiler-1.0.5353.tar.gz 6642256 BLAKE2B 
34b80b30f33dbd57bcea15852c80cdf8bdbf4630a7904946c7ce84481789e7db42f5216ba14140d445e9b0adbfcfe224468e462ea27768f0e8d31525ce56cde1
 SHA512 
e9f20e2261c5cb79d365d5d8257e8f4830b2364962c48413cc80154469db34c1c844ae5d576cbce2e3c5e5cbe22c7c3710ebd0a7fe7208e5412e81ce20077c80
+DIST intel-graphics-compiler-1.0.8173.tar.gz 7471884 BLAKE2B 
2248a8d5f23d4578c5bd04a799af65767916b3705e16a8145149794a2cf16e5a0e16c21669336151a241cc52e7672b05eb892ac4925f2c2d0b22673af4ebf67f
 SHA512 
bebccee0699dea48e98ddcdb320cacacda0cdcd36b68e51d932791756b0a8e2171a78cc1921ca2a092b9fe7dbd7a783d4898ada08c58bf856dd29bfc08334fa0

diff --git 
a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8173-fix-missing-limits.patch
 
b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8173-fix-missing-limits.patch
new file mode 100644
index 000..406262d2d91
--- /dev/null
+++ 
b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8173-fix-missing-limits.patch
@@ -0,0 +1,23 @@
+Fix compilation with >=gcc-11, taken from upstream:
+https://github.com/intel/intel-graphics-compiler/pull/190
+
+From 8e1a461d3e6b85a6cf018caf6abf4a3ba9a1758d Mon Sep 17 00:00:00 2001
+From: Bruno Pagani 
+Date: Wed, 4 Aug 2021 20:54:21 +0200
+Subject: [PATCH] Fix missing include
+
+---
+ visa/iga/IGALibrary/IR/RegDeps.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/visa/iga/IGALibrary/IR/RegDeps.cpp 
b/visa/iga/IGALibrary/IR/RegDeps.cpp
+index 83c226a316..585896631e 100644
+--- a/visa/iga/IGALibrary/IR/RegDeps.cpp
 b/visa/iga/IGALibrary/IR/RegDeps.cpp
+@@ -10,6 +10,7 @@ SPDX-License-Identifier: MIT
+ #include "../asserts.hpp"
+ #include "../bits.hpp"
+ 
++#include 
+ #include 
+ #include 

diff --git 
a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8173-opencl-clang_version.patch
 
b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8173-opencl-clang_version.patch
new file mode 100644
index 000..54a3364e7c6
--- /dev/null
+++ 
b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8173-opencl-clang_version.patch
@@ -0,0 +1,31 @@
+--- a/IGC/BiFModule/CMakeLists.txt
 b/IGC/BiFModule/CMakeLists.txt
+@@ -19,24 +19,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}
+-  RESULT_VARIABLE CCLANG_READELF_RESULT
+-  OUTPUT_VARIABLE CCLANG_READELF_CALL)
+-if(CCLANG_READELF_RESULT AND NOT CCLANG_READELF_RESULT EQUAL 0)
+-  message(FATAL_ERROR "[IGC\\BiFModule] : Error occurred while executing 
readelf:  ${CCLANG_READELF_RESULT}")
+-endif()
+-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

[gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/files/, dev-util/intel-graphics-compiler/

2020-09-13 Thread Marek Szuba 
commit: 67763d93882a3d7670c7f8b65588e13aa2b01164
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Sep 13 22:42:36 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Sep 13 22:45:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67763d93

Revert "dev-util/intel-graphics-compiler: bump to 1.0.4427"

It might _build_ fine without VC but it still causes intel-neo to fail
to compile.

This reverts commit a8e3b1a013be805fff6aa076d62c32f3be86fa9b.

Signed-off-by: Marek Szuba  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 deletions(-)

diff --git a/dev-util/intel-graphics-compiler/Manifest 
b/dev-util/intel-graphics-compiler/Manifest
index b1dc0c1dfbf..bb330148e01 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,2 +1 @@
 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
deleted file mode 100644
index 8822fc54e74..000
--- 
a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.4427-noVC_TranslateBuild_retval.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 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
deleted file mode 100644
index 95942f84f47..000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4427.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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}.:=[${MULTILIB_USEDEP}]
-   <=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.:=[${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

[gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/files/, dev-util/intel-graphics-compiler/

2020-06-19 Thread Marek Szuba 
commit: 3498f8461cc1879a984a214d85d59f47284b64b2
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Jun 19 14:18:28 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Jun 19 14:31:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3498f846

dev-util/intel-graphics-compiler: remove old

Signed-off-by: Marek Szuba  gentoo.org>

 dev-util/intel-graphics-compiler/Manifest  |  2 -
 ...-for-building-separated-dynamic-llvm-libs.patch | 45 -
 .../intel-graphics-compiler-1.0.3151.ebuild| 37 -
 .../intel-graphics-compiler-1.0.3445.ebuild| 46 --
 4 files changed, 130 deletions(-)

diff --git a/dev-util/intel-graphics-compiler/Manifest 
b/dev-util/intel-graphics-compiler/Manifest
index 68760404638..730ba542638 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.3151.tar.gz 5950502 BLAKE2B 
8ccbfc5d3cd6307eb5db602822d42e8744e6ca7696494a0dd349847aff0defde2434b9192f17645f1fcbf732ec98a66dbdcc7d03eed48702d90911f912135fc1
 SHA512 
a6e04a3a90aae9046f2698bf15d5f60862c93e7a87a6e4ae6b6c43c65490583608f201e94a2ef32fc2f72e9fa0da7d6c202f64ef610f03a81384ac537541df14
-DIST intel-graphics-compiler-1.0.3445.tar.gz 6026437 BLAKE2B 
4a4708109d125891dfe967186efbc2ebe70ce59dc0302f534dad74c0b1f2af36de0d7ee7cb69059e776ab4669236f5d62750159a44d44a6444ab85a205273563
 SHA512 
044b941adb921b25a1ab6da3ebe0f7c4d67769b43e5b855ae94871281cf387ce45351b8b46a6e98e3bd573022d7cfd9316629d590327c8f4007e1b1ae9f7071e
 DIST intel-graphics-compiler-1.0.3826.tar.gz 6007014 BLAKE2B 
fc09d6443818403bca803f3f78fbb9ee9a25ab674372585b880e038227712f8114ca2b17d6b219149f54f9f5856b973d3500f6537027660d1c657d61992f9e9b
 SHA512 
e4f06d6b8d2a7161f80956a8e9cbf23aa7293a31781405bc17ee512d27ca4114facc6bb0fa7f47fde3a37aa79ce288a98aef8b74c4e572e73d70bb50c21f6fbb
 DIST intel-graphics-compiler-1.0.4111.tar.gz 5781246 BLAKE2B 
6fe47422b31b0c73d24c3cef1265772927a57751bf5648f862f7c73528f2174268fdb2271c30c49ab038b4dfbe530bc088fe727e66babc5db0a41759e7212733
 SHA512 
8f589ee83a27b7a8f5abcd008e36a73fb704c20c1ae17e1ef265c59641768b75a0a08f2d6f80355442fff7625154603db3ebe9be0a4ba702b45e85db434f8110

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
deleted file mode 100644
index 931ba4437b1..000
--- 
a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 5a07111005b570875da8796f91b385edc483c0da Mon Sep 17 00:00:00 2001
-From: "Wesierski, Lukasz" 
-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.3151.ebuild 
b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3151.ebuild
deleted file mode 100644
index b6771efb82c..000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3151.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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"
-
-COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]
-   dev-libs/opencl-clang:8=[${MULTILIB_USEDEP}]"

[gentoo-commits] repo/gentoo:master commit in: dev-util/intel-graphics-compiler/files/, dev-util/intel-graphics-compiler/

2019-08-05 Thread Marek Szuba 
commit: 0f58ae2424ed029568d83593821e22a66f10ae47
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Aug  5 15:19:15 2019 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Aug  5 15:26:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f58ae24

dev-util/intel-graphics-compiler: fix opencl-clang filename mismatch

Upstream CMake files assumed that the shared-library file of opencl-clang
is named libopencl-clang.so.x if LLVM version is x.0.0 but
libopencl-clang.so.x.y.z otherwise. This is not correct, as
demonstrated by opencl-clang-8.0.1 - the shared library is still called
libopencl-clang.so.8. Make CMake always look for .so.x instead.

Closes: https://bugs.gentoo.org/690520
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Marek Szuba  gentoo.org>

 ...aphics-compiler-1.0.9-opencl-clang_solib_filename.patch | 14 ++
 .../intel-graphics-compiler-1.0.9.ebuild   |  1 +
 2 files changed, 15 insertions(+)

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
new file mode 100644
index 000..aef204e9055
--- /dev/null
+++ 
b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.9-opencl-clang_solib_filename.patch
@@ -0,0 +1,14 @@
+--- 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 $ DESTINATION 
${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT igc-opencl)

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
index 54d2ad4034c..6ed0f9a6290 100644
--- 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
@@ -22,6 +22,7 @@ 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}