From 1a991e6f14699a7ddf5078f7b69c37c23cd03d46 Mon Sep 17 00:00:00 2001
From: Mariya Podchishchaeva <mariya.podchishchaeva@intel.com>
Date: Mon, 1 Apr 2019 16:41:10 +0300
Subject: [PATCH 1/2] [SYCL] Use std::enable_if properly in buffer contructors

std::enable_if was used without "type" member type.

Signed-off-by: Mariya Podchishchaeva <mariya.podchishchaeva@intel.com>
---
 sycl/include/CL/sycl/buffer.hpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/sycl/include/CL/sycl/buffer.hpp b/sycl/include/CL/sycl/buffer.hpp
index 9a43504d5de7..39cf3d7c0c20 100644
--- a/sycl/include/CL/sycl/buffer.hpp
+++ b/sycl/include/CL/sycl/buffer.hpp
@@ -18,7 +18,7 @@ namespace cl {
 namespace sycl {
 class handler;
 class queue;
-template <int dimentions> class range;
+template <int dimensions> class range;
 
 template <typename T, int dimensions = 1,
           typename AllocatorT = cl::sycl::buffer_allocator>
@@ -28,6 +28,8 @@ class buffer {
   using reference = value_type &;
   using const_reference = const value_type &;
   using allocator_type = AllocatorT;
+  template <int dims>
+  using EnableIfOneDimension = typename std::enable_if<1 == dims>::type;
 
   buffer(const range<dimensions> &bufferRange,
          const property_list &propList = {})
@@ -83,7 +85,8 @@ class buffer {
         hostData, get_count() * sizeof(T), propList);
   }
 
-  template <class InputIterator>
+  template <class InputIterator, int N = dimensions,
+            typename = EnableIfOneDimension<N>>
   buffer(InputIterator first, InputIterator last, AllocatorT allocator,
          const property_list &propList = {})
       : Range(range<1>(std::distance(first, last))) {
@@ -92,7 +95,7 @@ class buffer {
   }
 
   template <class InputIterator, int N = dimensions,
-            typename = std::enable_if<N == 1>>
+            typename = EnableIfOneDimension<N>>
   buffer(InputIterator first, InputIterator last,
          const property_list &propList = {})
       : Range(range<1>(std::distance(first, last))) {
@@ -105,7 +108,7 @@ class buffer {
   //     impl = std::make_shared<detail::buffer_impl>(b, baseIndex, subRange);
   // }
 
-  template <int N = dimensions, typename = std::enable_if<N == 1>>
+  template <int N = dimensions, typename = EnableIfOneDimension<N>>
   buffer(cl_mem MemObject, const context &SyclContext,
          event AvailableEvent = {}) {
     impl = std::make_shared<detail::buffer_impl<AllocatorT>>(

From 3d84d5d9b197e3cc283e6b0a0268bbab23eab265 Mon Sep 17 00:00:00 2001
From: Mariya Podchishchaeva <mariya.podchishchaeva@intel.com>
Date: Mon, 1 Apr 2019 16:57:15 +0300
Subject: [PATCH 2/2] [SYCL] Initialize buffer range and size in interop
 constructor

Signed-off-by: Mariya Podchishchaeva <mariya.podchishchaeva@intel.com>
---
 sycl/include/CL/sycl/buffer.hpp               |  7 ++++++-
 sycl/include/CL/sycl/detail/buffer_impl.hpp   |  5 +++--
 .../basic_tests/buffer/buffer_interop.cpp     | 20 ++++++++++++++++++-
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/sycl/include/CL/sycl/buffer.hpp b/sycl/include/CL/sycl/buffer.hpp
index 39cf3d7c0c20..d3a43837a666 100644
--- a/sycl/include/CL/sycl/buffer.hpp
+++ b/sycl/include/CL/sycl/buffer.hpp
@@ -111,8 +111,13 @@ class buffer {
   template <int N = dimensions, typename = EnableIfOneDimension<N>>
   buffer(cl_mem MemObject, const context &SyclContext,
          event AvailableEvent = {}) {
+
+    size_t BufSize = 0;
+    CHECK_OCL_CODE(clGetMemObjectInfo(MemObject, CL_MEM_SIZE, sizeof(size_t),
+                                      &BufSize, nullptr));
+    Range[0] = BufSize / sizeof(T);
     impl = std::make_shared<detail::buffer_impl<AllocatorT>>(
-        MemObject, SyclContext, AvailableEvent);
+        MemObject, SyclContext, BufSize, AvailableEvent);
   }
 
   buffer(const buffer &rhs) = default;
diff --git a/sycl/include/CL/sycl/detail/buffer_impl.hpp b/sycl/include/CL/sycl/detail/buffer_impl.hpp
index 321bacb2f5aa..4da8134a9442 100644
--- a/sycl/include/CL/sycl/detail/buffer_impl.hpp
+++ b/sycl/include/CL/sycl/detail/buffer_impl.hpp
@@ -119,8 +119,9 @@ template <typename AllocatorT> class buffer_impl {
   }
 
   buffer_impl(cl_mem MemObject, const context &SyclContext,
-              event AvailableEvent = {})
-      : OpenCLInterop(true), AvailableEvent(AvailableEvent) {
+              const size_t sizeInBytes, event AvailableEvent = {})
+      : OpenCLInterop(true), SizeInBytes(sizeInBytes),
+        AvailableEvent(AvailableEvent) {
     if (SyclContext.is_host())
       throw cl::sycl::invalid_parameter_error(
           "Creation of interoperability buffer using host context is not "
diff --git a/sycl/test/basic_tests/buffer/buffer_interop.cpp b/sycl/test/basic_tests/buffer/buffer_interop.cpp
index 3d836c16812f..f0bdaa209071 100644
--- a/sycl/test/basic_tests/buffer/buffer_interop.cpp
+++ b/sycl/test/basic_tests/buffer/buffer_interop.cpp
@@ -16,10 +16,14 @@
 using namespace cl::sycl;
 
 int main() {
+  bool Failed = false;
   {
     const size_t Size = 32;
     int Init[Size] = {5};
     cl_int Error = CL_SUCCESS;
+    cl::sycl::range<1> InteropRange;
+    InteropRange[0] = Size;
+    size_t InteropSize = Size * sizeof(int);
 
     queue MyQueue;
 
@@ -29,6 +33,19 @@ int main() {
     CHECK_OCL_CODE(Error);
     buffer<int, 1> Buffer(OpenCLBuffer, MyQueue.get_context());
 
+    if (Buffer.get_range() != InteropRange) {
+          assert(false);
+          Failed = true;
+    }
+    if (Buffer.get_size() != InteropSize) {
+          assert(false);
+          Failed = true;
+    }
+    if (Buffer.get_count() != Size) {
+          assert(false);
+          Failed = true;
+    }
+
     MyQueue.submit([&](handler &CGH) {
       auto B = Buffer.get_access<access::mode::write>(CGH);
       CGH.parallel_for<class BufferInterop>(
@@ -58,8 +75,9 @@ int main() {
         std::cout << " array[" << i << "] is " << Result[i] << " expected "
                   << 20 << std::endl;
         assert(false);
+        Failed = true;
       }
     }
   }
-  return 0;
+  return Failed;
 }