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

Minor fixes for clCopyImage. (#1130)

Browse Source 
* Minor fixes for clCopyImage.

Signed-off-by: John Kesapides <john.kesapides@arm.com>
Change-Id: I63c47570e45580e5e29716a46929cb1127711c6b

* Convert comment to CTS style.
Return error code instead of -1 in clFinish.
This commit is contained in:
John Kesapides
2021-01-29 14:16:55 +00:00
committed by GitHub
parent c587b45a2b
commit 5930853a9b
1 changed files with 38 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
test_conformance/images/clCopyImage/test_copy_generic.cpp
View File

@@ -105,23 +105,41 @@ cl_mem create_image( cl_context context, cl_command_queue queue, BufferOwningPtr
if ( *error != CL_SUCCESS ) if ( *error != CL_SUCCESS )
{ {
long long unsigned imageSize = get_image_size_mb(imageInfo);
switch (imageInfo->type) switch (imageInfo->type)
{ {
case CL_MEM_OBJECT_IMAGE1D: case CL_MEM_OBJECT_IMAGE1D:
log_error( "ERROR: Unable to create 1D image of size %d (%s)", (int)imageInfo->width, IGetErrorString( *error ) ); log_error("ERROR: Unable to create 1D image of size %d (%llu "
"MB):(%s)",
(int)imageInfo->width, imageSize,
IGetErrorString(*error));
break; break;
case CL_MEM_OBJECT_IMAGE2D: case CL_MEM_OBJECT_IMAGE2D:
log_error( "ERROR: Unable to create 2D image of size %d x %d (%s)", (int)imageInfo->width, (int)imageInfo->height, IGetErrorString( *error ) ); log_error("ERROR: Unable to create 2D image of size %d x %d "
"(%llu MB):(%s)",
(int)imageInfo->width, (int)imageInfo->height,
imageSize, IGetErrorString(*error));
break; break;
case CL_MEM_OBJECT_IMAGE3D: case CL_MEM_OBJECT_IMAGE3D:
log_error( "ERROR: Unable to create 3D image of size %d x %d x %d (%s)", (int)imageInfo->width, (int)imageInfo->height, (int)imageInfo->depth, IGetErrorString( *error ) ); log_error("ERROR: Unable to create 3D image of size %d x %d x "
"%d (%llu MB):(%s)",
(int)imageInfo->width, (int)imageInfo->height,
(int)imageInfo->depth, imageSize,
IGetErrorString(*error));
break; break;
case CL_MEM_OBJECT_IMAGE1D_ARRAY: case CL_MEM_OBJECT_IMAGE1D_ARRAY:
log_error( "ERROR: Unable to create 1D image array of size %d x %d (%s)", (int)imageInfo->width, (int)imageInfo->arraySize, IGetErrorString( *error ) ); log_error("ERROR: Unable to create 1D image array of size %d x "
"%d (%llu MB):(%s)",
(int)imageInfo->width, (int)imageInfo->arraySize,
imageSize, IGetErrorString(*error));
break; break;
break; break;
case CL_MEM_OBJECT_IMAGE2D_ARRAY: case CL_MEM_OBJECT_IMAGE2D_ARRAY:
log_error( "ERROR: Unable to create 2D image array of size %d x %d x %d (%s)", (int)imageInfo->width, (int)imageInfo->height, (int)imageInfo->arraySize, IGetErrorString( *error ) ); log_error("ERROR: Unable to create 2D image array of size %d x "
"%d x %d (%llu MB):(%s)",
(int)imageInfo->width, (int)imageInfo->height,
(int)imageInfo->arraySize, imageSize,
IGetErrorString(*error));
break; break;
} }
log_error("ERROR: and %llu mip levels\n", (unsigned long long) imageInfo->num_mip_levels); log_error("ERROR: and %llu mip levels\n", (unsigned long long) imageInfo->num_mip_levels);
@@ -291,24 +309,7 @@ int test_copy_image_generic( cl_context context, cl_command_queue queue, image_d
} }
else else
{ {
switch (srcImageInfo->type) srcBytes = get_image_size(srcImageInfo);
{
case CL_MEM_OBJECT_IMAGE1D:
srcBytes = srcImageInfo->rowPitch;
break;
case CL_MEM_OBJECT_IMAGE2D:
srcBytes = srcImageInfo->height * srcImageInfo->rowPitch;
break;
case CL_MEM_OBJECT_IMAGE3D:
srcBytes = srcImageInfo->depth * srcImageInfo->slicePitch;
break;
case CL_MEM_OBJECT_IMAGE1D_ARRAY:
srcBytes = srcImageInfo->arraySize * srcImageInfo->slicePitch;
break;
case CL_MEM_OBJECT_IMAGE2D_ARRAY:
srcBytes = srcImageInfo->arraySize * srcImageInfo->slicePitch;
break;
}
} }
if (srcBytes > srcData.getSize()) if (srcBytes > srcData.getSize())
@@ -344,24 +345,7 @@ int test_copy_image_generic( cl_context context, cl_command_queue queue, image_d
} }
else else
{ {
switch (dstImageInfo->type) destImageSize = get_image_size(dstImageInfo);
{
case CL_MEM_OBJECT_IMAGE1D:
destImageSize = dstImageInfo->rowPitch;
break;
case CL_MEM_OBJECT_IMAGE2D:
destImageSize = dstImageInfo->height * dstImageInfo->rowPitch;
break;
case CL_MEM_OBJECT_IMAGE3D:
destImageSize = dstImageInfo->depth * dstImageInfo->slicePitch;
break;
case CL_MEM_OBJECT_IMAGE1D_ARRAY:
destImageSize = dstImageInfo->arraySize * dstImageInfo->slicePitch;
break;
case CL_MEM_OBJECT_IMAGE2D_ARRAY:
destImageSize = dstImageInfo->arraySize * dstImageInfo->slicePitch;
break;
}
} }
if (destImageSize > dstData.getSize()) if (destImageSize > dstData.getSize())
@@ -373,7 +357,11 @@ int test_copy_image_generic( cl_context context, cl_command_queue queue, image_d
log_error( "ERROR: Unable to malloc %lu bytes for dstData\n", destImageSize ); log_error( "ERROR: Unable to malloc %lu bytes for dstData\n", destImageSize );
return -1; return -1;
} }
}
if (destImageSize > dstHost.getSize())
{
dstHost.reset(NULL);
dstHost.reset(malloc(destImageSize),NULL,0,destImageSize); dstHost.reset(malloc(destImageSize),NULL,0,destImageSize);
if (dstHost == NULL) { if (dstHost == NULL) {
dstData.reset(NULL); dstData.reset(NULL);
@@ -632,5 +620,14 @@ int test_copy_image_generic( cl_context context, cl_command_queue queue, image_d
return error; return error;
} }
// Ensure the unmap call completes.
error = clFinish(queue);
if (error != CL_SUCCESS)
{
log_error("ERROR: clFinish() failed to return CL_SUCCESS: %s\n",
IGetErrorString(error));
return error;
}
return 0; return 0;
} }