4 files changed, 24 insertions, 23 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 060c2d14..8b769668 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
@@ -21,12 +21,12 @@ 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
-@@ -109,7 +109,7 @@ function(vc_build_bif TARGET RES_FILE CM
+@@ -119,7 +119,7 @@ function(vc_build_bif TARGET RES_FILE CM
      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_BUILD__OPAQUE_POINTERS_DEFAULT_ARG_OPT} --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)
+     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}
+     DEPENDS ${BIF_OPT_BC_PATH}
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 7dc0bc20..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
@@ -13,11 +13,11 @@ 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 31108b96b..007c24bf0 100644
---- a/external/SPIRV-Tools/CMakeLists.txt
-+++ b/external/SPIRV-Tools/CMakeLists.txt
-@@ -45,8 +45,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/0003-Improve-Reproducibility-for-src-package.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0003-Improve-Reproducibility-for-src-package.patch
index 9f2bc455..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
@@ -13,11 +13,11 @@ 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 1b01b3389..8d608163d 100644
---- a/visa/CMakeLists.txt
-+++ b/visa/CMakeLists.txt
-@@ -133,8 +133,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.17791.18.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_2.5.6.bb
index 529145c2..c824d57e 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.17791.18.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_2.5.6.bb
@@ -8,7 +8,7 @@ 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.17791 \
+SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/2.5.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 \
@@ -20,8 +20,8 @@ SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;nam
 
 SRC_URI:append:class-native = " file://0001-fix-tblgen.patch"
 
-SRCREV_igc = "e03ee5bdd7cd1cb9a715e424a53ae3011e5c5e44"
-SRCREV_vc = "8d2e809368443305155370573f3c6db8279ed87d"
+SRCREV_igc = "5b21d1b10cc02ee8f7756d1690f83792b8741235"
+SRCREV_vc = "41fa58112f00960da137b8ec76168b5a0321af33"
 SRCREV_spirv-tools = "f0cc85efdbbe3a46eae90e0f915dc1509836d0fc"
 SRCREV_spirv-headers = "1c6bb2743599e6eb6f37b2969acc0aef812e32e3"
 
@@ -68,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