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

basic: fix size_t Wformat warnings (#2264)

Browse Source 
Printing of a `size_t` requires the `%zu` specifier.

Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
This commit is contained in:
Sven van Haastregt
2025-02-18 18:11:32 +01:00
committed by GitHub
parent 9c5999bc1d
commit ea934a7648
11 changed files with 113 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
test_conformance/basic/test_global_work_offsets.cpp
View File

@@ -36,11 +36,12 @@ const char *work_offset_test[] = {
#define NUM_TESTS 16
#define MAX_OFFSET 256
#define CHECK_RANGE( v, m, c ) \
if( ( v >= (cl_int)m ) || ( v < 0 ) ) \
{ \
log_error( "ERROR: ouputID_%c[%lu]: %d is < 0 or >= %lu\n", c, i, v, m ); \
return -1; \
#define CHECK_RANGE(v, m, c) \
if ((v >= (cl_int)m) || (v < 0)) \
{ \
log_error("ERROR: ouputID_%c[%zu]: %d is < 0 or >= %zu\n", c, i, v, \
m); \
return -1; \
}
int check_results( size_t threads[], size_t offsets[], cl_int outputA[], cl_int outputB[], cl_int outputC[] )
@@ -76,13 +77,17 @@ int check_results( size_t threads[], size_t offsets[], cl_int outputA[], cl_int
if( counts[ x ][ y ][ z ] < 1 )
{
if( missed < 3 )
log_error( "ERROR: Map value (%ld,%ld,%ld) was missed%s\n", x, y, z, ( missed == 2 ) ? limitMsg : "" );
log_error(
"ERROR: Map value (%zu,%zu,%zu) was missed%s\n",
x, y, z, (missed == 2) ? limitMsg : "");
missed++;
}
else if( counts[ x ][ y ][ z ] > 1 )
{
if( multiple < 3 )
log_error( "ERROR: Map value (%ld,%ld,%ld) was returned multiple times%s\n", x, y, z, ( multiple == 2 ) ? limitMsg : "" );
log_error("ERROR: Map value (%zu,%zu,%zu) was "
"returned multiple times%s\n",
x, y, z, (multiple == 2) ? limitMsg : "");
multiple++;
}
}
@@ -91,7 +96,9 @@ int check_results( size_t threads[], size_t offsets[], cl_int outputA[], cl_int
if( counts[ x ][ y ][ z ] > 0 )
{
if( errored < 3 )
log_error( "ERROR: Map value (%ld,%ld,%ld) was erroneously returned%s\n", x, y, z, ( errored == 2 ) ? limitMsg : "" );
log_error("ERROR: Map value (%zu,%zu,%zu) was "
"erroneously returned%s\n",
x, y, z, (errored == 2) ? limitMsg : "");
errored++;
}
}
@@ -161,9 +168,11 @@ int test_global_work_offsets(cl_device_id deviceID, cl_context context, cl_comma
for( int j = 0; j < 3; j++ )
offsets[ j ] = random_in_range( 0, MAX_OFFSET, seed );
log_info( "\tTesting %ld,%ld,%ld (%ld,%ld,%ld) with offsets (%ld,%ld,%ld)...\n",
threads[ 0 ], threads[ 1 ], threads[ 2 ], localThreads[ 0 ], localThreads[ 1 ], localThreads[ 2 ],
offsets[ 0 ], offsets[ 1 ], offsets[ 2 ] );
log_info("\tTesting %zu,%zu,%zu (%zu,%zu,%zu) with offsets "
"(%zu,%zu,%zu)...\n",
threads[0], threads[1], threads[2], localThreads[0],
localThreads[1], localThreads[2], offsets[0], offsets[1],
offsets[2]);
// Now set up and run
for( int i = 0; i < 3; i++ )
@@ -187,9 +196,11 @@ int test_global_work_offsets(cl_device_id deviceID, cl_context context, cl_comma
// but they won't be in order, so we need to construct a count map to determine what we got
if( check_results( threads, offsets, outputA, outputB, outputC ) )
{
log_error( "\t(Test failed for global dim %ld,%ld,%ld, local dim %ld,%ld,%ld, offsets %ld,%ld,%ld)\n",
threads[ 0 ], threads[ 1 ], threads[ 2 ], localThreads[ 0 ], localThreads[ 1 ], localThreads[ 2 ],
offsets[ 0 ], offsets[ 1 ], offsets[ 2 ] );
log_error("\t(Test failed for global dim %zu,%zu,%zu, local dim "
"%zu,%zu,%zu, offsets %zu,%zu,%zu)\n",
threads[0], threads[1], threads[2], localThreads[0],
localThreads[1], localThreads[2], offsets[0], offsets[1],
offsets[2]);
return -1;
}
}
@@ -252,9 +263,11 @@ int test_get_global_offset(cl_device_id deviceID, cl_context context, cl_command
for( int j = 0; j < 3; j++ )
offsets[ j ] = random_in_range( 0, MAX_OFFSET, seed );
log_info( "\tTesting %ld,%ld,%ld (%ld,%ld,%ld) with offsets (%ld,%ld,%ld)...\n",
threads[ 0 ], threads[ 1 ], threads[ 2 ], localThreads[ 0 ], localThreads[ 1 ], localThreads[ 2 ],
offsets[ 0 ], offsets[ 1 ], offsets[ 2 ] );
log_info("\tTesting %zu,%zu,%zu (%zu,%zu,%zu) with offsets "
"(%zu,%zu,%zu)...\n",
threads[0], threads[1], threads[2], localThreads[0],
localThreads[1], localThreads[2], offsets[0], offsets[1],
offsets[2]);
// Now set up and run
error = clSetKernelArg( kernel, 0, sizeof( streams[0] ), &streams[0] );
@@ -273,7 +286,9 @@ int test_get_global_offset(cl_device_id deviceID, cl_context context, cl_command
{
if( outOffsets[ j ] != (cl_int)offsets[ j ] )
{
log_error( "ERROR: get_global_offset( %d ) did not return expected value (expected %ld, got %d)\n", j, offsets[ j ], outOffsets[ j ] );
log_error("ERROR: get_global_offset( %d ) did not return "
"expected value (expected %zu, got %d)\n",
j, offsets[j], outOffsets[j]);
errors++;
}
}