From 311b43239440070f750a0ec44537a26c5f22e131 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Tue, 22 Mar 2022 15:02:22 +0800 Subject: intel-graphics-compiler: fix compile issues Backport patches to fix compile problems like: | /build/build/tmp/work/corei7-64-poky-linux/intel-graphics-compiler/1.0.10395-r0/git/visa/LocalScheduler/SWSB_G4IR.cpp:1459:49: error: expected primary-expression before 'int' | 1459 | int maxTokenDelay = std::numeric_limits::min(); //The delay may cause if reuse | | ^~~ | /build/build/tmp/work/corei7-64-poky-linux/intel-graphics-compiler/1.0.10395-r0/git/visa/LocalScheduler/SWSB_G4IR.cpp:1460:37: error: 'numeric_limits' is not a member of 'std' | 1460 | int minTokenDistance = std::numeric_limits::max(); //The distance from the reused node Signed-off-by: Anuj Mittal --- .../4369c970d4e02258b3c53e854faaa34197124a33.patch | 23 ++++++++++++++++++++ .../recipes-opencl/igc/files/fix-header.patch | 25 ++++++++++++++++++++++ .../igc/intel-graphics-compiler_1.0.10395.bb | 2 ++ 3 files changed, 50 insertions(+) create mode 100644 dynamic-layers/clang-layer/recipes-opencl/igc/files/4369c970d4e02258b3c53e854faaa34197124a33.patch create mode 100644 dynamic-layers/clang-layer/recipes-opencl/igc/files/fix-header.patch diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/4369c970d4e02258b3c53e854faaa34197124a33.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/4369c970d4e02258b3c53e854faaa34197124a33.patch new file mode 100644 index 00000000..1e7816ab --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/4369c970d4e02258b3c53e854faaa34197124a33.patch @@ -0,0 +1,23 @@ +From 4369c970d4e02258b3c53e854faaa34197124a33 Mon Sep 17 00:00:00 2001 +From: Marcin Naczk +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 +--- +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 + + namespace iga + { 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 new file mode 100644 index 00000000..a504f55c --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/fix-header.patch @@ -0,0 +1,25 @@ +From 4f510460beb630bac74fad399370b76354fdbd65 Mon Sep 17 00:00:00 2001 +From: Bruno Pagani +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 +--- + 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 + #include + #include ++#include + #include + #include + 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.10395.bb index c3d9f10b..764ebb76 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.10395.bb @@ -17,6 +17,8 @@ SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;nam 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 \ " SRCREV_igc = "775a850f9b0c2d7249503b47ad6bd39a4eb9b3d7" -- cgit v1.2.3-54-g00ecf