From 203e26c918fbd52b5a3b22520e81a48a059cbfba Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Mon, 19 Sep 2022 10:41:24 +0800 Subject: intel-graphics-compiler: fix warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes errors when building on debian-11 or Ubuntu 22.04: 10:59:41 | /build/tmp/work/x86_64-linux/intel-graphics-compiler-native/1.0.3771-r0/git/visa/iga/IGALibrary/IR/SWSBSetter.cpp:713:39: error: ânumeric_limitsâ is not a member of âstdâ 10:59:41 | 713 | const InstIDs math_id = {std::numeric_limits::max(), 0}; 10:59:41 | | ^~~~~~~~~~~~~~ 22:06:45 | /build/tmp/work/x86_64-linux/intel-graphics-compiler-native/1.0.3771-r0/git/visa/iga/IGAExe/../IGALibrary/api/igax.hpp:501:30: error: argument to âallocaâ may be too large [-Werror=alloca-larger-than=] 22:06:45 | 501 | strPtr = (char *)alloca(strCap); \ 22:06:45 | | ^~~~~~ Signed-off-by: Anuj Mittal --- .../igc/files/0001-IGA-Add-missing-header.patch | 26 ++++++++++++ .../a58dd6de4c29595a0f93cff167b487d777e4559e.patch | 46 ++++++++++++++++++++++ .../igc/intel-graphics-compiler_1.0.3771.bb | 2 + 3 files changed, 74 insertions(+) create mode 100644 dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-IGA-Add-missing-header.patch create mode 100644 dynamic-layers/clang-layer/recipes-opencl/igc/files/a58dd6de4c29595a0f93cff167b487d777e4559e.patch diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-IGA-Add-missing-header.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-IGA-Add-missing-header.patch new file mode 100644 index 00000000..0a4a0fd9 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-IGA-Add-missing-header.patch @@ -0,0 +1,26 @@ +From a36a4788a52128e5ccbec4cd29eb167153dcc8b8 Mon Sep 17 00:00:00 2001 +From: Diana Chen +Date: Mon, 11 Jan 2021 19:06:36 +0000 +Subject: [PATCH] IGA: Add missing header + +Upstream-Status: Backport +Signed-off-by: Anuj Mittal +--- + visa/iga/IGALibrary/IR/SWSBSetter.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/visa/iga/IGALibrary/IR/SWSBSetter.cpp b/visa/iga/IGALibrary/IR/SWSBSetter.cpp +index 87f119f3b..6956edf0d 100644 +--- a/visa/iga/IGALibrary/IR/SWSBSetter.cpp ++++ b/visa/iga/IGALibrary/IR/SWSBSetter.cpp +@@ -27,6 +27,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + #include "Traversals.hpp" + #include "BitSet.hpp" + #include ++#include + using namespace iga; + + /** +-- +2.37.3 + diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/a58dd6de4c29595a0f93cff167b487d777e4559e.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/a58dd6de4c29595a0f93cff167b487d777e4559e.patch new file mode 100644 index 00000000..b88e9678 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/a58dd6de4c29595a0f93cff167b487d777e4559e.patch @@ -0,0 +1,46 @@ +From a58dd6de4c29595a0f93cff167b487d777e4559e Mon Sep 17 00:00:00 2001 +From: "Szymichowski, Pawel" +Date: Wed, 8 Apr 2020 08:24:05 -0700 +Subject: [PATCH] Changes in code. + +Change-Id: Ica75407e834f6b3439912bd0b47a6b30a6521fc7 + +Upstream-Status: Backport +Signed-off-by: Anuj Mittal +--- + visa/iga/IGALibrary/api/igax.hpp | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) + +diff --git a/visa/iga/IGALibrary/api/igax.hpp b/visa/iga/IGALibrary/api/igax.hpp +index 4f1c680c6a9..6d17cd99b6a 100644 +--- a/visa/iga/IGALibrary/api/igax.hpp ++++ b/visa/iga/IGALibrary/api/igax.hpp +@@ -492,16 +492,19 @@ inline iga::Op OpSpec::op() const + } + + +-#define IGA_OPSPEC_STRING_GETTER(API, INITSIZE) { \ +- char _staticBuf[INITSIZE]; \ +- char *strPtr = &_staticBuf[0]; \ +- size_t strCap = sizeof(_staticBuf); \ +- IGA_CHECKED_CALL(API, m_op, strPtr, &strCap); \ +- if (strCap > sizeof(_staticBuf)) { \ +- strPtr = (char *)alloca(strCap); \ ++#define IGA_OPSPEC_STRING_GETTER(API, INITSIZE) { \ ++ char _staticBuf[INITSIZE]; \ ++ char *strPtr = &_staticBuf[0]; \ ++ size_t strCap = sizeof(_staticBuf); \ ++ IGA_CHECKED_CALL(API, m_op, strPtr, &strCap); \ ++ if (strCap > sizeof(_staticBuf)) { \ ++ strPtr = (char *)malloc(strCap); \ + IGA_CHECKED_CALL(API, m_op, strPtr, &strCap); \ +- } \ +- return std::string(strPtr); \ ++ std::string res(strPtr); \ ++ free(strPtr); \ ++ return res; \ ++ } \ ++ return std::string(strPtr); \ + } + inline std::string OpSpec::menmonic() const + IGA_OPSPEC_STRING_GETTER(iga_opspec_mnemonic, 16); diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.3771.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.3771.bb index 6cfa0b6d..19d74b0e 100644 --- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.3771.bb +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.3771.bb @@ -9,6 +9,8 @@ LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https; \ file://0001-skip-execution-of-ElfPackager.patch \ + file://a58dd6de4c29595a0f93cff167b487d777e4559e.patch \ + file://0001-IGA-Add-missing-header.patch \ " SRCREV = "577887bf74c51a6084058836720fe58f8c35ca58" -- cgit v1.2.3-54-g00ecf