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

Pass 'flag' variable through to clGetImageRequirementsInfoEXT (attempt 2) (#1700)

Browse Source 
Rebase of my previous clGetImageRequirementsInfoEXT flag=0 fix PR: PR1632

Pass 'flag' variable through to clGetImageRequirementsInfoEXT:

Almost all of the image_from_buffer cl_ext_image_requirements_info tests pass '0' as the 'flags' to clGetImageRequirementsInfoEXT.
Passing '0' as the flags is valid according to the spec, but since the tests are calling clGetImageRequirementsInfoEXT in a loop over a list of flags it doesn't seem intended that all the tests pass '0'.

Fixed CL_MEM_KERNEL_READ_AND_WRITE flag override:

The mem_flags override for CL_MEM_KERNEL_READ_AND_WRITE was incorrectly affecting subsequent iterations of the image_format loop.
Fixed by using a separate variable inside the loop.
This commit is contained in:
paulfradgley
2023-04-25 17:17:22 +01:00
committed by GitHub
parent aa34b4b8c3
commit 033aa195c5
1 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,14 +89,14 @@ int image2d_from_buffer_positive(cl_device_id device, cl_context context,
CL_MEM_READ_WRITE, CL_MEM_READ_WRITE,
CL_MEM_KERNEL_READ_AND_WRITE }; CL_MEM_KERNEL_READ_AND_WRITE };
for (auto flag : flagTypes) for (auto flagType : flagTypes)
{ {
for (auto imageType : imageTypes) for (auto imageType : imageTypes)
{ {
/* Get the list of supported image formats */ /* Get the list of supported image formats */
std::vector<cl_image_format> formatList; std::vector<cl_image_format> formatList;
if (TEST_PASS if (TEST_PASS
!= get_format_list(context, imageType, formatList, flag) != get_format_list(context, imageType, formatList, flagType)
|| formatList.size() == 0) || formatList.size() == 0)
{ {
test_fail("Failure to get supported formats list\n"); test_fail("Failure to get supported formats list\n");
@@ -121,15 +121,15 @@ int image2d_from_buffer_positive(cl_device_id device, cl_context context,
cl_image_desc image_desc = { 0 }; cl_image_desc image_desc = { 0 };
image_desc_init(&image_desc, imageType); image_desc_init(&image_desc, imageType);
flag = (flag == CL_MEM_KERNEL_READ_AND_WRITE) cl_mem_flags flag = (flagType == CL_MEM_KERNEL_READ_AND_WRITE)
? CL_MEM_READ_WRITE ? CL_MEM_READ_WRITE
: flag; : flagType;
size_t row_pitch_alignment = 0; size_t row_pitch_alignment = 0;
size_t base_address_alignment = 0; size_t base_address_alignment = 0;
int get_error = get_image_requirement_alignment( int get_error = get_image_requirement_alignment(
device, context, 0, &format, &image_desc, device, context, flag, &format, &image_desc,
&row_pitch_alignment, nullptr, &base_address_alignment); &row_pitch_alignment, nullptr, &base_address_alignment);
if (TEST_PASS != get_error) if (TEST_PASS != get_error)
{ {
@@ -187,14 +187,14 @@ int memInfo_image_from_buffer_positive(cl_device_id device, cl_context context,
CL_MEM_READ_WRITE, CL_MEM_READ_WRITE,
CL_MEM_KERNEL_READ_AND_WRITE }; CL_MEM_KERNEL_READ_AND_WRITE };
for (auto flag : flagTypes) for (auto flagType : flagTypes)
{ {
for (auto imageType : imageTypes) for (auto imageType : imageTypes)
{ {
/* Get the list of supported image formats */ /* Get the list of supported image formats */
std::vector<cl_image_format> formatList; std::vector<cl_image_format> formatList;
if (TEST_PASS if (TEST_PASS
!= get_format_list(context, imageType, formatList, flag) != get_format_list(context, imageType, formatList, flagType)
|| formatList.size() == 0) || formatList.size() == 0)
{ {
test_fail("Failure to get supported formats list\n"); test_fail("Failure to get supported formats list\n");
@@ -205,15 +205,15 @@ int memInfo_image_from_buffer_positive(cl_device_id device, cl_context context,
cl_image_desc image_desc = { 0 }; cl_image_desc image_desc = { 0 };
image_desc_init(&image_desc, imageType); image_desc_init(&image_desc, imageType);
flag = (flag == CL_MEM_KERNEL_READ_AND_WRITE) cl_mem_flags flag = (flagType == CL_MEM_KERNEL_READ_AND_WRITE)
? CL_MEM_READ_WRITE ? CL_MEM_READ_WRITE
: flag; : flagType;
size_t row_pitch_alignment = 0; size_t row_pitch_alignment = 0;
size_t slice_pitch_alignment = 0; size_t slice_pitch_alignment = 0;
int get_error = get_image_requirement_alignment( int get_error = get_image_requirement_alignment(
device, context, 0, &format, &image_desc, device, context, flag, &format, &image_desc,
&row_pitch_alignment, &slice_pitch_alignment, nullptr); &row_pitch_alignment, &slice_pitch_alignment, nullptr);
if (TEST_PASS != get_error) if (TEST_PASS != get_error)
{ {
@@ -296,14 +296,14 @@ int imageInfo_image_from_buffer_positive(cl_device_id device,
CL_MEM_READ_WRITE, CL_MEM_READ_WRITE,
CL_MEM_KERNEL_READ_AND_WRITE }; CL_MEM_KERNEL_READ_AND_WRITE };
for (auto flag : flagTypes) for (auto flagType : flagTypes)
{ {
for (auto imageType : imageTypes) for (auto imageType : imageTypes)
{ {
/* Get the list of supported image formats */ /* Get the list of supported image formats */
std::vector<cl_image_format> formatList; std::vector<cl_image_format> formatList;
if (TEST_PASS if (TEST_PASS
!= get_format_list(context, imageType, formatList, flag) != get_format_list(context, imageType, formatList, flagType)
|| formatList.size() == 0) || formatList.size() == 0)
{ {
test_fail("Failure to get supported formats list\n"); test_fail("Failure to get supported formats list\n");
@@ -314,15 +314,15 @@ int imageInfo_image_from_buffer_positive(cl_device_id device,
cl_image_desc image_desc = { 0 }; cl_image_desc image_desc = { 0 };
image_desc_init(&image_desc, imageType); image_desc_init(&image_desc, imageType);
flag = (flag == CL_MEM_KERNEL_READ_AND_WRITE) cl_mem_flags flag = (flagType == CL_MEM_KERNEL_READ_AND_WRITE)
? CL_MEM_READ_WRITE ? CL_MEM_READ_WRITE
: flag; : flagType;
size_t row_pitch_alignment = 0; size_t row_pitch_alignment = 0;
size_t slice_pitch_alignment = 0; size_t slice_pitch_alignment = 0;
int get_error = get_image_requirement_alignment( int get_error = get_image_requirement_alignment(
device, context, 0, &format, &image_desc, device, context, flag, &format, &image_desc,
&row_pitch_alignment, &slice_pitch_alignment, nullptr); &row_pitch_alignment, &slice_pitch_alignment, nullptr);
if (TEST_PASS != get_error) if (TEST_PASS != get_error)
{ {
@@ -446,14 +446,14 @@ int image_from_buffer_alignment_negative(cl_device_id device,
CL_MEM_READ_WRITE, CL_MEM_READ_WRITE,
CL_MEM_KERNEL_READ_AND_WRITE }; CL_MEM_KERNEL_READ_AND_WRITE };
for (auto flag : flagTypes) for (auto flagType : flagTypes)
{ {
for (auto imageType : imageTypes) for (auto imageType : imageTypes)
{ {
/* Get the list of supported image formats */ /* Get the list of supported image formats */
std::vector<cl_image_format> formatList; std::vector<cl_image_format> formatList;
if (TEST_PASS if (TEST_PASS
!= get_format_list(context, imageType, formatList, flag) != get_format_list(context, imageType, formatList, flagType)
|| formatList.size() == 0) || formatList.size() == 0)
{ {
test_fail("Failure to get supported formats list\n"); test_fail("Failure to get supported formats list\n");
@@ -464,16 +464,16 @@ int image_from_buffer_alignment_negative(cl_device_id device,
cl_image_desc image_desc = { 0 }; cl_image_desc image_desc = { 0 };
image_desc_init(&image_desc, imageType); image_desc_init(&image_desc, imageType);
flag = (flag == CL_MEM_KERNEL_READ_AND_WRITE) cl_mem_flags flag = (flagType == CL_MEM_KERNEL_READ_AND_WRITE)
? CL_MEM_READ_WRITE ? CL_MEM_READ_WRITE
: flag; : flagType;
size_t row_pitch_alignment = 0; size_t row_pitch_alignment = 0;
size_t slice_pitch_alignment = 0; size_t slice_pitch_alignment = 0;
size_t base_address_alignment = 0; size_t base_address_alignment = 0;
int get_error = get_image_requirement_alignment( int get_error = get_image_requirement_alignment(
device, context, 0, &format, &image_desc, device, context, flag, &format, &image_desc,
&row_pitch_alignment, &slice_pitch_alignment, &row_pitch_alignment, &slice_pitch_alignment,
&base_address_alignment); &base_address_alignment);
if (TEST_PASS != get_error) if (TEST_PASS != get_error)
@@ -596,14 +596,14 @@ int image_from_small_buffer_negative(cl_device_id device, cl_context context,
CL_MEM_READ_WRITE, CL_MEM_READ_WRITE,
CL_MEM_KERNEL_READ_AND_WRITE }; CL_MEM_KERNEL_READ_AND_WRITE };
for (auto flag : flagTypes) for (auto flagType : flagTypes)
{ {
for (auto imageType : imageTypes) for (auto imageType : imageTypes)
{ {
/* Get the list of supported image formats */ /* Get the list of supported image formats */
std::vector<cl_image_format> formatList; std::vector<cl_image_format> formatList;
if (TEST_PASS if (TEST_PASS
!= get_format_list(context, imageType, formatList, flag) != get_format_list(context, imageType, formatList, flagType)
|| formatList.size() == 0) || formatList.size() == 0)
{ {
test_fail("Failure to get supported formats list\n"); test_fail("Failure to get supported formats list\n");
@@ -614,9 +614,9 @@ int image_from_small_buffer_negative(cl_device_id device, cl_context context,
cl_image_desc image_desc = { 0 }; cl_image_desc image_desc = { 0 };
image_desc_init(&image_desc, imageType); image_desc_init(&image_desc, imageType);
flag = (flag == CL_MEM_KERNEL_READ_AND_WRITE) cl_mem_flags flag = (flagType == CL_MEM_KERNEL_READ_AND_WRITE)
? CL_MEM_READ_WRITE ? CL_MEM_READ_WRITE
: flag; : flagType;
/* Invalid buffer size */ /* Invalid buffer size */
cl_int err; cl_int err;
@@ -704,14 +704,14 @@ int image_from_buffer_fill_positive(cl_device_id device, cl_context context,
CL_MEM_READ_WRITE, CL_MEM_READ_WRITE,
CL_MEM_KERNEL_READ_AND_WRITE }; CL_MEM_KERNEL_READ_AND_WRITE };
for (auto flag : flagTypes) for (auto flagType : flagTypes)
{ {
for (auto imageType : imageTypes) for (auto imageType : imageTypes)
{ {
/* Get the list of supported image formats */ /* Get the list of supported image formats */
std::vector<cl_image_format> formatList; std::vector<cl_image_format> formatList;
if (TEST_PASS if (TEST_PASS
!= get_format_list(context, imageType, formatList, flag) != get_format_list(context, imageType, formatList, flagType)
|| formatList.size() == 0) || formatList.size() == 0)
{ {
test_fail("Failure to get supported formats list\n"); test_fail("Failure to get supported formats list\n");
@@ -728,15 +728,15 @@ int image_from_buffer_fill_positive(cl_device_id device, cl_context context,
cl_image_desc image_desc = { 0 }; cl_image_desc image_desc = { 0 };
image_desc_init(&image_desc, imageType); image_desc_init(&image_desc, imageType);
flag = (flag == CL_MEM_KERNEL_READ_AND_WRITE) cl_mem_flags flag = (flagType == CL_MEM_KERNEL_READ_AND_WRITE)
? CL_MEM_READ_WRITE ? CL_MEM_READ_WRITE
: flag; : flagType;
size_t row_pitch_alignment = 0; size_t row_pitch_alignment = 0;
size_t slice_pitch_alignment = 0; size_t slice_pitch_alignment = 0;
int get_error = get_image_requirement_alignment( int get_error = get_image_requirement_alignment(
device, context, 0, &format, &image_desc, device, context, flag, &format, &image_desc,
&row_pitch_alignment, &slice_pitch_alignment, nullptr); &row_pitch_alignment, &slice_pitch_alignment, nullptr);
if (TEST_PASS != get_error) if (TEST_PASS != get_error)
{ {