Merge branch 'sycl' into l0_plugin

Author: againull

buildbot/dependency.conf

@@ -4,8 +4,8 @@ ocl_cpu_rt_ver=2020.10.4.0.15
 # https://github.com/intel/llvm/releases/download/2020-03/win-oclcpuexp-2020.10.4.0.15_rel.zip
 ocl_cpu_rt_ver_win=2020.10.4.0.15
 # Same GPU driver supports Level Zero and OpenCL:
-# https://github.com/intel/compute-runtime/releases/tag/20.12.16259
-ocl_gpu_rt_ver=l0-20.12.16259
+# https://github.com/intel/compute-runtime/releases/tag/20.19.16754
+ocl_gpu_rt_ver=20.19.16754
 # Same GPU driver supports Level Zero and OpenCL:
 # https://downloadcenter.intel.com/download/29557/Intel-Graphics-Windows-10-DCH-Drivers
 ocl_gpu_rt_ver_win=ci-neo-015900
@@ -22,7 +22,7 @@ fpga_ver_win=20200216_000000
 [DRIVER VERSIONS]
 cpu_driver_lin=2020.10.4.0.15
 cpu_driver_win=2020.10.4.0.15
-gpu_driver_lin=20.12.16259
+gpu_driver_lin=20.19.16754
 gpu_driver_win=ci-neo-015900
 fpga_driver_lin=2020.9.2.0
 fpga_driver_win=2020.9.2.0

sycl/include/CL/sycl/accessor.hpp

@@ -15,10 +15,10 @@
 #include <CL/sycl/detail/common.hpp>
 #include <CL/sycl/detail/export.hpp>
 #include <CL/sycl/detail/generic_type_traits.hpp>
+#include <CL/sycl/detail/handler_proxy.hpp>
 #include <CL/sycl/detail/image_accessor_util.hpp>
 #include <CL/sycl/detail/image_ocl_types.hpp>
 #include <CL/sycl/exception.hpp>
-#include <CL/sycl/handler.hpp>
 #include <CL/sycl/id.hpp>
 #include <CL/sycl/image.hpp>
 #include <CL/sycl/pointers.hpp>
@@ -846,7 +846,7 @@ class accessor :
             detail::convertToArrayOfN<3, 1>(BufferRef.get_range()), AccessMode,
             detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
             BufferRef.OffsetInBytes, BufferRef.IsSubBuffer) {
-    CommandGroupHandler.associateWithHandler(*this);
+    detail::associateWithHandler(CommandGroupHandler, this, AccessTarget);
   }
 #endif
 
@@ -888,7 +888,7 @@ class accessor :
             detail::convertToArrayOfN<3, 1>(BufferRef.get_range()), AccessMode,
             detail::getSyclObjImpl(BufferRef).get(), Dimensions, sizeof(DataT),
             BufferRef.OffsetInBytes, BufferRef.IsSubBuffer) {
-    CommandGroupHandler.associateWithHandler(*this);
+    detail::associateWithHandler(CommandGroupHandler, this, AccessTarget);
   }
 #endif
 
@@ -932,7 +932,7 @@ class accessor :
                          AccessMode, detail::getSyclObjImpl(BufferRef).get(),
                          Dimensions, sizeof(DataT), BufferRef.OffsetInBytes,
                          BufferRef.IsSubBuffer) {
-    CommandGroupHandler.associateWithHandler(*this);
+    detail::associateWithHandler(CommandGroupHandler, this, AccessTarget);
   }
 #endif
 
@@ -1238,7 +1238,10 @@ class accessor<DataT, Dimensions, AccessMode, access::target::image,
                                access::target::image, IsPlaceholder>(
             Image, CommandGroupHandler,
             (detail::getSyclObjImpl(Image))->getElementSize()) {
-    CommandGroupHandler.associateWithHandler(*this);
+#ifndef __SYCL_DEVICE_ONLY__
+    detail::associateWithHandler(CommandGroupHandler, this,
+                                 access::target::image);
+#endif
   }
 #ifdef __SYCL_DEVICE_ONLY__
 private:
@@ -1313,7 +1316,10 @@ class accessor<DataT, Dimensions, AccessMode, access::target::image_array,
                                access::target::image, IsPlaceholder>(
             Image, CommandGroupHandler,
             (detail::getSyclObjImpl(Image))->getElementSize()) {
-    CommandGroupHandler.associateWithHandler(*this);
+#ifndef __SYCL_DEVICE_ONLY__
+    detail::associateWithHandler(CommandGroupHandler, this,
+                                 access::target::image_array);
+#endif
   }
 
   detail::__image_array_slice__<DataT, Dimensions, AccessMode, IsPlaceholder>

sycl/include/CL/sycl/detail/buffer_impl.hpp

@@ -14,7 +14,6 @@
 #include <CL/sycl/detail/export.hpp>
 #include <CL/sycl/detail/helpers.hpp>
 #include <CL/sycl/detail/sycl_mem_obj_t.hpp>
-#include <CL/sycl/handler.hpp>
 #include <CL/sycl/property_list.hpp>
 #include <CL/sycl/stl.hpp>
 #include <CL/sycl/types.hpp>
@@ -32,7 +31,6 @@ template <typename DataT, int Dimensions, access::mode AccessMode,
 class accessor;
 template <typename T, int Dimensions, typename AllocatorT, typename Enable>
 class buffer;
-class handler;
 
 using buffer_allocator = detail::sycl_memory_object_allocator;