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

skip test cases rather than fail without cl_khr_3d_image_writes (#874)

Browse Source 
* skip test cases rather than fail without cl_khr_3d_image_writes

cl_khr_3d_image_writes is required for OpenCL 2.x devices, but is not
required for OpenCL 1.x or OpenCL 3.0 devices.  A check for the presence
of the extension on OpenCL 2.x devices already exists in
test_min_max_device_version, so we don't need any failure conditions
here, and can just skip tests if the extension is not supported.

* clang-format changes
This commit is contained in:
Ben Ashbaugh
2020-08-14 03:17:44 -07:00
committed by GitHub
parent 0ad8c9a9c0
commit 0424fc7f12
1 changed files with 196 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

202
test_conformance/images/kernel_read_write/test_loops.cpp
View File

@@ -29,28 +29,53 @@ extern bool gTestMipmaps;
extern int gtestTypesToRun; extern int gtestTypesToRun;
extern bool gDeviceLt20; extern bool gDeviceLt20;
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, 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,
bool floatCoords, ExplicitType outputType); bool floatCoords, 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, 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,
bool floatCoords, ExplicitType outputType); bool floatCoords, 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, extern int test_read_image_set_3D(cl_device_id device, cl_context context,
bool floatCoords, ExplicitType outputType ); cl_command_queue queue,
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, cl_image_format *format,
bool floatCoords, ExplicitType outputType ); image_sampler_data *imageSampler,
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,
bool floatCoords, ExplicitType outputType); bool floatCoords, 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,
bool floatCoords,
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,
bool floatCoords,
ExplicitType outputType);
int test_read_image_type( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format, bool floatCoords, int test_read_image_type(cl_device_id device, cl_context context,
image_sampler_data *imageSampler, ExplicitType outputType, cl_mem_object_type imageType ) cl_command_queue queue, cl_image_format *format,
bool floatCoords, image_sampler_data *imageSampler,
ExplicitType outputType, cl_mem_object_type imageType)
{ {
int ret = 0; int ret = 0;
cl_addressing_mode *addressModes = NULL; cl_addressing_mode *addressModes = NULL;
// The sampler-less read image functions behave exactly as the corresponding read image functions // The sampler-less read image functions behave exactly as the corresponding
// described in section 6.13.14.2 that take integer coordinates and a sampler with filter mode set to // read image functions described in section 6.13.14.2 that take integer
// CLK_FILTER_NEAREST, normalized coordinates set to CLK_NORMALIZED_COORDS_FALSE and addressing mode to CLK_ADDRESS_NONE // coordinates and a sampler with filter mode set to CLK_FILTER_NEAREST,
cl_addressing_mode addressModes_rw[] = { CL_ADDRESS_NONE, (cl_addressing_mode)-1 }; // normalized coordinates set to CLK_NORMALIZED_COORDS_FALSE and addressing
cl_addressing_mode addressModes_ro[] = { /* CL_ADDRESS_CLAMP_NONE,*/ CL_ADDRESS_CLAMP_TO_EDGE, CL_ADDRESS_CLAMP, CL_ADDRESS_REPEAT, CL_ADDRESS_MIRRORED_REPEAT, (cl_addressing_mode)-1 }; // mode to CLK_ADDRESS_NONE
cl_addressing_mode addressModes_rw[] = { CL_ADDRESS_NONE,
(cl_addressing_mode)-1 };
cl_addressing_mode addressModes_ro[] = {
/* CL_ADDRESS_CLAMP_NONE,*/ CL_ADDRESS_CLAMP_TO_EDGE, CL_ADDRESS_CLAMP,
CL_ADDRESS_REPEAT, CL_ADDRESS_MIRRORED_REPEAT, (cl_addressing_mode)-1
};
if (gtestTypesToRun & kReadWriteTests) if (gtestTypesToRun & kReadWriteTests)
{ {
@@ -66,32 +91,38 @@ int test_read_image_type( cl_device_id device, cl_context context, cl_command_qu
// of operations for linear filtering on the GPU. We do not test linear // of operations for linear filtering on the GPU. We do not test linear
// filtering for the CL_RGB CL_UNORM_INT_101010 image format; however, we // filtering for the CL_RGB CL_UNORM_INT_101010 image format; however, we
// test it internally for a set of other image formats. // test it internally for a set of other image formats.
if ((gDeviceType == CL_DEVICE_TYPE_GPU) && if ((gDeviceType == CL_DEVICE_TYPE_GPU)
(imageSampler->filter_mode == CL_FILTER_LINEAR) && && (imageSampler->filter_mode == CL_FILTER_LINEAR)
(format->image_channel_order == CL_RGB) && && (format->image_channel_order == CL_RGB)
(format->image_channel_data_type == CL_UNORM_INT_101010)) && (format->image_channel_data_type == CL_UNORM_INT_101010))
{ {
log_info("--- Skipping CL_RGB CL_UNORM_INT_101010 format with CL_FILTER_LINEAR on GPU.\n"); log_info("--- Skipping CL_RGB CL_UNORM_INT_101010 format with "
"CL_FILTER_LINEAR on GPU.\n");
return 0; return 0;
} }
#endif #endif
for( int adMode = 0; addressModes[ adMode ] != (cl_addressing_mode)-1; adMode++ ) for (int adMode = 0; addressModes[adMode] != (cl_addressing_mode)-1;
adMode++)
{ {
imageSampler->addressing_mode = addressModes[adMode]; imageSampler->addressing_mode = addressModes[adMode];
if( (addressModes[ adMode ] == CL_ADDRESS_REPEAT || addressModes[ adMode ] == CL_ADDRESS_MIRRORED_REPEAT) && !( imageSampler->normalized_coords ) ) if ((addressModes[adMode] == CL_ADDRESS_REPEAT
|| addressModes[adMode] == CL_ADDRESS_MIRRORED_REPEAT)
&& !(imageSampler->normalized_coords))
continue; // Repeat doesn't make sense for non-normalized coords continue; // Repeat doesn't make sense for non-normalized coords
// Use this run if we were told to only run a certain filter mode // Use this run if we were told to only run a certain filter mode
if( gAddressModeToUse != (cl_addressing_mode)-1 && imageSampler->addressing_mode != gAddressModeToUse ) if (gAddressModeToUse != (cl_addressing_mode)-1
&& imageSampler->addressing_mode != gAddressModeToUse)
continue; continue;
/* /*
Remove redundant check to see if workaround still necessary Remove redundant check to see if workaround still necessary
// Check added in because this case was leaking through causing a crash on CPU // Check added in because this case was leaking through causing a crash
if( ! imageSampler->normalized_coords && imageSampler->addressing_mode == CL_ADDRESS_REPEAT ) on CPU if( ! imageSampler->normalized_coords &&
continue; //repeat mode requires normalized coordinates imageSampler->addressing_mode == CL_ADDRESS_REPEAT ) continue; //repeat
mode requires normalized coordinates
*/ */
print_read_header(format, imageSampler, false); print_read_header(format, imageSampler, false);
@@ -101,19 +132,29 @@ int test_read_image_type( cl_device_id device, cl_context context, cl_command_qu
switch (imageType) switch (imageType)
{ {
case CL_MEM_OBJECT_IMAGE1D: case CL_MEM_OBJECT_IMAGE1D:
retCode = test_read_image_set_1D( device, context, queue, format, imageSampler, floatCoords, outputType ); retCode = test_read_image_set_1D(device, context, queue, format,
imageSampler, floatCoords,
outputType);
break; break;
case CL_MEM_OBJECT_IMAGE1D_ARRAY: case CL_MEM_OBJECT_IMAGE1D_ARRAY:
retCode = test_read_image_set_1D_array( device, context, queue, format, imageSampler, floatCoords, outputType ); retCode = test_read_image_set_1D_array(device, context, queue,
format, imageSampler,
floatCoords, outputType);
break; break;
case CL_MEM_OBJECT_IMAGE2D: case CL_MEM_OBJECT_IMAGE2D:
retCode = test_read_image_set_2D( device, context, queue, format, imageSampler, floatCoords, outputType ); retCode = test_read_image_set_2D(device, context, queue, format,
imageSampler, floatCoords,
outputType);
break; break;
case CL_MEM_OBJECT_IMAGE2D_ARRAY: case CL_MEM_OBJECT_IMAGE2D_ARRAY:
retCode = test_read_image_set_2D_array( device, context, queue, format, imageSampler, floatCoords, outputType ); retCode = test_read_image_set_2D_array(device, context, queue,
format, imageSampler,
floatCoords, outputType);
break; break;
case CL_MEM_OBJECT_IMAGE3D: case CL_MEM_OBJECT_IMAGE3D:
retCode = test_read_image_set_3D( device, context, queue, format, imageSampler, floatCoords, outputType ); retCode = test_read_image_set_3D(device, context, queue, format,
imageSampler, floatCoords,
outputType);
break; break;
} }
if (retCode != 0) if (retCode != 0)
@@ -129,8 +170,12 @@ int test_read_image_type( cl_device_id device, cl_context context, cl_command_qu
return ret; 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, int test_read_image_formats(cl_device_id device, cl_context context,
image_sampler_data *imageSampler, ExplicitType outputType, cl_mem_object_type imageType ) 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 ret = 0; int ret = 0;
bool flipFlop[2] = { false, true }; bool flipFlop[2] = { false, true };
@@ -138,22 +183,27 @@ int test_read_image_formats( cl_device_id device, cl_context context, cl_command
// Use this run if we were told to only run a certain filter mode // Use this run if we were told to only run a certain filter mode
if( gFilterModeToUse != (cl_filter_mode)-1 && imageSampler->filter_mode != gFilterModeToUse ) if (gFilterModeToUse != (cl_filter_mode)-1
&& imageSampler->filter_mode != gFilterModeToUse)
return 0; return 0;
// Test normalized/non-normalized // Test normalized/non-normalized
for (normalizedIdx = 0; normalizedIdx < 2; normalizedIdx++) for (normalizedIdx = 0; normalizedIdx < 2; normalizedIdx++)
{ {
imageSampler->normalized_coords = flipFlop[normalizedIdx]; imageSampler->normalized_coords = flipFlop[normalizedIdx];
if( gNormalizedModeToUse != 7 && gNormalizedModeToUse != (int)imageSampler->normalized_coords ) if (gNormalizedModeToUse != 7
&& gNormalizedModeToUse != (int)imageSampler->normalized_coords)
continue; continue;
for (floatCoordIdx = 0; floatCoordIdx < 2; floatCoordIdx++) for (floatCoordIdx = 0; floatCoordIdx < 2; floatCoordIdx++)
{ {
// Checks added in because this case was leaking through causing a crash on CPU // Checks added in because this case was leaking through causing a
// crash on CPU
if (!flipFlop[floatCoordIdx]) if (!flipFlop[floatCoordIdx])
if( imageSampler->filter_mode != CL_FILTER_NEAREST || // integer coords can only be used with nearest if (imageSampler->filter_mode != CL_FILTER_NEAREST
flipFlop[ normalizedIdx ]) // Normalized integer coords makes no sense (they'd all be zero) || // integer coords can only be used with nearest
flipFlop[normalizedIdx]) // Normalized integer coords makes
// no sense (they'd all be zero)
continue; continue;
if (flipFlop[floatCoordIdx] && (gtestTypesToRun & kReadWriteTests)) if (flipFlop[floatCoordIdx] && (gtestTypesToRun & kReadWriteTests))
@@ -161,18 +211,24 @@ int test_read_image_formats( cl_device_id device, cl_context context, cl_command
continue; continue;
log_info( "read_image (%s coords, %s results) *****************************\n", log_info("read_image (%s coords, %s results) "
flipFlop[ floatCoordIdx ] ? ( imageSampler->normalized_coords ? "normalized float" : "unnormalized float" ) : "integer", "*****************************\n",
flipFlop[floatCoordIdx] ? (imageSampler->normalized_coords
? "normalized float"
: "unnormalized float")
: "integer",
get_explicit_type_name(outputType)); get_explicit_type_name(outputType));
for (unsigned int i = 0; i < numFormats; i++) for (unsigned int i = 0; i < numFormats; i++)
{ {
if( filterFlags[i] ) if (filterFlags[i]) continue;
continue;
cl_image_format &imageFormat = formatList[i]; cl_image_format &imageFormat = formatList[i];
ret |= test_read_image_type( device, context, queue, &imageFormat, flipFlop[ floatCoordIdx ], imageSampler, outputType, imageType ); ret |=
test_read_image_type(device, context, queue, &imageFormat,
flipFlop[floatCoordIdx], imageSampler,
outputType, imageType);
} }
} }
} }
@@ -180,20 +236,27 @@ int test_read_image_formats( cl_device_id device, cl_context context, cl_command
} }
int test_image_set( cl_device_id device, cl_context context, cl_command_queue queue, test_format_set_fn formatTestFn, cl_mem_object_type imageType ) int test_image_set(cl_device_id device, cl_context context,
cl_command_queue queue, test_format_set_fn formatTestFn,
cl_mem_object_type imageType)
{ {
int ret = 0; int ret = 0;
static int printedFormatList = -1; static int printedFormatList = -1;
if ( ( 0 == is_extension_available( device, "cl_khr_3d_image_writes" )) && (imageType == CL_MEM_OBJECT_IMAGE3D) && (formatTestFn == test_write_image_formats) ) if ((imageType == CL_MEM_OBJECT_IMAGE3D)
&& (formatTestFn == test_write_image_formats))
{ {
gFailCount++; if (0 == is_extension_available(device, "cl_khr_3d_image_writes"))
log_error( "-----------------------------------------------------\n" ); {
log_error( "FAILED: test writing CL_MEM_OBJECT_IMAGE3D images\n" ); log_info("-----------------------------------------------------\n");
log_error( "This device does not support the mandated extension cl_khr_3d_image_writes.\n"); log_info(
log_error( "-----------------------------------------------------\n\n" ); "This device does not support "
return -1; "cl_khr_3d_image_writes.\nSkipping 3d image write test. \n");
log_info(
"-----------------------------------------------------\n\n");
return 0;
}
} }
if (gTestMipmaps) if (gTestMipmaps)
@@ -201,22 +264,30 @@ int test_image_set( cl_device_id device, cl_context context, cl_command_queue qu
if (0 == is_extension_available(device, "cl_khr_mipmap_image")) if (0 == is_extension_available(device, "cl_khr_mipmap_image"))
{ {
log_info("-----------------------------------------------------\n"); log_info("-----------------------------------------------------\n");
log_info( "This device does not support cl_khr_mipmap_image.\nSkipping mipmapped image test. \n" ); log_info("This device does not support "
log_info( "-----------------------------------------------------\n\n" ); "cl_khr_mipmap_image.\nSkipping mipmapped image test. \n");
log_info(
"-----------------------------------------------------\n\n");
return 0; return 0;
} }
if ( ( 0 == is_extension_available( device, "cl_khr_mipmap_image_writes" )) && (formatTestFn == test_write_image_formats)) if ((0 == is_extension_available(device, "cl_khr_mipmap_image_writes"))
&& (formatTestFn == test_write_image_formats))
{ {
log_info("-----------------------------------------------------\n"); log_info("-----------------------------------------------------\n");
log_info( "This device does not support cl_khr_mipmap_image_writes.\nSkipping mipmapped image write test. \n" ); log_info("This device does not support "
log_info( "-----------------------------------------------------\n\n" ); "cl_khr_mipmap_image_writes.\nSkipping mipmapped image "
"write test. \n");
log_info(
"-----------------------------------------------------\n\n");
return 0; return 0;
} }
} }
int version_check = (get_device_cl_version(device) < Version(1, 2)); int version_check = (get_device_cl_version(device) < Version(1, 2));
if (version_check != 0) { if (version_check != 0)
switch (imageType) { {
switch (imageType)
{
case CL_MEM_OBJECT_IMAGE1D: case CL_MEM_OBJECT_IMAGE1D:
test_missing_feature(version_check, "image_1D"); test_missing_feature(version_check, "image_1D");
case CL_MEM_OBJECT_IMAGE1D_ARRAY: case CL_MEM_OBJECT_IMAGE1D_ARRAY:
@@ -276,15 +347,22 @@ int test_image_set( cl_device_id device, cl_context context, cl_command_queue qu
BufferOwningPtr<bool> filterFlagsBuf(filterFlags); BufferOwningPtr<bool> filterFlagsBuf(filterFlags);
memset(filterFlags, 0, sizeof(bool) * numFormats); memset(filterFlags, 0, sizeof(bool) * numFormats);
// First time through, we'll go ahead and print the formats supported, regardless of type // First time through, we'll go ahead and print the formats supported,
int test = imageType | (formatTestFn == test_read_image_formats ? (1 << 16) : (1 << 17)); // regardless of type
int test = imageType
| (formatTestFn == test_read_image_formats ? (1 << 16) : (1 << 17));
if (printedFormatList != test) if (printedFormatList != test)
{ {
log_info( "---- Supported %s %s formats for this device ---- \n", convert_image_type_to_string(imageType), flagNames ); log_info("---- Supported %s %s formats for this device ---- \n",
convert_image_type_to_string(imageType), flagNames);
for (unsigned int f = 0; f < numFormats; f++) for (unsigned int f = 0; f < numFormats; f++)
{ {
if ( IsChannelOrderSupported( formatList[ f ].image_channel_order ) && IsChannelTypeSupported( formatList[ f ].image_channel_data_type ) ) if (IsChannelOrderSupported(formatList[f].image_channel_order)
log_info( " %-7s %-24s %d\n", GetChannelOrderName( formatList[ f ].image_channel_order ), && IsChannelTypeSupported(
formatList[f].image_channel_data_type))
log_info(
" %-7s %-24s %d\n",
GetChannelOrderName(formatList[f].image_channel_order),
GetChannelTypeName(formatList[f].image_channel_data_type), GetChannelTypeName(formatList[f].image_channel_data_type),
(int)get_format_channel_count(&formatList[f])); (int)get_format_channel_count(&formatList[f]));
} }