diff --git a/test_common/gl/helpers.cpp b/test_common/gl/helpers.cpp index 0d5cba75..def78d75 100644 --- a/test_common/gl/helpers.cpp +++ b/test_common/gl/helpers.cpp @@ -1277,9 +1277,7 @@ void * CreateGLTexture2DMultisample( size_t width, size_t height, size_t samples case kUInt: *((unsigned int*)p) = val*0xffffffff; break; - case kHalf: - *((cl_ushort*)p) = convert_float_to_half(val); - break; + case kHalf: *((cl_half *)p) = convert_float_to_half(val); break; default: log_error("Test error: unexpected type enum 0x%x\n",type); } @@ -1541,9 +1539,7 @@ void * CreateGLTexture2DArrayMultisample(size_t width, size_t height, case kUInt: *((unsigned int*)p) = val*0xffffffff; break; - case kHalf: - *((cl_ushort*)p) = convert_float_to_half(val); - break; + case kHalf: *((cl_half *)p) = convert_float_to_half(val); break; default: log_error("Test error: unexpected type enum 0x%x\n",type); } diff --git a/test_common/harness/conversions.cpp b/test_common/harness/conversions.cpp index 72fd8cb3..3c5ec964 100644 --- a/test_common/harness/conversions.cpp +++ b/test_common/harness/conversions.cpp @@ -880,7 +880,7 @@ void generate_random_data( ExplicitType type, size_t count, MTdata d, void *outD cl_ulong *ulongPtr; cl_float *floatPtr; cl_double *doublePtr; - cl_ushort *halfPtr; + cl_half *halfPtr; size_t i; cl_uint bits = genrand_int32(d); cl_uint bitsLeft = 32; diff --git a/test_common/harness/errorHelpers.cpp b/test_common/harness/errorHelpers.cpp index b2586f90..5fee9a2c 100644 --- a/test_common/harness/errorHelpers.cpp +++ b/test_common/harness/errorHelpers.cpp @@ -354,7 +354,7 @@ static float Ulp_Error_Half_Float( float test, double reference ) return (float) scalbn( testVal - reference, ulp_exp ); } -float Ulp_Error_Half( cl_ushort test, float reference ) +float Ulp_Error_Half(cl_half test, float reference) { return Ulp_Error_Half_Float(cl_half_to_float(test), reference); } diff --git a/test_common/harness/errorHelpers.h b/test_common/harness/errorHelpers.h index ba9e6474..36868f8d 100644 --- a/test_common/harness/errorHelpers.h +++ b/test_common/harness/errorHelpers.h @@ -122,9 +122,9 @@ static int vlog_win32(const char *format, ...); extern const char *IGetErrorString( int clErrorCode ); -extern float Ulp_Error_Half( cl_ushort test, float reference ); -extern float Ulp_Error( float test, double reference ); -extern float Ulp_Error_Double( double test, long double reference ); +extern float Ulp_Error_Half(cl_half test, float reference); +extern float Ulp_Error(float test, double reference); +extern float Ulp_Error_Double(double test, long double reference); extern const char *GetChannelTypeName( cl_channel_type type ); extern int IsChannelTypeSupported( cl_channel_type type ); diff --git a/test_common/harness/imageHelpers.cpp b/test_common/harness/imageHelpers.cpp index 6a84fde8..af1aea3d 100644 --- a/test_common/harness/imageHelpers.cpp +++ b/test_common/harness/imageHelpers.cpp @@ -925,7 +925,7 @@ int get_format_min_int( cl_image_format *format ) } } -cl_ushort convert_float_to_half( float f ) +cl_half convert_float_to_half(float f) { switch( gFloatToHalfRoundingMode ) { @@ -1281,10 +1281,9 @@ void read_image_pixel_float( void *imageData, image_descriptor *imageInfo, break; } - case CL_HALF_FLOAT: - { - cl_ushort *dPtr = (cl_ushort *)ptr; - for( i = 0; i < channelCount; i++ ) + case CL_HALF_FLOAT: { + cl_half *dPtr = (cl_half *)ptr; + for (i = 0; i < channelCount; i++) tempData[i] = cl_half_to_float(dPtr[i]); break; } @@ -2397,9 +2396,8 @@ void pack_image_pixel( float *srcVector, const cl_image_format *imageFormat, voi size_t channelCount = get_format_channel_count( imageFormat ); switch( imageFormat->image_channel_data_type ) { - case CL_HALF_FLOAT: - { - cl_ushort *ptr = (cl_ushort *)outData; + case CL_HALF_FLOAT: { + cl_half *ptr = (cl_half *)outData; switch( gFloatToHalfRoundingMode ) { @@ -2569,9 +2567,8 @@ void pack_image_pixel_error( const float *srcVector, const cl_image_format *imag size_t channelCount = get_format_channel_count( imageFormat ); switch( imageFormat->image_channel_data_type ) { - case CL_HALF_FLOAT: - { - const cl_ushort *ptr = (const cl_ushort *)results; + case CL_HALF_FLOAT: { + const cl_half *ptr = (const cl_half *)results; for( unsigned int i = 0; i < channelCount; i++ ) errors[i] = Ulp_Error_Half( ptr[i], srcVector[i] ); @@ -2838,25 +2835,28 @@ int DetectFloatToHalfRoundingMode( cl_command_queue q ) // Returns CL_SUCCESS return err; } - // read the results - cl_ushort outBuf[count*4]; - memset( outBuf, -1, sizeof( outBuf ) ); - size_t origin[3] = {0,0,0}; - size_t region[3] = {count,1,1}; - err = clEnqueueReadImage( q, outImage, CL_TRUE, origin, region, 0, 0, outBuf, 0, NULL, NULL ); - if( err ) + // read the results + cl_half outBuf[count * 4]; + memset(outBuf, -1, sizeof(outBuf)); + size_t origin[3] = { 0, 0, 0 }; + size_t region[3] = { count, 1, 1 }; + err = clEnqueueReadImage(q, outImage, CL_TRUE, origin, region, 0, 0, + outBuf, 0, NULL, NULL); + if (err) { - log_error( "Error: could not read output image in DetectFloatToHalfRoundingMode (%d)", err ); - clReleaseMemObject( inBuf ); - clReleaseMemObject( outImage ); - clReleaseKernel( k ); + log_error("Error: could not read output image in " + "DetectFloatToHalfRoundingMode (%d)", + err); + clReleaseMemObject(inBuf); + clReleaseMemObject(outImage); + clReleaseKernel(k); return err; } - // Generate our list of reference results - cl_ushort rte_ref[count*4]; - cl_ushort rtz_ref[count*4]; - for( size_t i = 0; i < 4 * count; i++ ) + // Generate our list of reference results + cl_half rte_ref[count * 4]; + cl_half rtz_ref[count * 4]; + for (size_t i = 0; i < 4 * count; i++) { rte_ref[i] = cl_half_from_float(inp[i], CL_HALF_RTE); rtz_ref[i] = cl_half_from_float(inp[i], CL_HALF_RTZ); diff --git a/test_common/harness/imageHelpers.h b/test_common/harness/imageHelpers.h index 4c527543..ca335d7d 100644 --- a/test_common/harness/imageHelpers.h +++ b/test_common/harness/imageHelpers.h @@ -275,10 +275,9 @@ template void read_image_pixel( void *imageData, image_descriptor *ima break; } - case CL_HALF_FLOAT: - { - cl_ushort *dPtr = (cl_ushort *)ptr; - for( i = 0; i < get_format_channel_count( format ); i++ ) + case CL_HALF_FLOAT: { + cl_half *dPtr = (cl_half *)ptr; + for (i = 0; i < get_format_channel_count(format); i++) tempData[i] = (T)cl_half_to_float(dPtr[i]); break; } @@ -639,17 +638,18 @@ protected: size_t mVecSize; }; -extern cl_ushort convert_float_to_half(float f); -extern int DetectFloatToHalfRoundingMode( cl_command_queue ); // Returns CL_SUCCESS on success +extern cl_half convert_float_to_half(float f); +extern int DetectFloatToHalfRoundingMode( + cl_command_queue); // Returns CL_SUCCESS on success // sign bit: don't care, exponent: maximum value, significand: non-zero -static int inline is_half_nan( cl_ushort half ){ return ( half & 0x7fff ) > 0x7c00; } +static int inline is_half_nan(cl_half half) { return (half & 0x7fff) > 0x7c00; } // sign bit: don't care, exponent: zero, significand: non-zero -static int inline is_half_denorm( cl_ushort half ){ return IsHalfSubnormal( half ); } +static int inline is_half_denorm(cl_half half) { return IsHalfSubnormal(half); } // sign bit: don't care, exponent: zero, significand: zero -static int inline is_half_zero( cl_ushort half ){ return ( half & 0x7fff ) == 0; } +static int inline is_half_zero(cl_half half) { return (half & 0x7fff) == 0; } extern double sRGBmap(float fc); diff --git a/test_conformance/buffers/test_buffer_write.cpp b/test_conformance/buffers/test_buffer_write.cpp index 0f672807..49340520 100644 --- a/test_conformance/buffers/test_buffer_write.cpp +++ b/test_conformance/buffers/test_buffer_write.cpp @@ -554,8 +554,8 @@ static int verify_write_float( void *ptr1, void *ptr2, int n ) static int verify_write_half( void *ptr1, void *ptr2, int n ) { int i; - cl_ushort *inptr = (cl_ushort *)ptr1; - cl_ushort *outptr = (cl_ushort *)ptr2; + cl_half *inptr = (cl_half *)ptr1; + cl_half *outptr = (cl_half *)ptr2; for ( i = 0; i < n; i++ ){ if ( outptr[i] != inptr[i] ) diff --git a/test_conformance/half/Test_vStoreHalf.cpp b/test_conformance/half/Test_vStoreHalf.cpp index 658694fa..c3a328ad 100644 --- a/test_conformance/half/Test_vStoreHalf.cpp +++ b/test_conformance/half/Test_vStoreHalf.cpp @@ -210,42 +210,42 @@ CheckD(cl_uint jid, cl_uint tid, void *userInfo) return ret; } -static cl_ushort float2half_rte(float f) +static cl_half float2half_rte(float f) { return cl_half_from_float(f, CL_HALF_RTE); } -static cl_ushort float2half_rtz(float f) +static cl_half float2half_rtz(float f) { return cl_half_from_float(f, CL_HALF_RTZ); } -static cl_ushort float2half_rtp(float f) +static cl_half float2half_rtp(float f) { return cl_half_from_float(f, CL_HALF_RTP); } -static cl_ushort float2half_rtn(float f) +static cl_half float2half_rtn(float f) { return cl_half_from_float(f, CL_HALF_RTN); } -static cl_ushort double2half_rte(double f) +static cl_half double2half_rte(double f) { return cl_half_from_double(f, CL_HALF_RTE); } -static cl_ushort double2half_rtz(double f) +static cl_half double2half_rtz(double f) { return cl_half_from_double(f, CL_HALF_RTZ); } -static cl_ushort double2half_rtp(double f) +static cl_half double2half_rtp(double f) { return cl_half_from_double(f, CL_HALF_RTP); } -static cl_ushort double2half_rtn(double f) +static cl_half double2half_rtn(double f) { return cl_half_from_double(f, CL_HALF_RTN); } @@ -696,30 +696,30 @@ int Test_vStoreHalf_private( cl_device_id device, f2h referenceFunc, d2h doubleR ComputeReferenceInfoF fref; fref.x = (float *)gIn_single; - fref.r = (cl_ushort *)gOut_half_reference; + fref.r = (cl_half *)gOut_half_reference; fref.f = referenceFunc; fref.lim = blockCount; fref.count = (blockCount + threadCount - 1) / threadCount; CheckResultInfoF fchk; fchk.x = (const float *)gIn_single; - fchk.r = (const cl_ushort *)gOut_half_reference; - fchk.s = (const cl_ushort *)gOut_half; + fchk.r = (const cl_half *)gOut_half_reference; + fchk.s = (const cl_half *)gOut_half; fchk.f = referenceFunc; fchk.lim = blockCount; fchk.count = (blockCount + threadCount - 1) / threadCount; ComputeReferenceInfoD dref; dref.x = (double *)gIn_double; - dref.r = (cl_ushort *)gOut_half_reference_double; + dref.r = (cl_half *)gOut_half_reference_double; dref.f = doubleReferenceFunc; dref.lim = blockCount; dref.count = (blockCount + threadCount - 1) / threadCount; CheckResultInfoD dchk; dchk.x = (const double *)gIn_double; - dchk.r = (const cl_ushort *)gOut_half_reference_double; - dchk.s = (const cl_ushort *)gOut_half; + dchk.r = (const cl_half *)gOut_half_reference_double; + dchk.s = (const cl_half *)gOut_half; dchk.f = doubleReferenceFunc; dchk.lim = blockCount; dchk.count = (blockCount + threadCount - 1) / threadCount; @@ -764,7 +764,9 @@ int Test_vStoreHalf_private( cl_device_id device, f2h referenceFunc, d2h doubleR cl_uint pattern = 0xdeaddead; memset_pattern4( gOut_half, &pattern, BUFFER_SIZE/2); - error = clEnqueueWriteBuffer(gQueue, gOutBuffer_half, CL_FALSE, 0, count * sizeof(cl_ushort), gOut_half, 0, NULL, NULL); + error = clEnqueueWriteBuffer(gQueue, gOutBuffer_half, CL_FALSE, + 0, count * sizeof(cl_half), + gOut_half, 0, NULL, NULL); if (error) { vlog_error( "Failure in clWriteArray\n" ); gFailCount++; @@ -779,7 +781,9 @@ int Test_vStoreHalf_private( cl_device_id device, f2h referenceFunc, d2h doubleR goto exit; } - error = clEnqueueReadBuffer(gQueue, gOutBuffer_half, CL_TRUE, 0, count * sizeof(cl_ushort), gOut_half, 0, NULL, NULL); + error = clEnqueueReadBuffer(gQueue, gOutBuffer_half, CL_TRUE, 0, + count * sizeof(cl_half), gOut_half, + 0, NULL, NULL); if (error) { vlog_error( "Failure in clReadArray\n" ); gFailCount++; @@ -795,7 +799,9 @@ int Test_vStoreHalf_private( cl_device_id device, f2h referenceFunc, d2h doubleR if (gTestDouble) { memset_pattern4( gOut_half, &pattern, BUFFER_SIZE/2); - error = clEnqueueWriteBuffer(gQueue, gOutBuffer_half, CL_FALSE, 0, count * sizeof(cl_ushort), gOut_half, 0, NULL, NULL); + error = clEnqueueWriteBuffer( + gQueue, gOutBuffer_half, CL_FALSE, 0, + count * sizeof(cl_half), gOut_half, 0, NULL, NULL); if (error) { vlog_error( "Failure in clWriteArray\n" ); gFailCount++; @@ -810,7 +816,9 @@ int Test_vStoreHalf_private( cl_device_id device, f2h referenceFunc, d2h doubleR goto exit; } - error = clEnqueueReadBuffer(gQueue, gOutBuffer_half, CL_TRUE, 0, count * sizeof(cl_ushort), gOut_half, 0, NULL, NULL); + error = clEnqueueReadBuffer( + gQueue, gOutBuffer_half, CL_TRUE, 0, + count * sizeof(cl_half), gOut_half, 0, NULL, NULL); if (error) { vlog_error( "Failure in clReadArray\n" ); gFailCount++; @@ -1285,30 +1293,30 @@ int Test_vStoreaHalf_private( cl_device_id device, f2h referenceFunc, d2h double ComputeReferenceInfoF fref; fref.x = (float *)gIn_single; - fref.r = (cl_ushort *)gOut_half_reference; + fref.r = (cl_half *)gOut_half_reference; fref.f = referenceFunc; fref.lim = blockCount; fref.count = (blockCount + threadCount - 1) / threadCount; CheckResultInfoF fchk; fchk.x = (const float *)gIn_single; - fchk.r = (const cl_ushort *)gOut_half_reference; - fchk.s = (const cl_ushort *)gOut_half; + fchk.r = (const cl_half *)gOut_half_reference; + fchk.s = (const cl_half *)gOut_half; fchk.f = referenceFunc; fchk.lim = blockCount; fchk.count = (blockCount + threadCount - 1) / threadCount; ComputeReferenceInfoD dref; dref.x = (double *)gIn_double; - dref.r = (cl_ushort *)gOut_half_reference_double; + dref.r = (cl_half *)gOut_half_reference_double; dref.f = doubleReferenceFunc; dref.lim = blockCount; dref.count = (blockCount + threadCount - 1) / threadCount; CheckResultInfoD dchk; dchk.x = (const double *)gIn_double; - dchk.r = (const cl_ushort *)gOut_half_reference_double; - dchk.s = (const cl_ushort *)gOut_half; + dchk.r = (const cl_half *)gOut_half_reference_double; + dchk.s = (const cl_half *)gOut_half; dchk.f = doubleReferenceFunc; dchk.lim = blockCount; dchk.count = (blockCount + threadCount - 1) / threadCount; @@ -1353,7 +1361,9 @@ int Test_vStoreaHalf_private( cl_device_id device, f2h referenceFunc, d2h double cl_uint pattern = 0xdeaddead; memset_pattern4(gOut_half, &pattern, BUFFER_SIZE/2); - error = clEnqueueWriteBuffer(gQueue, gOutBuffer_half, CL_FALSE, 0, count * sizeof(cl_ushort), gOut_half, 0, NULL, NULL); + error = clEnqueueWriteBuffer(gQueue, gOutBuffer_half, CL_FALSE, + 0, count * sizeof(cl_half), + gOut_half, 0, NULL, NULL); if (error) { vlog_error( "Failure in clWriteArray\n" ); gFailCount++; @@ -1368,7 +1378,9 @@ int Test_vStoreaHalf_private( cl_device_id device, f2h referenceFunc, d2h double goto exit; } - error = clEnqueueReadBuffer(gQueue, gOutBuffer_half, CL_TRUE, 0, count * sizeof(cl_ushort), gOut_half, 0, NULL, NULL); + error = clEnqueueReadBuffer(gQueue, gOutBuffer_half, CL_TRUE, 0, + count * sizeof(cl_half), gOut_half, + 0, NULL, NULL); if (error) { vlog_error( "Failure in clReadArray\n" ); gFailCount++; @@ -1384,7 +1396,9 @@ int Test_vStoreaHalf_private( cl_device_id device, f2h referenceFunc, d2h double if (gTestDouble) { memset_pattern4(gOut_half, &pattern, BUFFER_SIZE/2); - error = clEnqueueWriteBuffer(gQueue, gOutBuffer_half, CL_FALSE, 0, count * sizeof(cl_ushort), gOut_half, 0, NULL, NULL); + error = clEnqueueWriteBuffer( + gQueue, gOutBuffer_half, CL_FALSE, 0, + count * sizeof(cl_half), gOut_half, 0, NULL, NULL); if (error) { vlog_error( "Failure in clWriteArray\n" ); gFailCount++; @@ -1399,7 +1413,9 @@ int Test_vStoreaHalf_private( cl_device_id device, f2h referenceFunc, d2h double goto exit; } - error = clEnqueueReadBuffer(gQueue, gOutBuffer_half, CL_TRUE, 0, count * sizeof(cl_ushort), gOut_half, 0, NULL, NULL); + error = clEnqueueReadBuffer( + gQueue, gOutBuffer_half, CL_TRUE, 0, + count * sizeof(cl_half), gOut_half, 0, NULL, NULL); if (error) { vlog_error( "Failure in clReadArray\n" ); gFailCount++; diff --git a/test_conformance/images/kernel_read_write/test_write_1D.cpp b/test_conformance/images/kernel_read_write/test_write_1D.cpp index ca022629..845ba830 100644 --- a/test_conformance/images/kernel_read_write/test_write_1D.cpp +++ b/test_conformance/images/kernel_read_write/test_write_1D.cpp @@ -472,8 +472,18 @@ int test_write_image_1D( cl_device_id device, cl_context context, cl_command_que log_error( " Error: %f %f %f %f\n", errors[0], errors[1], errors[2], errors[3] ); break; case CL_HALF_FLOAT: - log_error( " Expected: 0x%4.4x 0x%4.4x 0x%4.4x 0x%4.4x\n", ((cl_ushort*)resultBuffer)[0], ((cl_ushort*)resultBuffer)[1], ((cl_ushort*)resultBuffer)[2], ((cl_ushort*)resultBuffer)[3] ); - log_error( " Actual: 0x%4.4x 0x%4.4x 0x%4.4x 0x%4.4x\n", ((cl_ushort*)resultPtr)[0], ((cl_ushort*)resultPtr)[1], ((cl_ushort*)resultPtr)[2], ((cl_ushort*)resultPtr)[3] ); + log_error(" Expected: 0x%4.4x " + "0x%4.4x 0x%4.4x 0x%4.4x\n", + ((cl_half *)resultBuffer)[0], + ((cl_half *)resultBuffer)[1], + ((cl_half *)resultBuffer)[2], + ((cl_half *)resultBuffer)[3]); + log_error(" Actual: 0x%4.4x " + "0x%4.4x 0x%4.4x 0x%4.4x\n", + ((cl_half *)resultPtr)[0], + ((cl_half *)resultPtr)[1], + ((cl_half *)resultPtr)[2], + ((cl_half *)resultPtr)[3]); log_error( " Ulps: %f %f %f %f\n", errors[0], errors[1], errors[2], errors[3] ); break; case CL_UNSIGNED_INT32: diff --git a/test_conformance/images/kernel_read_write/test_write_1D_array.cpp b/test_conformance/images/kernel_read_write/test_write_1D_array.cpp index b91bf1cf..5fe928f1 100644 --- a/test_conformance/images/kernel_read_write/test_write_1D_array.cpp +++ b/test_conformance/images/kernel_read_write/test_write_1D_array.cpp @@ -491,8 +491,18 @@ int test_write_image_1D_array( cl_device_id device, cl_context context, cl_comma log_error( " Error: %f %f %f %f\n", errors[0], errors[1], errors[2], errors[3] ); break; case CL_HALF_FLOAT: - log_error( " Expected: 0x%4.4x 0x%4.4x 0x%4.4x 0x%4.4x\n", ((cl_ushort*)resultBuffer)[0], ((cl_ushort*)resultBuffer)[1], ((cl_ushort*)resultBuffer)[2], ((cl_ushort*)resultBuffer)[3] ); - log_error( " Actual: 0x%4.4x 0x%4.4x 0x%4.4x 0x%4.4x\n", ((cl_ushort*)resultPtr)[0], ((cl_ushort*)resultPtr)[1], ((cl_ushort*)resultPtr)[2], ((cl_ushort*)resultPtr)[3] ); + log_error(" Expected: 0x%4.4x " + "0x%4.4x 0x%4.4x 0x%4.4x\n", + ((cl_half *)resultBuffer)[0], + ((cl_half *)resultBuffer)[1], + ((cl_half *)resultBuffer)[2], + ((cl_half *)resultBuffer)[3]); + log_error(" Actual: 0x%4.4x " + "0x%4.4x 0x%4.4x 0x%4.4x\n", + ((cl_half *)resultPtr)[0], + ((cl_half *)resultPtr)[1], + ((cl_half *)resultPtr)[2], + ((cl_half *)resultPtr)[3]); log_error( " Ulps: %f %f %f %f\n", errors[0], errors[1], errors[2], errors[3] ); break; case CL_UNSIGNED_INT32: diff --git a/test_conformance/images/kernel_read_write/test_write_2D_array.cpp b/test_conformance/images/kernel_read_write/test_write_2D_array.cpp index 4524c6cd..01050c2c 100644 --- a/test_conformance/images/kernel_read_write/test_write_2D_array.cpp +++ b/test_conformance/images/kernel_read_write/test_write_2D_array.cpp @@ -514,8 +514,20 @@ int test_write_image_2D_array( cl_device_id device, cl_context context, cl_comma log_error( " Error: %f %f %f %f\n", errors[0], errors[1], errors[2], errors[3] ); break; case CL_HALF_FLOAT: - log_error( " Expected: 0x%4.4x 0x%4.4x 0x%4.4x 0x%4.4x\n", ((cl_ushort*)resultBuffer)[0], ((cl_ushort*)resultBuffer)[1], ((cl_ushort*)resultBuffer)[2], ((cl_ushort*)resultBuffer)[3] ); - log_error( " Actual: 0x%4.4x 0x%4.4x 0x%4.4x 0x%4.4x\n", ((cl_ushort*)resultPtr)[0], ((cl_ushort*)resultPtr)[1], ((cl_ushort*)resultPtr)[2], ((cl_ushort*)resultPtr)[3] ); + log_error( + " Expected: 0x%4.4x 0x%4.4x " + "0x%4.4x 0x%4.4x\n", + ((cl_half *)resultBuffer)[0], + ((cl_half *)resultBuffer)[1], + ((cl_half *)resultBuffer)[2], + ((cl_half *)resultBuffer)[3]); + log_error( + " Actual: 0x%4.4x 0x%4.4x " + "0x%4.4x 0x%4.4x\n", + ((cl_half *)resultPtr)[0], + ((cl_half *)resultPtr)[1], + ((cl_half *)resultPtr)[2], + ((cl_half *)resultPtr)[3]); log_error( " Ulps: %f %f %f %f\n", errors[0], errors[1], errors[2], errors[3] ); break; case CL_UNSIGNED_INT32: diff --git a/test_conformance/images/kernel_read_write/test_write_3D.cpp b/test_conformance/images/kernel_read_write/test_write_3D.cpp index 7440bd6e..b67a7325 100644 --- a/test_conformance/images/kernel_read_write/test_write_3D.cpp +++ b/test_conformance/images/kernel_read_write/test_write_3D.cpp @@ -521,8 +521,20 @@ int test_write_image_3D( cl_device_id device, cl_context context, cl_command_que log_error( " Error: %f %f %f %f\n", errors[0], errors[1], errors[2], errors[3] ); break; case CL_HALF_FLOAT: - log_error( " Expected: 0x%4.4x 0x%4.4x 0x%4.4x 0x%4.4x\n", ((cl_ushort*)resultBuffer)[0], ((cl_ushort*)resultBuffer)[1], ((cl_ushort*)resultBuffer)[2], ((cl_ushort*)resultBuffer)[3] ); - log_error( " Actual: 0x%4.4x 0x%4.4x 0x%4.4x 0x%4.4x\n", ((cl_ushort*)resultPtr)[0], ((cl_ushort*)resultPtr)[1], ((cl_ushort*)resultPtr)[2], ((cl_ushort*)resultPtr)[3] ); + log_error( + " Expected: 0x%4.4x 0x%4.4x " + "0x%4.4x 0x%4.4x\n", + ((cl_half *)resultBuffer)[0], + ((cl_half *)resultBuffer)[1], + ((cl_half *)resultBuffer)[2], + ((cl_half *)resultBuffer)[3]); + log_error( + " Actual: 0x%4.4x 0x%4.4x " + "0x%4.4x 0x%4.4x\n", + ((cl_half *)resultPtr)[0], + ((cl_half *)resultPtr)[1], + ((cl_half *)resultPtr)[2], + ((cl_half *)resultPtr)[3]); log_error( " Ulps: %f %f %f %f\n", errors[0], errors[1], errors[2], errors[3] ); break; case CL_UNSIGNED_INT32: diff --git a/test_conformance/images/kernel_read_write/test_write_image.cpp b/test_conformance/images/kernel_read_write/test_write_image.cpp index f6d9235c..37274f3a 100644 --- a/test_conformance/images/kernel_read_write/test_write_image.cpp +++ b/test_conformance/images/kernel_read_write/test_write_image.cpp @@ -538,8 +538,18 @@ int test_write_image( cl_device_id device, cl_context context, cl_command_queue log_error( " Error: %f %f %f %f\n", errors[0], errors[1], errors[2], errors[3] ); break; case CL_HALF_FLOAT: - log_error( " Expected: 0x%4.4x 0x%4.4x 0x%4.4x 0x%4.4x\n", ((cl_ushort*)resultBuffer)[0], ((cl_ushort*)resultBuffer)[1], ((cl_ushort*)resultBuffer)[2], ((cl_ushort*)resultBuffer)[3] ); - log_error( " Actual: 0x%4.4x 0x%4.4x 0x%4.4x 0x%4.4x\n", ((cl_ushort*)resultPtr)[0], ((cl_ushort*)resultPtr)[1], ((cl_ushort*)resultPtr)[2], ((cl_ushort*)resultPtr)[3] ); + log_error(" Expected: 0x%4.4x " + "0x%4.4x 0x%4.4x 0x%4.4x\n", + ((cl_half *)resultBuffer)[0], + ((cl_half *)resultBuffer)[1], + ((cl_half *)resultBuffer)[2], + ((cl_half *)resultBuffer)[3]); + log_error(" Actual: 0x%4.4x " + "0x%4.4x 0x%4.4x 0x%4.4x\n", + ((cl_half *)resultPtr)[0], + ((cl_half *)resultPtr)[1], + ((cl_half *)resultPtr)[2], + ((cl_half *)resultPtr)[3]); log_error( " Ulps: %f %f %f %f\n", errors[0], errors[1], errors[2], errors[3] ); break; case CL_UNSIGNED_INT32: diff --git a/test_conformance/pipes/test_pipe_read_write.cpp b/test_conformance/pipes/test_pipe_read_write.cpp index 4bb4468e..64ee31b3 100644 --- a/test_conformance/pipes/test_pipe_read_write.cpp +++ b/test_conformance/pipes/test_pipe_read_write.cpp @@ -361,8 +361,8 @@ static int verify_readwrite_half(void *ptr1, void *ptr2, int n) { int i; int sum_input = 0, sum_output = 0; - cl_ushort *inptr = (cl_ushort *)ptr1; - cl_ushort *outptr = (cl_ushort *)ptr2; + cl_half *inptr = (cl_half *)ptr1; + cl_half *outptr = (cl_half *)ptr2; for(i = 0; i < n; i++) { diff --git a/test_conformance/profiling/writeArray.cpp b/test_conformance/profiling/writeArray.cpp index 1455c1e3..c3481e60 100644 --- a/test_conformance/profiling/writeArray.cpp +++ b/test_conformance/profiling/writeArray.cpp @@ -551,8 +551,8 @@ static int verify_write_float( void *ptr1, void *ptr2, int n ) static int verify_write_half( void *ptr1, void *ptr2, int n ) { int i; - cl_ushort *inptr = (cl_ushort *)ptr1; - cl_ushort *outptr = (cl_ushort *)ptr2; + cl_half *inptr = (cl_half *)ptr1; + cl_half *outptr = (cl_half *)ptr2; for( i = 0; i < n; i++ ){ if( outptr[i] != inptr[i] )