Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes for Image_from_buffer_alignment_negative when alignments are 1 #1967

Closed
wants to merge 8 commits into from
Closed

Fixes for Image_from_buffer_alignment_negative when alignments are 1 #1967

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7d4e582
Add cl_khr_kernel_clock tests
AhmedAmraniAkdi May 1, 2024
17bb73b
Change cl_kernel_clock_capabilities_khr to cl_device_kernel_clock_cap…
AhmedAmraniAkdi May 1, 2024
3b96da8
Formatting
AhmedAmraniAkdi May 1, 2024
6ce88df
Add cl_khr_kernel_clock to the list of known extensions in the compil…
AhmedAmraniAkdi May 1, 2024
3912bfc
Fix error: braces around scalar initializer
AhmedAmraniAkdi May 1, 2024
72c91b4
Put cl_khr_kernel_clock before the API-only extensions in the known_e…
AhmedAmraniAkdi May 3, 2024
8b4a239
Skip test is alignment is 1
AhmedAmraniAkdi May 21, 2024
57081e5
Merge branch 'KhronosGroup:main' into image_from_buffer_alignment_neg…
AhmedAmraniAkdi May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 37 additions & 31 deletions test_conformance/images/kernel_read_write/test_cl_ext_image_from_buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand All @@ -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;
Expand All @@ -524,36 +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 */

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");
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");

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);
test_error(err, "Unable to release buffer");
err = clReleaseMemObject(buffer_host);
test_error(err, "Unable to release buffer");
}

err = clReleaseMemObject(buffer_host);
err = clReleaseMemObject(buffer);
test_error(err, "Unable to release buffer");
}
}
Expand Down
Loading