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

Add testing of CL_UNORM_INT_2_101010_EXT (#2112)

Browse Source 
All existing tests in `test_image_streams`, that are capable of testing
image formats using the `CL_UNORM_INT_2_101010_EXT` data type, do so.

Signed-off-by: Gorazd Sumkovski <gorazd.sumkovski@arm.com>
This commit is contained in:
gorazd-sumkovski-arm
2024-10-22 17:54:46 +01:00
committed by GitHub
parent 482a6bcff0
commit e678277c93
5 changed files with 76 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test_common/harness/errorHelpers.cpp
View File

@@ -197,6 +197,7 @@ const char *GetChannelTypeName(cl_channel_type type)
case CL_UNORM_SHORT_555: return "CL_UNORM_SHORT_555"; case CL_UNORM_SHORT_555: return "CL_UNORM_SHORT_555";
case CL_UNORM_INT_101010: return "CL_UNORM_INT_101010"; case CL_UNORM_INT_101010: return "CL_UNORM_INT_101010";
case CL_UNORM_INT_101010_2: return "CL_UNORM_INT_101010_2"; case CL_UNORM_INT_101010_2: return "CL_UNORM_INT_101010_2";
case CL_UNORM_INT_2_101010_EXT: return "CL_UNORM_INT_2_101010_EXT";
case CL_SIGNED_INT8: return "CL_SIGNED_INT8"; case CL_SIGNED_INT8: return "CL_SIGNED_INT8";
case CL_SIGNED_INT16: return "CL_SIGNED_INT16"; case CL_SIGNED_INT16: return "CL_SIGNED_INT16";
case CL_SIGNED_INT32: return "CL_SIGNED_INT32"; case CL_SIGNED_INT32: return "CL_SIGNED_INT32";
@@ -228,6 +229,7 @@ int IsChannelTypeSupported(cl_channel_type type)
case CL_UNORM_SHORT_555: case CL_UNORM_SHORT_555:
case CL_UNORM_INT_101010: case CL_UNORM_INT_101010:
case CL_UNORM_INT_101010_2: case CL_UNORM_INT_101010_2:
case CL_UNORM_INT_2_101010_EXT:
case CL_SIGNED_INT8: case CL_SIGNED_INT8:
case CL_SIGNED_INT16: case CL_SIGNED_INT16:
case CL_SIGNED_INT32: case CL_SIGNED_INT32:

82
test_common/harness/imageHelpers.cpp
View File

@@ -100,7 +100,8 @@ uint32_t get_channel_data_type_size(cl_channel_type channelType)
case CL_UNORM_SHORT_555: return 2; case CL_UNORM_SHORT_555: return 2;
case CL_UNORM_INT_101010: case CL_UNORM_INT_101010:
case CL_UNORM_INT_101010_2: return 4; case CL_UNORM_INT_101010_2:
case CL_UNORM_INT_2_101010_EXT: return 4;
case CL_FLOAT: return sizeof(cl_float); case CL_FLOAT: return sizeof(cl_float);
@@ -163,25 +164,27 @@ cl_channel_type get_channel_type_from_name(const char *name)
{ {
cl_channel_type type; cl_channel_type type;
const char *name; const char *name;
} typeNames[] = { { CL_SNORM_INT8, "CL_SNORM_INT8" }, } typeNames[] = {
{ CL_SNORM_INT16, "CL_SNORM_INT16" }, { CL_SNORM_INT8, "CL_SNORM_INT8" },
{ CL_UNORM_INT8, "CL_UNORM_INT8" }, { CL_SNORM_INT16, "CL_SNORM_INT16" },
{ CL_UNORM_INT16, "CL_UNORM_INT16" }, { CL_UNORM_INT8, "CL_UNORM_INT8" },
{ CL_UNORM_INT24, "CL_UNORM_INT24" }, { CL_UNORM_INT16, "CL_UNORM_INT16" },
{ CL_UNORM_SHORT_565, "CL_UNORM_SHORT_565" }, { CL_UNORM_INT24, "CL_UNORM_INT24" },
{ CL_UNORM_SHORT_555, "CL_UNORM_SHORT_555" }, { CL_UNORM_SHORT_565, "CL_UNORM_SHORT_565" },
{ CL_UNORM_INT_101010, "CL_UNORM_INT_101010" }, { CL_UNORM_SHORT_555, "CL_UNORM_SHORT_555" },
{ CL_UNORM_INT_101010_2, "CL_UNORM_INT_101010_2" }, { CL_UNORM_INT_101010, "CL_UNORM_INT_101010" },
{ CL_SIGNED_INT8, "CL_SIGNED_INT8" }, { CL_UNORM_INT_101010_2, "CL_UNORM_INT_101010_2" },
{ CL_SIGNED_INT16, "CL_SIGNED_INT16" }, { CL_UNORM_INT_2_101010_EXT, "CL_UNORM_INT_2_101010_EXT" },
{ CL_SIGNED_INT32, "CL_SIGNED_INT32" }, { CL_SIGNED_INT8, "CL_SIGNED_INT8" },
{ CL_UNSIGNED_INT8, "CL_UNSIGNED_INT8" }, { CL_SIGNED_INT16, "CL_SIGNED_INT16" },
{ CL_UNSIGNED_INT16, "CL_UNSIGNED_INT16" }, { CL_SIGNED_INT32, "CL_SIGNED_INT32" },
{ CL_UNSIGNED_INT32, "CL_UNSIGNED_INT32" }, { CL_UNSIGNED_INT8, "CL_UNSIGNED_INT8" },
{ CL_HALF_FLOAT, "CL_HALF_FLOAT" }, { CL_UNSIGNED_INT16, "CL_UNSIGNED_INT16" },
{ CL_FLOAT, "CL_FLOAT" }, { CL_UNSIGNED_INT32, "CL_UNSIGNED_INT32" },
{ CL_HALF_FLOAT, "CL_HALF_FLOAT" },
{ CL_FLOAT, "CL_FLOAT" },
#ifdef CL_SFIXED14_APPLE #ifdef CL_SFIXED14_APPLE
{ CL_SFIXED14_APPLE, "CL_SFIXED14_APPLE" } { CL_SFIXED14_APPLE, "CL_SFIXED14_APPLE" }
#endif #endif
}; };
for (size_t i = 0; i < sizeof(typeNames) / sizeof(typeNames[0]); i++) for (size_t i = 0; i < sizeof(typeNames) / sizeof(typeNames[0]); i++)
@@ -288,7 +291,8 @@ uint32_t get_pixel_size(const cl_image_format *format)
case CL_FLOAT: case CL_FLOAT:
return get_format_channel_count(format) * sizeof(cl_float); return get_format_channel_count(format) * sizeof(cl_float);
case CL_UNORM_INT_101010_2: return 4; case CL_UNORM_INT_101010_2:
case CL_UNORM_INT_2_101010_EXT: return 4;
case CL_UNSIGNED_INT_RAW10_EXT: case CL_UNSIGNED_INT_RAW10_EXT:
case CL_UNSIGNED_INT_RAW12_EXT: return 2; case CL_UNSIGNED_INT_RAW12_EXT: return 2;
@@ -937,6 +941,7 @@ float get_max_relative_error(const cl_image_format *format,
case CL_UNORM_SHORT_555: case CL_UNORM_SHORT_555:
case CL_UNORM_INT_101010: case CL_UNORM_INT_101010:
case CL_UNORM_INT_101010_2: case CL_UNORM_INT_101010_2:
case CL_UNORM_INT_2_101010_EXT:
// Maximum sampling error for round to zero normalization based on // Maximum sampling error for round to zero normalization based on
// multiplication by reciprocal (using reciprocal generated in // multiplication by reciprocal (using reciprocal generated in
// round to +inf mode, so that 1.0 matches spec) // round to +inf mode, so that 1.0 matches spec)
@@ -1021,7 +1026,8 @@ size_t get_format_max_int(const cl_image_format *format)
case CL_UNORM_SHORT_555: return 31; case CL_UNORM_SHORT_555: return 31;
case CL_UNORM_INT_101010: case CL_UNORM_INT_101010:
case CL_UNORM_INT_101010_2: return 1023; case CL_UNORM_INT_101010_2:
case CL_UNORM_INT_2_101010_EXT: return 1023;
case CL_HALF_FLOAT: return 1 << 10; case CL_HALF_FLOAT: return 1 << 10;
@@ -1054,7 +1060,8 @@ int get_format_min_int(const cl_image_format *format)
case CL_UNORM_SHORT_565: case CL_UNORM_SHORT_565:
case CL_UNORM_SHORT_555: case CL_UNORM_SHORT_555:
case CL_UNORM_INT_101010: case CL_UNORM_INT_101010:
case CL_UNORM_INT_101010_2: return 0; case CL_UNORM_INT_101010_2:
case CL_UNORM_INT_2_101010_EXT: return 0;
case CL_HALF_FLOAT: return -(1 << 10); case CL_HALF_FLOAT: return -(1 << 10);
@@ -1479,6 +1486,15 @@ void read_image_pixel_float(void *imageData, image_descriptor *imageInfo, int x,
break; break;
} }
case CL_UNORM_INT_2_101010_EXT: {
cl_uint *dPtr = (cl_uint *)ptr;
tempData[0] = (float)((dPtr[0] >> 30) & 0x3) / (float)3;
tempData[1] = (float)((dPtr[0] >> 20) & 0x3ff) / (float)1023;
tempData[2] = (float)(dPtr[0] >> 10 & 0x3ff) / (float)1023;
tempData[3] = (float)(dPtr[0] >> 0 & 0x3ff) / (float)1023;
break;
}
case CL_FLOAT: { case CL_FLOAT: {
float *dPtr = (float *)ptr; float *dPtr = (float *)ptr;
for (i = 0; i < channelCount; i++) tempData[i] = (float)dPtr[i]; for (i = 0; i < channelCount; i++) tempData[i] = (float)dPtr[i];
@@ -2753,6 +2769,14 @@ void pack_image_pixel(float *srcVector, const cl_image_format *imageFormat,
| (((unsigned int)NORMALIZE(srcVector[3], 3.f) & 3) << 0); | (((unsigned int)NORMALIZE(srcVector[3], 3.f) & 3) << 0);
break; break;
} }
case CL_UNORM_INT_2_101010_EXT: {
cl_uint *ptr = (cl_uint *)outData;
ptr[0] = (((unsigned int)NORMALIZE(srcVector[0], 3.f) & 3) << 30)
| (((unsigned int)NORMALIZE(srcVector[1], 1023.f) & 1023) << 20)
| (((unsigned int)NORMALIZE(srcVector[2], 1023.f) & 1023) << 10)
| (((unsigned int)NORMALIZE(srcVector[3], 1023.f) & 1023) << 0);
break;
}
case CL_SIGNED_INT8: { case CL_SIGNED_INT8: {
cl_char *ptr = (cl_char *)outData; cl_char *ptr = (cl_char *)outData;
for (unsigned int i = 0; i < channelCount; i++) for (unsigned int i = 0; i < channelCount; i++)
@@ -2929,6 +2953,20 @@ void pack_image_pixel_error(const float *srcVector,
break; break;
} }
case CL_UNORM_INT_2_101010_EXT: {
const cl_uint *ptr = (const cl_uint *)results;
errors[0] =
((ptr[0] >> 30) & 3) - NORMALIZE_UNROUNDED(srcVector[0], 3.f);
errors[1] = ((ptr[0] >> 20) & 1023)
- NORMALIZE_UNROUNDED(srcVector[1], 1023.f);
errors[2] = ((ptr[0] >> 10) & 1023)
- NORMALIZE_UNROUNDED(srcVector[2], 1023.f);
errors[3] = ((ptr[0] >> 0) & 1023)
- NORMALIZE_UNROUNDED(srcVector[3], 1023.f);
break;
}
case CL_SIGNED_INT8: { case CL_SIGNED_INT8: {
const cl_char *ptr = (const cl_char *)results; const cl_char *ptr = (const cl_char *)results;

3
test_common/harness/kernelHelpers.cpp
View File

@@ -1320,7 +1320,8 @@ size_t get_pixel_bytes(const cl_image_format *fmt)
case CL_UNORM_SHORT_555: return 2; case CL_UNORM_SHORT_555: return 2;
case CL_UNORM_INT_101010: case CL_UNORM_INT_101010:
case CL_UNORM_INT_101010_2: return 4; case CL_UNORM_INT_101010_2:
case CL_UNORM_INT_2_101010_EXT: return 4;
case CL_SNORM_INT8: case CL_SNORM_INT8:
case CL_UNORM_INT8: case CL_UNORM_INT8:

13
test_conformance/images/common.cpp
View File

@@ -16,13 +16,20 @@
#include "common.h" #include "common.h"
cl_channel_type floatFormats[] = { cl_channel_type floatFormats[] = {
CL_UNORM_SHORT_565, CL_UNORM_SHORT_555, CL_UNORM_INT_101010, CL_UNORM_SHORT_565,
CL_UNORM_SHORT_555,
CL_UNORM_INT_101010,
CL_UNORM_INT_101010_2, CL_UNORM_INT_101010_2,
CL_UNORM_INT_2_101010_EXT,
#ifdef CL_SFIXED14_APPLE #ifdef CL_SFIXED14_APPLE
CL_SFIXED14_APPLE, CL_SFIXED14_APPLE,
#endif #endif
CL_UNORM_INT8, CL_SNORM_INT8, CL_UNORM_INT16, CL_UNORM_INT8,
CL_SNORM_INT16, CL_FLOAT, CL_HALF_FLOAT, CL_SNORM_INT8,
CL_UNORM_INT16,
CL_SNORM_INT16,
CL_FLOAT,
CL_HALF_FLOAT,
(cl_channel_type)-1, (cl_channel_type)-1,
}; };

2
test_conformance/images/kernel_read_write/test_common.cpp
View File

@@ -2146,6 +2146,8 @@ int filter_rounding_errors(int forceCorrectlyRoundedWrites,
|| imageInfo->format->image_channel_data_type == CL_UNORM_INT_101010 || imageInfo->format->image_channel_data_type == CL_UNORM_INT_101010
|| imageInfo->format->image_channel_data_type || imageInfo->format->image_channel_data_type
== CL_UNORM_INT_101010_2 == CL_UNORM_INT_101010_2
|| imageInfo->format->image_channel_data_type
== CL_UNORM_INT_2_101010_EXT
|| imageInfo->format->image_channel_data_type == CL_UNORM_INT16 || imageInfo->format->image_channel_data_type == CL_UNORM_INT16
|| imageInfo->format->image_channel_data_type == CL_SNORM_INT8 || imageInfo->format->image_channel_data_type == CL_SNORM_INT8
|| imageInfo->format->image_channel_data_type == CL_SNORM_INT16 || imageInfo->format->image_channel_data_type == CL_SNORM_INT16