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

cl_khr_semaphore: fix -Wformat warnings (#2124)

Browse Source 
Add a `format` parameter to the macro, to be able to specify how to
print the expected and actual parameter values.

Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
This commit is contained in:
Sven van Haastregt
2024-10-29 17:43:30 +01:00
committed by GitHub
parent 7d3e1f0b82
commit 8369028c92
2 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test_conformance/extensions/cl_khr_semaphore/test_semaphores_negative_getinfo.cpp
View File

@@ -90,7 +90,7 @@ struct GetInfoInvalidValue : public SemaphoreTestBase
// make sure that first test provides too small param size // make sure that first test provides too small param size
if (size != sizeof(sema_props)) if (size != sizeof(sema_props))
test_fail("Error: expected size %d, returned %d", test_fail("Error: expected size %zu, returned %zu",
sizeof(sema_props), size); sizeof(sema_props), size);
// first test with non-zero property size but not enough // first test with non-zero property size but not enough

49
test_conformance/extensions/cl_khr_semaphore/test_semaphores_queries.cpp
View File

@@ -14,11 +14,12 @@
// limitations under the License. // limitations under the License.
// //
#include <cinttypes>
#include "semaphore_base.h" #include "semaphore_base.h"
#define FLUSH_DELAY_S 5 #define FLUSH_DELAY_S 5
#define SEMAPHORE_PARAM_TEST(param_name, param_type, expected) \ #define SEMAPHORE_PARAM_TEST(param_name, param_type, format, expected) \
do \ do \
{ \ { \
param_type value; \ param_type value; \
@@ -28,9 +29,10 @@
test_error(error, "Unable to get " #param_name " from semaphore"); \ test_error(error, "Unable to get " #param_name " from semaphore"); \
if (value != expected) \ if (value != expected) \
{ \ { \
test_fail("ERROR: Parameter %s did not validate! (expected %d, " \ test_fail( \
"got %d)\n", \ "ERROR: Parameter %s did not validate! (expected " format ", " \
#param_name, expected, value); \ "got " format ")\n", \
#param_name, expected, value); \
} \ } \
if (size != sizeof(value)) \ if (size != sizeof(value)) \
{ \ { \
@@ -96,39 +98,44 @@ struct SemaphoreWithDeviceListQueries : public SemaphoreTestBase
// Confirm that querying CL_SEMAPHORE_TYPE_KHR returns // Confirm that querying CL_SEMAPHORE_TYPE_KHR returns
// CL_SEMAPHORE_TYPE_BINARY_KHR // CL_SEMAPHORE_TYPE_BINARY_KHR
SEMAPHORE_PARAM_TEST(CL_SEMAPHORE_TYPE_KHR, cl_semaphore_type_khr, SEMAPHORE_PARAM_TEST(CL_SEMAPHORE_TYPE_KHR, cl_semaphore_type_khr, "%d",
CL_SEMAPHORE_TYPE_BINARY_KHR); CL_SEMAPHORE_TYPE_BINARY_KHR);
// Confirm that querying CL_SEMAPHORE_CONTEXT_KHR returns the right // Confirm that querying CL_SEMAPHORE_CONTEXT_KHR returns the right
// context // context
SEMAPHORE_PARAM_TEST(CL_SEMAPHORE_CONTEXT_KHR, cl_context, context); SEMAPHORE_PARAM_TEST(CL_SEMAPHORE_CONTEXT_KHR, cl_context, "%p",
context);
// Confirm that querying CL_SEMAPHORE_REFERENCE_COUNT_KHR returns // Confirm that querying CL_SEMAPHORE_REFERENCE_COUNT_KHR returns the
// the right value // right value
SEMAPHORE_PARAM_TEST(CL_SEMAPHORE_REFERENCE_COUNT_KHR, cl_uint, 1); SEMAPHORE_PARAM_TEST(CL_SEMAPHORE_REFERENCE_COUNT_KHR, cl_uint, "%u",
1);
err = clRetainSemaphoreKHR(semaphore); err = clRetainSemaphoreKHR(semaphore);
test_error(err, "Could not retain semaphore"); test_error(err, "Could not retain semaphore");
SEMAPHORE_PARAM_TEST(CL_SEMAPHORE_REFERENCE_COUNT_KHR, cl_uint, 2); SEMAPHORE_PARAM_TEST(CL_SEMAPHORE_REFERENCE_COUNT_KHR, cl_uint, "%u",
2);
err = clReleaseSemaphoreKHR(semaphore); err = clReleaseSemaphoreKHR(semaphore);
test_error(err, "Could not release semaphore"); test_error(err, "Could not release semaphore");
SEMAPHORE_PARAM_TEST(CL_SEMAPHORE_REFERENCE_COUNT_KHR, cl_uint, 1); SEMAPHORE_PARAM_TEST(CL_SEMAPHORE_REFERENCE_COUNT_KHR, cl_uint, "%u",
1);
// Confirm that querying CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR returns // Confirm that querying CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR returns the
// the same device id the semaphore was created with // same device id the semaphore was created with
SEMAPHORE_PARAM_TEST(CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR, cl_device_id, SEMAPHORE_PARAM_TEST(CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR, cl_device_id,
device); "%p", device);
// Confirm that querying CL_SEMAPHORE_PROPERTIES_KHR returns the // Confirm that querying CL_SEMAPHORE_PROPERTIES_KHR returns the same
// same properties the semaphore was created with // properties the semaphore was created with
SEMAPHORE_PARAM_TEST_ARRAY(CL_SEMAPHORE_PROPERTIES_KHR, SEMAPHORE_PARAM_TEST_ARRAY(CL_SEMAPHORE_PROPERTIES_KHR,
cl_semaphore_properties_khr, 6, sema_props); cl_semaphore_properties_khr, 6, sema_props);
// Confirm that querying CL_SEMAPHORE_PAYLOAD_KHR returns the // Confirm that querying CL_SEMAPHORE_PAYLOAD_KHR returns the unsignaled
// unsignaled state // state
SEMAPHORE_PARAM_TEST(CL_SEMAPHORE_PAYLOAD_KHR, cl_semaphore_payload_khr, SEMAPHORE_PARAM_TEST(CL_SEMAPHORE_PAYLOAD_KHR, cl_semaphore_payload_khr,
0); "%" PRIu64,
static_cast<cl_semaphore_payload_khr>(0));
return TEST_PASS; return TEST_PASS;
} }
@@ -162,7 +169,7 @@ struct SemaphoreNoDeviceListQueries : public SemaphoreTestBase
// Confirm that querying CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR returns // Confirm that querying CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR returns
// device id the semaphore was created with // device id the semaphore was created with
SEMAPHORE_PARAM_TEST(CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR, cl_device_id, SEMAPHORE_PARAM_TEST(CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR, cl_device_id,
device); "%p", device);
return TEST_PASS; return TEST_PASS;
} }
@@ -239,7 +246,7 @@ struct SemaphoreMultiDeviceContextQueries : public SemaphoreTestBase
// Confirm that querying CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR returns // Confirm that querying CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR returns
// the same device id the semaphore was created with // the same device id the semaphore was created with
SEMAPHORE_PARAM_TEST(CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR, cl_device_id, SEMAPHORE_PARAM_TEST(CL_SEMAPHORE_DEVICE_HANDLE_LIST_KHR, cl_device_id,
scope_guard.sub_devices[0]); "%p", scope_guard.sub_devices[0]);
return TEST_PASS; return TEST_PASS;
} }