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

harness: Fix -Wformat warnings (#1527)

Browse Source 
The main sources of warnings were:

 * Printing of a `size_t` which requires the `%zu` specifier.

 * Printing of `cl_long`/`cl_ulong` which is now done using the
   `PRI*64` macros to ensure portability across 32 and 64-bit builds.

Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>

Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
This commit is contained in:
Sven van Haastregt
2022-10-13 10:02:40 +01:00
committed by GitHub
parent 4b39b59469
commit f6a963a583
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test_common/harness/conversions.cpp
View File

@@ -14,6 +14,7 @@
// limitations under the License. // limitations under the License.
// //
#include "conversions.h" #include "conversions.h"
#include <cinttypes>
#include <limits.h> #include <limits.h>
#include <time.h> #include <time.h>
#include <assert.h> #include <assert.h>
@@ -50,10 +51,10 @@ void print_type_to_string(ExplicitType type, void *data, char *string)
case kInt: sprintf(string, "%d", *((cl_int *)data)); return; case kInt: sprintf(string, "%d", *((cl_int *)data)); return;
case kUInt: case kUInt:
case kUnsignedInt: sprintf(string, "%u", *((cl_uint *)data)); return; case kUnsignedInt: sprintf(string, "%u", *((cl_uint *)data)); return;
case kLong: sprintf(string, "%lld", *((cl_long *)data)); return; case kLong: sprintf(string, "%" PRId64 "", *((cl_long *)data)); return;
case kULong: case kULong:
case kUnsignedLong: case kUnsignedLong:
sprintf(string, "%llu", *((cl_ulong *)data)); sprintf(string, "%" PRIu64 "", *((cl_ulong *)data));
return; return;
case kFloat: sprintf(string, "%f", *((cl_float *)data)); return; case kFloat: sprintf(string, "%f", *((cl_float *)data)); return;
case kHalf: sprintf(string, "half"); return; case kHalf: sprintf(string, "half"); return;

7
test_common/harness/imageHelpers.cpp
View File

@@ -23,6 +23,7 @@
#include <malloc.h> #include <malloc.h>
#endif #endif
#include <algorithm> #include <algorithm>
#include <cinttypes>
#include <iterator> #include <iterator>
#if !defined(_WIN32) #if !defined(_WIN32)
#include <cmath> #include <cmath>
@@ -421,7 +422,7 @@ void print_first_pixel_difference_error(size_t where, const char *sourcePixel,
(int)thirdDim, (int)imageInfo->rowPitch, (int)thirdDim, (int)imageInfo->rowPitch,
(int)imageInfo->rowPitch (int)imageInfo->rowPitch
- (int)imageInfo->width * (int)pixel_size); - (int)imageInfo->width * (int)pixel_size);
log_error("Failed at column: %ld ", where); log_error("Failed at column: %zu ", where);
switch (pixel_size) switch (pixel_size)
{ {
@@ -454,7 +455,7 @@ void print_first_pixel_difference_error(size_t where, const char *sourcePixel,
((cl_ushort *)destPixel)[1], ((cl_ushort *)destPixel)[2]); ((cl_ushort *)destPixel)[1], ((cl_ushort *)destPixel)[2]);
break; break;
case 8: case 8:
log_error("*0x%16.16llx vs. 0x%16.16llx\n", log_error("*0x%16.16" PRIx64 " vs. 0x%16.16" PRIx64 "\n",
((cl_ulong *)sourcePixel)[0], ((cl_ulong *)destPixel)[0]); ((cl_ulong *)sourcePixel)[0], ((cl_ulong *)destPixel)[0]);
break; break;
case 12: case 12:
@@ -473,7 +474,7 @@ void print_first_pixel_difference_error(size_t where, const char *sourcePixel,
((cl_uint *)destPixel)[2], ((cl_uint *)destPixel)[3]); ((cl_uint *)destPixel)[2], ((cl_uint *)destPixel)[3]);
break; break;
default: default:
log_error("Don't know how to print pixel size of %ld\n", log_error("Don't know how to print pixel size of %zu\n",
pixel_size); pixel_size);
break; break;
} }

11
test_common/harness/propertyHelpers.cpp
View File

@@ -19,6 +19,7 @@
#include <assert.h> #include <assert.h>
#include <algorithm> #include <algorithm>
#include <cinttypes>
#include <vector> #include <vector>
static bool findProperty(const std::vector<cl_properties>& props, static bool findProperty(const std::vector<cl_properties>& props,
@@ -97,16 +98,16 @@ int compareProperties(const std::vector<cl_properties>& queried,
if (!found) if (!found)
{ {
log_error("ERROR: expected property 0x%llx not found!\n", log_error("ERROR: expected property 0x%" PRIx64 " not found!\n",
check_prop); check_prop);
return TEST_FAIL; return TEST_FAIL;
} }
else if (check_value != queried_value) else if (check_value != queried_value)
{ {
log_error( log_error("ERROR: mis-matched value for property 0x%" PRIx64
"ERROR: mis-matched value for property 0x%llx: wanted " ": wanted "
"0x%llx, got 0x%llx\n", "0x%" PRIx64 ", got 0x%" PRIx64 "\n",
check_prop, check_value, queried_value); check_prop, check_value, queried_value);
return TEST_FAIL; return TEST_FAIL;
} }
} }

2
test_common/harness/testHarness.cpp
View File

@@ -1198,7 +1198,7 @@ cl_platform_id getPlatformFromDevice(cl_device_id deviceID)
void PrintArch(void) void PrintArch(void)
{ {
vlog("sizeof( void*) = %ld\n", sizeof(void *)); vlog("sizeof( void*) = %zu\n", sizeof(void *));
#if defined(__ppc__) #if defined(__ppc__)
vlog("ARCH:\tppc\n"); vlog("ARCH:\tppc\n");
#elif defined(__ppc64__) #elif defined(__ppc64__)