From 8e1c5395e85921350ff40564edf035faacd98e3d Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Thu, 28 May 2020 17:53:25 +0800 Subject: intel-graphics-compiler: upgrade 1.0.3771 -> 1.0.4053 Release notes: https://github.com/intel/intel-graphics-compiler/releases/tag/igc-1.0.4053 Signed-off-by: Naveen Saini Signed-off-by: Anuj Mittal --- .../0001-add-workaround-for-gcc-10-error.patch | 39 ++++++++++++++++++++++ .../igc/intel-graphics-compiler_1.0.3771.bb | 34 ------------------- .../igc/intel-graphics-compiler_1.0.4053.bb | 35 +++++++++++++++++++ 3 files changed, 74 insertions(+), 34 deletions(-) create mode 100644 dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-add-workaround-for-gcc-10-error.patch delete mode 100644 dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.3771.bb create mode 100644 dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.4053.bb (limited to 'dynamic-layers') diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-add-workaround-for-gcc-10-error.patch b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-add-workaround-for-gcc-10-error.patch new file mode 100644 index 00000000..ae8ccbf2 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/files/0001-add-workaround-for-gcc-10-error.patch @@ -0,0 +1,39 @@ +From 8435bfb432282bdb900492f479233d2772f57f7c Mon Sep 17 00:00:00 2001 +From: 8tab +Date: Thu, 21 May 2020 14:21:58 +0200 +Subject: [PATCH] Add workaround for gcc 10 internal compiler error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +There is a regression in recent gcc (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95241), +that make IGC fail to compile: +In file included from /home/tab/dev/external/oneapi/igc/visa/iga/IGALibrary/Models/Models.cpp:7: +/home/tab/dev/external/oneapi/igc/visa/iga/IGALibrary/Models/bxml/Model7P5.hpp:1258:34: in ‘constexpr’ expansion of ‘iga::Field(((const char*)"MathFC"), 24, 4)’ +/home/tab/dev/external/oneapi/igc/visa/iga/IGALibrary/Models/bxml/Model7P5.hpp:2085:5: internal compiler error: in tree_to_uhwi, at tree.h:4519 + 2085 | }; + | ^ + +Upstream-Status: Submitted [https://github.com/intel/intel-graphics-compiler/pull/135] +Signed-off-by: Naveen Saini +--- + visa/iga/IGALibrary/Backend/Native/Field.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/visa/iga/IGALibrary/Backend/Native/Field.hpp b/visa/iga/IGALibrary/Backend/Native/Field.hpp +index 4b97280b..04855576 100644 +--- a/visa/iga/IGALibrary/Backend/Native/Field.hpp ++++ b/visa/iga/IGALibrary/Backend/Native/Field.hpp +@@ -150,8 +150,8 @@ namespace iga + // a simple encoded field (single contiguous) + constexpr Field(const char *_name, int offset, int length) + : name(_name) +- , fragments{Fragment(_name, offset, length)} + { ++ fragments[0] = Fragment(_name, offset, length); + } + // a zero fill field or must-be-zero field + constexpr Field(const char *_name, int length, +-- +2.17.1 + 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 deleted file mode 100644 index 93484c47..00000000 --- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.3771.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "The Intel(R) Graphics Compiler for OpenCL(TM)" -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" -LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc/LICENSE.TXT;md5=311cfc1a5b54bab8ed34a0b5fba4373e \ - file://IGC/Compiler/LegalizationPass.cpp;beginline=1;endline=25;md5=4abf1738ff96b18e34186eb763e28eeb" - -SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https; \ - file://0001-skip-execution-of-ElfPackager.patch \ - " - -SRCREV = "577887bf74c51a6084058836720fe58f8c35ca58" - -S = "${WORKDIR}/git" - -inherit cmake - -COMPATIBLE_HOST = '(x86_64).*-linux' -COMPATIBLE_HOST_libc-musl = "null" - -DEPENDS += " flex-native bison-native clang opencl-clang" -DEPENDS_append_class-target = " clang-cross-x86_64" - -RDEPENDS_${PN} += "opencl-clang" - -LLVM_COMPAT_VER = "${@bb.utils.contains('LLVMVERSION', '9.0.1', '9.0.0', '10.0.0', d)}" - -EXTRA_OECMAKE = "-DIGC_PREFERRED_LLVM_VERSION=${LLVM_COMPAT_VER} -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3" - -BBCLASSEXTEND = "native nativesdk" - -UPSTREAM_CHECK_GITTAGREGEX = "^igc-(?P(?!19\..*)\d+(\.\d+)+)$" diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.4053.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.4053.bb new file mode 100644 index 00000000..11fb2b87 --- /dev/null +++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.4053.bb @@ -0,0 +1,35 @@ +SUMMARY = "The Intel(R) Graphics Compiler for OpenCL(TM)" +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" +LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc/LICENSE.TXT;md5=311cfc1a5b54bab8ed34a0b5fba4373e \ + file://IGC/Compiler/LegalizationPass.cpp;beginline=1;endline=25;md5=4abf1738ff96b18e34186eb763e28eeb" + +SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https; \ + file://0001-skip-execution-of-ElfPackager.patch \ + file://0001-add-workaround-for-gcc-10-error.patch \ + " + +SRCREV = "bd171d27a65dd82a0966f54f012b113e2796d87e" + +S = "${WORKDIR}/git" + +inherit cmake + +COMPATIBLE_HOST = '(x86_64).*-linux' +COMPATIBLE_HOST_libc-musl = "null" + +DEPENDS += " flex-native bison-native clang opencl-clang" +DEPENDS_append_class-target = " clang-cross-x86_64" + +RDEPENDS_${PN} += "opencl-clang" + +LLVM_COMPAT_VER = "${@bb.utils.contains('LLVMVERSION', '9.0.1', '9.0.0', '10.0.0', d)}" + +EXTRA_OECMAKE = "-DIGC_PREFERRED_LLVM_VERSION=${LLVM_COMPAT_VER} -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3" + +BBCLASSEXTEND = "native nativesdk" + +UPSTREAM_CHECK_GITTAGREGEX = "^igc-(?P(?!19\..*)\d+(\.\d+)+)$" -- cgit v1.2.3-54-g00ecf