ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-26 08:49:02 +00:00
Code Packages Projects Releases Wiki Activity

Fix samplerlessReads read_write (#329) (#1016)

Browse Source 
The test was trying to create read_write image with read_only formats.
Make it use common image formats for both read_only and read_write
flags when creating images.

Fixes issue #329

Signed-off-by: Radek Szymanski <radek.szymanski@arm.com>
Signed-off-by: James Morrissey <james.morrissey@arm.com>

Co-authored-by: Radek Szymanski <radek.szymanski@arm.com>
This commit is contained in:
james-morrissey-arm
2021-01-11 15:02:26 +00:00
committed by GitHub
parent 2597027737
commit 901f5fcb63
1 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
test_conformance/images/samplerlessReads/test_loops.cpp
View File

@@ -96,7 +96,6 @@ int test_image_set( cl_device_id device, cl_context context, cl_command_queue qu
// Grab the list of supported image formats // Grab the list of supported image formats
cl_image_format *formatList; cl_image_format *formatList;
bool *filterFlags;
unsigned int numFormats; unsigned int numFormats;
if (gTestReadWrite && checkForReadWriteImageSupport(device)) if (gTestReadWrite && checkForReadWriteImageSupport(device))
@@ -104,14 +103,58 @@ int test_image_set( cl_device_id device, cl_context context, cl_command_queue qu
return TEST_SKIPPED_ITSELF; return TEST_SKIPPED_ITSELF;
} }
// This flag is only for querying the list of supported formats cl_image_format *readOnlyFormats;
// The flag for creating image will be set explicitly in test functions unsigned int numReadOnlyFormats;
cl_mem_flags flags = (gTestReadWrite)? CL_MEM_KERNEL_READ_AND_WRITE : CL_MEM_READ_ONLY;
if ( get_format_list( context, imageType, formatList, numFormats, flags ) ) if (get_format_list(context, imageType, readOnlyFormats, numReadOnlyFormats,
CL_MEM_READ_ONLY))
return -1; return -1;
filterFlags = new bool[ numFormats ]; if (gTestReadWrite)
{
cl_image_format *readWriteFormats;
unsigned int numReadWriteFormats;
if (get_format_list(context, imageType, readWriteFormats,
numReadWriteFormats, CL_MEM_KERNEL_READ_AND_WRITE))
return -1;
numFormats = numReadOnlyFormats;
formatList = new cl_image_format[numFormats];
unsigned int k = 0;
// Keep only intersecting formats with read only and read write flags
for (unsigned int i = 0; i < numReadOnlyFormats; i++)
{
for (unsigned int j = 0; j < numReadWriteFormats; j++)
{
if (readOnlyFormats[i].image_channel_data_type
== readWriteFormats[j].image_channel_data_type
&& readOnlyFormats[i].image_channel_order
== readWriteFormats[j].image_channel_order)
{
formatList[k].image_channel_data_type =
readOnlyFormats[i].image_channel_data_type;
formatList[k].image_channel_order =
readOnlyFormats[i].image_channel_order;
k++;
break;
}
}
}
numFormats = k;
delete[] readOnlyFormats;
delete[] readWriteFormats;
}
else
{
numFormats = numReadOnlyFormats;
formatList = readOnlyFormats;
}
bool *filterFlags = new bool[numFormats];
if ( filterFlags == NULL ) if ( filterFlags == NULL )
{ {
log_error( "ERROR: Out of memory allocating filter flags list!\n" ); log_error( "ERROR: Out of memory allocating filter flags list!\n" );