half: fix -Wformat warnings (#1927)

Avoid casting to `uint64_t` in some places; instead keep the types as
`size_t` and use the `%z` length modifier, or as
`uint32_t` and use the `%u` specifier.

For printing of 64-bit types, use the `PRI*64` macros from <cinttypes>
to ensure portability across 32 and 64-bit builds.

Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
This commit is contained in:
Sven van Haastregt
2024-03-27 14:46:27 +01:00
committed by GitHub
parent 96361171ed
commit 83203db6e2
4 changed files with 26 additions and 10 deletions

View File

@@ -19,6 +19,7 @@
#include <string.h>
#include <algorithm>
#include <cinttypes>
#include "cl_utils.h"
#include "tests.h"
@@ -157,7 +158,8 @@ int Test_vLoadHalf_private( cl_device_id device, bool aligned )
char local_buf_size[10];
sprintf(local_buf_size, "%lld", (uint64_t)((effectiveVectorSize))*gWorkGroupSize);
sprintf(local_buf_size, "%" PRIu64,
(uint64_t)(effectiveVectorSize)*gWorkGroupSize);
const char *source_local1[] = {
"__kernel void test( const __global half *p, __global float *f )\n"
"{\n"
@@ -522,10 +524,17 @@ int Test_vLoadHalf_private( cl_device_id device, bool aligned )
continue;
if( u1[j] != u2[j])
{
vlog_error( " %lld) (of %lld) Failure at 0x%4.4x: %a vs *%a (0x%8.8x vs *0x%8.8x) vector_size = %d (%s) address space = %s, load is %s\n",
j, (uint64_t)count, ((unsigned short*)gIn_half)[j], f1[j], f2[j], u1[j], u2[j], (g_arrVecSizes[vectorSize]),
vector_size_names[vectorSize], addressSpaceNames[addressSpace],
(aligned?"aligned":"unaligned"));
vlog_error(
" %" PRId64
") (of %u) Failure at 0x%4.4x: %a vs *%a "
"(0x%8.8x vs *0x%8.8x) vector_size = %d (%s) "
"address space = %s, load is %s\n",
j, count, ((unsigned short *)gIn_half)[j],
f1[j], f2[j], u1[j], u2[j],
(g_arrVecSizes[vectorSize]),
vector_size_names[vectorSize],
addressSpaceNames[addressSpace],
(aligned ? "aligned" : "unaligned"));
gFailCount++;
error = -1;
goto exit;