From d5699d4fcb80b2bae2e490b737da30fafa80104d Mon Sep 17 00:00:00 2001
From: Artur Gainullin <artur.gainullin@intel.com>
Date: Wed, 29 Jul 2020 12:46:50 -0700
Subject: [PATCH 1/2] [SYCL] Fix fail in the post commit testing

Signed-off-by: Artur Gainullin <artur.gainullin@intel.com>
---
 sycl/test/basic_tests/handler/handler_set_args.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sycl/test/basic_tests/handler/handler_set_args.cpp b/sycl/test/basic_tests/handler/handler_set_args.cpp
index dcb613ec33627..6e15ecc6fa836 100644
--- a/sycl/test/basic_tests/handler/handler_set_args.cpp
+++ b/sycl/test/basic_tests/handler/handler_set_args.cpp
@@ -22,7 +22,7 @@ using AccessorT = cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write,
 struct SingleTaskFunctor {
   SingleTaskFunctor(AccessorT acc) : MAcc(acc) {}
 
-  void operator()() { MAcc[0] = 10; }
+  void operator()() const { MAcc[0] = 10; }
 
   AccessorT MAcc;
 };
@@ -30,7 +30,7 @@ struct SingleTaskFunctor {
 template <bool useOffset> struct ParallelForRangeIdFunctor {
   ParallelForRangeIdFunctor(AccessorT acc) : MAcc(acc) {}
 
-  void operator()(cl::sycl::id<1> id) { MAcc[0] = 10; }
+  void operator()(cl::sycl::id<1> id) const { MAcc[0] = 10; }
 
   AccessorT MAcc;
 };
@@ -38,7 +38,7 @@ template <bool useOffset> struct ParallelForRangeIdFunctor {
 template <bool useOffset> struct ParallelForRangeItemFunctor {
   ParallelForRangeItemFunctor(AccessorT acc) : MAcc(acc) {}
 
-  void operator()(cl::sycl::item<1> item) { MAcc[0] = 10; }
+  void operator()(cl::sycl::item<1> item) const { MAcc[0] = 10; }
 
   AccessorT MAcc;
 };
@@ -46,7 +46,7 @@ template <bool useOffset> struct ParallelForRangeItemFunctor {
 struct ParallelForNdRangeFunctor {
   ParallelForNdRangeFunctor(AccessorT acc) : MAcc(acc) {}
 
-  void operator()(cl::sycl::nd_item<1> ndItem) { MAcc[0] = 10; }
+  void operator()(cl::sycl::nd_item<1> ndItem) const { MAcc[0] = 10; }
 
   AccessorT MAcc;
 };

From a96d954b82dc2c78d73f9eb19cda36cc464f3e8f Mon Sep 17 00:00:00 2001
From: Artur Gainullin <artur.gainullin@intel.com>
Date: Wed, 29 Jul 2020 13:41:41 -0700
Subject: [PATCH 2/2] [SYCL] Checkout fixed version of Level Zero loader

Checkout fixed version of the Level Zero loader instead of checking out
master. Otherwise major changes in the headers can cause build
failures.

Signed-off-by: Artur Gainullin <artur.gainullin@intel.com>
---
 sycl/plugins/level_zero/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sycl/plugins/level_zero/CMakeLists.txt b/sycl/plugins/level_zero/CMakeLists.txt
index bc75ae3ecee9c..b7e89af870b48 100755
--- a/sycl/plugins/level_zero/CMakeLists.txt
+++ b/sycl/plugins/level_zero/CMakeLists.txt
@@ -23,7 +23,7 @@ if (NOT DEFINED L0_LIBRARY OR NOT DEFINED L0_INCLUDE_DIR)
   endif()
   ExternalProject_Add(l0-loader
     GIT_REPOSITORY    https://github.com/oneapi-src/level-zero.git
-    GIT_TAG           origin/master
+    GIT_TAG           v0.91.21
     UPDATE_DISCONNECTED ${SYCL_EP_L0_LOADER_SKIP_AUTO_UPDATE}
     SOURCE_DIR        ${L0_LOADER_SOURCE_DIR}
     BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/l0_loader_build"