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 7cd06a4a71)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Anuj Mittal 2022-05-19 22:04:22 +08:00
parent 6702aec8ff
commit 26d268b690
9 changed files with 493 additions and 161 deletions

View File

@ -1,4 +1,4 @@
From 6f6997066040c5f33bf05ffde36a9800dcde1fcf Mon Sep 17 00:00:00 2001
From 16fb6c022380bbb3c48f21372fcb1da7f30d3903 Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com>
Date: Tue, 12 Oct 2021 23:46:42 +0800
Subject: [PATCH] BiF/CMakeLists.txt: remove opt from DEPENDS
@ -18,18 +18,18 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
index 5d9a901d7..66e59e399 100644
index be8e5557e..07ab40382 100644
--- a/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
+++ b/IGC/VectorCompiler/lib/BiF/CMakeLists.txt
@@ -88,7 +88,7 @@ function(vc_embed_bif RES_FILE CMCL_SRC_PATH BIF_NAME PTR_BIT_SIZE)
@@ -112,7 +112,7 @@ function(vc_build_bif RES_FILE CMCL_SRC_PATH BIF_NAME PTR_BIT_SIZE)
add_custom_command(OUTPUT ${BIF_OPT_BC_PATH}
COMMAND ${LLVM_OPT_EXE} --O2 -o ${BIF_OPT_BC_NAME} ${BIF_CMCL_BC_NAME}
COMMENT "vc_embed_bif: running opt with O2: ${BIF_CMCL_BC_NAME} -> ${BIF_OPT_BC_NAME}"
COMMENT "vc_build_bif: running opt with O2: ${BIF_CMCL_BC_NAME} -> ${BIF_OPT_BC_NAME}"
- DEPENDS opt ${BIF_CMCL_BC_PATH})
+ DEPENDS ${BIF_CMCL_BC_PATH})
add_custom_command(
OUTPUT ${BIF_CPP_PATH}
COMMAND ${PYTHON_EXECUTABLE} ${RESOURCE_EMBEDDER_SCRIPT} ${BIF_OPT_BC_NAME} ${BIF_CPP_NAME}
set(${RES_FILE} ${BIF_OPT_BC_NAME} PARENT_SCOPE)
endfunction()
--
2.32.0
2.35.3

View File

@ -0,0 +1,25 @@
From 5329f00de484b470152e2bd3a5ab6dac45668b13 Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com>
Date: Thu, 19 May 2022 22:50:09 +0800
Subject: [PATCH] fix tblgen
---
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 89c03fc49..85be9ae08 100644
--- a/IGC/cmake/igc_llvm.cmake
+++ b/IGC/cmake/igc_llvm.cmake
@@ -48,7 +48,7 @@ else()
set(LLVM_OPT_EXE "opt" CACHE STRING "")
set(LLVM_TABLEGEN_EXE "llvm-tblgen")
- if(CMAKE_CROSSCOMPILING)
+ if(TRUE)
if(DEFINED LLVM_TABLEGEN)
set(LLVM_TABLEGEN_EXE ${LLVM_TABLEGEN})
else()
--
2.35.3

View File

@ -1,29 +0,0 @@
From 0088e843be66ed5f11388a9ef57f364a2a236584 Mon Sep 17 00:00:00 2001
From: Dongwon Kim <dongwon.kim@intel.com>
Date: Tue, 1 Mar 2022 17:05:01 -0800
Subject: [PATCH] llvm-link external
Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
---
IGC/cmake/igc_llvm.cmake | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake
index 80c83d4e0..85f7dda3d 100644
--- a/IGC/cmake/igc_llvm.cmake
+++ b/IGC/cmake/igc_llvm.cmake
@@ -29,7 +29,10 @@ if(LLVM_TABLEGEN_EXE-NOTFOUND)
message(FATAL_ERROR "[VC] llvm-tblgen is not found")
endif()
-set(LLVM_LINK_EXE "llvm-link" CACHE STRING "")
+find_program(LLVM_LINK_EXE "llvm-link")
+if(LLVM_LINK_EXE-NOTFOUND)
+ message(FATAL_ERROR "[VC] llvm-link is not found")
+endif()
include(AddLLVM)
include(TableGen)
--
2.20.1

View File

@ -1,35 +0,0 @@
From 3d99559779d628704568879a2ee51e968e66d005 Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com>
Date: Tue, 5 Oct 2021 00:11:26 +0800
Subject: [PATCH] llvm_deps.cmake: don't copy header file when building
We build in pre-built mode and this header shouldn't be copied in
that case.
Upstream-Status: Pending
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
external/llvm/llvm_deps.cmake | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/external/llvm/llvm_deps.cmake b/external/llvm/llvm_deps.cmake
index 425d3766f..e43804f77 100644
--- a/external/llvm/llvm_deps.cmake
+++ b/external/llvm/llvm_deps.cmake
@@ -46,9 +46,9 @@ if(IGC_OPTION__LLVM_LLD)
include(llvm_lld_source_hook)
if(NOT EXISTS "${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o" AND ${IGC_OPTION__LLVM_PREFERRED_VERSION} GREATER_EQUAL "12.0.0")
# Need to copy one header from unwind package for LLD (only for building from sources)
- file(MAKE_DIRECTORY ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o)
- file(COPY ${DEFAULT_IGC_LLVM_SOURCES_DIR}/libunwind/include/mach-o/compact_unwind_encoding.h
- DESTINATION ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o/)
+ #file(MAKE_DIRECTORY ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o)
+ #file(COPY ${DEFAULT_IGC_LLVM_SOURCES_DIR}/libunwind/include/mach-o/compact_unwind_encoding.h
+ # DESTINATION ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o/)
endif()
endif()
--
2.32.0

View File

@ -1,29 +0,0 @@
From ac19bd37abccb697cc5fc9647be48de14185e9a2 Mon Sep 17 00:00:00 2001
From: Dongwon Kim <dongwon.kim@intel.com>
Date: Tue, 1 Mar 2022 15:23:36 -0800
Subject: [PATCH] find external llvm-tblgen new
Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
---
IGC/cmake/igc_llvm.cmake | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/IGC/cmake/igc_llvm.cmake b/IGC/cmake/igc_llvm.cmake
index 038a9ce3e..80c83d4e0 100644
--- a/IGC/cmake/igc_llvm.cmake
+++ b/IGC/cmake/igc_llvm.cmake
@@ -24,7 +24,10 @@ set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH}
)
-set(LLVM_TABLEGEN_EXE "llvm-tblgen")
+find_program(LLVM_TABLEGEN_EXE "llvm-tblgen")
+if(LLVM_TABLEGEN_EXE-NOTFOUND)
+ message(FATAL_ERROR "[VC] llvm-tblgen is not found")
+endif()
set(LLVM_LINK_EXE "llvm-link" CACHE STRING "")
--
2.20.1

View File

@ -1,23 +0,0 @@
From 4369c970d4e02258b3c53e854faaa34197124a33 Mon Sep 17 00:00:00 2001
From: Marcin Naczk <marcin.naczk@intel.com>
Date: Tue, 22 Feb 2022 13:09:54 +0000
Subject: [PATCH] Upgrade github Action build IGC
- Fix build IGC on Ubuntu 22.04 by adding missing include
Upstream-Status: Backport
Part of: https://github.com/intel/intel-graphics-compiler/commit/4369c970d4e02258b3c53e854faaa34197124a33
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
diff --git a/visa/iga/IGALibrary/IR/SWSBSetter.hpp b/visa/iga/IGALibrary/IR/SWSBSetter.hpp
index 6a2de51ee02..4a6fd8735ce 100644
--- a/visa/iga/IGALibrary/IR/SWSBSetter.hpp
+++ b/visa/iga/IGALibrary/IR/SWSBSetter.hpp
@@ -15,6 +15,7 @@ SPDX-License-Identifier: MIT
#include "Operand.hpp"
#include "../ErrorHandler.hpp"
#include "RegDeps.hpp"
+#include <limits>
namespace iga
{

View File

@ -0,0 +1,447 @@
From 991fd3d661efcb4fb6df63b76310d6e634b05c39 Mon Sep 17 00:00:00 2001
From: "Grzywacz, Maciej" <maciej.grzywacz@intel.com>
Date: Tue, 10 May 2022 09:44:09 +0000
Subject: [PATCH] Fix IGC OS linux buildbreak
Fix finding lldelf and SpirvLLVMTranslator
Upstream-Status: Backport
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
IGC/cmake/igc_find_liblldELF.cmake | 128 +++++----
.../modules/FindSPIRVLLVMTranslator.cmake | 271 +++++++++++-------
2 files changed, 252 insertions(+), 147 deletions(-)
diff --git a/IGC/cmake/igc_find_liblldELF.cmake b/IGC/cmake/igc_find_liblldELF.cmake
index b014910d2e9..c6d5765d5df 100644
--- a/IGC/cmake/igc_find_liblldELF.cmake
+++ b/IGC/cmake/igc_find_liblldELF.cmake
@@ -10,61 +10,89 @@
# IGC_OPTION__LLDELF_H_DIR - Specify additional directories for searching lldELF headers
function(add_lld_library LIB_NAME)
- find_library(${LIB_NAME}_PATH_RELEASE
- ${LIB_NAME}
- PATHS "${IGC_OPTION__LLD_DIR}/Release/lib"
- PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/lib")
-
- if("${${LIB_NAME}_PATH_RELEASE}" STREQUAL "${LIB_NAME}_PATH_RELEASE-NOTFOUND")
- message(FATAL_ERROR
- "Cannot find ${LIB_NAME} library in Release version in ${IGC_OPTION__LLD_DIR}")
- endif()
-
- find_library(${LIB_NAME}_PATH_DEBUG
- ${LIB_NAME}
- PATHS "${IGC_OPTION__LLD_DIR}/Debug/lib"
- PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/lib")
-
- if("${${LIB_NAME}_PATH_DEBUG}" STREQUAL "${LIB_NAME}_PATH_DEBUG-NOTFOUND")
- message(FATAL_ERROR
- "Cannot find ${LIB_NAME} library in Debug version in ${IGC_OPTION__LLD_DIR}")
+ if(WIN32)
+ find_library(${LIB_NAME}_PATH_RELEASE
+ ${LIB_NAME}
+ PATHS "${IGC_OPTION__LLD_DIR}/Release/lib"
+ PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/lib")
+
+ if("${${LIB_NAME}_PATH_RELEASE}" STREQUAL "${LIB_NAME}_PATH_RELEASE-NOTFOUND")
+ message(FATAL_ERROR
+ "Cannot find ${LIB_NAME} library in Release version in ${IGC_OPTION__LLD_DIR}")
+ endif()
+
+ find_library(${LIB_NAME}_PATH_DEBUG
+ ${LIB_NAME}
+ PATHS "${IGC_OPTION__LLD_DIR}/Debug/lib"
+ PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/lib")
+
+ if("${${LIB_NAME}_PATH_DEBUG}" STREQUAL "${LIB_NAME}_PATH_DEBUG-NOTFOUND")
+ message(FATAL_ERROR
+ "Cannot find ${LIB_NAME} library in Debug version in ${IGC_OPTION__LLD_DIR}")
+ endif()
+
+ add_library(${LIB_NAME} UNKNOWN IMPORTED GLOBAL)
+ set_target_properties(${LIB_NAME} PROPERTIES
+ IMPORTED_LOCATION_RELEASE "${${LIB_NAME}_PATH_RELEASE}"
+ IMPORTED_LOCATION_RELEASEINTERNAL "${${LIB_NAME}_PATH_RELEASE}"
+ IMPORTED_LOCATION_DEBUG "${${LIB_NAME}_PATH_DEBUG}"
+ )
+ else()
+ find_library(${LIB_NAME}_PATH
+ ${LIB_NAME}
+ PATHS "${IGC_OPTION__LLDELF_LIB_DIR}"
+ PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/lib")
+
+ if(${LIB_NAME}_PATH-NOTFOUND)
+ message(FATAL_ERROR
+ "Cannot find ${LIB_NAME} library, please install missing library or provide the path by IGC_OPTION__LLDELF_LIB_DIR")
+ endif()
+ add_library(${LIB_NAME} UNKNOWN IMPORTED GLOBAL)
+ set_target_properties(${LIB_NAME} PROPERTIES IMPORTED_LOCATION ${${LIB_NAME}_PATH})
endif()
-
- add_library(${LIB_NAME} UNKNOWN IMPORTED GLOBAL)
- set_target_properties(${LIB_NAME} PROPERTIES
- IMPORTED_LOCATION_RELEASE "${${LIB_NAME}_PATH_RELEASE}"
- IMPORTED_LOCATION_RELEASEINTERNAL "${${LIB_NAME}_PATH_RELEASE}"
- IMPORTED_LOCATION_DEBUG "${${LIB_NAME}_PATH_DEBUG}"
- )
endfunction()
function(add_lld_executable EXE_NAME)
- find_program(${EXE_NAME}_PATH_RELEASE
- ${EXE_NAME}
- PATHS "${IGC_OPTION__LLD_DIR}/Release/bin"
- PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/bin")
-
- if("${${EXE_NAME}_PATH_RELEASE}" STREQUAL "${EXE_NAME}_PATH_RELEASE-NOTFOUND")
- message(FATAL_ERROR
- "Cannot find ${EXE_NAME} executable in Release version in ${IGC_OPTION__LLD_DIR}")
+ if(WIN32)
+ find_program(${EXE_NAME}_PATH_RELEASE
+ ${EXE_NAME}
+ PATHS "${IGC_OPTION__LLD_DIR}/Release/bin"
+ PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/bin")
+
+ if("${${EXE_NAME}_PATH_RELEASE}" STREQUAL "${EXE_NAME}_PATH_RELEASE-NOTFOUND")
+ message(FATAL_ERROR
+ "Cannot find ${EXE_NAME} executable in Release version in ${IGC_OPTION__LLD_DIR}")
+ endif()
+
+ find_program(${EXE_NAME}_PATH_DEBUG
+ ${EXE_NAME}
+ PATHS "${IGC_OPTION__LLD_DIR}/Debug/bin"
+ PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/bin")
+
+ if("${${EXE_NAME}_PATH_DEBUG}" STREQUAL "${EXE_NAME}_PATH_DEBUG-NOTFOUND")
+ message(FATAL_ERROR
+ "Cannot find ${EXE_NAME} executable in Debug version in ${IGC_OPTION__LLD_DIR}")
+ endif()
+
+ add_executable(${EXE_NAME} IMPORTED GLOBAL)
+ set_target_properties(${EXE_NAME} PROPERTIES
+ IMPORTED_LOCATION_RELEASE "${${EXE_NAME}_PATH_RELEASE}"
+ IMPORTED_LOCATION_RELEASEINTERNAL "${${EXE_NAME}_PATH_RELEASE}"
+ IMPORTED_LOCATION_DEBUG "${${EXE_NAME}_PATH_DEBUG}"
+ )
+ else()
+ find_program(${EXE_NAME}_PATH
+ ${EXE_NAME}
+ PATHS "${IGC_OPTION__LLD_BIN_DIR}"
+ PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/bin")
+
+ if(${EXE_NAME}_PATH-NOTFOUND)
+ message(FATAL_ERROR "Cannot find ${EXE_NAME} executable, please install missing executable or provide the path by IGC_OPTION__LLD_BIN_DIR")
+ endif()
+
+ add_executable(${EXE_NAME} IMPORTED GLOBAL)
+ set_target_properties(${EXE_NAME} PROPERTIES IMPORTED_LOCATION ${${EXE_NAME}_PATH})
endif()
-
- find_program(${EXE_NAME}_PATH_DEBUG
- ${EXE_NAME}
- PATHS "${IGC_OPTION__LLD_DIR}/Debug/bin"
- PATH_SUFFIXES "llvm-${LLVM_VERSION_MAJOR}/bin")
-
- if("${${EXE_NAME}_PATH_DEBUG}" STREQUAL "${EXE_NAME}_PATH_DEBUG-NOTFOUND")
- message(FATAL_ERROR
- "Cannot find ${EXE_NAME} executable in Debug version in ${IGC_OPTION__LLD_DIR}")
- endif()
-
- add_executable(${EXE_NAME} IMPORTED GLOBAL)
- set_target_properties(${EXE_NAME} PROPERTIES
- IMPORTED_LOCATION_RELEASE "${${EXE_NAME}_PATH_RELEASE}"
- IMPORTED_LOCATION_RELEASEINTERNAL "${${EXE_NAME}_PATH_RELEASE}"
- IMPORTED_LOCATION_DEBUG "${${EXE_NAME}_PATH_DEBUG}"
- )
endfunction()
if(IGC_BUILD__LLVM_SOURCES)
diff --git a/IGC/cmake/modules/FindSPIRVLLVMTranslator.cmake b/IGC/cmake/modules/FindSPIRVLLVMTranslator.cmake
index de2ff5baad1..0d8d00b4a5d 100644
--- a/IGC/cmake/modules/FindSPIRVLLVMTranslator.cmake
+++ b/IGC/cmake/modules/FindSPIRVLLVMTranslator.cmake
@@ -15,109 +15,186 @@
# Optionally, llvm-spirv tool will be checked and LLVMSPIRVTranslator_Tool_FOUND
# will be set to true and llvm-spirv executable target will be defined.
-find_library(SPIRVLLVMTranslator_Library_Release LLVMSPIRVLib PATHS "${LLVM_DIR}/Release/lib")
-find_library(SPIRVLLVMTranslator_Library_Debug LLVMSPIRVLib PATHS "${LLVM_DIR}/Debug/lib")
-
-find_path(SPIRVLLVMTranslator_INCLUDE_DIR "LLVMSPIRVLib.h"
- PATH_SUFFIXES LLVMSPIRVLib
- PATHS "${IGC_OPTION__SPIRV_TRANSLATOR_SOURCE_DIR}/include"
- )
-
-# Try to find version and llvm-spirv.
-if(SPIRVLLVMTranslator_Library_Release AND SPIRVLLVMTranslator_Library_Debug)
- set(SPIRVLLVMTranslator_Library_FOUND YES)
-
- get_filename_component(_libdir_Release ${SPIRVLLVMTranslator_Library_Release} DIRECTORY)
- get_filename_component(_libdir_Debug ${SPIRVLLVMTranslator_Library_Debug} DIRECTORY)
-
- # Get library version. Manual parsing is used because it is quite easy and
- # will work for both linux and windows (which is lacking pkg-config).
- file(STRINGS "${_libdir_Release}/pkgconfig/LLVMSPIRVLib.pc" _version_file_release
- REGEX "Version: .*")
- file(STRINGS "${_libdir_Debug}/pkgconfig/LLVMSPIRVLib.pc" _version_file_debug
- REGEX "Version: .*")
-
- if(NOT _version_file_release OR NOT _version_file_debug)
- message(AUTHOR_WARNING "LLVMSPIRVLib is found, but LLVMSPIRVLib.pc is missing!")
+if(WIN32)
+ find_library(SPIRVLLVMTranslator_Library_Release LLVMSPIRVLib PATHS "${LLVM_DIR}/Release/lib")
+ find_library(SPIRVLLVMTranslator_Library_Debug LLVMSPIRVLib PATHS "${LLVM_DIR}/Debug/lib")
+
+ find_path(SPIRVLLVMTranslator_INCLUDE_DIR "LLVMSPIRVLib.h"
+ PATH_SUFFIXES LLVMSPIRVLib
+ PATHS "${IGC_OPTION__SPIRV_TRANSLATOR_SOURCE_DIR}/include"
+ )
+
+ # Try to find version and llvm-spirv.
+ if(SPIRVLLVMTranslator_Library_Release AND SPIRVLLVMTranslator_Library_Debug)
+ set(SPIRVLLVMTranslator_Library_FOUND YES)
+
+ get_filename_component(_libdir_Release ${SPIRVLLVMTranslator_Library_Release} DIRECTORY)
+ get_filename_component(_libdir_Debug ${SPIRVLLVMTranslator_Library_Debug} DIRECTORY)
+
+ # Get library version. Manual parsing is used because it is quite easy and
+ # will work for both linux and windows (which is lacking pkg-config).
+ file(STRINGS "${_libdir_Release}/pkgconfig/LLVMSPIRVLib.pc" _version_file_release
+ REGEX "Version: .*")
+ file(STRINGS "${_libdir_Debug}/pkgconfig/LLVMSPIRVLib.pc" _version_file_debug
+ REGEX "Version: .*")
+
+ if(NOT _version_file_release OR NOT _version_file_debug)
+ message(AUTHOR_WARNING "LLVMSPIRVLib is found, but LLVMSPIRVLib.pc is missing!")
+ endif()
+ string(REPLACE "Version: " "" SPIRVLLVMTranslator_VERSION_Release "${_version_file_release}")
+ string(REPLACE "Version: " "" SPIRVLLVMTranslator_VERSION_Debug "${_version_file_debug}")
+ set(SPIRVLLVMTranslator_VERSION_Release ${SPIRVLLVMTranslator_VERSION_Release} CACHE STRING "SPIRVLLVMTranslator release version")
+ set(SPIRVLLVMTranslator_VERSION_Debug ${SPIRVLLVMTranslator_VERSION_Debug} CACHE STRING "SPIRVLLVMTranslator debug version")
+
+ # Try to find llvm-spirv.
+ find_program(SPIRVLLVMTranslator_Tool_Release llvm-spirv
+ PATHS ${_libdir_Release}/../bin
+ NO_DEFAULT_PATH
+ )
+ find_program(SPIRVLLVMTranslator_Tool_Debug llvm-spirv
+ PATHS ${_libdir_Debug}/../bin
+ NO_DEFAULT_PATH
+ )
+
+ if(SPIRVLLVMTranslator_Tool_Release AND SPIRVLLVMTranslator_Tool_Debug)
+ set(SPIRVLLVMTranslator_Tool_FOUND YES)
+ endif()
+
+ unset(_libdir)
endif()
- string(REPLACE "Version: " "" SPIRVLLVMTranslator_VERSION_Release "${_version_file_release}")
- string(REPLACE "Version: " "" SPIRVLLVMTranslator_VERSION_Debug "${_version_file_debug}")
- set(SPIRVLLVMTranslator_VERSION_Release ${SPIRVLLVMTranslator_VERSION_Release} CACHE STRING "SPIRVLLVMTranslator release version")
- set(SPIRVLLVMTranslator_VERSION_Debug ${SPIRVLLVMTranslator_VERSION_Debug} CACHE STRING "SPIRVLLVMTranslator debug version")
-
- # Try to find llvm-spirv.
- find_program(SPIRVLLVMTranslator_Tool_Release llvm-spirv
- PATHS ${_libdir_Release}/../bin
- NO_DEFAULT_PATH
+
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(SPIRVLLVMTranslator_Release
+ REQUIRED_VARS SPIRVLLVMTranslator_Library_Release SPIRVLLVMTranslator_INCLUDE_DIR
+ VERSION_VAR SPIRVLLVMTranslator_VERSION_Release
+ HANDLE_COMPONENTS
)
- find_program(SPIRVLLVMTranslator_Tool_Debug llvm-spirv
- PATHS ${_libdir_Debug}/../bin
- NO_DEFAULT_PATH
+ find_package_handle_standard_args(SPIRVLLVMTranslator_Debug
+ REQUIRED_VARS SPIRVLLVMTranslator_Library_Debug SPIRVLLVMTranslator_INCLUDE_DIR
+ VERSION_VAR SPIRVLLVMTranslator_VERSION_Debug
+ HANDLE_COMPONENTS
)
- if(SPIRVLLVMTranslator_Tool_Release AND SPIRVLLVMTranslator_Tool_Debug)
- set(SPIRVLLVMTranslator_Tool_FOUND YES)
+ # Mark all cached variables as advanced.
+ if(SPIRVLLVMTranslator_Release_FOUND)
+ mark_as_advanced(SPIRVLLVMTranslator_Library_Release)
+ mark_as_advanced(SPIRVLLVMTranslator_INCLUDE_DIR)
+ mark_as_advanced(SPIRVLLVMTranslator_VERSION_Release)
endif()
- unset(_libdir)
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(SPIRVLLVMTranslator_Release
- REQUIRED_VARS SPIRVLLVMTranslator_Library_Release SPIRVLLVMTranslator_INCLUDE_DIR
- VERSION_VAR SPIRVLLVMTranslator_VERSION_Release
- HANDLE_COMPONENTS
- )
-find_package_handle_standard_args(SPIRVLLVMTranslator_Debug
- REQUIRED_VARS SPIRVLLVMTranslator_Library_Debug SPIRVLLVMTranslator_INCLUDE_DIR
- VERSION_VAR SPIRVLLVMTranslator_VERSION_Debug
- HANDLE_COMPONENTS
- )
-
-# Mark all cached variables as advanced.
-if(SPIRVLLVMTranslator_Release_FOUND)
- mark_as_advanced(SPIRVLLVMTranslator_Library_Release)
- mark_as_advanced(SPIRVLLVMTranslator_INCLUDE_DIR)
- mark_as_advanced(SPIRVLLVMTranslator_VERSION_Release)
-endif()
-
-if(SPIRVLLVMTranslator_Debug_FOUND)
- mark_as_advanced(SPIRVLLVMTranslator_Library_Debug)
- mark_as_advanced(SPIRVLLVMTranslator_INCLUDE_DIR)
- mark_as_advanced(SPIRVLLVMTranslator_VERSION_Debug)
-endif()
-
-if(SPIRVLLVMTranslator_Tool_Release_FOUND)
- mark_as_advanced(SPIRVLLVMTranslator_Tool_Release)
-endif()
-
-if(SPIRVLLVMTranslator_Tool_Debug_FOUND)
-mark_as_advanced(SPIRVLLVMTranslator_Tool_Debug)
-endif()
-
-# Add interface target for library.
-if(SPIRVLLVMTranslator_FOUND AND NOT TARGET LLVMSPIRVLib)
- add_library(LLVMSPIRVLib IMPORTED UNKNOWN)
- set_target_properties(LLVMSPIRVLib PROPERTIES
- IMPORTED_LOCATION_RELEASE "${SPIRVLLVMTranslator_Library_Release}"
- IMPORTED_LOCATION_RELEASEINTERNAL "${SPIRVLLVMTranslator_Library_Release}"
- IMPORTED_LOCATION_DEBUG "${SPIRVLLVMTranslator_Library_Debug}"
- INTERFACE_INCLUDE_DIRECTORIES ${SPIRVLLVMTranslator_INCLUDE_DIR}
- )
-endif()
+ if(SPIRVLLVMTranslator_Debug_FOUND)
+ mark_as_advanced(SPIRVLLVMTranslator_Library_Debug)
+ mark_as_advanced(SPIRVLLVMTranslator_INCLUDE_DIR)
+ mark_as_advanced(SPIRVLLVMTranslator_VERSION_Debug)
+ endif()
+
+ if(SPIRVLLVMTranslator_Tool_Release_FOUND)
+ mark_as_advanced(SPIRVLLVMTranslator_Tool_Release)
+ endif()
+
+ if(SPIRVLLVMTranslator_Tool_Debug_FOUND)
+ mark_as_advanced(SPIRVLLVMTranslator_Tool_Debug)
+ endif()
+
+ # Add interface target for library.
+ if(SPIRVLLVMTranslator_FOUND AND NOT TARGET LLVMSPIRVLib)
+ add_library(LLVMSPIRVLib IMPORTED UNKNOWN)
+ set_target_properties(LLVMSPIRVLib PROPERTIES
+ IMPORTED_LOCATION_RELEASE "${SPIRVLLVMTranslator_Library_Release}"
+ IMPORTED_LOCATION_RELEASEINTERNAL "${SPIRVLLVMTranslator_Library_Release}"
+ IMPORTED_LOCATION_DEBUG "${SPIRVLLVMTranslator_Library_Debug}"
+ INTERFACE_INCLUDE_DIRECTORIES ${SPIRVLLVMTranslator_INCLUDE_DIR}
+ )
+ endif()
+
+ if (NOT IGC_BUILD__SPIRV_TRANSLATOR_SOURCES)
+ set_target_properties(LLVMSPIRVLib PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES ${SPIRVLLVMTranslator_INCLUDE_DIR}
+ )
+ endif()
-if (NOT IGC_BUILD__SPIRV_TRANSLATOR_SOURCES)
- set_target_properties(LLVMSPIRVLib PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES ${SPIRVLLVMTranslator_INCLUDE_DIR}
+ # Add interface target for llvm-spirv.
+ if(SPIRVLLVMTranslator_Tool_FOUND AND NOT TARGET llvm-spirv)
+ add_executable(llvm-spirv IMPORTED)
+ set_target_properties(llvm-spirv PROPERTIES
+ IMPORTED_LOCATION_RELEASE "${SPIRVLLVMTranslator_Tool_Release}"
+ IMPORTED_LOCATION_RELEASEINTERNAL "${SPIRVLLVMTranslator_Tool_Release}"
+ IMPORTED_LOCATION_DEBUG "${SPIRVLLVMTranslator_Tool_Debug}"
+ )
+ endif()
+else()
+ find_library(SPIRVLLVMTranslator_Library LLVMSPIRVLib PATHS ${LLVM_LIB_DIR})
+ find_path(SPIRVLLVMTranslator_INCLUDE_DIR "LLVMSPIRVLib.h"
+ PATH_SUFFIXES LLVMSPIRVLib
+ PATHS "${IGC_OPTION__SPIRV_TRANSLATOR_SOURCE_DIR}/include"
)
-endif()
-
-# Add interface target for llvm-spirv.
-if(SPIRVLLVMTranslator_Tool_FOUND AND NOT TARGET llvm-spirv)
- add_executable(llvm-spirv IMPORTED)
- set_target_properties(llvm-spirv PROPERTIES
- IMPORTED_LOCATION_RELEASE "${SPIRVLLVMTranslator_Tool_Release}"
- IMPORTED_LOCATION_RELEASEINTERNAL "${SPIRVLLVMTranslator_Tool_Release}"
- IMPORTED_LOCATION_DEBUG "${SPIRVLLVMTranslator_Tool_Debug}"
+
+ # Try to find version and llvm-spirv.
+ if(SPIRVLLVMTranslator_Library)
+ set(SPIRVLLVMTranslator_Library_FOUND YES)
+
+ get_filename_component(_libdir ${SPIRVLLVMTranslator_Library} DIRECTORY)
+
+ # Get library version. Manual parsing is used because it is quite easy and
+ # will work for both linux and windows (which is lacking pkg-config).
+ file(STRINGS "${_libdir}/pkgconfig/LLVMSPIRVLib.pc" _version_file
+ REGEX "Version: .*")
+ if(NOT _version_file)
+ message(AUTHOR_WARNING "LLVMSPIRVLib is found, but LLVMSPIRVLib.pc is missing!")
+ endif()
+ string(REPLACE "Version: " "" SPIRVLLVMTranslator_VERSION "${_version_file}")
+ set(SPIRVLLVMTranslator_VERSION ${SPIRVLLVMTranslator_VERSION} CACHE STRING "SPIRVLLVMTranslator version")
+
+ # Try to find llvm-spirv.
+ find_program(SPIRVLLVMTranslator_Tool llvm-spirv
+ PATHS ${_libdir}/../bin
+ NO_DEFAULT_PATH
+ )
+ if(SPIRVLLVMTranslator_Tool)
+ set(SPIRVLLVMTranslator_Tool_FOUND YES)
+ endif()
+
+ unset(_libdir)
+ endif()
+
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(SPIRVLLVMTranslator
+ REQUIRED_VARS SPIRVLLVMTranslator_Library SPIRVLLVMTranslator_INCLUDE_DIR
+ VERSION_VAR SPIRVLLVMTranslator_VERSION
+ HANDLE_COMPONENTS
)
-endif()
+
+ # Mark all cached variables as advanced.
+ if(SPIRVLLVMTranslator_FOUND)
+ mark_as_advanced(SPIRVLLVMTranslator_Library)
+ mark_as_advanced(SPIRVLLVMTranslator_INCLUDE_DIR)
+ mark_as_advanced(SPIRVLLVMTranslator_VERSION)
+ endif()
+
+ if(SPIRVLLVMTranslator_Tool_FOUND)
+ mark_as_advanced(SPIRVLLVMTranslator_Tool)
+ endif()
+
+ # Add interface target for library.
+ if(SPIRVLLVMTranslator_FOUND AND NOT TARGET LLVMSPIRVLib)
+ add_library(LLVMSPIRVLib IMPORTED UNKNOWN)
+ set_target_properties(LLVMSPIRVLib PROPERTIES
+ IMPORTED_LOCATION ${SPIRVLLVMTranslator_Library}
+ INTERFACE_INCLUDE_DIRECTORIES ${SPIRVLLVMTranslator_INCLUDE_DIR}
+ )
+ endif()
+
+ if (NOT IGC_BUILD__SPIRV_TRANSLATOR_SOURCES)
+ set_target_properties(LLVMSPIRVLib PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES ${SPIRVLLVMTranslator_INCLUDE_DIR}
+ )
+ endif()
+
+ # Add interface target for llvm-spirv.
+ if(SPIRVLLVMTranslator_Tool_FOUND AND NOT TARGET llvm-spirv)
+ add_executable(llvm-spirv IMPORTED)
+ set_target_properties(llvm-spirv PROPERTIES
+ IMPORTED_LOCATION ${SPIRVLLVMTranslator_Tool}
+ )
+ endif()
+endif()
\ No newline at end of file

View File

@ -1,25 +0,0 @@
From 4f510460beb630bac74fad399370b76354fdbd65 Mon Sep 17 00:00:00 2001
From: Bruno Pagani <bruno.n.pagani@gmail.com>
Date: Mon, 21 Feb 2022 12:32:25 +0000
Subject: [PATCH] Fix missing include
Same as 6c805b2
Upstream-Status: Backport
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
visa/LocalScheduler/SWSB_G4IR.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/visa/LocalScheduler/SWSB_G4IR.cpp b/visa/LocalScheduler/SWSB_G4IR.cpp
index 153d8a7dc58..cea75c7faa7 100644
--- a/visa/LocalScheduler/SWSB_G4IR.cpp
+++ b/visa/LocalScheduler/SWSB_G4IR.cpp
@@ -16,6 +16,7 @@ SPDX-License-Identifier: MIT
#include <algorithm>
#include <fstream>
#include <functional>
+#include <limits>
#include <sstream>
#include <queue>

View File

@ -3,28 +3,26 @@ 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 & BSD-3-Clause"
LICENSE = "MIT & Apache-2.0"
LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc/LICENSE.TXT;md5=311cfc1a5b54bab8ed34a0b5fba4373e \
file://IGC/Compiler/LegalizationPass.cpp;beginline=1;endline=23;md5=4a985f2545dd5a846e205b1e60a51cd9 \
file://LICENSE.md;md5=488d74376edf2765f6e78d271543dde3 \
file://NOTICES.txt;md5=7f4fbc3eb2c34807465e63b1ec3c9d1a"
SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=master \
git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=git/vc-intrinsics;name=vc;branch=master \
git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=SPIRV-Tools;name=spirv-tools;branch=master \
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 \
file://0001-llvm_deps.cmake-don-t-copy-header-file-when-building.patch \
file://0003-Improve-Reproducibility-for-src-package.patch \
file://0004-find-external-llvm-tblgen.patch \
file://0001-BiF-CMakeLists.txt-remove-opt-from-DEPENDS.patch \
file://0001-llvm-link-external.patch \
file://fix-header.patch \
file://4369c970d4e02258b3c53e854faaa34197124a33.patch \
file://991fd3d661efcb4fb6df63b76310d6e634b05c39.patch \
"
SRCREV_igc = "775a850f9b0c2d7249503b47ad6bd39a4eb9b3d7"
SRCREV_vc = "5066d947985dd0c5107765daec5f24f735f3259a"
SRCREV_spirv-tools = "eeb973f5020a5f0e92ad6da879bc4df9f5985a1c"
SRCREV_spirv-headers = "ae217c17809fadb232ec94b29304b4afcd417bb4"
SRC_URI:append:class-native = " file://0001-fix-tblgen.patch"
SRCREV_igc = "b2c14d219dc4d3e384f217ef6bd2c2db1bd6b9ce"
SRCREV_vc = "4ce354da51f219bbdfa9c4cd5d8f640e92e38511"
SRCREV_spirv-tools = "45dd184c790d6bfc78a5a74a10c37e888b1823fa"
SRCREV_spirv-headers = "b42ba6d92faf6b4938e6f22ddd186dbdacc98d78"
SRCREV_FORMAT = "igc_vc_spirv-tools_spirv-headers"
@ -53,6 +51,8 @@ EXTRA_OECMAKE = " \
-DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \
-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 \
"
do_install:append:class-native () {
@ -60,6 +60,7 @@ do_install:append:class-native () {
install ${B}/IGC/Release/elf_packager ${D}${bindir}/
if ${@bb.utils.contains('PACKAGECONFIG', 'vc', 'true', 'false', d)}; then
install ${B}/IGC/Release/CMCLTranslatorTool ${D}${bindir}/
install ${B}/IGC/Release/vcb ${D}${bindir}/
fi
}