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

Use std::vector for format lists in images suite (#1105)

Browse Source 
* Use std::vector for format lists in images suite

Avoids memory deallocation issues and generally simplifies the code.

* Fixup formatting with git-clang-format
This commit is contained in:
James Price
2021-01-14 08:27:59 -05:00
committed by GitHub
parent 0b6fbd15d1
commit 03a0989998
28 changed files with 280 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,15 +19,42 @@
extern int gTypesToTest;
extern bool gTestReadWrite;
extern int test_read_image_set_1D( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format, image_sampler_data *imageSampler, ExplicitType outputType );
extern int test_read_image_set_1D_buffer( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format, image_sampler_data *imageSampler, ExplicitType outputType );
extern int test_read_image_set_2D( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format, image_sampler_data *imageSampler, ExplicitType outputType );
extern int test_read_image_set_3D( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format, image_sampler_data *imageSampler, ExplicitType outputType );
extern int test_read_image_set_1D_array( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format, image_sampler_data *imageSampler, ExplicitType outputType );
extern int test_read_image_set_2D_array( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format, image_sampler_data *imageSampler, ExplicitType outputType );
extern int test_read_image_set_1D(cl_device_id device, cl_context context,
cl_command_queue queue,
const cl_image_format *format,
image_sampler_data *imageSampler,
ExplicitType outputType);
extern int test_read_image_set_1D_buffer(cl_device_id device,
cl_context context,
cl_command_queue queue,
const cl_image_format *format,
image_sampler_data *imageSampler,
ExplicitType outputType);
extern int test_read_image_set_2D(cl_device_id device, cl_context context,
cl_command_queue queue,
const cl_image_format *format,
image_sampler_data *imageSampler,
ExplicitType outputType);
extern int test_read_image_set_3D(cl_device_id device, cl_context context,
cl_command_queue queue,
const cl_image_format *format,
image_sampler_data *imageSampler,
ExplicitType outputType);
extern int test_read_image_set_1D_array(cl_device_id device, cl_context context,
cl_command_queue queue,
const cl_image_format *format,
image_sampler_data *imageSampler,
ExplicitType outputType);
extern int test_read_image_set_2D_array(cl_device_id device, cl_context context,
cl_command_queue queue,
const cl_image_format *format,
image_sampler_data *imageSampler,
ExplicitType outputType);
int test_read_image_type( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format,
image_sampler_data *imageSampler, ExplicitType outputType, cl_mem_object_type imageType )
int test_read_image_type(cl_device_id device, cl_context context,
cl_command_queue queue, const cl_image_format *format,
image_sampler_data *imageSampler,
ExplicitType outputType, cl_mem_object_type imageType)
{
int ret = 0;
imageSampler->addressing_mode = CL_ADDRESS_NONE;
@@ -68,20 +95,25 @@ int test_read_image_type( cl_device_id device, cl_context context, cl_command_qu
return ret;
}
int test_read_image_formats( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *formatList, bool *filterFlags, unsigned int numFormats,
image_sampler_data *imageSampler, ExplicitType outputType, cl_mem_object_type imageType )
int test_read_image_formats(cl_device_id device, cl_context context,
cl_command_queue queue,
const std::vector<cl_image_format> &formatList,
const std::vector<bool> &filterFlags,
image_sampler_data *imageSampler,
ExplicitType outputType,
cl_mem_object_type imageType)
{
int ret = 0;
imageSampler->normalized_coords = false;
log_info( "read_image (%s coords, %s results) *****************************\n",
"integer", get_explicit_type_name( outputType ) );
for ( unsigned int i = 0; i < numFormats; i++ )
for (unsigned int i = 0; i < formatList.size(); i++)
{
if ( filterFlags[i] )
continue;
cl_image_format &imageFormat = formatList[ i ];
const cl_image_format &imageFormat = formatList[i];
ret |= test_read_image_type( device, context, queue, &imageFormat, imageSampler, outputType, imageType );
}
@@ -95,78 +127,50 @@ int test_image_set( cl_device_id device, cl_context context, cl_command_queue qu
static int printedFormatList = -1;
// Grab the list of supported image formats
cl_image_format *formatList;
unsigned int numFormats;
std::vector<cl_image_format> formatList;
if (gTestReadWrite && checkForReadWriteImageSupport(device))
{
return TEST_SKIPPED_ITSELF;
}
cl_image_format *readOnlyFormats;
unsigned int numReadOnlyFormats;
if (get_format_list(context, imageType, readOnlyFormats, numReadOnlyFormats,
CL_MEM_READ_ONLY))
std::vector<cl_image_format> readOnlyFormats;
if (get_format_list(context, imageType, readOnlyFormats, CL_MEM_READ_ONLY))
return -1;
if (gTestReadWrite)
{
cl_image_format *readWriteFormats;
unsigned int numReadWriteFormats;
std::vector<cl_image_format> readWriteFormats;
if (get_format_list(context, imageType, readWriteFormats,
numReadWriteFormats, CL_MEM_KERNEL_READ_AND_WRITE))
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 i = 0; i < readOnlyFormats.size(); i++)
{
for (unsigned int j = 0; j < numReadWriteFormats; j++)
for (unsigned int j = 0; j < readWriteFormats.size(); 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++;
formatList.push_back(readOnlyFormats[i]);
break;
}
}
}
numFormats = k;
delete[] readOnlyFormats;
delete[] readWriteFormats;
}
else
{
numFormats = numReadOnlyFormats;
formatList = readOnlyFormats;
}
bool *filterFlags = new bool[numFormats];
if ( filterFlags == NULL )
{
log_error( "ERROR: Out of memory allocating filter flags list!\n" );
return -1;
}
memset( filterFlags, 0, sizeof( bool ) * numFormats );
// First time through, we'll go ahead and print the formats supported, regardless of type
if ( printedFormatList != (int)imageType )
{
log_info( "---- Supported %s read formats for this device ---- \n", convert_image_type_to_string(imageType) );
for ( unsigned int f = 0; f < numFormats; f++ )
for (unsigned int f = 0; f < formatList.size(); f++)
log_info( " %-7s %-24s %d\n", GetChannelOrderName( formatList[ f ].image_channel_order ),
GetChannelTypeName( formatList[ f ].image_channel_data_type ),
(int)get_format_channel_count( &formatList[ f ] ) );
@@ -180,9 +184,8 @@ int test_image_set( cl_device_id device, cl_context context, cl_command_queue qu
{
if (gTypesToTest & test.type)
{
if (filter_formats(formatList, filterFlags, numFormats,
test.channelTypes)
== 0)
std::vector<bool> filterFlags(formatList.size(), false);
if (filter_formats(formatList, filterFlags, test.channelTypes) == 0)
{
log_info("No formats supported for %s type\n", test.name);
}
@@ -190,14 +193,11 @@ int test_image_set( cl_device_id device, cl_context context, cl_command_queue qu
{
imageSampler.filter_mode = CL_FILTER_NEAREST;
ret += test_read_image_formats(
device, context, queue, formatList, filterFlags, numFormats,
device, context, queue, formatList, filterFlags,
&imageSampler, test.explicitType, imageType);
}
}
}
delete[] filterFlags;
delete[] formatList;
return ret;
}