diff options
Diffstat (limited to 'dynamic-layers/clang-layer')
12 files changed, 90 insertions, 99 deletions
diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.4.1.bb b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.5.3.bb index 2fa3f627..7a627e83 100644 --- a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.4.1.bb +++ b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_3.5.3.bb | |||
@@ -15,7 +15,7 @@ inherit pkgconfig cmake ptest | |||
15 | DNN_BRANCH = "rls-v${@'.'.join(d.getVar('PV').split('.')[0:2])}" | 15 | DNN_BRANCH = "rls-v${@'.'.join(d.getVar('PV').split('.')[0:2])}" |
16 | 16 | ||
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
18 | SRCREV = "f5ff0a6de16c130053bec1a1aec3a9b826c66f78" | 18 | SRCREV = "66f0cb9eb66affd2da3bf5f8d897376f04aae6af" |
19 | SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=${DNN_BRANCH};protocol=https \ | 19 | SRC_URI = "git://github.com/oneapi-src/oneDNN.git;branch=${DNN_BRANCH};protocol=https \ |
20 | file://run-ptest \ | 20 | file://run-ptest \ |
21 | " | 21 | " |
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0002-Build-not-able-to-locate-cpp_generation_tool.patch index 265fcfa2..45288ce1 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/allow-to-find-cpp-generation-tool.patch +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0002-Build-not-able-to-locate-cpp_generation_tool.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From a6361d635e5f3046853883f3ac06fb175116933c Mon Sep 17 00:00:00 2001 | 1 | From 8c330d0cb5167612296801f0202b0de35e9ca88d Mon Sep 17 00:00:00 2001 |
2 | From: Dongwon Kim <dongwon.kim@intel.com> | 2 | From: Dongwon Kim <dongwon.kim@intel.com> |
3 | Date: Sat, 21 Aug 2021 16:09:39 -0700 | 3 | Date: Sat, 21 Aug 2021 16:09:39 -0700 |
4 | Subject: [PATCH] Build not able to locate cpp_generation_tool. | 4 | Subject: [PATCH 2/5] Build not able to locate cpp_generation_tool. |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe specific] | 6 | Upstream-Status: Inappropriate [oe specific] |
7 | 7 | ||
@@ -11,12 +11,12 @@ Signed-off-by: Dongwon Kim <dongwon.kim@intel.com> | |||
11 | shared/source/built_ins/kernels/CMakeLists.txt | 10 +++++----- | 11 | shared/source/built_ins/kernels/CMakeLists.txt | 10 +++++----- |
12 | 1 file changed, 5 insertions(+), 5 deletions(-) | 12 | 1 file changed, 5 insertions(+), 5 deletions(-) |
13 | 13 | ||
14 | diff --git a/shared/source/built_ins/kernels/CMakeLists.txt b/shared/source/built_ins/kernels/CMakeLists.txt | 14 | Index: git/shared/source/built_ins/kernels/CMakeLists.txt |
15 | index ed85a37c52..f7c9e79137 100644 | 15 | =================================================================== |
16 | --- a/shared/source/built_ins/kernels/CMakeLists.txt | 16 | --- git.orig/shared/source/built_ins/kernels/CMakeLists.txt |
17 | +++ b/shared/source/built_ins/kernels/CMakeLists.txt | 17 | +++ git/shared/source/built_ins/kernels/CMakeLists.txt |
18 | @@ -107,9 +107,9 @@ function(compile_builtin core_type platform_it builtin bits builtin_options mode | 18 | @@ -122,9 +122,9 @@ function(compile_builtin core_type platf |
19 | ) | 19 | endif() |
20 | add_custom_command( | 20 | add_custom_command( |
21 | OUTPUT ${OUTPUT_FILE_CPP} | 21 | OUTPUT ${OUTPUT_FILE_CPP} |
22 | - COMMAND $<TARGET_FILE:cpp_generate_tool> --file ${BINARY_OUTPUT}.bin --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --device ${RELEASE_FILENAME} | 22 | - COMMAND $<TARGET_FILE:cpp_generate_tool> --file ${BINARY_OUTPUT}.bin --output ${OUTPUT_FILE_CPP} --array ${mode}_${BASENAME} --device ${RELEASE_FILENAME} |
@@ -27,8 +27,8 @@ index ed85a37c52..f7c9e79137 100644 | |||
27 | ) | 27 | ) |
28 | list(APPEND BUILTINS_COMMANDS "${OUTPUT_FILE_CPP}") | 28 | list(APPEND BUILTINS_COMMANDS "${OUTPUT_FILE_CPP}") |
29 | else() | 29 | else() |
30 | @@ -159,9 +159,9 @@ function(generate_cpp_spirv builtin) | 30 | @@ -176,9 +176,9 @@ function(generate_cpp_spirv builtin) |
31 | ) | 31 | endif() |
32 | add_custom_command( | 32 | add_custom_command( |
33 | OUTPUT ${OUTPUT_FILE_CPP} | 33 | OUTPUT ${OUTPUT_FILE_CPP} |
34 | - COMMAND $<TARGET_FILE:cpp_generate_tool> --file ${GENERATED_SPV_INPUT} --output ${OUTPUT_FILE_CPP} --array ${BASENAME} | 34 | - COMMAND $<TARGET_FILE:cpp_generate_tool> --file ${GENERATED_SPV_INPUT} --output ${OUTPUT_FILE_CPP} --array ${BASENAME} |
@@ -39,13 +39,3 @@ index ed85a37c52..f7c9e79137 100644 | |||
39 | ) | 39 | ) |
40 | set(OUTPUT_LIST_CPP_FILES ${OUTPUT_LIST_CPP_FILES} ${OUTPUT_FILE_CPP} PARENT_SCOPE) | 40 | set(OUTPUT_LIST_CPP_FILES ${OUTPUT_LIST_CPP_FILES} ${OUTPUT_FILE_CPP} PARENT_SCOPE) |
41 | else() | 41 | else() |
42 | @@ -277,4 +277,4 @@ if(NOT "${OUTPUT_LIST_CPP_FILES}" STREQUAL "") | ||
43 | ) | ||
44 | endif() | ||
45 | |||
46 | -apply_macro_for_each_core_type("SUPPORTED") | ||
47 | \ No newline at end of file | ||
48 | +apply_macro_for_each_core_type("SUPPORTED") | ||
49 | -- | ||
50 | 2.43.2 | ||
51 | |||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0003-external-ocloc.patch index 5f93b7b6..2001d839 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/external-ocloc.patch +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/0003-external-ocloc.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 1f58c22992ddea4167b01b44448528de427f50d5 Mon Sep 17 00:00:00 2001 | 1 | From 0006db5f55a9f08bd3452558a53704cd3bbb790f Mon Sep 17 00:00:00 2001 |
2 | From: Dongwon Kim <dongwon.kim@intel.com> | 2 | From: Dongwon Kim <dongwon.kim@intel.com> |
3 | Date: Wed, 2 Mar 2022 15:52:45 -0800 | 3 | Date: Wed, 2 Mar 2022 15:52:45 -0800 |
4 | Subject: [PATCH] external ocloc | 4 | Subject: [PATCH 3/5] external ocloc |
5 | 5 | ||
6 | Upstream-Status: Inappropriate | 6 | Upstream-Status: Inappropriate |
7 | 7 | ||
@@ -10,11 +10,11 @@ Signed-off-by: Dongwon Kim <dongwon.kim@intel.com> | |||
10 | cmake/ocloc_cmd_prefix.cmake | 14 ++++++++------ | 10 | cmake/ocloc_cmd_prefix.cmake | 14 ++++++++------ |
11 | 1 file changed, 8 insertions(+), 6 deletions(-) | 11 | 1 file changed, 8 insertions(+), 6 deletions(-) |
12 | 12 | ||
13 | diff --git a/cmake/ocloc_cmd_prefix.cmake b/cmake/ocloc_cmd_prefix.cmake | 13 | Index: git/cmake/ocloc_cmd_prefix.cmake |
14 | index 2b44330831..03067c9df0 100644 | 14 | =================================================================== |
15 | --- a/cmake/ocloc_cmd_prefix.cmake | 15 | --- git.orig/cmake/ocloc_cmd_prefix.cmake |
16 | +++ b/cmake/ocloc_cmd_prefix.cmake | 16 | +++ git/cmake/ocloc_cmd_prefix.cmake |
17 | @@ -4,12 +4,14 @@ | 17 | @@ -4,13 +4,15 @@ |
18 | # SPDX-License-Identifier: MIT | 18 | # SPDX-License-Identifier: MIT |
19 | # | 19 | # |
20 | 20 | ||
@@ -35,6 +35,4 @@ index 2b44330831..03067c9df0 100644 | |||
35 | + endif() | 35 | + endif() |
36 | endif() | 36 | endif() |
37 | endif() | 37 | endif() |
38 | -- | 38 | |
39 | 2.37.3 | ||
40 | |||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/disable-werror.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/disable-werror.patch deleted file mode 100644 index 20d9b847..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/disable-werror.patch +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate | ||
2 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | |||
4 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
5 | index d52e089778..bc0cf35014 100644 | ||
6 | --- a/CMakeLists.txt | ||
7 | +++ b/CMakeLists.txt | ||
8 | @@ -727,7 +727,7 @@ if(NOT MSVC) | ||
9 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-noexcept-type") # Added for gtest | ||
10 | endif() | ||
11 | endif() | ||
12 | - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=vla") | ||
13 | + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=vla") | ||
14 | |||
15 | if(USE_SANITIZE_UB) | ||
16 | check_cxx_compiler_flag(-fsanitize=undefined COMPILER_SUPPORTS_UNDEFINED_BEHAVIOR_SANITIZER) | ||
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.13.29138.7.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_25.13.33276.16.bb index 5214d5cf..635e8c2f 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_24.13.29138.7.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_25.13.33276.16.bb | |||
@@ -8,13 +8,12 @@ LICENSE = "MIT & Apache-2.0" | |||
8 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eca6ec6997e18db166db7109cdbe611c \ | 8 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eca6ec6997e18db166db7109cdbe611c \ |
9 | file://third_party/opencl_headers/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 9 | file://third_party/opencl_headers/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=releases/24.13 \ | 11 | SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https;branch=releases/25.13 \ |
12 | file://disable-werror.patch \ | 12 | file://0002-Build-not-able-to-locate-cpp_generation_tool.patch \ |
13 | file://allow-to-find-cpp-generation-tool.patch \ | 13 | file://0003-external-ocloc.patch \ |
14 | file://external-ocloc.patch \ | ||
15 | " | 14 | " |
16 | 15 | ||
17 | SRCREV = "7131387cdbb02d480a225c70daef913a6c024a6e" | 16 | SRCREV = "a9961bdfaa07250fd52ff930bf8f31fb4e3b7799" |
18 | 17 | ||
19 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
20 | 19 | ||
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 @@ | |||
1 | From 3d71670f8ad5b54d434c2f5f71713bb1d5433ae4 Mon Sep 17 00:00:00 2001 | 1 | From 1b98a931c3bf8daccc48cd618335ff35e3d382da Mon Sep 17 00:00:00 2001 |
2 | From: Anuj Mittal <anuj.mittal@intel.com> | 2 | From: Anuj Mittal <anuj.mittal@intel.com> |
3 | Date: Tue, 12 Oct 2021 23:46:42 +0800 | 3 | Date: Tue, 12 Oct 2021 23:46:42 +0800 |
4 | Subject: [PATCH] BiF/CMakeLists.txt: remove opt from DEPENDS | 4 | Subject: [PATCH] BiF/CMakeLists.txt: remove opt from DEPENDS |
@@ -17,19 +17,16 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | |||
17 | IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake | 2 +- | 17 | IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake | 2 +- |
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
19 | 19 | ||
20 | diff --git a/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake b/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake | 20 | Index: git/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake |
21 | index d20d7f887..882e09fea 100644 | 21 | =================================================================== |
22 | --- a/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake | 22 | --- git.orig/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake |
23 | +++ b/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake | 23 | +++ git/IGC/VectorCompiler/lib/BiF/cmake/Functions.cmake |
24 | @@ -109,7 +109,7 @@ function(vc_build_bif TARGET RES_FILE CMCL_SRC_PATH BIF_NAME PTR_BIT_SIZE) | 24 | @@ -121,7 +121,7 @@ function(vc_build_bif RES_FILE CMCL_SRC_ |
25 | COMMENT "vc_build_bif: Translating CMCL builtins: ${BIF_CLANG_BC_NAME_FINAL} -> ${BIF_OPT_BC_NAME}" | 25 | COMMENT "vc_build_bif: Translating CMCL builtins: ${BIF_CLANG_BC_NAME_FINAL} -> ${BIF_OPT_BC_NAME}" |
26 | COMMAND CMCLTranslatorTool -o ${BIF_CMCL_BC_NAME} ${BIF_CLANG_BC_NAME_FINAL} | 26 | COMMAND CMCLTranslatorTool ${OPT_OPAQUE_ARG} -o ${BIF_CMCL_BC_PATH} ${BIF_CLANG_BC_PATH_FINAL} |
27 | COMMAND ${LLVM_OPT_EXE} ${IGC_LLVM_DEPENDENT_OPT_FLAGS} --O2 -o ${BIF_OPT_BC_NAME} ${BIF_CMCL_BC_NAME} | 27 | COMMAND ${LLVM_OPT_EXE} ${OPT_OPAQUE_ARG} --O2 -o ${BIF_OPT_BC_PATH} ${BIF_CMCL_BC_PATH} |
28 | - DEPENDS CMCLTranslatorTool ${LLVM_OPT_EXE} ${BIF_CLANG_BC_PATH_FINAL} | 28 | - DEPENDS CMCLTranslatorTool ${LLVM_OPT_EXE} ${OPT_BC_DEPENDS}) |
29 | + DEPENDS CMCLTranslatorTool ${BIF_CLANG_BC_PATH_FINAL} | 29 | + DEPENDS CMCLTranslatorTool ${BIF_CLANG_BC_PATH_FINAL}) |
30 | BYPRODUCTS ${BIF_OPT_BC_PATH} | 30 | |
31 | SOURCES ${CMCL_SRC_PATH}) | 31 | add_custom_target(${TARGET_NAME} |
32 | set(${RES_FILE} ${BIF_OPT_BC_NAME} PARENT_SCOPE) | 32 | DEPENDS ${BIF_OPT_BC_PATH} |
33 | -- | ||
34 | 2.43.2 | ||
35 | |||
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 @@ | |||
1 | From 048512728eea53b3772a3f80ac9743bfc462487e Mon Sep 17 00:00:00 2001 | ||
2 | From: Yogesh Tyagi <yogesh.tyagi@intel.com> | ||
3 | Date: Thu, 2 Jan 2025 15:59:27 +0530 | ||
4 | Subject: [PATCH] Build not able to locate BiFManager-bin | ||
5 | |||
6 | Upstream-Status: Inappropriate [oe specific] | ||
7 | |||
8 | Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com> | ||
9 | --- | ||
10 | IGC/BiFModule/CMakeLists.txt | 4 ++-- | ||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | Index: git/IGC/BiFModule/CMakeLists.txt | ||
14 | =================================================================== | ||
15 | --- git.orig/IGC/BiFModule/CMakeLists.txt | ||
16 | +++ git/IGC/BiFModule/CMakeLists.txt | ||
17 | @@ -655,8 +655,8 @@ set(IGC_BUILD__PROJ__BiFModuleCache_OCL | ||
18 | |||
19 | add_custom_command( | ||
20 | OUTPUT "${IGC_BUILD__BIF_DIR}/OCLBiFImpl.h" "${IGC_BUILD__BIF_DIR}/OCLBiFImpl.bifbc" | ||
21 | - 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" | ||
22 | - 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> | ||
23 | + 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" | ||
24 | + 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 | ||
25 | COMMENT "BiF: ${IGC_BUILD__BIF_DIR}/OCLBiFImpl.bc: Spliting output .bc." | ||
26 | COMMAND_EXPAND_LISTS | ||
27 | ) | ||
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 @@ | |||
1 | From e69a3181482e5f442756a61c7b683914072884f1 Mon Sep 17 00:00:00 2001 | 1 | From 251e2854dd206ebf66e5908d3277e4585fe2a63b Mon Sep 17 00:00:00 2001 |
2 | From: Anuj Mittal <anuj.mittal@intel.com> | 2 | From: Anuj Mittal <anuj.mittal@intel.com> |
3 | Date: Mon, 9 Jan 2023 11:43:05 +0800 | 3 | Date: Mon, 9 Jan 2023 11:43:05 +0800 |
4 | Subject: [PATCH] external/SPIRV-Tools: change path to tools and headers | 4 | Subject: [PATCH] external/SPIRV-Tools: change path to tools and headers |
@@ -9,16 +9,15 @@ file path substitutions take place. | |||
9 | Upstream-Status: Inappropriate | 9 | Upstream-Status: Inappropriate |
10 | 10 | ||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | 11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
12 | |||
13 | --- | 12 | --- |
14 | external/SPIRV-Tools/CMakeLists.txt | 4 ++-- | 13 | external/SPIRV-Tools/CMakeLists.txt | 4 ++-- |
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | 14 | 1 file changed, 2 insertions(+), 2 deletions(-) |
16 | 15 | ||
17 | diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt | 16 | Index: git/external/SPIRV-Tools/CMakeLists.txt |
18 | index 9afa5746c..7ca24d5dc 100644 | 17 | =================================================================== |
19 | --- a/external/SPIRV-Tools/CMakeLists.txt | 18 | --- git.orig/external/SPIRV-Tools/CMakeLists.txt |
20 | +++ b/external/SPIRV-Tools/CMakeLists.txt | 19 | +++ git/external/SPIRV-Tools/CMakeLists.txt |
21 | @@ -43,8 +43,8 @@ else() #By default use build from sources | 20 | @@ -45,8 +45,8 @@ else() #By default use build from source |
22 | message(STATUS "[SPIRV-Tools] : Building from source") | 21 | message(STATUS "[SPIRV-Tools] : Building from source") |
23 | message(STATUS "[SPIRV-Tools] : Current source dir: ${CMAKE_CURRENT_SOURCE_DIR}") | 22 | message(STATUS "[SPIRV-Tools] : Current source dir: ${CMAKE_CURRENT_SOURCE_DIR}") |
24 | 23 | ||
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 @@ | |||
1 | From 5648568e597acd0fed82aac3e6aef0f95a1b78d1 Mon Sep 17 00:00:00 2001 | 1 | From 1641dc87b2ed6b6b87b2cef824e4d66da65b0b30 Mon Sep 17 00:00:00 2001 |
2 | From: Anuj Mittal <anuj.mittal@intel.com> | 2 | From: Anuj Mittal <anuj.mittal@intel.com> |
3 | Date: Thu, 19 May 2022 22:50:09 +0800 | 3 | Date: Thu, 19 May 2022 22:50:09 +0800 |
4 | Subject: [PATCH] fix tblgen | 4 | Subject: [PATCH] fix tblgen |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [OE specific] | 6 | Upstream-Status: Inappropriate [OE specific] |
7 | |||
8 | --- | 7 | --- |
9 | IGC/cmake/igc_llvm.cmake | 2 +- | 8 | IGC/cmake/igc_llvm.cmake | 2 +- |
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 9 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 10 | ||
12 | diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake | 11 | diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake |
13 | index 10322533c..9020cb3c8 100644 | 12 | index b708cc904..fe4668890 100644 |
14 | --- a/IGC/cmake/igc_llvm.cmake | 13 | --- a/IGC/cmake/igc_llvm.cmake |
15 | +++ b/IGC/cmake/igc_llvm.cmake | 14 | +++ b/IGC/cmake/igc_llvm.cmake |
16 | @@ -52,7 +52,7 @@ else() | 15 | @@ -53,7 +53,7 @@ else() |
17 | set(LLVM_OPT_EXE "opt" CACHE STRING "") | 16 | set(LLVM_OPT_EXE "opt" CACHE STRING "") |
18 | 17 | ||
19 | set(LLVM_TABLEGEN_EXE "llvm-tblgen") | 18 | 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 @@ | |||
1 | From 0559332abd04b6c8bc70171d201f43d2e4735336 Mon Sep 17 00:00:00 2001 | 1 | From ca136c04d4ac60e3febc8ea2b9c4d4736365a424 Mon Sep 17 00:00:00 2001 |
2 | From: Lee Chee Yang <chee.yang.lee@intel.com> | 2 | From: Lee Chee Yang <chee.yang.lee@intel.com> |
3 | Date: Wed, 2 Sep 2020 08:28:35 +0800 | 3 | Date: Wed, 2 Sep 2020 08:28:35 +0800 |
4 | Subject: [PATCH] Improve Reproducibility for src package | 4 | Subject: [PATCH] Improve Reproducibility for src package |
@@ -9,16 +9,15 @@ this only works on bison 3.7 onward, hence check for bison version | |||
9 | before adding the flags. | 9 | before adding the flags. |
10 | Upstream-Status: Inappropriate [applying --file-prefix-map in such way does not work for upstream] | 10 | Upstream-Status: Inappropriate [applying --file-prefix-map in such way does not work for upstream] |
11 | Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> | 11 | Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> |
12 | |||
13 | --- | 12 | --- |
14 | visa/CMakeLists.txt | 7 +++++-- | 13 | visa/CMakeLists.txt | 7 +++++-- |
15 | 1 file changed, 5 insertions(+), 2 deletions(-) | 14 | 1 file changed, 5 insertions(+), 2 deletions(-) |
16 | 15 | ||
17 | diff --git a/visa/CMakeLists.txt b/visa/CMakeLists.txt | 16 | Index: git/visa/CMakeLists.txt |
18 | index 6be467587..930c386a6 100644 | 17 | =================================================================== |
19 | --- a/visa/CMakeLists.txt | 18 | --- git.orig/visa/CMakeLists.txt |
20 | +++ b/visa/CMakeLists.txt | 19 | +++ git/visa/CMakeLists.txt |
21 | @@ -123,8 +123,11 @@ endif() | 20 | @@ -135,8 +135,11 @@ endif() |
22 | set(bison_output_file ${CMAKE_CURRENT_BINARY_DIR}/CISA.tab.cpp) | 21 | set(bison_output_file ${CMAKE_CURRENT_BINARY_DIR}/CISA.tab.cpp) |
23 | set(flex_output_file ${CMAKE_CURRENT_BINARY_DIR}/lex.CISA.cpp) | 22 | set(flex_output_file ${CMAKE_CURRENT_BINARY_DIR}/lex.CISA.cpp) |
24 | 23 | ||
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 | |||
8 | file://LICENSE.md;md5=488d74376edf2765f6e78d271543dde3 \ | 8 | file://LICENSE.md;md5=488d74376edf2765f6e78d271543dde3 \ |
9 | file://NOTICES.txt;md5=b81a52411c84df3419f20bad4d755880" | 9 | file://NOTICES.txt;md5=b81a52411c84df3419f20bad4d755880" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/igc-1.0.16510 \ | 11 | SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/2.10.x \ |
12 | git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=git/vc-intrinsics;name=vc;nobranch=1 \ | 12 | git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=git/vc-intrinsics;name=vc;nobranch=1 \ |
13 | git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/SPIRV-Tools;name=spirv-tools;branch=main \ | 13 | git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/SPIRV-Tools;name=spirv-tools;branch=main \ |
14 | git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/SPIRV-Headers;name=spirv-headers;branch=main \ | 14 | git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/SPIRV-Headers;name=spirv-headers;branch=main \ |
15 | file://0003-Improve-Reproducibility-for-src-package.patch \ | 15 | file://0003-Improve-Reproducibility-for-src-package.patch \ |
16 | file://0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch \ | 16 | file://0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch \ |
17 | file://0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch \ | 17 | file://0001-external-SPIRV-Tools-change-path-to-tools-and-header.patch \ |
18 | file://0001-Build-not-able-to-locate-BiFManager-bin.patch \ | ||
18 | " | 19 | " |
19 | 20 | ||
20 | SRC_URI:append:class-native = " file://0001-fix-tblgen.patch" | 21 | SRC_URI:append:class-native = " file://0001-fix-tblgen.patch" |
21 | 22 | ||
22 | SRCREV_igc = "c2495d45f37fadd963ad22eb0cc1a8235a306775" | 23 | SRCREV_igc = "83925314d4fc32b017fcbfcd73e0667ba833fb8f" |
23 | SRCREV_vc = "f9c34404d0ea9abad83875a10bd48d88cea90ebd" | 24 | SRCREV_vc = "9d255266e1df8f1dc5d11e1fbb03213acfaa4fc7" |
24 | SRCREV_spirv-tools = "f0cc85efdbbe3a46eae90e0f915dc1509836d0fc" | 25 | SRCREV_spirv-tools = "f289d047f49fb60488301ec62bafab85573668cc" |
25 | SRCREV_spirv-headers = "1c6bb2743599e6eb6f37b2969acc0aef812e32e3" | 26 | SRCREV_spirv-headers = "0e710677989b4326ac974fd80c5308191ed80965" |
26 | 27 | ||
27 | SRCREV_FORMAT = "igc_vc_spirv-tools_spirv-headers" | 28 | SRCREV_FORMAT = "igc_vc_spirv-tools_spirv-headers" |
28 | 29 | ||
@@ -38,7 +39,9 @@ CXXFLAGS:append = " -Wno-error=nonnull" | |||
38 | COMPATIBLE_HOST = '(x86_64).*-linux' | 39 | COMPATIBLE_HOST = '(x86_64).*-linux' |
39 | COMPATIBLE_HOST:libc-musl = "null" | 40 | COMPATIBLE_HOST:libc-musl = "null" |
40 | 41 | ||
41 | DEPENDS += " flex-native bison-native clang clang-cross-x86_64 opencl-clang qemu-native python3-mako-native" | 42 | DEPENDS += " flex-native bison-native clang clang-cross-x86_64 opencl-clang qemu-native python3-mako-native \ |
43 | python3-pyyaml-native \ | ||
44 | " | ||
42 | 45 | ||
43 | RDEPENDS:${PN} += "opencl-clang" | 46 | RDEPENDS:${PN} += "opencl-clang" |
44 | 47 | ||
@@ -65,10 +68,11 @@ EOF | |||
65 | chmod +x ${WORKDIR}/qemuwrapper | 68 | chmod +x ${WORKDIR}/qemuwrapper |
66 | } | 69 | } |
67 | 70 | ||
68 | UPSTREAM_CHECK_GITTAGREGEX = "^igc-(?P<pver>(?!19\..*)\d+(\.\d+)+)$" | 71 | |
72 | UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$" | ||
69 | 73 | ||
70 | FILES:${PN} += " \ | 74 | FILES:${PN} += " \ |
71 | ${libdir}/igc/NOTICES.txt \ | 75 | ${libdir}/igc2/NOTICES.txt \ |
72 | " | 76 | " |
73 | 77 | ||
74 | # libigc.so contains buildpaths | 78 | # libigc.so contains buildpaths |
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 deleted file mode 100644 index 7e56af75..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/opencl-clang/opencl-clang_14.0.0.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require opencl-clang.inc | ||
2 | |||
3 | SRCREV = "980f1691c5babcf824ee10375a04a0d0c5d7d44a" | ||
4 | |||
5 | BRANCH = "ocl-open-140" | ||