summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2022-05-19 14:04:22 (GMT)
committerAnuj Mittal <anuj.mittal@intel.com>2022-06-13 02:40:13 (GMT)
commit26d268b690dd1544dec91be897f1241521340b48 (patch)
treed385e0ae8af3ebbb19a3103efa67aa90ea12012b
parent6702aec8ff8230dac967a11a79d639c3d7778845 (diff)
downloadmeta-intel-26d268b690dd1544dec91be897f1241521340b48.tar.gz
intel-graphics-compiler: upgrade 1.0.10395 -> 1.0.11279
* Remove upstreamed patches and refresh others. * Include the LICENSE.md file and remove the cpp file which just points to MIT license. * Update the license to MIT and Apache-2.0 * Install vcb tool from -native recipe. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> (cherry picked from commit 7cd06a4a7151341fca82a08b5f820fae6504d409) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r--dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch16
-rw-r--r--dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch25
-rw-r--r--dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-llvm-link-external.patch29
-rw-r--r--dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-llvm_deps.cmake-don-t-copy-header-file-when-building.patch35
-rw-r--r--dynamic-layers/clang-layer/recipes-opencl/igc/files/0004-find-external-llvm-tblgen.patch29
-rw-r--r--dynamic-layers/clang-layer/recipes-opencl/igc/files/4369c970d4e02258b3c53e854faaa34197124a33.patch23
-rw-r--r--dynamic-layers/clang-layer/recipes-opencl/igc/files/991fd3d661efcb4fb6df63b76310d6e634b05c39.patch447
-rw-r--r--dynamic-layers/clang-layer/recipes-opencl/igc/files/fix-header.patch25
-rw-r--r--dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.11279.bb (renamed from dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.10395.bb)25
9 files changed, 493 insertions, 161 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 a6af0ef..0dd7553 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 @@
1From 6f6997066040c5f33bf05ffde36a9800dcde1fcf Mon Sep 17 00:00:00 2001 1From 16fb6c022380bbb3c48f21372fcb1da7f30d3903 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com> 2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Tue, 12 Oct 2021 23:46:42 +0800 3Date: Tue, 12 Oct 2021 23:46:42 +0800
4Subject: [PATCH] BiF/CMakeLists.txt: remove opt from DEPENDS 4Subject: [PATCH] BiF/CMakeLists.txt: remove opt from DEPENDS
@@ -18,18 +18,18 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
18 1 file changed, 1 insertion(+), 1 deletion(-) 18 1 file changed, 1 insertion(+), 1 deletion(-)
19 19
20diff --git a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt 20diff --git a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
21index 5d9a901d7..66e59e399 100644 21index be8e5557e..07ab40382 100644
22--- a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt 22--- a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
23+++ b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt 23+++ b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
24@@ -88,7 +88,7 @@ function(vc_embed_bif RES_FILE CMCL_SRC_PATH BIF_NAME PTR_BIT_SIZE) 24@@ -112,7 +112,7 @@ function(vc_build_bif RES_FILE CMCL_SRC_PATH BIF_NAME PTR_BIT_SIZE)
25 add_custom_command(OUTPUT ${BIF_OPT_BC_PATH} 25 add_custom_command(OUTPUT ${BIF_OPT_BC_PATH}
26 COMMAND ${LLVM_OPT_EXE} --O2 -o ${BIF_OPT_BC_NAME} ${BIF_CMCL_BC_NAME} 26 COMMAND ${LLVM_OPT_EXE} --O2 -o ${BIF_OPT_BC_NAME} ${BIF_CMCL_BC_NAME}
27 COMMENT "vc_embed_bif: running opt with O2: ${BIF_CMCL_BC_NAME} -> ${BIF_OPT_BC_NAME}" 27 COMMENT "vc_build_bif: running opt with O2: ${BIF_CMCL_BC_NAME} -> ${BIF_OPT_BC_NAME}"
28- DEPENDS opt ${BIF_CMCL_BC_PATH}) 28- DEPENDS opt ${BIF_CMCL_BC_PATH})
29+ DEPENDS ${BIF_CMCL_BC_PATH}) 29+ DEPENDS ${BIF_CMCL_BC_PATH})
30 add_custom_command( 30 set(${RES_FILE} ${BIF_OPT_BC_NAME} PARENT_SCOPE)
31 OUTPUT ${BIF_CPP_PATH} 31 endfunction()
32 COMMAND ${PYTHON_EXECUTABLE} ${RESOURCE_EMBEDDER_SCRIPT} ${BIF_OPT_BC_NAME} ${BIF_CPP_NAME} 32
33-- 33--
342.32.0 342.35.3
35 35
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
new file mode 100644
index 0000000..24367f1
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-fix-tblgen.patch
@@ -0,0 +1,25 @@
1From 5329f00de484b470152e2bd3a5ab6dac45668b13 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Thu, 19 May 2022 22:50:09 +0800
4Subject: [PATCH] fix tblgen
5
6---
7 IGC/cmake/igc_llvm.cmake | 2 +-
8 1 file changed, 1 insertion(+), 1 deletion(-)
9
10diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake
11index 89c03fc49..85be9ae08 100644
12--- a/IGC/cmake/igc_llvm.cmake
13+++ b/IGC/cmake/igc_llvm.cmake
14@@ -48,7 +48,7 @@ else()
15 set(LLVM_OPT_EXE "opt" CACHE STRING "")
16
17 set(LLVM_TABLEGEN_EXE "llvm-tblgen")
18- if(CMAKE_CROSSCOMPILING)
19+ if(TRUE)
20 if(DEFINED LLVM_TABLEGEN)
21 set(LLVM_TABLEGEN_EXE ${LLVM_TABLEGEN})
22 else()
23--
242.35.3
25
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-llvm-link-external.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-llvm-link-external.patch
deleted file mode 100644
index e0800f6..0000000
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-llvm-link-external.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 0088e843be66ed5f11388a9ef57f364a2a236584 Mon Sep 17 00:00:00 2001
2From: Dongwon Kim <dongwon.kim@intel.com>
3Date: Tue, 1 Mar 2022 17:05:01 -0800
4Subject: [PATCH] llvm-link external
5
6Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
7---
8 IGC/cmake/igc_llvm.cmake | 5 ++++-
9 1 file changed, 4 insertions(+), 1 deletion(-)
10
11diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake
12index 80c83d4e0..85f7dda3d 100644
13--- a/IGC/cmake/igc_llvm.cmake
14+++ b/IGC/cmake/igc_llvm.cmake
15@@ -29,7 +29,10 @@ if(LLVM_TABLEGEN_EXE-NOTFOUND)
16 message(FATAL_ERROR "[VC] llvm-tblgen is not found")
17 endif()
18
19-set(LLVM_LINK_EXE "llvm-link" CACHE STRING "")
20+find_program(LLVM_LINK_EXE "llvm-link")
21+if(LLVM_LINK_EXE-NOTFOUND)
22+ message(FATAL_ERROR "[VC] llvm-link is not found")
23+endif()
24
25 include(AddLLVM)
26 include(TableGen)
27--
282.20.1
29
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-llvm_deps.cmake-don-t-copy-header-file-when-building.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-llvm_deps.cmake-don-t-copy-header-file-when-building.patch
deleted file mode 100644
index d62f47c..0000000
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-llvm_deps.cmake-don-t-copy-header-file-when-building.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 3d99559779d628704568879a2ee51e968e66d005 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Tue, 5 Oct 2021 00:11:26 +0800
4Subject: [PATCH] llvm_deps.cmake: don't copy header file when building
5
6We build in pre-built mode and this header shouldn't be copied in
7that case.
8
9Upstream-Status: Pending
10
11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
12---
13 external/llvm/llvm_deps.cmake | 6 +++---
14 1 file changed, 3 insertions(+), 3 deletions(-)
15
16diff --git a/external/llvm/llvm_deps.cmake b/external/llvm/llvm_deps.cmake
17index 425d3766f..e43804f77 100644
18--- a/external/llvm/llvm_deps.cmake
19+++ b/external/llvm/llvm_deps.cmake
20@@ -46,9 +46,9 @@ if(IGC_OPTION__LLVM_LLD)
21 include(llvm_lld_source_hook)
22 if(NOT EXISTS "${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o" AND ${IGC_OPTION__LLVM_PREFERRED_VERSION} GREATER_EQUAL "12.0.0")
23 # Need to copy one header from unwind package for LLD (only for building from sources)
24- file(MAKE_DIRECTORY ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o)
25- file(COPY ${DEFAULT_IGC_LLVM_SOURCES_DIR}/libunwind/include/mach-o/compact_unwind_encoding.h
26- DESTINATION ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o/)
27+ #file(MAKE_DIRECTORY ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o)
28+ #file(COPY ${DEFAULT_IGC_LLVM_SOURCES_DIR}/libunwind/include/mach-o/compact_unwind_encoding.h
29+ # DESTINATION ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o/)
30 endif()
31 endif()
32
33--
342.32.0
35
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0004-find-external-llvm-tblgen.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0004-find-external-llvm-tblgen.patch
deleted file mode 100644
index 9827845..0000000
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0004-find-external-llvm-tblgen.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From ac19bd37abccb697cc5fc9647be48de14185e9a2 Mon Sep 17 00:00:00 2001
2From: Dongwon Kim <dongwon.kim@intel.com>
3Date: Tue, 1 Mar 2022 15:23:36 -0800
4Subject: [PATCH] find external llvm-tblgen new
5
6Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
7---
8 IGC/cmake/igc_llvm.cmake | 5 ++++-
9 1 file changed, 4 insertions(+), 1 deletion(-)
10
11diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake
12index 038a9ce3e..80c83d4e0 100644
13--- a/IGC/cmake/igc_llvm.cmake
14+++ b/IGC/cmake/igc_llvm.cmake
15@@ -24,7 +24,10 @@ set(CMAKE_MODULE_PATH
16 ${CMAKE_MODULE_PATH}
17 )
18
19-set(LLVM_TABLEGEN_EXE "llvm-tblgen")
20+find_program(LLVM_TABLEGEN_EXE "llvm-tblgen")
21+if(LLVM_TABLEGEN_EXE-NOTFOUND)
22+ message(FATAL_ERROR "[VC] llvm-tblgen is not found")
23+endif()
24
25 set(LLVM_LINK_EXE "llvm-link" CACHE STRING "")
26
27--
282.20.1
29
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/4369c970d4e02258b3c53e854faaa34197124a33.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/4369c970d4e02258b3c53e854faaa34197124a33.patch
deleted file mode 100644
index 1e7816a..0000000
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/4369c970d4e02258b3c53e854faaa34197124a33.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1From 4369c970d4e02258b3c53e854faaa34197124a33 Mon Sep 17 00:00:00 2001
2From: Marcin Naczk <marcin.naczk@intel.com>
3Date: Tue, 22 Feb 2022 13:09:54 +0000
4Subject: [PATCH] Upgrade github Action build IGC
5
6- Fix build IGC on Ubuntu 22.04 by adding missing include
7
8Upstream-Status: Backport
9Part of: https://github.com/intel/intel-graphics-compiler/commit/4369c970d4e02258b3c53e854faaa34197124a33
10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
11---
12diff --git a/visa/iga/IGALibrary/IR/SWSBSetter.hpp b/visa/iga/IGALibrary/IR/SWSBSetter.hpp
13index 6a2de51ee02..4a6fd8735ce 100644
14--- a/visa/iga/IGALibrary/IR/SWSBSetter.hpp
15+++ b/visa/iga/IGALibrary/IR/SWSBSetter.hpp
16@@ -15,6 +15,7 @@ SPDX-License-Identifier: MIT
17 #include "Operand.hpp"
18 #include "../ErrorHandler.hpp"
19 #include "RegDeps.hpp"
20+#include <limits>
21
22 namespace iga
23 {
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/991fd3d661efcb4fb6df63b76310d6e634b05c39.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/991fd3d661efcb4fb6df63b76310d6e634b05c39.patch
new file mode 100644
index 0000000..bcf31fd
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/991fd3d661efcb4fb6df63b76310d6e634b05c39.patch
@@ -0,0 +1,447 @@
1From 991fd3d661efcb4fb6df63b76310d6e634b05c39 Mon Sep 17 00:00:00 2001
2From: "Grzywacz, Maciej" <maciej.grzywacz@intel.com>
3Date: Tue, 10 May 2022 09:44:09 +0000
4Subject: [PATCH] Fix IGC OS linux buildbreak
5
6Fix finding lldelf and SpirvLLVMTranslator
7
8Upstream-Status: Backport
9Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
10---
11 IGC/cmake/igc_find_liblldELF.cmake | 128 +++++----
12 .../modules/FindSPIRVLLVMTranslator.cmake | 271 +++++++++++-------
13 2 files changed, 252 insertions(+), 147 deletions(-)
14
15diff --git a/IGC/cmake/igc_find_liblldELF.cmake b/IGC/cmake/igc_find_liblldELF.cmake
16index b014910d2e9..c6d5765d5df 100644
17--- a/IGC/cmake/igc_find_liblldELF.cmake
18+++ b/IGC/cmake/igc_find_liblldELF.cmake
19@@ -10,61 +10,89 @@
20 # IGC_OPTION__LLDELF_H_DIR - Specify additional directories for searching lldELF headers
21
22 function(add_lld_library LIB_NAME)
23- find_library(${LIB_NAME}_PATH_RELEASE
24- ${LIB_NAME}
25- PATHS "${IGC_OPTION__LLD_DIR}/Release/lib"
26- PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/lib")
27-
28- if("${${LIB_NAME}_PATH_RELEASE}" STREQUAL "${LIB_NAME}_PATH_RELEASE-NOTFOUND")
29- message(FATAL_ERROR
30- "Cannot find ${LIB_NAME} library in Release version in ${IGC_OPTION__LLD_DIR}")
31- endif()
32-
33- find_library(${LIB_NAME}_PATH_DEBUG
34- ${LIB_NAME}
35- PATHS "${IGC_OPTION__LLD_DIR}/Debug/lib"
36- PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/lib")
37-
38- if("${${LIB_NAME}_PATH_DEBUG}" STREQUAL "${LIB_NAME}_PATH_DEBUG-NOTFOUND")
39- message(FATAL_ERROR
40- "Cannot find ${LIB_NAME} library in Debug version in ${IGC_OPTION__LLD_DIR}")
41+ if(WIN32)
42+ find_library(${LIB_NAME}_PATH_RELEASE
43+ ${LIB_NAME}
44+ PATHS "${IGC_OPTION__LLD_DIR}/Release/lib"
45+ PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/lib")
46+
47+ if("${${LIB_NAME}_PATH_RELEASE}" STREQUAL "${LIB_NAME}_PATH_RELEASE-NOTFOUND")
48+ message(FATAL_ERROR
49+ "Cannot find ${LIB_NAME} library in Release version in ${IGC_OPTION__LLD_DIR}")
50+ endif()
51+
52+ find_library(${LIB_NAME}_PATH_DEBUG
53+ ${LIB_NAME}
54+ PATHS "${IGC_OPTION__LLD_DIR}/Debug/lib"
55+ PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/lib")
56+
57+ if("${${LIB_NAME}_PATH_DEBUG}" STREQUAL "${LIB_NAME}_PATH_DEBUG-NOTFOUND")
58+ message(FATAL_ERROR
59+ "Cannot find ${LIB_NAME} library in Debug version in ${IGC_OPTION__LLD_DIR}")
60+ endif()
61+
62+ add_library(${LIB_NAME} UNKNOWN IMPORTED GLOBAL)
63+ set_target_properties(${LIB_NAME} PROPERTIES
64+ IMPORTED_LOCATION_RELEASE "${${LIB_NAME}_PATH_RELEASE}"
65+ IMPORTED_LOCATION_RELEASEINTERNAL "${${LIB_NAME}_PATH_RELEASE}"
66+ IMPORTED_LOCATION_DEBUG "${${LIB_NAME}_PATH_DEBUG}"
67+ )
68+ else()
69+ find_library(${LIB_NAME}_PATH
70+ ${LIB_NAME}
71+ PATHS "${IGC_OPTION__LLDELF_LIB_DIR}"
72+ PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/lib")
73+
74+ if(${LIB_NAME}_PATH-NOTFOUND)
75+ message(FATAL_ERROR
76+ "Cannot find ${LIB_NAME} library, please install missing library or provide the path by IGC_OPTION__LLDELF_LIB_DIR")
77+ endif()
78+ add_library(${LIB_NAME} UNKNOWN IMPORTED GLOBAL)
79+ set_target_properties(${LIB_NAME} PROPERTIES IMPORTED_LOCATION ${${LIB_NAME}_PATH})
80 endif()
81-
82- add_library(${LIB_NAME} UNKNOWN IMPORTED GLOBAL)
83- set_target_properties(${LIB_NAME} PROPERTIES
84- IMPORTED_LOCATION_RELEASE "${${LIB_NAME}_PATH_RELEASE}"
85- IMPORTED_LOCATION_RELEASEINTERNAL "${${LIB_NAME}_PATH_RELEASE}"
86- IMPORTED_LOCATION_DEBUG "${${LIB_NAME}_PATH_DEBUG}"
87- )
88 endfunction()
89
90 function(add_lld_executable EXE_NAME)
91- find_program(${EXE_NAME}_PATH_RELEASE
92- ${EXE_NAME}
93- PATHS "${IGC_OPTION__LLD_DIR}/Release/bin"
94- PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/bin")
95-
96- if("${${EXE_NAME}_PATH_RELEASE}" STREQUAL "${EXE_NAME}_PATH_RELEASE-NOTFOUND")
97- message(FATAL_ERROR
98- "Cannot find ${EXE_NAME} executable in Release version in ${IGC_OPTION__LLD_DIR}")
99+ if(WIN32)
100+ find_program(${EXE_NAME}_PATH_RELEASE
101+ ${EXE_NAME}
102+ PATHS "${IGC_OPTION__LLD_DIR}/Release/bin"
103+ PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/bin")
104+
105+ if("${${EXE_NAME}_PATH_RELEASE}" STREQUAL "${EXE_NAME}_PATH_RELEASE-NOTFOUND")
106+ message(FATAL_ERROR
107+ "Cannot find ${EXE_NAME} executable in Release version in ${IGC_OPTION__LLD_DIR}")
108+ endif()
109+
110+ find_program(${EXE_NAME}_PATH_DEBUG
111+ ${EXE_NAME}
112+ PATHS "${IGC_OPTION__LLD_DIR}/Debug/bin"
113+ PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/bin")
114+
115+ if("${${EXE_NAME}_PATH_DEBUG}" STREQUAL "${EXE_NAME}_PATH_DEBUG-NOTFOUND")
116+ message(FATAL_ERROR
117+ "Cannot find ${EXE_NAME} executable in Debug version in ${IGC_OPTION__LLD_DIR}")
118+ endif()
119+
120+ add_executable(${EXE_NAME} IMPORTED GLOBAL)
121+ set_target_properties(${EXE_NAME} PROPERTIES
122+ IMPORTED_LOCATION_RELEASE "${${EXE_NAME}_PATH_RELEASE}"
123+ IMPORTED_LOCATION_RELEASEINTERNAL "${${EXE_NAME}_PATH_RELEASE}"
124+ IMPORTED_LOCATION_DEBUG "${${EXE_NAME}_PATH_DEBUG}"
125+ )
126+ else()
127+ find_program(${EXE_NAME}_PATH
128+ ${EXE_NAME}
129+ PATHS "${IGC_OPTION__LLD_BIN_DIR}"
130+ PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/bin")
131+
132+ if(${EXE_NAME}_PATH-NOTFOUND)
133+ message(FATAL_ERROR "Cannot find ${EXE_NAME} executable, please install missing executable or provide the path by IGC_OPTION__LLD_BIN_DIR")
134+ endif()
135+
136+ add_executable(${EXE_NAME} IMPORTED GLOBAL)
137+ set_target_properties(${EXE_NAME} PROPERTIES IMPORTED_LOCATION ${${EXE_NAME}_PATH})
138 endif()
139-
140- find_program(${EXE_NAME}_PATH_DEBUG
141- ${EXE_NAME}
142- PATHS "${IGC_OPTION__LLD_DIR}/Debug/bin"
143- PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/bin")
144-
145- if("${${EXE_NAME}_PATH_DEBUG}" STREQUAL "${EXE_NAME}_PATH_DEBUG-NOTFOUND")
146- message(FATAL_ERROR
147- "Cannot find ${EXE_NAME} executable in Debug version in ${IGC_OPTION__LLD_DIR}")
148- endif()
149-
150- add_executable(${EXE_NAME} IMPORTED GLOBAL)
151- set_target_properties(${EXE_NAME} PROPERTIES
152- IMPORTED_LOCATION_RELEASE "${${EXE_NAME}_PATH_RELEASE}"
153- IMPORTED_LOCATION_RELEASEINTERNAL "${${EXE_NAME}_PATH_RELEASE}"
154- IMPORTED_LOCATION_DEBUG "${${EXE_NAME}_PATH_DEBUG}"
155- )
156 endfunction()
157
158 if(IGC_BUILD__LLVM_SOURCES)
159diff --git a/IGC/cmake/modules/FindSPIRVLLVMTranslator.cmake b/IGC/cmake/modules/FindSPIRVLLVMTranslator.cmake
160index de2ff5baad1..0d8d00b4a5d 100644
161--- a/IGC/cmake/modules/FindSPIRVLLVMTranslator.cmake
162+++ b/IGC/cmake/modules/FindSPIRVLLVMTranslator.cmake
163@@ -15,109 +15,186 @@
164 # Optionally, llvm-spirv tool will be checked and LLVMSPIRVTranslator_Tool_FOUND
165 # will be set to true and llvm-spirv executable target will be defined.
166
167-find_library(SPIRVLLVMTranslator_Library_Release LLVMSPIRVLib PATHS "${LLVM_DIR}/Release/lib")
168-find_library(SPIRVLLVMTranslator_Library_Debug LLVMSPIRVLib PATHS "${LLVM_DIR}/Debug/lib")
169-
170-find_path(SPIRVLLVMTranslator_INCLUDE_DIR "LLVMSPIRVLib.h"
171- PATH_SUFFIXES LLVMSPIRVLib
172- PATHS "${IGC_OPTION__SPIRV_TRANSLATOR_SOURCE_DIR}/include"
173- )
174-
175-# Try to find version and llvm-spirv.
176-if(SPIRVLLVMTranslator_Library_Release AND SPIRVLLVMTranslator_Library_Debug)
177- set(SPIRVLLVMTranslator_Library_FOUND YES)
178-
179- get_filename_component(_libdir_Release ${SPIRVLLVMTranslator_Library_Release} DIRECTORY)
180- get_filename_component(_libdir_Debug ${SPIRVLLVMTranslator_Library_Debug} DIRECTORY)
181-
182- # Get library version. Manual parsing is used because it is quite easy and
183- # will work for both linux and windows (which is lacking pkg-config).
184- file(STRINGS "${_libdir_Release}/pkgconfig/LLVMSPIRVLib.pc" _version_file_release
185- REGEX "Version: .*")
186- file(STRINGS "${_libdir_Debug}/pkgconfig/LLVMSPIRVLib.pc" _version_file_debug
187- REGEX "Version: .*")
188-
189- if(NOT _version_file_release OR NOT _version_file_debug)
190- message(AUTHOR_WARNING "LLVMSPIRVLib is found, but LLVMSPIRVLib.pc is missing!")
191+if(WIN32)
192+ find_library(SPIRVLLVMTranslator_Library_Release LLVMSPIRVLib PATHS "${LLVM_DIR}/Release/lib")
193+ find_library(SPIRVLLVMTranslator_Library_Debug LLVMSPIRVLib PATHS "${LLVM_DIR}/Debug/lib")
194+
195+ find_path(SPIRVLLVMTranslator_INCLUDE_DIR "LLVMSPIRVLib.h"
196+ PATH_SUFFIXES LLVMSPIRVLib
197+ PATHS "${IGC_OPTION__SPIRV_TRANSLATOR_SOURCE_DIR}/include"
198+ )
199+
200+ # Try to find version and llvm-spirv.
201+ if(SPIRVLLVMTranslator_Library_Release AND SPIRVLLVMTranslator_Library_Debug)
202+ set(SPIRVLLVMTranslator_Library_FOUND YES)
203+
204+ get_filename_component(_libdir_Release ${SPIRVLLVMTranslator_Library_Release} DIRECTORY)
205+ get_filename_component(_libdir_Debug ${SPIRVLLVMTranslator_Library_Debug} DIRECTORY)
206+
207+ # Get library version. Manual parsing is used because it is quite easy and
208+ # will work for both linux and windows (which is lacking pkg-config).
209+ file(STRINGS "${_libdir_Release}/pkgconfig/LLVMSPIRVLib.pc" _version_file_release
210+ REGEX "Version: .*")
211+ file(STRINGS "${_libdir_Debug}/pkgconfig/LLVMSPIRVLib.pc" _version_file_debug
212+ REGEX "Version: .*")
213+
214+ if(NOT _version_file_release OR NOT _version_file_debug)
215+ message(AUTHOR_WARNING "LLVMSPIRVLib is found, but LLVMSPIRVLib.pc is missing!")
216+ endif()
217+ string(REPLACE "Version: " "" SPIRVLLVMTranslator_VERSION_Release "${_version_file_release}")
218+ string(REPLACE "Version: " "" SPIRVLLVMTranslator_VERSION_Debug "${_version_file_debug}")
219+ set(SPIRVLLVMTranslator_VERSION_Release ${SPIRVLLVMTranslator_VERSION_Release} CACHE STRING "SPIRVLLVMTranslator release version")
220+ set(SPIRVLLVMTranslator_VERSION_Debug ${SPIRVLLVMTranslator_VERSION_Debug} CACHE STRING "SPIRVLLVMTranslator debug version")
221+
222+ # Try to find llvm-spirv.
223+ find_program(SPIRVLLVMTranslator_Tool_Release llvm-spirv
224+ PATHS ${_libdir_Release}/../bin
225+ NO_DEFAULT_PATH
226+ )
227+ find_program(SPIRVLLVMTranslator_Tool_Debug llvm-spirv
228+ PATHS ${_libdir_Debug}/../bin
229+ NO_DEFAULT_PATH
230+ )
231+
232+ if(SPIRVLLVMTranslator_Tool_Release AND SPIRVLLVMTranslator_Tool_Debug)
233+ set(SPIRVLLVMTranslator_Tool_FOUND YES)
234+ endif()
235+
236+ unset(_libdir)
237 endif()
238- string(REPLACE "Version: " "" SPIRVLLVMTranslator_VERSION_Release "${_version_file_release}")
239- string(REPLACE "Version: " "" SPIRVLLVMTranslator_VERSION_Debug "${_version_file_debug}")
240- set(SPIRVLLVMTranslator_VERSION_Release ${SPIRVLLVMTranslator_VERSION_Release} CACHE STRING "SPIRVLLVMTranslator release version")
241- set(SPIRVLLVMTranslator_VERSION_Debug ${SPIRVLLVMTranslator_VERSION_Debug} CACHE STRING "SPIRVLLVMTranslator debug version")
242-
243- # Try to find llvm-spirv.
244- find_program(SPIRVLLVMTranslator_Tool_Release llvm-spirv
245- PATHS ${_libdir_Release}/../bin
246- NO_DEFAULT_PATH
247+
248+ include(FindPackageHandleStandardArgs)
249+ find_package_handle_standard_args(SPIRVLLVMTranslator_Release
250+ REQUIRED_VARS SPIRVLLVMTranslator_Library_Release SPIRVLLVMTranslator_INCLUDE_DIR
251+ VERSION_VAR SPIRVLLVMTranslator_VERSION_Release
252+ HANDLE_COMPONENTS
253 )
254- find_program(SPIRVLLVMTranslator_Tool_Debug llvm-spirv
255- PATHS ${_libdir_Debug}/../bin
256- NO_DEFAULT_PATH
257+ find_package_handle_standard_args(SPIRVLLVMTranslator_Debug
258+ REQUIRED_VARS SPIRVLLVMTranslator_Library_Debug SPIRVLLVMTranslator_INCLUDE_DIR
259+ VERSION_VAR SPIRVLLVMTranslator_VERSION_Debug
260+ HANDLE_COMPONENTS
261 )
262
263- if(SPIRVLLVMTranslator_Tool_Release AND SPIRVLLVMTranslator_Tool_Debug)
264- set(SPIRVLLVMTranslator_Tool_FOUND YES)
265+ # Mark all cached variables as advanced.
266+ if(SPIRVLLVMTranslator_Release_FOUND)
267+ mark_as_advanced(SPIRVLLVMTranslator_Library_Release)
268+ mark_as_advanced(SPIRVLLVMTranslator_INCLUDE_DIR)
269+ mark_as_advanced(SPIRVLLVMTranslator_VERSION_Release)
270 endif()
271
272- unset(_libdir)
273-endif()
274-
275-include(FindPackageHandleStandardArgs)
276-find_package_handle_standard_args(SPIRVLLVMTranslator_Release
277- REQUIRED_VARS SPIRVLLVMTranslator_Library_Release SPIRVLLVMTranslator_INCLUDE_DIR
278- VERSION_VAR SPIRVLLVMTranslator_VERSION_Release
279- HANDLE_COMPONENTS
280- )
281-find_package_handle_standard_args(SPIRVLLVMTranslator_Debug
282- REQUIRED_VARS SPIRVLLVMTranslator_Library_Debug SPIRVLLVMTranslator_INCLUDE_DIR
283- VERSION_VAR SPIRVLLVMTranslator_VERSION_Debug
284- HANDLE_COMPONENTS
285- )
286-
287-# Mark all cached variables as advanced.
288-if(SPIRVLLVMTranslator_Release_FOUND)
289- mark_as_advanced(SPIRVLLVMTranslator_Library_Release)
290- mark_as_advanced(SPIRVLLVMTranslator_INCLUDE_DIR)
291- mark_as_advanced(SPIRVLLVMTranslator_VERSION_Release)
292-endif()
293-
294-if(SPIRVLLVMTranslator_Debug_FOUND)
295- mark_as_advanced(SPIRVLLVMTranslator_Library_Debug)
296- mark_as_advanced(SPIRVLLVMTranslator_INCLUDE_DIR)
297- mark_as_advanced(SPIRVLLVMTranslator_VERSION_Debug)
298-endif()
299-
300-if(SPIRVLLVMTranslator_Tool_Release_FOUND)
301- mark_as_advanced(SPIRVLLVMTranslator_Tool_Release)
302-endif()
303-
304-if(SPIRVLLVMTranslator_Tool_Debug_FOUND)
305-mark_as_advanced(SPIRVLLVMTranslator_Tool_Debug)
306-endif()
307-
308-# Add interface target for library.
309-if(SPIRVLLVMTranslator_FOUND AND NOT TARGET LLVMSPIRVLib)
310- add_library(LLVMSPIRVLib IMPORTED UNKNOWN)
311- set_target_properties(LLVMSPIRVLib PROPERTIES
312- IMPORTED_LOCATION_RELEASE "${SPIRVLLVMTranslator_Library_Release}"
313- IMPORTED_LOCATION_RELEASEINTERNAL "${SPIRVLLVMTranslator_Library_Release}"
314- IMPORTED_LOCATION_DEBUG "${SPIRVLLVMTranslator_Library_Debug}"
315- INTERFACE_INCLUDE_DIRECTORIES ${SPIRVLLVMTranslator_INCLUDE_DIR}
316- )
317-endif()
318+ if(SPIRVLLVMTranslator_Debug_FOUND)
319+ mark_as_advanced(SPIRVLLVMTranslator_Library_Debug)
320+ mark_as_advanced(SPIRVLLVMTranslator_INCLUDE_DIR)
321+ mark_as_advanced(SPIRVLLVMTranslator_VERSION_Debug)
322+ endif()
323+
324+ if(SPIRVLLVMTranslator_Tool_Release_FOUND)
325+ mark_as_advanced(SPIRVLLVMTranslator_Tool_Release)
326+ endif()
327+
328+ if(SPIRVLLVMTranslator_Tool_Debug_FOUND)
329+ mark_as_advanced(SPIRVLLVMTranslator_Tool_Debug)
330+ endif()
331+
332+ # Add interface target for library.
333+ if(SPIRVLLVMTranslator_FOUND AND NOT TARGET LLVMSPIRVLib)
334+ add_library(LLVMSPIRVLib IMPORTED UNKNOWN)
335+ set_target_properties(LLVMSPIRVLib PROPERTIES
336+ IMPORTED_LOCATION_RELEASE "${SPIRVLLVMTranslator_Library_Release}"
337+ IMPORTED_LOCATION_RELEASEINTERNAL "${SPIRVLLVMTranslator_Library_Release}"
338+ IMPORTED_LOCATION_DEBUG "${SPIRVLLVMTranslator_Library_Debug}"
339+ INTERFACE_INCLUDE_DIRECTORIES ${SPIRVLLVMTranslator_INCLUDE_DIR}
340+ )
341+ endif()
342+
343+ if (NOT IGC_BUILD__SPIRV_TRANSLATOR_SOURCES)
344+ set_target_properties(LLVMSPIRVLib PROPERTIES
345+ INTERFACE_INCLUDE_DIRECTORIES ${SPIRVLLVMTranslator_INCLUDE_DIR}
346+ )
347+ endif()
348
349-if (NOT IGC_BUILD__SPIRV_TRANSLATOR_SOURCES)
350- set_target_properties(LLVMSPIRVLib PROPERTIES
351- INTERFACE_INCLUDE_DIRECTORIES ${SPIRVLLVMTranslator_INCLUDE_DIR}
352+ # Add interface target for llvm-spirv.
353+ if(SPIRVLLVMTranslator_Tool_FOUND AND NOT TARGET llvm-spirv)
354+ add_executable(llvm-spirv IMPORTED)
355+ set_target_properties(llvm-spirv PROPERTIES
356+ IMPORTED_LOCATION_RELEASE "${SPIRVLLVMTranslator_Tool_Release}"
357+ IMPORTED_LOCATION_RELEASEINTERNAL "${SPIRVLLVMTranslator_Tool_Release}"
358+ IMPORTED_LOCATION_DEBUG "${SPIRVLLVMTranslator_Tool_Debug}"
359+ )
360+ endif()
361+else()
362+ find_library(SPIRVLLVMTranslator_Library LLVMSPIRVLib PATHS ${LLVM_LIB_DIR})
363+ find_path(SPIRVLLVMTranslator_INCLUDE_DIR "LLVMSPIRVLib.h"
364+ PATH_SUFFIXES LLVMSPIRVLib
365+ PATHS "${IGC_OPTION__SPIRV_TRANSLATOR_SOURCE_DIR}/include"
366 )
367-endif()
368-
369-# Add interface target for llvm-spirv.
370-if(SPIRVLLVMTranslator_Tool_FOUND AND NOT TARGET llvm-spirv)
371- add_executable(llvm-spirv IMPORTED)
372- set_target_properties(llvm-spirv PROPERTIES
373- IMPORTED_LOCATION_RELEASE "${SPIRVLLVMTranslator_Tool_Release}"
374- IMPORTED_LOCATION_RELEASEINTERNAL "${SPIRVLLVMTranslator_Tool_Release}"
375- IMPORTED_LOCATION_DEBUG "${SPIRVLLVMTranslator_Tool_Debug}"
376+
377+ # Try to find version and llvm-spirv.
378+ if(SPIRVLLVMTranslator_Library)
379+ set(SPIRVLLVMTranslator_Library_FOUND YES)
380+
381+ get_filename_component(_libdir ${SPIRVLLVMTranslator_Library} DIRECTORY)
382+
383+ # Get library version. Manual parsing is used because it is quite easy and
384+ # will work for both linux and windows (which is lacking pkg-config).
385+ file(STRINGS "${_libdir}/pkgconfig/LLVMSPIRVLib.pc" _version_file
386+ REGEX "Version: .*")
387+ if(NOT _version_file)
388+ message(AUTHOR_WARNING "LLVMSPIRVLib is found, but LLVMSPIRVLib.pc is missing!")
389+ endif()
390+ string(REPLACE "Version: " "" SPIRVLLVMTranslator_VERSION "${_version_file}")
391+ set(SPIRVLLVMTranslator_VERSION ${SPIRVLLVMTranslator_VERSION} CACHE STRING "SPIRVLLVMTranslator version")
392+
393+ # Try to find llvm-spirv.
394+ find_program(SPIRVLLVMTranslator_Tool llvm-spirv
395+ PATHS ${_libdir}/../bin
396+ NO_DEFAULT_PATH
397+ )
398+ if(SPIRVLLVMTranslator_Tool)
399+ set(SPIRVLLVMTranslator_Tool_FOUND YES)
400+ endif()
401+
402+ unset(_libdir)
403+ endif()
404+
405+ include(FindPackageHandleStandardArgs)
406+ find_package_handle_standard_args(SPIRVLLVMTranslator
407+ REQUIRED_VARS SPIRVLLVMTranslator_Library SPIRVLLVMTranslator_INCLUDE_DIR
408+ VERSION_VAR SPIRVLLVMTranslator_VERSION
409+ HANDLE_COMPONENTS
410 )
411-endif()
412+
413+ # Mark all cached variables as advanced.
414+ if(SPIRVLLVMTranslator_FOUND)
415+ mark_as_advanced(SPIRVLLVMTranslator_Library)
416+ mark_as_advanced(SPIRVLLVMTranslator_INCLUDE_DIR)
417+ mark_as_advanced(SPIRVLLVMTranslator_VERSION)
418+ endif()
419+
420+ if(SPIRVLLVMTranslator_Tool_FOUND)
421+ mark_as_advanced(SPIRVLLVMTranslator_Tool)
422+ endif()
423+
424+ # Add interface target for library.
425+ if(SPIRVLLVMTranslator_FOUND AND NOT TARGET LLVMSPIRVLib)
426+ add_library(LLVMSPIRVLib IMPORTED UNKNOWN)
427+ set_target_properties(LLVMSPIRVLib PROPERTIES
428+ IMPORTED_LOCATION ${SPIRVLLVMTranslator_Library}
429+ INTERFACE_INCLUDE_DIRECTORIES ${SPIRVLLVMTranslator_INCLUDE_DIR}
430+ )
431+ endif()
432+
433+ if (NOT IGC_BUILD__SPIRV_TRANSLATOR_SOURCES)
434+ set_target_properties(LLVMSPIRVLib PROPERTIES
435+ INTERFACE_INCLUDE_DIRECTORIES ${SPIRVLLVMTranslator_INCLUDE_DIR}
436+ )
437+ endif()
438+
439+ # Add interface target for llvm-spirv.
440+ if(SPIRVLLVMTranslator_Tool_FOUND AND NOT TARGET llvm-spirv)
441+ add_executable(llvm-spirv IMPORTED)
442+ set_target_properties(llvm-spirv PROPERTIES
443+ IMPORTED_LOCATION ${SPIRVLLVMTranslator_Tool}
444+ )
445+ endif()
446+endif()
447\ No newline at end of file
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/fix-header.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/fix-header.patch
deleted file mode 100644
index a504f55..0000000
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/files/fix-header.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From 4f510460beb630bac74fad399370b76354fdbd65 Mon Sep 17 00:00:00 2001
2From: Bruno Pagani <bruno.n.pagani@gmail.com>
3Date: Mon, 21 Feb 2022 12:32:25 +0000
4Subject: [PATCH] Fix missing include
5
6Same as 6c805b2
7
8Upstream-Status: Backport
9Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
10---
11 visa/LocalScheduler/SWSB_G4IR.cpp | 1 +
12 1 file changed, 1 insertion(+)
13
14diff --git a/visa/LocalScheduler/SWSB_G4IR.cpp b/visa/LocalScheduler/SWSB_G4IR.cpp
15index 153d8a7dc58..cea75c7faa7 100644
16--- a/visa/LocalScheduler/SWSB_G4IR.cpp
17+++ b/visa/LocalScheduler/SWSB_G4IR.cpp
18@@ -16,6 +16,7 @@ SPDX-License-Identifier: MIT
19 #include <algorithm>
20 #include <fstream>
21 #include <functional>
22+#include <limits>
23 #include <sstream>
24 #include <queue>
25
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.10395.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.11279.bb
index 0fa9352..aec820c 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.10395.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.11279.bb
@@ -3,28 +3,26 @@ DESCRIPTION = "The Intel(R) Graphics Compiler for OpenCL(TM) is an \
3llvm based compiler for OpenCL(TM) targeting Intel Gen graphics \ 3llvm based compiler for OpenCL(TM) targeting Intel Gen graphics \
4hardware architecture." 4hardware architecture."
5 5
6LICENSE = "MIT & BSD-3-Clause" 6LICENSE = "MIT & Apache-2.0"
7LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc/LICENSE.TXT;md5=311cfc1a5b54bab8ed34a0b5fba4373e \ 7LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc/LICENSE.TXT;md5=311cfc1a5b54bab8ed34a0b5fba4373e \
8 file://IGC/Compiler/LegalizationPass.cpp;beginline=1;endline=23;md5=4a985f2545dd5a846e205b1e60a51cd9 \ 8 file://LICENSE.md;md5=488d74376edf2765f6e78d271543dde3 \
9 file://NOTICES.txt;md5=7f4fbc3eb2c34807465e63b1ec3c9d1a" 9 file://NOTICES.txt;md5=7f4fbc3eb2c34807465e63b1ec3c9d1a"
10 10
11SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=master \ 11SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=master \
12 git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=git/vc-intrinsics;name=vc;branch=master \ 12 git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=git/vc-intrinsics;name=vc;branch=master \
13 git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=SPIRV-Tools;name=spirv-tools;branch=master \ 13 git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=SPIRV-Tools;name=spirv-tools;branch=sdk-1.3.204 \
14 git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=SPIRV-Headers;name=spirv-headers;branch=master \ 14 git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=SPIRV-Headers;name=spirv-headers;branch=master \
15 file://0001-llvm_deps.cmake-don-t-copy-header-file-when-building.patch \
16 file://0003-Improve-Reproducibility-for-src-package.patch \ 15 file://0003-Improve-Reproducibility-for-src-package.patch \
17 file://0004-find-external-llvm-tblgen.patch \
18 file://0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch \ 16 file://0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch \
19 file://0001-llvm-link-external.patch \ 17 file://991fd3d661efcb4fb6df63b76310d6e634b05c39.patch \
20 file://fix-header.patch \
21 file://4369c970d4e02258b3c53e854faaa34197124a33.patch \
22 " 18 "
23 19
24SRCREV_igc = "775a850f9b0c2d7249503b47ad6bd39a4eb9b3d7" 20SRC_URI:append:class-native = " file://0001-fix-tblgen.patch"
25SRCREV_vc = "5066d947985dd0c5107765daec5f24f735f3259a" 21
26SRCREV_spirv-tools = "eeb973f5020a5f0e92ad6da879bc4df9f5985a1c" 22SRCREV_igc = "b2c14d219dc4d3e384f217ef6bd2c2db1bd6b9ce"
27SRCREV_spirv-headers = "ae217c17809fadb232ec94b29304b4afcd417bb4" 23SRCREV_vc = "4ce354da51f219bbdfa9c4cd5d8f640e92e38511"
24SRCREV_spirv-tools = "45dd184c790d6bfc78a5a74a10c37e888b1823fa"
25SRCREV_spirv-headers = "b42ba6d92faf6b4938e6f22ddd186dbdacc98d78"
28 26
29SRCREV_FORMAT = "igc_vc_spirv-tools_spirv-headers" 27SRCREV_FORMAT = "igc_vc_spirv-tools_spirv-headers"
30 28
@@ -53,6 +51,8 @@ EXTRA_OECMAKE = " \
53 -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \ 51 -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \
54 -DVC_INTRINSICS_SRC="${S}/vc-intrinsics" \ 52 -DVC_INTRINSICS_SRC="${S}/vc-intrinsics" \
55 -DIGC_OPTION__LLVM_MODE=Prebuilds \ 53 -DIGC_OPTION__LLVM_MODE=Prebuilds \
54 -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
55 -DLLVM_LINK_EXE=${STAGING_BINDIR_NATIVE}/llvm-link \
56 " 56 "
57 57
58do_install:append:class-native () { 58do_install:append:class-native () {
@@ -60,6 +60,7 @@ do_install:append:class-native () {
60 install ${B}/IGC/Release/elf_packager ${D}${bindir}/ 60 install ${B}/IGC/Release/elf_packager ${D}${bindir}/
61 if ${@bb.utils.contains('PACKAGECONFIG', 'vc', 'true', 'false', d)}; then 61 if ${@bb.utils.contains('PACKAGECONFIG', 'vc', 'true', 'false', d)}; then
62 install ${B}/IGC/Release/CMCLTranslatorTool ${D}${bindir}/ 62 install ${B}/IGC/Release/CMCLTranslatorTool ${D}${bindir}/
63 install ${B}/IGC/Release/vcb ${D}${bindir}/
63 fi 64 fi
64} 65}
65 66