From c4cd14c32faeff945515418434a4d7206b870ba2 Mon Sep 17 00:00:00 2001 From: Yogesh Tyagi Date: Tue, 14 Jan 2025 10:34:37 +0530 Subject: [PATCH] intel-graphics-compiler : upgrade 1.0.17193.4 -> 1.0.17791.18 Refresh patch dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch Release Notes: https://github.com/intel/intel-graphics-compiler/releases/tag/igc-1.0.17791.18 Signed-off-by: Yogesh Tyagi Signed-off-by: Anuj Mittal --- ...akeLists.txt-remove-opt-from-DEPENDS.patch | 12 ++++---- ...ld-not-able-to-locate-BiFManager-bin.patch | 30 +++++++++++++++++++ ...> intel-graphics-compiler_1.0.17791.18.bb} | 11 ++++--- 3 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-Build-not-able-to-locate-BiFManager-bin.patch rename dynamic-layers/clang-layer/recipes-opencl/igc/{intel-graphics-compiler_1.0.17193.4.bb => intel-graphics-compiler_1.0.17791.18.bb} (90%) 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 1e1ea855..060c2d14 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 @@ -17,14 +17,14 @@ Signed-off-by: Anuj Mittal 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 +@@ -109,7 +109,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_LLVM_DEPENDENT_OPT_FLAGS} --O2 -o ${BIF_OPT_BC_NAME} ${BIF_CMCL_BC_NAME} + 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} 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..b1109fb9 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-Build-not-able-to-locate-BiFManager-bin.patch @@ -0,0 +1,30 @@ +From 048512728eea53b3772a3f80ac9743bfc462487e Mon Sep 17 00:00:00 2001 +From: Yogesh Tyagi +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 +--- + IGC/BiFModule/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/IGC/BiFModule/CMakeLists.txt b/IGC/BiFModule/CMakeLists.txt +index d59e345ce..460cd6ed2 100644 +--- a/IGC/BiFModule/CMakeLists.txt ++++ b/IGC/BiFModule/CMakeLists.txt +@@ -644,8 +644,8 @@ set(IGC_BUILD__PROJ__BiFModuleCache_OCL "${IGC_BUILD__PROJ__BiFModuleCache + + add_custom_command( + OUTPUT "${IGC_BUILD__BIF_DIR}/OCLBiFImpl.h" "${IGC_BUILD__BIF_DIR}/OCLBiFImpl.bifbc" +- COMMAND $ "${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"$ ++ 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 + ) +-- +2.43.0 + diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.17193.4.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.17791.18.bb similarity index 90% rename from dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.17193.4.bb rename to dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.17791.18.bb index 651b96be..529145c2 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.17193.4.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.17791.18.bb @@ -8,19 +8,20 @@ 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.17193 \ +SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/igc-1.0.17791 \ 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 = "ffa6fb4fc18ae047b8a8e91dbab83f8b3da5ce52" -SRCREV_vc = "f9c34404d0ea9abad83875a10bd48d88cea90ebd" +SRCREV_igc = "e03ee5bdd7cd1cb9a715e424a53ae3011e5c5e44" +SRCREV_vc = "8d2e809368443305155370573f3c6db8279ed87d" SRCREV_spirv-tools = "f0cc85efdbbe3a46eae90e0f915dc1509836d0fc" SRCREV_spirv-headers = "1c6bb2743599e6eb6f37b2969acc0aef812e32e3" @@ -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"