From a3ba71f4b98ebcdbc0207990d10c828cd94201b6 Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com>
Date: Tue, 13 Oct 2020 23:41:39 +0800
Subject: igc: upgrade 1.0.4756 -> 1.0.5176

Include compatibility for both LLVM 10 and LLVM 11. Vector Compiler
fails to compile for LLVM 11 so disable the build for now.

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 .../igc/intel-graphics-compiler_1.0.4756.bb        | 42 -------------------
 .../igc/intel-graphics-compiler_1.0.5176.bb        | 47 ++++++++++++++++++++++
 2 files changed, 47 insertions(+), 42 deletions(-)
 delete mode 100644 dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.4756.bb
 create mode 100644 dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.5176.bb

(limited to 'dynamic-layers')

diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.4756.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.4756.bb
deleted file mode 100644
index e13f34b9..00000000
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.4756.bb
+++ /dev/null
@@ -1,42 +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 \
-                    file://NOTICES.txt;md5=b12e73994de4fbe0f688cf0bc91512a0"
-
-SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https; \
-           file://0001-skip-execution-of-ElfPackager.patch \
-           file://link-to-LLVMGenXIntrinsics.patch \
-           file://improve_src_package_reproducibility.patch \
-          "
-
-SRCREV = "3623209b10b357ddb3a3d6eac3551c53ebc897f7"
-
-# Used to replace with relative path in reproducibility patch
-export B
-
-S = "${WORKDIR}/git"
-
-inherit cmake
-
-COMPATIBLE_HOST = '(x86_64).*-linux'
-COMPATIBLE_HOST_libc-musl = "null"
-
-DEPENDS += " flex-native bison-native clang opencl-clang vc-intrinsics"
-DEPENDS_append_class-target = " clang-cross-x86_64"
-
-RDEPENDS_${PN} += "opencl-clang"
-
-EXTRA_OECMAKE = "-DIGC_PREFERRED_LLVM_VERSION=10.0.0 -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 -DINSTALL_SPIRVDLL=0"
-
-BBCLASSEXTEND = "native nativesdk"
-
-UPSTREAM_CHECK_GITTAGREGEX = "^igc-(?P<pver>(?!19\..*)\d+(\.\d+)+)$"
-
-FILES_${PN} += " \
-                 ${libdir}/igc/NOTICES.txt \
-                 "
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.5176.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.5176.bb
new file mode 100644
index 00000000..d55e2c61
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.5176.bb
@@ -0,0 +1,47 @@
+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 \
+                    file://NOTICES.txt;md5=b12e73994de4fbe0f688cf0bc91512a0"
+
+SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https; \
+           file://0001-skip-execution-of-ElfPackager.patch \
+           file://link-to-LLVMGenXIntrinsics.patch \
+           file://improve_src_package_reproducibility.patch \
+          "
+
+SRCREV = "3e7c8e95b48a4eb6637077c52ff253a37b5ea085"
+
+# Used to replace with relative path in reproducibility patch
+export B
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+COMPATIBLE_HOST = '(x86_64).*-linux'
+COMPATIBLE_HOST_libc-musl = "null"
+
+DEPENDS += " flex-native bison-native clang opencl-clang vc-intrinsics"
+DEPENDS_append_class-target = " clang-cross-x86_64"
+
+RDEPENDS_${PN} += "opencl-clang"
+
+LLVM_COMPAT_VERSION = "${@bb.utils.contains('LLVMVERSION', '10.0.1', '10.0.0', '11.0.0', d)}"
+EXTRA_OECMAKE = "-DIGC_PREFERRED_LLVM_VERSION=${LLVM_COMPAT_VERSION} -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 -DINSTALL_SPIRVDLL=0"
+
+# VectorCompiler doesn't build with LLVM11 as of this release.
+# Re-enable after those issues have been fixed.
+EXTRA_OECMAKE_append = " ${@bb.utils.contains('LLVMVERSION', '11.0.0', "-DIGC_BUILD__VC_ENABLED=OFF", "", d)}"
+
+BBCLASSEXTEND = "native nativesdk"
+
+UPSTREAM_CHECK_GITTAGREGEX = "^igc-(?P<pver>(?!19\..*)\d+(\.\d+)+)$"
+
+FILES_${PN} += " \
+                 ${libdir}/igc/NOTICES.txt \
+                 "
-- 
cgit v1.2.3-54-g00ecf