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

Unduplicate kernel_read_write image tests (read) (#1552)

Browse Source 
The kernel_read_write tests have a lot of duplicate code. These are the
next steps to reducing the duplication, by using the functions in
test_common.cpp as common for 1D, 1D array and 2D array.

---------

Signed-off-by: Ellen Norris-Thompson <ellen.norris-thompson@arm.com>
Co-authored-by: Ahmed Hesham <117350656+ahesham-arm@users.noreply.github.com>
This commit is contained in:
ellnor01
2024-08-06 17:28:39 +01:00
committed by GitHub
parent 5be093e0c8
commit 13848621f1
5 changed files with 650 additions and 3401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
test_conformance/images/kernel_read_write/test_common.h
View File

@@ -53,6 +53,9 @@ int determine_validation_error_offset(
float zAddressOffset, size_t j, int &numTries, int &numClamped,
bool printAsFloat, int lod)
{
bool image_type_3D = ((imageInfo->type == CL_MEM_OBJECT_IMAGE2D_ARRAY)
|| (imageInfo->type == CL_MEM_OBJECT_IMAGE3D));
bool image_type_1D = (imageInfo->type == CL_MEM_OBJECT_IMAGE1D);
int actualX, actualY, actualZ;
int found = debug_find_pixel_in_image(imagePtr, imageInfo, resultPtr,
&actualX, &actualY, &actualZ, lod);
@@ -66,16 +69,18 @@ int determine_validation_error_offset(
return TEST_FAIL;
}
clamped = get_integer_coords_offset(x, y, z, xAddressOffset, yAddressOffset,
zAddressOffset, imageWidth, imageHeight,
imageDepth, imageSampler, imageInfo,
clampedX, clampedY, clampedZ);
clamped = get_integer_coords_offset(
x, !image_type_1D ? y : 0.0f, image_type_3D ? z : 0.0f, xAddressOffset,
!image_type_1D ? yAddressOffset : 0.0f,
image_type_3D ? zAddressOffset : 0.0f, imageWidth, imageHeight,
imageDepth, imageSampler, imageInfo, clampedX, clampedY, clampedZ);
if (found)
{
// Is it a clamping bug?
if (clamped && clampedX == actualX && clampedY == actualY
&& clampedZ == actualZ)
if (clamped && clampedX == actualX
&& (clampedY == actualY || image_type_1D)
&& (clampedZ == actualZ || !image_type_3D))
{
if ((--numClamped) == 0)
{
@@ -102,6 +107,16 @@ int determine_validation_error_offset(
}
log_error("ERROR: TEST FAILED: Read is erroneously clamping "
"coordinates!\n");
if (imageSampler->filter_mode != CL_FILTER_LINEAR)
{
log_error(
"\tValue really found in image at %d,%d,%d (%s)\n",
actualX, actualY, actualZ,
(found > 1) ? "NOT unique!!" : "unique");
}
log_error("\n");
return -1;
}
clampingErr = true;