From 19561ccc5ff270ae9ab846a0f1132c3d8e100bc4 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 (cherry picked from commit 311b43239440070f750a0ec44537a26c5f22e131) Signed-off-by: Anuj Mittal --- .../4369c970d4e02258b3c53e854faaa34197124a33.patch | 27 ++++++++++++++++++++++ .../recipes-opencl/igc/files/fix-header.patch | 26 +++++++++++++++++++++ .../igc/intel-graphics-compiler_1.0.3771.bb | 2 ++ 3 files changed, 55 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 (limited to 'dynamic-layers/clang-layer/recipes-opencl/igc') 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..68131584 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/4369c970d4e02258b3c53e854faaa34197124a33.patch @@ -0,0 +1,27 @@ +From 79a95322fc5ae21c3380f6455b28b931c98b2d13 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 + +--- + visa/iga/IGALibrary/IR/SWSBSetter.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/visa/iga/IGALibrary/IR/SWSBSetter.hpp b/visa/iga/IGALibrary/IR/SWSBSetter.hpp +index 5a7ad75c0..02d52add2 100644 +--- a/visa/iga/IGALibrary/IR/SWSBSetter.hpp ++++ b/visa/iga/IGALibrary/IR/SWSBSetter.hpp +@@ -32,6 +32,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + #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..6efd51bc --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/fix-header.patch @@ -0,0 +1,26 @@ +From 59d5ba1517c48a9e629994917a6e90207df26b08 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 0ef7961a0..bb631117d 100644 +--- a/visa/LocalScheduler/SWSB_G4IR.cpp ++++ b/visa/LocalScheduler/SWSB_G4IR.cpp +@@ -26,6 +26,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + #include + #include ++#include + #include + #include "SWSB_G4IR.h" + #include "../G4_Opcode.h" 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 19d74b0e..5474f8a7 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 @@ -11,6 +11,8 @@ 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 \ + file://4369c970d4e02258b3c53e854faaa34197124a33.patch \ + file://fix-header.patch \ " SRCREV = "577887bf74c51a6084058836720fe58f8c35ca58" -- cgit v1.2.3-54-g00ecf