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

Refactor clCopyImage and clFillImage tests (#2283)

Browse Source 
This change mainly extends `clFillImage` and `clCopyImage` test function
to include memory flags to be used during creating the image instead of
hard-coding these values. The memory flags are also different parameters
for source and destination images in `clCopyImage` tests.

---------

Signed-off-by: Michael Rizkalla <michael.rizkalla@arm.com>
This commit is contained in:
Michael Rizkalla
2025-04-01 17:53:37 +01:00
committed by GitHub
parent 78bd3ddece
commit 5930d45fc6
19 changed files with 1762 additions and 1043 deletions
Download Patch File Download Diff File Expand all files Collapse all files

227
test_conformance/images/clCopyImage/test_copy_2D.cpp
View File

@@ -18,38 +18,50 @@
extern int test_copy_image_generic( cl_context context, cl_command_queue queue, image_descriptor *srcImageInfo, image_descriptor *dstImageInfo,
const size_t sourcePos[], const size_t destPos[], const size_t regionSize[], MTdata d );
int test_copy_image_size_2D( cl_context context, cl_command_queue queue, image_descriptor *imageInfo, MTdata d )
int test_copy_image_size_2D(cl_context context, cl_command_queue queue,
image_descriptor *srcImageInfo,
image_descriptor *dstImageInfo, MTdata d)
{
size_t sourcePos[ 3 ], destPos[ 3 ], regionSize[ 3 ];
int ret = 0, retCode;
size_t src_lod = 0, src_width_lod = imageInfo->width, src_row_pitch_lod;
size_t src_height_lod = imageInfo->height;
size_t dst_lod = 0, dst_width_lod = imageInfo->width, dst_row_pitch_lod;
size_t dst_height_lod = imageInfo->height;
size_t width_lod = imageInfo->width, height_lod = imageInfo->height;
size_t src_lod = 0, src_width_lod = srcImageInfo->width, src_row_pitch_lod;
size_t src_height_lod = srcImageInfo->height;
size_t dst_lod = 0, dst_width_lod = dstImageInfo->width, dst_row_pitch_lod;
size_t dst_height_lod = dstImageInfo->height;
size_t width_lod = srcImageInfo->width, height_lod = srcImageInfo->height;
size_t max_mip_level = 0;
if( gTestMipmaps )
{
max_mip_level = imageInfo->num_mip_levels;
max_mip_level = srcImageInfo->num_mip_levels;
// Work at a random mip level
src_lod = (size_t)random_in_range( 0, max_mip_level ? max_mip_level - 1 : 0, d );
dst_lod = (size_t)random_in_range( 0, max_mip_level ? max_mip_level - 1 : 0, d );
src_width_lod = ( imageInfo->width >> src_lod )? ( imageInfo->width >> src_lod ) : 1;
dst_width_lod = ( imageInfo->width >> dst_lod )? ( imageInfo->width >> dst_lod ) : 1;
src_height_lod = ( imageInfo->height >> src_lod )? ( imageInfo->height >> src_lod ) : 1;
dst_height_lod = ( imageInfo->height >> dst_lod )? ( imageInfo->height >> dst_lod ) : 1;
src_width_lod = (srcImageInfo->width >> src_lod)
? (srcImageInfo->width >> src_lod)
: 1;
dst_width_lod = (dstImageInfo->width >> dst_lod)
? (dstImageInfo->width >> dst_lod)
: 1;
src_height_lod = (srcImageInfo->height >> src_lod)
? (srcImageInfo->height >> src_lod)
: 1;
dst_height_lod = (dstImageInfo->height >> dst_lod)
? (dstImageInfo->height >> dst_lod)
: 1;
width_lod = ( src_width_lod > dst_width_lod ) ? dst_width_lod : src_width_lod;
height_lod = ( src_height_lod > dst_height_lod ) ? dst_height_lod : src_height_lod;
src_row_pitch_lod = src_width_lod * get_pixel_size( imageInfo->format );
dst_row_pitch_lod = dst_width_lod * get_pixel_size( imageInfo->format );
src_row_pitch_lod =
src_width_lod * get_pixel_size(srcImageInfo->format);
dst_row_pitch_lod =
dst_width_lod * get_pixel_size(srcImageInfo->format);
}
// First, try just a full covering region
sourcePos[ 0 ] = sourcePos[ 1 ] = sourcePos[ 2 ] = 0;
destPos[ 0 ] = destPos[ 1 ] = destPos[ 2 ] = 0;
regionSize[ 0 ] = imageInfo->width;
regionSize[ 1 ] = imageInfo->height;
regionSize[0] = srcImageInfo->width;
regionSize[1] = srcImageInfo->height;
regionSize[ 2 ] = 1;
if(gTestMipmaps)
@@ -60,7 +72,9 @@ int test_copy_image_size_2D( cl_context context, cl_command_queue queue, image_d
regionSize[ 1 ] = height_lod;
}
retCode = test_copy_image_generic( context, queue, imageInfo, imageInfo, sourcePos, destPos, regionSize, d );
retCode =
test_copy_image_generic(context, queue, srcImageInfo, dstImageInfo,
sourcePos, destPos, regionSize, d);
if( retCode < 0 )
return retCode;
else
@@ -74,10 +88,18 @@ int test_copy_image_size_2D( cl_context context, cl_command_queue queue, image_d
// Work at a random mip level
src_lod = (size_t)random_in_range( 0, max_mip_level ? max_mip_level - 1 : 0, d );
dst_lod = (size_t)random_in_range( 0, max_mip_level ? max_mip_level - 1 : 0, d );
src_width_lod = ( imageInfo->width >> src_lod )? ( imageInfo->width >> src_lod ) : 1;
dst_width_lod = ( imageInfo->width >> dst_lod )? ( imageInfo->width >> dst_lod ) : 1;
src_height_lod = ( imageInfo->height >> src_lod )? ( imageInfo->height >> src_lod ) : 1;
dst_height_lod = ( imageInfo->height >> dst_lod )? ( imageInfo->height >> dst_lod ) : 1;
src_width_lod = (srcImageInfo->width >> src_lod)
? (srcImageInfo->width >> src_lod)
: 1;
dst_width_lod = (dstImageInfo->width >> dst_lod)
? (dstImageInfo->width >> dst_lod)
: 1;
src_height_lod = (srcImageInfo->height >> src_lod)
? (srcImageInfo->height >> src_lod)
: 1;
dst_height_lod = (dstImageInfo->height >> dst_lod)
? (dstImageInfo->height >> dst_lod)
: 1;
width_lod = ( src_width_lod > dst_width_lod ) ? dst_width_lod : src_width_lod;
height_lod = ( src_height_lod > dst_height_lod ) ? dst_height_lod : src_height_lod;
sourcePos[ 2 ] = src_lod;
@@ -95,7 +117,9 @@ int test_copy_image_size_2D( cl_context context, cl_command_queue queue, image_d
destPos[ 1 ] = ( height_lod > regionSize[ 1 ] ) ? (size_t)random_in_range( 0, (int)( height_lod - regionSize[ 1 ] - 1 ), d ) : 0;
// Go for it!
retCode = test_copy_image_generic( context, queue, imageInfo, imageInfo, sourcePos, destPos, regionSize, d );
retCode =
test_copy_image_generic(context, queue, srcImageInfo, dstImageInfo,
sourcePos, destPos, regionSize, d);
if( retCode < 0 )
return retCode;
else
@@ -105,17 +129,23 @@ int test_copy_image_size_2D( cl_context context, cl_command_queue queue, image_d
return ret;
}
int test_copy_image_set_2D( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format )
int test_copy_image_set_2D(cl_device_id device, cl_context context,
cl_command_queue queue, cl_mem_flags src_flags,
cl_mem_object_type src_type, cl_mem_flags dst_flags,
cl_mem_object_type dst_type, cl_image_format *format)
{
assert(dst_type == src_type); // This test expects to copy 2D -> 2D images
size_t maxWidth, maxHeight;
cl_ulong maxAllocSize, memSize;
image_descriptor imageInfo = { 0 };
image_descriptor srcImageInfo = { 0 };
image_descriptor dstImageInfo = { 0 };
RandomSeed seed(gRandomSeed);
size_t pixelSize;
imageInfo.format = format;
imageInfo.type = CL_MEM_OBJECT_IMAGE2D;
pixelSize = get_pixel_size( imageInfo.format );
srcImageInfo.format = format;
srcImageInfo.type = src_type;
srcImageInfo.mem_flags = src_flags;
pixelSize = get_pixel_size(srcImageInfo.format);
int error = clGetDeviceInfo( device, CL_DEVICE_IMAGE2D_MAX_WIDTH, sizeof( maxWidth ), &maxWidth, NULL );
error |= clGetDeviceInfo( device, CL_DEVICE_IMAGE2D_MAX_HEIGHT, sizeof( maxHeight ), &maxHeight, NULL );
@@ -130,32 +160,43 @@ int test_copy_image_set_2D( cl_device_id device, cl_context context, cl_command_
if( gTestSmallImages )
{
for( imageInfo.width = 1; imageInfo.width < 13; imageInfo.width++ )
for (srcImageInfo.width = 1; srcImageInfo.width < 13;
srcImageInfo.width++)
{
size_t rowPadding = gEnablePitch ? 48 : 0;
imageInfo.rowPitch = imageInfo.width * pixelSize + rowPadding;
srcImageInfo.rowPitch = srcImageInfo.width * pixelSize + rowPadding;
if (gTestMipmaps)
imageInfo.num_mip_levels = (cl_uint) random_log_in_range(2, (int)compute_max_mip_levels(imageInfo.width, imageInfo.height, 0), seed);
if (gTestMipmaps)
srcImageInfo.num_mip_levels = (cl_uint)random_log_in_range(
2,
(int)compute_max_mip_levels(srcImageInfo.width,
srcImageInfo.height, 0),
seed);
if (gEnablePitch)
{
do {
rowPadding++;
imageInfo.rowPitch = imageInfo.width * pixelSize + rowPadding;
} while ((imageInfo.rowPitch % pixelSize) != 0);
}
if (gEnablePitch)
{
do
{
rowPadding++;
srcImageInfo.rowPitch =
srcImageInfo.width * pixelSize + rowPadding;
} while ((srcImageInfo.rowPitch % pixelSize) != 0);
}
for( imageInfo.height = 1; imageInfo.height < 9; imageInfo.height++ )
{
if( gDebugTrace )
log_info( " at size %d,%d\n", (int)imageInfo.width, (int)imageInfo.height );
for (srcImageInfo.height = 1; srcImageInfo.height < 9;
srcImageInfo.height++)
{
if (gDebugTrace)
log_info(" at size %d,%d\n", (int)srcImageInfo.width,
(int)srcImageInfo.height);
int ret = test_copy_image_size_2D( context, queue, &imageInfo, seed );
if( ret )
return -1;
}
dstImageInfo = srcImageInfo;
dstImageInfo.mem_flags = dst_flags;
int ret = test_copy_image_size_2D(context, queue, &srcImageInfo,
&dstImageInfo, seed);
if (ret) return -1;
}
}
}
else if( gTestMaxImages )
@@ -164,31 +205,42 @@ int test_copy_image_set_2D( cl_device_id device, cl_context context, cl_command_
size_t numbeOfSizes;
size_t sizes[100][3];
get_max_sizes(&numbeOfSizes, 100, sizes, maxWidth, maxHeight, 1, 1, maxAllocSize, memSize, CL_MEM_OBJECT_IMAGE2D, imageInfo.format);
get_max_sizes(&numbeOfSizes, 100, sizes, maxWidth, maxHeight, 1, 1,
maxAllocSize, memSize, src_type, srcImageInfo.format);
for( size_t idx = 0; idx < numbeOfSizes; idx++ )
{
size_t rowPadding = gEnablePitch ? 48 : 0;
imageInfo.width = sizes[ idx ][ 0 ];
imageInfo.height = sizes[ idx ][ 1 ];
imageInfo.rowPitch = imageInfo.width * pixelSize + rowPadding;
srcImageInfo.width = sizes[idx][0];
srcImageInfo.height = sizes[idx][1];
srcImageInfo.rowPitch = srcImageInfo.width * pixelSize + rowPadding;
if (gTestMipmaps)
imageInfo.num_mip_levels = (cl_uint) random_log_in_range(2, (int)compute_max_mip_levels(imageInfo.width, imageInfo.height, 0), seed);
if (gTestMipmaps)
srcImageInfo.num_mip_levels = (cl_uint)random_log_in_range(
2,
(int)compute_max_mip_levels(srcImageInfo.width,
srcImageInfo.height, 0),
seed);
if (gEnablePitch)
{
do {
rowPadding++;
imageInfo.rowPitch = imageInfo.width * pixelSize + rowPadding;
} while ((imageInfo.rowPitch % pixelSize) != 0);
}
if (gEnablePitch)
{
do
{
rowPadding++;
srcImageInfo.rowPitch =
srcImageInfo.width * pixelSize + rowPadding;
} while ((srcImageInfo.rowPitch % pixelSize) != 0);
}
log_info( "Testing %d x %d\n", (int)sizes[ idx ][ 0 ], (int)sizes[ idx ][ 1 ] );
if( gDebugTrace )
log_info( " at max size %d,%d\n", (int)sizes[ idx ][ 0 ], (int)sizes[ idx ][ 1 ] );
if( test_copy_image_size_2D( context, queue, &imageInfo, seed ) )
dstImageInfo = srcImageInfo;
dstImageInfo.mem_flags = dst_flags;
if (test_copy_image_size_2D(context, queue, &srcImageInfo,
&dstImageInfo, seed))
return -1;
}
}
@@ -202,34 +254,51 @@ int test_copy_image_set_2D( cl_device_id device, cl_context context, cl_command_
// image, the result array, plus offset arrays, will fit in the global ram space
do
{
imageInfo.width = (size_t)random_log_in_range( 16, (int)maxWidth / 32, seed );
imageInfo.height = (size_t)random_log_in_range( 16, (int)maxHeight / 32, seed );
srcImageInfo.width =
(size_t)random_log_in_range(16, (int)maxWidth / 32, seed);
srcImageInfo.height =
(size_t)random_log_in_range(16, (int)maxHeight / 32, seed);
if (gTestMipmaps)
{
imageInfo.num_mip_levels = (cl_uint) random_log_in_range(2, (int)compute_max_mip_levels(imageInfo.width, imageInfo.height, 0), seed);
imageInfo.rowPitch = imageInfo.width * get_pixel_size( imageInfo.format );
size = compute_mipmapped_image_size( imageInfo );
size = size*4;
}
if (gTestMipmaps)
{
srcImageInfo.num_mip_levels = (cl_uint)random_log_in_range(
2,
(int)compute_max_mip_levels(srcImageInfo.width,
srcImageInfo.height, 0),
seed);
srcImageInfo.rowPitch = srcImageInfo.width
* get_pixel_size(srcImageInfo.format);
size = compute_mipmapped_image_size(srcImageInfo);
size = size * 4;
}
else
{
imageInfo.rowPitch = imageInfo.width * pixelSize + rowPadding;
if (gEnablePitch)
{
do {
rowPadding++;
imageInfo.rowPitch = imageInfo.width * pixelSize + rowPadding;
} while ((imageInfo.rowPitch % pixelSize) != 0);
}
srcImageInfo.rowPitch = srcImageInfo.width * pixelSize + rowPadding;
if (gEnablePitch)
{
do
{
rowPadding++;
srcImageInfo.rowPitch =
srcImageInfo.width * pixelSize + rowPadding;
} while ((srcImageInfo.rowPitch % pixelSize) != 0);
}
size = (size_t)imageInfo.rowPitch * (size_t)imageInfo.height * 4;
size =
(size_t)srcImageInfo.rowPitch * (size_t)srcImageInfo.height * 4;
}
} while( size > maxAllocSize || ( size * 3 ) > memSize );
if( gDebugTrace )
log_info( " at size %d,%d (row pitch %d) out of %d,%d\n", (int)imageInfo.width, (int)imageInfo.height, (int)imageInfo.rowPitch, (int)maxWidth, (int)maxHeight );
int ret = test_copy_image_size_2D( context, queue, &imageInfo, seed );
log_info(" at size %d,%d (row pitch %d) out of %d,%d\n",
(int)srcImageInfo.width, (int)srcImageInfo.height,
(int)srcImageInfo.rowPitch, (int)maxWidth,
(int)maxHeight);
dstImageInfo = srcImageInfo;
dstImageInfo.mem_flags = dst_flags;
int ret = test_copy_image_size_2D(context, queue, &srcImageInfo,
&dstImageInfo, seed);
if( ret )
return -1;
}