ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-19 06:09:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for Image_from_buffer_alignment_negative when alignments are 1 (#1971)

Browse Source 
The Image_from_buffer_alignment_negative test creates images with
incorrect pitches by adding 1 and tests whether the image creation
fails.

Devices that return 1 for either of
CL_IMAGE_REQUIREMENTS_ROW_PITCH_ALIGNMENT_EXT,
CL_IMAGE_REQUIREMENTS_SLICE_PITCH_ALIGNMENT_EXT or
CL_IMAGE_REQUIREMENTS_BASE_ADDRESS_ALIGNMENT_EXT will successfully
create the image and therefore fail the test.

This change allows to skip the image creation in this case as the error
condition (pitch % pitch_alignment != 0) will not be triggered for these
devices.
This commit is contained in:
Ahmed
2024-06-18 17:40:14 +01:00
committed by GitHub
parent c8f91c5ead
commit b3c89ebde0
1 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
test_conformance/images/kernel_read_write/test_cl_ext_image_from_buffer.cpp
View File

@@ -494,10 +494,11 @@ int image_from_buffer_alignment_negative(cl_device_id device,
test_error(err, "Unable to create buffer");
/* Test Row pitch images */
if (imageType == CL_MEM_OBJECT_IMAGE2D
|| imageType == CL_MEM_OBJECT_IMAGE3D
|| imageType == CL_MEM_OBJECT_IMAGE1D_ARRAY
|| imageType == CL_MEM_OBJECT_IMAGE2D_ARRAY)
if ((imageType == CL_MEM_OBJECT_IMAGE2D
|| imageType == CL_MEM_OBJECT_IMAGE3D
|| imageType == CL_MEM_OBJECT_IMAGE1D_ARRAY
|| imageType == CL_MEM_OBJECT_IMAGE2D_ARRAY)
&& row_pitch_alignment != 1)
{
image_desc.buffer = buffer;
image_desc.image_row_pitch =
@@ -510,8 +511,9 @@ int image_from_buffer_alignment_negative(cl_device_id device,
}
/* Test Slice pitch images */
if (imageType == CL_MEM_OBJECT_IMAGE3D
|| imageType == CL_MEM_OBJECT_IMAGE2D_ARRAY)
if ((imageType == CL_MEM_OBJECT_IMAGE3D
|| imageType == CL_MEM_OBJECT_IMAGE2D_ARRAY)
&& slice_pitch_alignment != 1)
{
image_desc.buffer = buffer;
image_desc.image_row_pitch = row_pitch;
@@ -524,37 +526,40 @@ int image_from_buffer_alignment_negative(cl_device_id device,
"Unexpected clCreateImage return");
}
/* Test buffer from host ptr to test base address alignment */
const size_t aligned_buffer_size =
aligned_size(buffer_size, base_address_alignment);
/* Create buffer with host ptr and additional size for the wrong
* alignment */
void* const host_ptr =
malloc(aligned_buffer_size + base_address_alignment);
void* non_aligned_host_ptr =
(void*)((char*)(aligned_ptr(host_ptr,
base_address_alignment))
+ 1); /* wrong alignment */
if (base_address_alignment != 1)
{
/* Test buffer from host ptr to test base address alignment
*/
const size_t aligned_buffer_size =
aligned_size(buffer_size, base_address_alignment);
/* Create buffer with host ptr and additional size for the
* wrong alignment */
void* const host_ptr =
malloc(aligned_buffer_size + base_address_alignment);
void* non_aligned_host_ptr =
(void*)((char*)(aligned_ptr(host_ptr,
base_address_alignment))
+ 1); /* wrong alignment */
cl_mem buffer_host = clCreateBuffer(
context, CL_MEM_USE_HOST_PTR | CL_MEM_READ_WRITE,
buffer_size, non_aligned_host_ptr, &err);
test_error(err, "Unable to create buffer");
cl_mem buffer_host = clCreateBuffer(
context, CL_MEM_USE_HOST_PTR | CL_MEM_READ_WRITE,
buffer_size, non_aligned_host_ptr, &err);
test_error(err, "Unable to create buffer");
image_desc.buffer = buffer_host;
image_desc.buffer = buffer_host;
clCreateImage(context, flag, &format, &image_desc, nullptr,
&err);
test_failure_error(err, CL_INVALID_IMAGE_FORMAT_DESCRIPTOR,
"Unexpected clCreateImage return");
clCreateImage(context, flag, &format, &image_desc, nullptr,
&err);
test_failure_error(err, CL_INVALID_IMAGE_FORMAT_DESCRIPTOR,
"Unexpected clCreateImage return");
free(host_ptr);
free(host_ptr);
err = clReleaseMemObject(buffer_host);
test_error(err, "Unable to release buffer");
}
err = clReleaseMemObject(buffer);
test_error(err, "Unable to release buffer");
err = clReleaseMemObject(buffer_host);
test_error(err, "Unable to release buffer");
}
}
}