From cea3080350596dc96ed0ef5d137c07aa279a04ea Mon Sep 17 00:00:00 2001 From: Yogesh Tyagi Date: Thu, 25 Jul 2024 10:19:22 +0530 Subject: intel-graphics-compiler : upgrade 1.0.16510.2 -> 1.0.16900.23 Refresh patches Release Notes: https://github.com/intel/intel-graphics-compiler/releases/tag/igc-1.0.16900.23 Signed-off-by: Yogesh Tyagi Signed-off-by: Anuj Mittal --- ...iF-CMakeLists.txt-remove-opt-from-DEPENDS.patch | 5 +- ...IRV-Tools-change-path-to-tools-and-header.patch | 7 +- .../recipes-opencl/igc/files/0001-fix-tblgen.patch | 7 +- ...3-Improve-Reproducibility-for-src-package.patch | 7 +- .../igc/intel-graphics-compiler_1.0.16510.2.bb | 75 ---------------------- .../igc/intel-graphics-compiler_1.0.16900.23.bb | 75 ++++++++++++++++++++++ 6 files changed, 85 insertions(+), 91 deletions(-) delete mode 100644 dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.16510.2.bb create mode 100644 dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.16900.23.bb (limited to 'dynamic-layers/clang-layer') 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..1e1ea855 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 Date: Tue, 12 Oct 2021 23:46:42 +0800 Subject: [PATCH] BiF/CMakeLists.txt: remove opt from DEPENDS @@ -30,6 +30,3 @@ index d20d7f887..882e09fea 100644 BYPRODUCTS ${BIF_OPT_BC_PATH} SOURCES ${CMCL_SRC_PATH}) set(${RES_FILE} ${BIF_OPT_BC_NAME} PARENT_SCOPE) --- -2.43.2 - 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..7dc0bc20 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 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 - --- 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 +index 31108b96b..007c24bf0 100644 --- a/external/SPIRV-Tools/CMakeLists.txt +++ b/external/SPIRV-Tools/CMakeLists.txt -@@ -43,8 +43,8 @@ else() #By default use build from sources +@@ -45,8 +45,8 @@ else() #By default use build from sources 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 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..9f2bc455 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 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 - --- 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 +index 1b01b3389..8d608163d 100644 --- a/visa/CMakeLists.txt +++ b/visa/CMakeLists.txt -@@ -123,8 +123,11 @@ endif() +@@ -133,8 +133,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_1.0.16510.2.bb deleted file mode 100644 index 24eb97bd..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.16510.2.bb +++ /dev/null @@ -1,75 +0,0 @@ -SUMMARY = "The Intel(R) Graphics Compiler for OpenCL(TM)" -DESCRIPTION = "The Intel(R) Graphics Compiler for OpenCL(TM) is an \ -llvm based compiler for OpenCL(TM) targeting Intel Gen graphics \ -hardware architecture." - -LICENSE = "MIT & Apache-2.0" -LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc/LICENSE.TXT;md5=311cfc1a5b54bab8ed34a0b5fba4373e \ - 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 \ - 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 \ - " - -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_FORMAT = "igc_vc_spirv-tools_spirv-headers" - -# Used to replace with relative path in reproducibility patch -export B - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig qemu python3native - -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" - -RDEPENDS:${PN} += "opencl-clang" - -PACKAGECONFIG ??= "vc" -PACKAGECONFIG[vc] = "-DIGC_BUILD__VC_ENABLED=ON -DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR=ON -DIGC_OPTION__SPIRV_TRANSLATOR_MODE=Prebuilds,-DIGC_BUILD__VC_ENABLED=OFF," - -EXTRA_OECMAKE = " \ - -DIGC_OPTION__LLVM_PREFERRED_VERSION=${LLVMVERSION} \ - -DVC_INTRINSICS_SRC="${S}/vc-intrinsics" \ - -DIGC_OPTION__LLVM_MODE=Prebuilds \ - -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ - -DLLVM_LINK_EXE=${STAGING_BINDIR_NATIVE}/llvm-link \ - -DCLANG_EXE=${STAGING_BINDIR_NATIVE}/clang \ - -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \ - " - -do_configure:prepend:class-target () { - # Write out a qemu wrapper that will be used by cmake. - qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" - cat > ${WORKDIR}/qemuwrapper << EOF -#!/bin/sh -$qemu_binary "\$@" -EOF - chmod +x ${WORKDIR}/qemuwrapper -} - -UPSTREAM_CHECK_GITTAGREGEX = "^igc-(?P(?!19\..*)\d+(\.\d+)+)$" - -FILES:${PN} += " \ - ${libdir}/igc/NOTICES.txt \ - " - -# libigc.so contains buildpaths -INSANE_SKIP:${PN} += "buildpaths" diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.16900.23.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.16900.23.bb new file mode 100644 index 00000000..16dcd360 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.16900.23.bb @@ -0,0 +1,75 @@ +SUMMARY = "The Intel(R) Graphics Compiler for OpenCL(TM)" +DESCRIPTION = "The Intel(R) Graphics Compiler for OpenCL(TM) is an \ +llvm based compiler for OpenCL(TM) targeting Intel Gen graphics \ +hardware architecture." + +LICENSE = "MIT & Apache-2.0" +LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc/LICENSE.TXT;md5=311cfc1a5b54bab8ed34a0b5fba4373e \ + 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.16900 \ + 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 \ + " + +SRC_URI:append:class-native = " file://0001-fix-tblgen.patch" + +SRCREV_igc = "626c9e4a18b174f2f0f2d5328166f38da4538500" +SRCREV_vc = "f9c34404d0ea9abad83875a10bd48d88cea90ebd" +SRCREV_spirv-tools = "f0cc85efdbbe3a46eae90e0f915dc1509836d0fc" +SRCREV_spirv-headers = "1c6bb2743599e6eb6f37b2969acc0aef812e32e3" + +SRCREV_FORMAT = "igc_vc_spirv-tools_spirv-headers" + +# Used to replace with relative path in reproducibility patch +export B + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig qemu python3native + +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" + +RDEPENDS:${PN} += "opencl-clang" + +PACKAGECONFIG ??= "vc" +PACKAGECONFIG[vc] = "-DIGC_BUILD__VC_ENABLED=ON -DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR=ON -DIGC_OPTION__SPIRV_TRANSLATOR_MODE=Prebuilds,-DIGC_BUILD__VC_ENABLED=OFF," + +EXTRA_OECMAKE = " \ + -DIGC_OPTION__LLVM_PREFERRED_VERSION=${LLVMVERSION} \ + -DVC_INTRINSICS_SRC="${S}/vc-intrinsics" \ + -DIGC_OPTION__LLVM_MODE=Prebuilds \ + -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ + -DLLVM_LINK_EXE=${STAGING_BINDIR_NATIVE}/llvm-link \ + -DCLANG_EXE=${STAGING_BINDIR_NATIVE}/clang \ + -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \ + " + +do_configure:prepend:class-target () { + # Write out a qemu wrapper that will be used by cmake. + qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" + cat > ${WORKDIR}/qemuwrapper << EOF +#!/bin/sh +$qemu_binary "\$@" +EOF + chmod +x ${WORKDIR}/qemuwrapper +} + +UPSTREAM_CHECK_GITTAGREGEX = "^igc-(?P(?!19\..*)\d+(\.\d+)+)$" + +FILES:${PN} += " \ + ${libdir}/igc/NOTICES.txt \ + " + +# libigc.so contains buildpaths +INSANE_SKIP:${PN} += "buildpaths" -- cgit v1.2.3-54-g00ecf