Re: [Beignet] [PATCH v3 3/3] add utest for creating 2d image from buffer.

2015-09-15 Thread Guo, Yejun
2 comments inline, thanks.

-Original Message-
From: Beignet [mailto:beignet-boun...@lists.freedesktop.org] On Behalf Of 
xionghu@intel.com
Sent: Wednesday, September 09, 2015 1:44 PM
To: beignet@lists.freedesktop.org
Cc: Luo, Xionghu
Subject: [Beignet] [PATCH v3 3/3] add utest for creating 2d image from buffer.



+  OCL_CALL (clGetDeviceInfo, device, CL_DEVICE_IMAGE_BASE_ADDRESS_ALIGNMENT, 
0, 0, _value_size);
+  size_t base_address_alignment = 0;
+  OCL_CALL (clGetDeviceInfo, device, CL_DEVICE_IMAGE_BASE_ADDRESS_ALIGNMENT, 
param_value_size, _address_alignment, _value_size);
[Yejun] the proper usage is: OCL_CALL (clGetDeviceInfo, device, 
CL_DEVICE_IMAGE_BASE_ADDRESS_ALIGNMENT, sizeof(base_address_alignment), 
_address_alignment, NULL);



+  // Setup kernel and images
+  size_t buffer_sz = sizeof(uint32_t) * w * h;
[yejun] it is better to query IMAGE_PITCH_ALIGNMENT to do alignment for w


___
Beignet mailing list
Beignet@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/beignet


[Beignet] [PATCH v3 3/3] add utest for creating 2d image from buffer.

2015-09-08 Thread xionghu . luo
From: Luo Xionghu 

 v2: check cl_khr_image2d_from_buffer support first;
 use CL_DEVICE_IMAGE_BASE_ADDRESS_ALIGNMENT to allocate memory.

Signed-off-by: Luo Xionghu 
---
 utests/CMakeLists.txt|  1 +
 utests/image_from_buffer.cpp | 83 
 2 files changed, 84 insertions(+)
 create mode 100644 utests/image_from_buffer.cpp

diff --git a/utests/CMakeLists.txt b/utests/CMakeLists.txt
index e7a9e26..bfb902c 100644
--- a/utests/CMakeLists.txt
+++ b/utests/CMakeLists.txt
@@ -204,6 +204,7 @@ set (utests_sources
   enqueue_fill_buf.cpp
   builtin_kernel_max_global_size.cpp
   image_1D_buffer.cpp
+  image_from_buffer.cpp
   compare_image_2d_and_1d_array.cpp
   compiler_fill_image_1d_array.cpp
   compiler_fill_image_2d_array.cpp
diff --git a/utests/image_from_buffer.cpp b/utests/image_from_buffer.cpp
new file mode 100644
index 000..be5f5e6
--- /dev/null
+++ b/utests/image_from_buffer.cpp
@@ -0,0 +1,83 @@
+#include 
+#include "utest_helper.hpp"
+#include 
+#include 
+
+static void image_from_buffer(void)
+{
+  size_t param_value_size;
+  std::string extensionStr;
+  OCL_CALL (clGetPlatformInfo, platform, CL_PLATFORM_EXTENSIONS, 0, 0, 
_value_size);
+  std::vector param_value(param_value_size);
+  OCL_CALL (clGetPlatformInfo, platform, CL_PLATFORM_EXTENSIONS, 
param_value_size, param_value.empty() ? NULL : _value.front(), 
_value_size);
+  if (!param_value.empty())
+extensionStr = std::string(_value.front(), param_value_size-1);
+
+  if (!std::strstr(extensionStr.c_str(), "cl_khr_image2d_from_buffer")) {
+return;
+  }
+
+  OCL_CALL (clGetDeviceInfo, device, CL_DEVICE_IMAGE_BASE_ADDRESS_ALIGNMENT, 
0, 0, _value_size);
+  size_t base_address_alignment = 0;
+  OCL_CALL (clGetDeviceInfo, device, CL_DEVICE_IMAGE_BASE_ADDRESS_ALIGNMENT, 
param_value_size, _address_alignment, _value_size);
+  const size_t w = 512;
+  const size_t h = 512;
+  cl_image_format format;
+  cl_image_desc desc;
+  int error;
+
+  memset(, 0x0, sizeof(cl_image_desc));
+  memset(, 0x0, sizeof(cl_image_format));
+
+  // Setup kernel and images
+  size_t buffer_sz = sizeof(uint32_t) * w * h;
+  //buf_data[0] = (uint32_t*) malloc(buffer_sz);
+  buf_data[0] = (uint32_t*)memalign(base_address_alignment, buffer_sz);
+  for (uint32_t j = 0; j < h; ++j)
+for (uint32_t i = 0; i < w; i++)
+  ((uint32_t*)buf_data[0])[j * w + i] = j * w + i;
+
+  cl_mem buff = clCreateBuffer(ctx, CL_MEM_READ_ONLY | CL_MEM_USE_HOST_PTR, 
buffer_sz, buf_data[0], );
+
+  OCL_ASSERT(error == CL_SUCCESS);
+  format.image_channel_order = CL_RGBA;
+  format.image_channel_data_type = CL_UNSIGNED_INT8;
+  desc.image_type = CL_MEM_OBJECT_IMAGE2D;
+  desc.image_width = w;
+  desc.image_height = h;
+  desc.image_row_pitch = w * sizeof(uint32_t);
+
+  desc.buffer = 0;
+  OCL_CREATE_IMAGE(buf[0], CL_MEM_COPY_HOST_PTR, , , buf_data[0]);
+
+  desc.buffer = buff;
+  OCL_CREATE_IMAGE(buf[1], 0, , , NULL);
+
+  free(buf_data[0]);
+  buf_data[0] = NULL;
+
+  // Check result
+  OCL_MAP_BUFFER_GTT(0);
+  OCL_MAP_BUFFER_GTT(1);
+  for (uint32_t j = 0; j < h; ++j)
+for (uint32_t i = 0; i < w; i++)
+{
+  //printf("%d,%d\n", ((uint32_t*)buf_data[0])[j * w + i], 
((uint32_t*)buf_data[1])[j * w + i]);
+  OCL_ASSERT(((uint32_t*)buf_data[0])[j * w + i] == 
((uint32_t*)buf_data[1])[j * w + i]);
+}
+  OCL_UNMAP_BUFFER_GTT(0);
+  OCL_UNMAP_BUFFER_GTT(1);
+
+  //spec didn't tell the sequence of release buffer of image. so release 
either buffer or image first is ok here.
+  //we follow the rule of destroy the bo at the last release, then the access 
of buffer after release image is legal
+  //and vice verse.
+#if 1
+  clReleaseMemObject(buf[1]);
+  clReleaseMemObject(buff);
+#else
+  clReleaseMemObject(buff);
+  clReleaseMemObject(buf[1]);
+#endif
+}
+
+MAKE_UTEST_FROM_FUNCTION(image_from_buffer);
-- 
1.9.1

___
Beignet mailing list
Beignet@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/beignet