6 files changed, 67 insertions, 42 deletions

diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch
index 377081fd..456a8c65 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch
@@ -1,4 +1,4 @@
-From 3d71670f8ad5b54d434c2f5f71713bb1d5433ae4 Mon Sep 17 00:00:00 2001
+From 1b98a931c3bf8daccc48cd618335ff35e3d382da Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
 Date: Tue, 12 Oct 2021 23:46:42 +0800
 Subject: [PATCH] BiF/CMakeLists.txt: remove opt from DEPENDS
@@ -17,19 +17,16 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
  IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake b/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake
-index d20d7f887..882e09fea 100644
---- a/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake
-+++ b/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake
-@@ -109,7 +109,7 @@ function(vc_build_bif TARGET RES_FILE CMCL_SRC_PATH BIF_NAME PTR_BIT_SIZE)
+Index: git/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake
+===================================================================
+--- git.orig/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake
++++ git/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake
+@@ -121,7 +121,7 @@ function(vc_build_bif RES_FILE CMCL_SRC_
      COMMENT "vc_build_bif: Translating CMCL builtins:  ${BIF_CLANG_BC_NAME_FINAL} -> ${BIF_OPT_BC_NAME}"
-     COMMAND CMCLTranslatorTool -o ${BIF_CMCL_BC_NAME} ${BIF_CLANG_BC_NAME_FINAL}
-     COMMAND ${LLVM_OPT_EXE} ${IGC_LLVM_DEPENDENT_OPT_FLAGS} --O2 -o ${BIF_OPT_BC_NAME} ${BIF_CMCL_BC_NAME}
--    DEPENDS CMCLTranslatorTool ${LLVM_OPT_EXE} ${BIF_CLANG_BC_PATH_FINAL}
-+    DEPENDS CMCLTranslatorTool ${BIF_CLANG_BC_PATH_FINAL}
-     BYPRODUCTS ${BIF_OPT_BC_PATH}
-     SOURCES ${CMCL_SRC_PATH})
-   set(${RES_FILE} ${BIF_OPT_BC_NAME} PARENT_SCOPE)
--- 
-2.43.2
-
+     COMMAND CMCLTranslatorTool ${OPT_OPAQUE_ARG} -o ${BIF_CMCL_BC_PATH} ${BIF_CLANG_BC_PATH_FINAL}
+     COMMAND ${LLVM_OPT_EXE} ${OPT_OPAQUE_ARG} --O2 -o ${BIF_OPT_BC_PATH} ${BIF_CMCL_BC_PATH}
+-    DEPENDS CMCLTranslatorTool ${LLVM_OPT_EXE} ${OPT_BC_DEPENDS})
++    DEPENDS CMCLTranslatorTool ${BIF_CLANG_BC_PATH_FINAL})
+ 
+   add_custom_target(${TARGET_NAME}
+     DEPENDS ${BIF_OPT_BC_PATH}
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-Build-not-able-to-locate-BiFManager-bin.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-Build-not-able-to-locate-BiFManager-bin.patch
new file mode 100644
index 00000000..87b094aa
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-Build-not-able-to-locate-BiFManager-bin.patch
@@ -0,0 +1,27 @@
+From 048512728eea53b3772a3f80ac9743bfc462487e Mon Sep 17 00:00:00 2001
+From: Yogesh Tyagi <yogesh.tyagi@intel.com>
+Date: Thu, 2 Jan 2025 15:59:27 +0530
+Subject: [PATCH] Build not able to locate BiFManager-bin
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
+---
+ IGC/BiFModule/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: git/IGC/BiFModule/CMakeLists.txt
+===================================================================
+--- git.orig/IGC/BiFModule/CMakeLists.txt
++++ git/IGC/BiFModule/CMakeLists.txt
+@@ -655,8 +655,8 @@ set(IGC_BUILD__PROJ__BiFModuleCache_OCL
+ 
+ add_custom_command(
+     OUTPUT "${IGC_BUILD__BIF_DIR}/OCLBiFImpl.h" "${IGC_BUILD__BIF_DIR}/OCLBiFImpl.bifbc"
+-    COMMAND $<TARGET_FILE:BiFManager-bin> "${IGC_BUILD__BIF_DIR}/OCLBiFImpl.bc" "${IGC_BUILD__BIF_DIR}/IGCsize_t_32.bc" "${IGC_BUILD__BIF_DIR}/IGCsize_t_64.bc" "${IGC_BUILD__BIF_DIR}/OCLBiFImpl.bifbc" "${IGC_BUILD__BIF_DIR}/OCLBiFImpl.h"
+-    DEPENDS "${IGC_BUILD__BIF_DIR}/OCLBiFImpl.bc" "${IGC_BUILD__BIF_DIR}/IGCsize_t_32.bc" "${IGC_BUILD__BIF_DIR}/IGCsize_t_64.bc"$<TARGET_FILE:BiFManager-bin>
++    COMMAND BiFManager-bin "${IGC_BUILD__BIF_DIR}/OCLBiFImpl.bc" "${IGC_BUILD__BIF_DIR}/IGCsize_t_32.bc" "${IGC_BUILD__BIF_DIR}/IGCsize_t_64.bc" "${IGC_BUILD__BIF_DIR}/OCLBiFImpl.bifbc" "${IGC_BUILD__BIF_DIR}/OCLBiFImpl.h"
++    DEPENDS "${IGC_BUILD__BIF_DIR}/OCLBiFImpl.bc" "${IGC_BUILD__BIF_DIR}/IGCsize_t_32.bc" "${IGC_BUILD__BIF_DIR}/IGCsize_t_64.bc" BiFManager-bin
+     COMMENT "BiF: ${IGC_BUILD__BIF_DIR}/OCLBiFImpl.bc: Spliting output .bc."
+     COMMAND_EXPAND_LISTS
+ )
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch
index dca75e22..fc66b71d 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch
@@ -1,4 +1,4 @@
-From e69a3181482e5f442756a61c7b683914072884f1 Mon Sep 17 00:00:00 2001
+From 251e2854dd206ebf66e5908d3277e4585fe2a63b Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
 Date: Mon, 9 Jan 2023 11:43:05 +0800
 Subject: [PATCH] external/SPIRV-Tools: change path to tools and headers
@@ -9,16 +9,15 @@ file path substitutions take place.
 Upstream-Status: Inappropriate
 
 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-
 ---
  external/SPIRV-Tools/CMakeLists.txt | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt
-index 9afa5746c..7ca24d5dc 100644
---- a/external/SPIRV-Tools/CMakeLists.txt
-+++ b/external/SPIRV-Tools/CMakeLists.txt
-@@ -43,8 +43,8 @@ else() #By default use build from sources
+Index: git/external/SPIRV-Tools/CMakeLists.txt
+===================================================================
+--- git.orig/external/SPIRV-Tools/CMakeLists.txt
++++ git/external/SPIRV-Tools/CMakeLists.txt
+@@ -45,8 +45,8 @@ else() #By default use build from source
   message(STATUS "[SPIRV-Tools] : Building from source")
   message(STATUS "[SPIRV-Tools] : Current source dir: ${CMAKE_CURRENT_SOURCE_DIR}")
  
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch
index 39443931..3d9ae02f 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch
@@ -1,19 +1,18 @@
-From 5648568e597acd0fed82aac3e6aef0f95a1b78d1 Mon Sep 17 00:00:00 2001
+From 1641dc87b2ed6b6b87b2cef824e4d66da65b0b30 Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
 Date: Thu, 19 May 2022 22:50:09 +0800
 Subject: [PATCH] fix tblgen
 
 Upstream-Status: Inappropriate [OE specific]
-
 ---
  IGC/cmake/igc_llvm.cmake | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake
-index 10322533c..9020cb3c8 100644
+index b708cc904..fe4668890 100644
 --- a/IGC/cmake/igc_llvm.cmake
 +++ b/IGC/cmake/igc_llvm.cmake
-@@ -52,7 +52,7 @@ else()
+@@ -53,7 +53,7 @@ else()
    set(LLVM_OPT_EXE "opt" CACHE STRING "")
  
    set(LLVM_TABLEGEN_EXE "llvm-tblgen")
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Improve-Reproducibility-for-src-package.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Improve-Reproducibility-for-src-package.patch
index 650130a8..4269fadf 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Improve-Reproducibility-for-src-package.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Improve-Reproducibility-for-src-package.patch
@@ -1,4 +1,4 @@
-From 0559332abd04b6c8bc70171d201f43d2e4735336 Mon Sep 17 00:00:00 2001
+From ca136c04d4ac60e3febc8ea2b9c4d4736365a424 Mon Sep 17 00:00:00 2001
 From: Lee Chee Yang <chee.yang.lee@intel.com>
 Date: Wed, 2 Sep 2020 08:28:35 +0800
 Subject: [PATCH] Improve Reproducibility for src package
@@ -9,16 +9,15 @@ this only works on bison 3.7 onward, hence check for bison version
 before adding the flags.
 Upstream-Status: Inappropriate [applying --file-prefix-map in such way does not work for upstream]
 Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
-
 ---
  visa/CMakeLists.txt | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
-diff --git a/visa/CMakeLists.txt b/visa/CMakeLists.txt
-index 6be467587..930c386a6 100644
---- a/visa/CMakeLists.txt
-+++ b/visa/CMakeLists.txt
-@@ -123,8 +123,11 @@ endif()
+Index: git/visa/CMakeLists.txt
+===================================================================
+--- git.orig/visa/CMakeLists.txt
++++ git/visa/CMakeLists.txt
+@@ -135,8 +135,11 @@ endif()
  set(bison_output_file ${CMAKE_CURRENT_BINARY_DIR}/CISA.tab.cpp)
  set(flex_output_file ${CMAKE_CURRENT_BINARY_DIR}/lex.CISA.cpp)
  
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.16510.2.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_2.10.10.bb
index 24eb97bd..b6d8ddeb 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.16510.2.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_2.10.10.bb
@@ -8,21 +8,22 @@ LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc
                     file://LICENSE.md;md5=488d74376edf2765f6e78d271543dde3 \
                     file://NOTICES.txt;md5=b81a52411c84df3419f20bad4d755880"
 
-SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/igc-1.0.16510 \
+SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/2.10.x \
            git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=git/vc-intrinsics;name=vc;nobranch=1 \
            git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/SPIRV-Tools;name=spirv-tools;branch=main \
            git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/SPIRV-Headers;name=spirv-headers;branch=main \
            file://0003-Improve-Reproducibility-for-src-package.patch \
            file://0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch \
            file://0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch \
+           file://0001-Build-not-able-to-locate-BiFManager-bin.patch \
            "
 
 SRC_URI:append:class-native = " file://0001-fix-tblgen.patch"
 
-SRCREV_igc = "c2495d45f37fadd963ad22eb0cc1a8235a306775"
-SRCREV_vc = "f9c34404d0ea9abad83875a10bd48d88cea90ebd"
-SRCREV_spirv-tools = "f0cc85efdbbe3a46eae90e0f915dc1509836d0fc"
-SRCREV_spirv-headers = "1c6bb2743599e6eb6f37b2969acc0aef812e32e3"
+SRCREV_igc = "83925314d4fc32b017fcbfcd73e0667ba833fb8f"
+SRCREV_vc = "9d255266e1df8f1dc5d11e1fbb03213acfaa4fc7"
+SRCREV_spirv-tools = "f289d047f49fb60488301ec62bafab85573668cc"
+SRCREV_spirv-headers = "0e710677989b4326ac974fd80c5308191ed80965"
 
 SRCREV_FORMAT = "igc_vc_spirv-tools_spirv-headers"
 
@@ -38,7 +39,9 @@ CXXFLAGS:append = " -Wno-error=nonnull"
 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"
 
-DEPENDS += " flex-native bison-native clang clang-cross-x86_64 opencl-clang qemu-native python3-mako-native"
+DEPENDS += " flex-native bison-native clang clang-cross-x86_64 opencl-clang qemu-native python3-mako-native \
+             python3-pyyaml-native \
+           "
 
 RDEPENDS:${PN} += "opencl-clang"
 
@@ -65,10 +68,11 @@ EOF
     chmod +x ${WORKDIR}/qemuwrapper
 }
 
-UPSTREAM_CHECK_GITTAGREGEX = "^igc-(?P<pver>(?!19\..*)\d+(\.\d+)+)$"
+
+UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$"
 
 FILES:${PN} += " \
-                 ${libdir}/igc/NOTICES.txt \
+                 ${libdir}/igc2/NOTICES.txt \
                  "
 
 # libigc.so contains buildpaths