10 files changed, 260 insertions, 41 deletions

diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0001-fix-add-missing-includes.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0001-fix-add-missing-includes.patch
new file mode 100644
index 00000000..a008d69e
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0001-fix-add-missing-includes.patch
@@ -0,0 +1,157 @@
+From 1517c8689cdaab9aaa1fa25e8db3b84f93e1f1ca Mon Sep 17 00:00:00 2001
+From: Mateusz Jablonski <mateusz.jablonski@intel.com>
+Date: Tue, 22 Aug 2023 12:37:37 +0200
+Subject: [PATCH] fix: add missing includes
+
+Upstream-Status: Pending
+Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
+---
+ level_zero/tools/source/sysman/linux/pmt/pmt_xml_offsets.h | 1 +
+ opencl/test/unit_test/built_ins/built_ins_file_names.h     | 3 ++-
+ shared/source/compiler_interface/external_functions.h      | 1 +
+ shared/source/os_interface/linux/drm_debug.h               | 1 +
+ shared/source/os_interface/linux/pci_path.h                | 3 ++-
+ shared/source/os_interface/linux/pmt_util.h                | 1 +
+ shared/source/os_interface/print.h                         | 1 +
+ shared/source/tbx/tbx_sockets.h                            | 1 +
+ shared/source/tbx/tbx_sockets_imp.h                        | 1 +
+ third_party/aot_config_headers/platforms.h                 | 1 +
+ 10 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/level_zero/tools/source/sysman/linux/pmt/pmt_xml_offsets.h b/level_zero/tools/source/sysman/linux/pmt/pmt_xml_offsets.h
+index 2bcfa0e6aa..2a30b0c6be 100644
+--- a/level_zero/tools/source/sysman/linux/pmt/pmt_xml_offsets.h
++++ b/level_zero/tools/source/sysman/linux/pmt/pmt_xml_offsets.h
+@@ -7,6 +7,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <map>
+ #include <string>
+ 
+diff --git a/opencl/test/unit_test/built_ins/built_ins_file_names.h b/opencl/test/unit_test/built_ins/built_ins_file_names.h
+index 08dc38d406..ca43ba0f26 100644
+--- a/opencl/test/unit_test/built_ins/built_ins_file_names.h
++++ b/opencl/test/unit_test/built_ins/built_ins_file_names.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2020-2022 Intel Corporation
++ * Copyright (C) 2020-2023 Intel Corporation
+  *
+  * SPDX-License-Identifier: MIT
+  *
+@@ -7,6 +7,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+diff --git a/shared/source/compiler_interface/external_functions.h b/shared/source/compiler_interface/external_functions.h
+index f4cd790489..d377bf3937 100644
+--- a/shared/source/compiler_interface/external_functions.h
++++ b/shared/source/compiler_interface/external_functions.h
+@@ -9,6 +9,7 @@
+ 
+ #include "shared/source/utilities/arrayref.h"
+ 
++#include <cstdint>
+ #include <string>
+ #include <unordered_map>
+ #include <vector>
+diff --git a/shared/source/os_interface/linux/drm_debug.h b/shared/source/os_interface/linux/drm_debug.h
+index a1a46fcd8e..bc56e407d9 100644
+--- a/shared/source/os_interface/linux/drm_debug.h
++++ b/shared/source/os_interface/linux/drm_debug.h
+@@ -7,6 +7,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <array>
+ #include <string>
+ #include <utility>
+diff --git a/shared/source/os_interface/linux/pci_path.h b/shared/source/os_interface/linux/pci_path.h
+index c72c1d65d0..4f95e5ba61 100644
+--- a/shared/source/os_interface/linux/pci_path.h
++++ b/shared/source/os_interface/linux/pci_path.h
+@@ -7,6 +7,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <optional>
+ #include <string>
+ 
+@@ -16,4 +17,4 @@ std::optional<std::string> getPciPath(int deviceFd);
+ std::optional<std::string> getPciLinkPath(int deviceFd);
+ std::optional<std::string> getPciRootPath(int deviceFd);
+ 
+-} // namespace NEO
+\ No newline at end of file
++} // namespace NEO
+diff --git a/shared/source/os_interface/linux/pmt_util.h b/shared/source/os_interface/linux/pmt_util.h
+index 28ecad3f05..d85bf298ae 100644
+--- a/shared/source/os_interface/linux/pmt_util.h
++++ b/shared/source/os_interface/linux/pmt_util.h
+@@ -7,6 +7,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <map>
+ #include <poll.h>
+ #include <string>
+diff --git a/shared/source/os_interface/print.h b/shared/source/os_interface/print.h
+index 7cc214e6ec..ac967be44b 100644
+--- a/shared/source/os_interface/print.h
++++ b/shared/source/os_interface/print.h
+@@ -7,6 +7,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <cstddef>
+ 
+ void printToSTDOUT(const char *str);
+diff --git a/shared/source/tbx/tbx_sockets.h b/shared/source/tbx/tbx_sockets.h
+index 9b7f7863f0..2d4cf2ffbe 100644
+--- a/shared/source/tbx/tbx_sockets.h
++++ b/shared/source/tbx/tbx_sockets.h
+@@ -6,6 +6,7 @@
+  */
+ 
+ #pragma once
++#include <cstdint>
+ #include <string>
+ 
+ namespace NEO {
+diff --git a/shared/source/tbx/tbx_sockets_imp.h b/shared/source/tbx/tbx_sockets_imp.h
+index 738f26175b..4a567a8f64 100644
+--- a/shared/source/tbx/tbx_sockets_imp.h
++++ b/shared/source/tbx/tbx_sockets_imp.h
+@@ -10,6 +10,7 @@
+ 
+ #include "os_socket.h"
+ 
++#include <cstdint>
+ #include <iostream>
+ 
+ namespace NEO {
+diff --git a/third_party/aot_config_headers/platforms.h b/third_party/aot_config_headers/platforms.h
+index 05f75a40b3..35fb490a55 100644
+--- a/third_party/aot_config_headers/platforms.h
++++ b/third_party/aot_config_headers/platforms.h
+@@ -7,6 +7,7 @@
+ 
+ #include <map>
+ #include <string>
++#include <cstdint>
+ 
+ #pragma once
+ 
+-- 
+2.43.0
+
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0001-fix-add-missing-zero-initialization-in-StackVec-clas.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0001-fix-add-missing-zero-initialization-in-StackVec-clas.patch
new file mode 100644
index 00000000..4aed37b8
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0001-fix-add-missing-zero-initialization-in-StackVec-clas.patch
@@ -0,0 +1,25 @@
+From 894bab05efb447d249c9f0afdbf0ca62c82395c6 Mon Sep 17 00:00:00 2001
+From: Mateusz Jablonski <mateusz.jablonski@intel.com>
+Date: Tue, 22 Aug 2023 10:55:50 +0000
+Subject: [PATCH] fix: add missing zero-initialization in StackVec class
+
+Upstream-Status: Backport [https://github.com/intel/compute-runtime/commit/894bab05efb447d249c9f0afdbf0ca62c82395c6]
+
+Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
+---
+ shared/source/utilities/stackvec.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: git/shared/source/utilities/stackvec.h
+===================================================================
+--- git.orig/shared/source/utilities/stackvec.h
++++ git/shared/source/utilities/stackvec.h
+@@ -431,7 +431,7 @@ class StackVec { // NOLINT(clang-analyze
+         DataType *onStackMem;
+     };
+ 
+-    alignas(alignof(DataType)) char onStackMemRawBytes[sizeof(DataType[onStackCaps])];
++    alignas(alignof(DataType)) char onStackMemRawBytes[sizeof(DataType[onStackCaps])]{};
+     SizeT onStackSize = 0U;
+ };
+ 
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_22.31.23852.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_22.31.23852.bb
index ebf69af2..bb471f00 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_22.31.23852.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_22.31.23852.bb
@@ -9,6 +9,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9280143b568466d8fbe385f838078b93 \
                     file://third_party/opencl_headers/LICENSE;md5=dcefc90f4c3c689ec0c2489064e7273b"
 
 SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=master \
+           file://0001-fix-add-missing-zero-initialization-in-StackVec-clas.patch \
+           file://0001-fix-add-missing-includes.patch \
           "
 
 SRC_URI:append:class-target = "file://allow-to-find-cpp-generation-tool.patch \
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-SPIRVutil-Include-cstdint-to-fix-GCC-13-build.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-SPIRVutil-Include-cstdint-to-fix-GCC-13-build.patch
new file mode 100644
index 00000000..4b1078e1
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-SPIRVutil-Include-cstdint-to-fix-GCC-13-build.patch
@@ -0,0 +1,29 @@
+From 5ea17d8bcf3daa03ef95d0fed796f68cec7dc32d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
+Date: Wed, 18 Jan 2023 22:22:23 +0000
+Subject: [PATCH]  SPIRVutil: Include cstdint to fix GCC 13 build
+
+SPIRVutil: Include cstdint to fix GCC 13 build
+
+Upstream-Status: Backport [https://github.com/intel-innersource/drivers.gpu.compiler.staging/commit/5ea17d8bcf3daa03ef95d0fed796f68cec7dc32d]
+
+Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
+---
+ IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVUtil.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVUtil.h b/IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVUtil.h
+index 1076d5d42..9685e477f 100644
+--- a/IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVUtil.h
++++ b/IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVUtil.h
+@@ -49,6 +49,7 @@ THE SOFTWARE.
+ #define SPIRVUTIL_H_
+ 
+ #include <algorithm>
++#include <cstdint>
+ #include <functional>
+ #include <limits>
+ #include <map>
+-- 
+2.34.1
+
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.11702.1.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.11702.1.bb
index 7a994ebe..b9119a12 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.11702.1.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.11702.1.bb
@@ -11,9 +11,10 @@ LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc
 SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/igc-1.0.11702 \
            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=SPIRV-Tools;name=spirv-tools;branch=sdk-1.3.204 \
-           git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=SPIRV-Headers;name=spirv-headers;branch=master \
+           git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=SPIRV-Headers;name=spirv-headers;nobranch=1 \
            file://0003-Improve-Reproducibility-for-src-package.patch \
            file://0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch \
+           file://0001-SPIRVutil-Include-cstdint-to-fix-GCC-13-build.patch \
            "
 
 SRC_URI:append:class-native = " file://0001-fix-tblgen.patch"
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-Fix-standalone-build-415.patch b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-Fix-standalone-build-415.patch
new file mode 100644
index 00000000..732589f2
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-Fix-standalone-build-415.patch
@@ -0,0 +1,32 @@
+From 3a281f634be5e56d5fb49d07da85fe24e5971dd0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <Zatloukal.Frantisek@gmail.com>
+Date: Fri, 21 Apr 2023 04:07:21 +0200
+Subject: [PATCH] Fix standalone build (#415)
+
+Fixes https://github.com/intel/opencl-clang/issues/406
+Fixes https://github.com/intel/opencl-clang/issues/374
+
+Upstream-Status: Backport [https://github.com/intel/opencl-clang/commit/529a9188114bcbd8ed753d2276942384fa50d7a1]
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ cl_headers/CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/cl_headers/CMakeLists.txt b/cl_headers/CMakeLists.txt
+index 69cf11e..a258b62 100644
+--- a/cl_headers/CMakeLists.txt
++++ b/cl_headers/CMakeLists.txt
+@@ -1,5 +1,9 @@
+ set(CL_HEADERS_LIB cl_headers)
+-set(CLANG_COMMAND $<TARGET_FILE:clang> )
++if(USE_PREBUILT_LLVM)
++    find_program(CLANG_COMMAND clang PATHS ${LLVM_TOOLS_BINARY_DIR})
++else()
++    set(CLANG_COMMAND $<TARGET_FILE:clang>)
++endif()
+ if(LLVM_USE_HOST_TOOLS AND NOT OPENCL_CLANG_BUILD_EXTERNAL)
+   build_native_tool(clang CLANG_COMMAND)
+ endif()
+-- 
+2.34.1
+
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch
deleted file mode 100644
index 8df7e3ab..00000000
--- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/files/0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From f3ef79a6301bab0b3a447f07ceb94c39a95009df Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Thu, 2 Apr 2020 08:59:20 +0800
-Subject: [PATCH] don't redefine LLVM_TABLEGEN_EXE
-
-Use the value that has been passed by the user.
-
-Upstream-Status: Submitted
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6893e97..941b0ae 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -137,7 +137,10 @@ endif(NOT USE_PREBUILT_LLVM)
- set (COMPILE_OPTIONS_TD  opencl_clang_options.td)
- set (COMPILE_OPTIONS_INC opencl_clang_options.inc)
- 
--set(LLVM_TABLEGEN_EXE "llvm-tblgen")
-+if(NOT DEFINED LLVM_TABLEGEN_EXE)
-+  set(LLVM_TABLEGEN_EXE "llvm-tblgen")
-+endif()
-+
- set(LLVM_TARGET_DEFINITIONS ${COMPILE_OPTIONS_TD})
- if(USE_PREBUILT_LLVM)
-   set(TABLEGEN_ADDITIONAL -I ${LLVM_INCLUDE_DIRS})
--- 
-2.25.1
-
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc
index 1d9b4d51..0886e43b 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc
+++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang.inc
@@ -16,9 +16,4 @@ DEPENDS:append:class-target = " opencl-clang-native"
 COMPATIBLE_HOST = '(x86_64).*-linux'
 COMPATIBLE_HOST:libc-musl = "null"
 
-do_install:append:class-native() {
-        install -d ${D}${bindir}
-        install -m 0755 ${B}/linux_linker/linux_resource_linker ${D}${bindir}/
-}
-
 BBCLASSEXTEND = "native nativesdk"
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_12.0.0.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_12.0.0.bb
index d0b2acfb..6cab99c2 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_12.0.0.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_12.0.0.bb
@@ -10,3 +10,8 @@ EXTRA_OECMAKE += "\
                   -DCMAKE_SKIP_RPATH=TRUE \
                   -DPREFERRED_LLVM_VERSION="12.0.0" \
                   "
+
+do_install:append:class-native() {
+        install -d ${D}${bindir}
+        install -m 0755 ${B}/linux_linker/linux_resource_linker ${D}${bindir}/
+}
diff --git a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb
index 367ca7e9..2af08f39 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb
@@ -1,8 +1,8 @@
 require opencl-clang.inc
 
-SRC_URI:append = " file://0001-don-t-redefine-LLVM_TABLEGEN_EXE.patch \
-           "
-SRCREV = "06c7c0d7f5cbd13810d79489a533fa6c5b6c7d9f"
+SRC_URI:append = " file://0001-Fix-standalone-build-415.patch \
+                   "
+SRCREV = "cf95b338d14685e4f3402ab1828bef31d48f1fd6"
 
 BRANCH = "ocl-open-140"
 
@@ -13,3 +13,8 @@ EXTRA_OECMAKE += "\
                   -DCMAKE_SKIP_RPATH=TRUE \
                   -DPREFERRED_LLVM_VERSION=${LLVMVERSION} \
                   "
+
+do_install:append:class-native() {
+        install -d ${D}${bindir}
+        install -m 0755 ${B}/bin/linux_resource_linker ${D}${bindir}/
+}