intel-compute-runtime: upgrade 19.44.14658 -> 20.04.15428

For more details:
https://github.com/intel/compute-runtime/releases/tag/20.04.15428

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>

3 files changed, 65 insertions, 12 deletions

diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/dont-use-ld-library-path.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/dont-use-ld-library-path.patch
index b886b95d..6f7cdff8 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/dont-use-ld-library-path.patch
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/dont-use-ld-library-path.patch
@@ -1,6 +1,6 @@
-From 2475dfc1350f73a243c9fc223a9f06af85321d56 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <anuj.mittal@intel.com>
-Date: Tue, 2 Jul 2019 08:36:34 +0800
+From ad3e325c1af4d6533fd9b3dfc5208267b678327a Mon Sep 17 00:00:00 2001
+From: Naveen Saini <naveen.kumar.saini@intel.com>
+Date: Thu, 6 Feb 2020 18:25:19 +0800
 Subject: [PATCH] don't use LD_LIBRARY_PATH for native offline compiler
 
 Let us supply the correct path for it to be able to find the correct
@@ -9,19 +9,19 @@ libraries.
 Upstream-Status: Inappropriate
 
 Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
 ---
  runtime/built_ins/kernels/CMakeLists.txt | 2 +-
  runtime/scheduler/scheduler_binary.cmake | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/runtime/built_ins/kernels/CMakeLists.txt b/runtime/built_ins/kernels/CMakeLists.txt
-index 5dc9fe1b..e258847d 100644
+index 863dba145..a385cf768 100644
 --- a/runtime/built_ins/kernels/CMakeLists.txt
 +++ b/runtime/built_ins/kernels/CMakeLists.txt
-@@ -51,7 +51,7 @@ function(compile_builtin gen_type platform_type builtin)
-     if(DEFINED IGDRCL__IGC_LIBRARY_PATH)
-       set(cloc_cmd_prefix LD_LIBRARY_PATH=${IGDRCL__IGC_LIBRARY_PATH} $<TARGET_FILE:ocloc>)
+@@ -66,7 +66,7 @@ function(compile_builtin gen_type platform_type builtin bits builtin_options)
+     if(DEFINED NEO__IGC_LIBRARY_PATH)
+       set(cloc_cmd_prefix LD_LIBRARY_PATH=${NEO__IGC_LIBRARY_PATH} $<TARGET_FILE:ocloc>)
      else()
 -      set(cloc_cmd_prefix LD_LIBRARY_PATH=$<TARGET_FILE_DIR:ocloc> $<TARGET_FILE:ocloc>)
 +      set(cloc_cmd_prefix ocloc)
@@ -29,15 +29,18 @@ index 5dc9fe1b..e258847d 100644
    endif()
    list(APPEND __cloc__options__ "-cl-kernel-arg-info")
 diff --git a/runtime/scheduler/scheduler_binary.cmake b/runtime/scheduler/scheduler_binary.cmake
-index 1b12592b..ed9f375d 100644
+index a7015b909..a720d2f5c 100644
 --- a/runtime/scheduler/scheduler_binary.cmake
 +++ b/runtime/scheduler/scheduler_binary.cmake
 @@ -37,7 +37,7 @@ function(compile_kernel target gen_type platform_type kernel)
-     if(DEFINED IGDRCL__IGC_LIBRARY_PATH)
-       set(cloc_cmd_prefix LD_LIBRARY_PATH=${IGDRCL__IGC_LIBRARY_PATH} $<TARGET_FILE:ocloc>)
+     if(DEFINED NEO__IGC_LIBRARY_PATH)
+       set(cloc_cmd_prefix LD_LIBRARY_PATH=${NEO__IGC_LIBRARY_PATH} $<TARGET_FILE:ocloc>)
      else()
 -      set(cloc_cmd_prefix LD_LIBRARY_PATH=$<TARGET_FILE_DIR:ocloc> $<TARGET_FILE:ocloc>)
 +      set(cloc_cmd_prefix ocloc)
      endif()
    endif()
    list(APPEND __cloc__options__ "-cl-kernel-arg-info")
+-- 
+2.17.1
+
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/fix-missing-header-path.patch b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/fix-missing-header-path.patch
new file mode 100644
index 00000000..dbeeb1d3
--- /dev/null
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime/fix-missing-header-path.patch
@@ -0,0 +1,49 @@
+From c5cbcef415b16a8d0168c0d6b9da467d8c4e59a3 Mon Sep 17 00:00:00 2001
+From: Naveen Saini <naveen.kumar.saini@intel.com>
+Date: Thu, 6 Feb 2020 16:01:39 +0800
+Subject: [PATCH] linker.cpp: fix for missing RelocationInfo.h
+
+Facing build failure with below error:
+
+git/core/compiler_interface/linker.cpp:14:10: fatal error: RelocationInfo.h: No such file or directory
+|    14 | #include "RelocationInfo.h"
+|       |          ^~~~~~~~~~~~~~~~~~
+| compilation terminated.
+
+Upstream-Status: Submitted [https://github.com/intel/compute-runtime/pull/256]
+
+Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
+---
+ core/compiler_interface/linker.cpp                  | 2 +-
+ core/unit_tests/compiler_interface/linker_tests.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/core/compiler_interface/linker.cpp b/core/compiler_interface/linker.cpp
+index a5b0386e9..c1445b336 100644
+--- a/core/compiler_interface/linker.cpp
++++ b/core/compiler_interface/linker.cpp
+@@ -11,7 +11,7 @@
+ #include "core/helpers/debug_helpers.h"
+ #include "core/helpers/ptr_math.h"
+ 
+-#include "RelocationInfo.h"
++#include "visa/RelocationInfo.h"
+ 
+ #include <sstream>
+ 
+diff --git a/core/unit_tests/compiler_interface/linker_tests.cpp b/core/unit_tests/compiler_interface/linker_tests.cpp
+index 6bb7e987c..f2d0b5632 100644
+--- a/core/unit_tests/compiler_interface/linker_tests.cpp
++++ b/core/unit_tests/compiler_interface/linker_tests.cpp
+@@ -11,7 +11,7 @@
+ 
+ #include <string>
+ 
+-#include "RelocationInfo.h"
++#include "visa/RelocationInfo.h"
+ 
+ TEST(LinkerInputTests, givenGlobalsSymbolTableThenProperlyDecodesGlobalVariablesAndGlobalConstants) {
+     NEO::LinkerInput linkerInput;
+-- 
+2.17.1
+
diff --git a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_19.44.14658.bb b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.04.15428.bb
index ac09ed32..a910ab34 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_19.44.14658.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/compute-runtime/intel-compute-runtime_20.04.15428.bb
@@ -13,9 +13,10 @@ SRC_URI = "git://github.com/intel/compute-runtime.git;protocol=https \
 
 SRC_URI_append_class-target = " \
       file://dont-use-ld-library-path.patch \
+      file://fix-missing-header-path.patch \
 "
 
-SRCREV = "74a5e50339cb58dd62b198763f65aa4987314a59"
+SRCREV = "98006aa2bf282ebc5914359e0e4c5f1c539de56f"
 
 S = "${WORKDIR}/git"