From c32a76786cacdae50c895ceca4ca73eeffb1b78f Mon Sep 17 00:00:00 2001 From: Sven van Haastregt Date: Sat, 7 Sep 2024 00:48:19 +0200 Subject: [PATCH] cl_khr_mutable_dispatch: fix -Wformat warnings (#2071) Printing of a `size_t` requires the `%zu` specifier. Signed-off-by: Sven van Haastregt --- .../mutable_command_arguments.cpp | 8 ++++---- .../mutable_command_global_offset.cpp | 4 ++-- .../mutable_command_global_size.cpp | 4 ++-- .../mutable_command_image_arguments.cpp | 8 ++++---- .../mutable_command_local_size.cpp | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_arguments.cpp b/test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_arguments.cpp index f0e9cb317..d61472578 100644 --- a/test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_arguments.cpp +++ b/test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_arguments.cpp @@ -324,8 +324,8 @@ struct MutableDispatchLocalArguments : public MutableDispatchArgumentsTest for (size_t i = 0; i < number_of_ints; i++) if (constant_data[i] != result_data[i]) { - log_error("Data failed to verify: constant_data[%d]=%d != " - "result_data[%d]=%d\n", + log_error("Data failed to verify: constant_data[%zu]=%d != " + "result_data[%zu]=%d\n", i, constant_data[i], i, result_data[i]); return TEST_FAIL; } @@ -457,8 +457,8 @@ struct MutableDispatchPODArguments : public MutableDispatchArgumentsTest for (size_t i = 0; i < number_of_ints; i++) if (constant_data[i] != result_data[i]) { - log_error("Data failed to verify: constant_data[%d]=%d != " - "result_data[%d]=%d\n", + log_error("Data failed to verify: constant_data[%zu]=%d != " + "result_data[%zu]=%d\n", i, constant_data[i], i, result_data[i]); return TEST_FAIL; } diff --git a/test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_global_offset.cpp b/test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_global_offset.cpp index e3944e195..1c7061ff9 100644 --- a/test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_global_offset.cpp +++ b/test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_global_offset.cpp @@ -137,7 +137,7 @@ struct MutableDispatchGlobalOffset : InfoMutableCommandBufferTest if (i < update_global_offset && 0 != resultData[i]) { log_error("Data failed to verify: update_global_offset != " - "resultData[%d]=%d\n", + "resultData[%zu]=%d\n", i, resultData[i]); return TEST_FAIL; } @@ -145,7 +145,7 @@ struct MutableDispatchGlobalOffset : InfoMutableCommandBufferTest && update_global_offset != resultData[i]) { log_error("Data failed to verify: update_global_offset != " - "resultData[%d]=%d\n", + "resultData[%zu]=%d\n", i, resultData[i]); return TEST_FAIL; } diff --git a/test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_global_size.cpp b/test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_global_size.cpp index 44cfd57ff..946fa995b 100644 --- a/test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_global_size.cpp +++ b/test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_global_size.cpp @@ -136,7 +136,7 @@ struct MutableDispatchGlobalSize : public InfoMutableCommandBufferTest if (i >= update_global_size && global_work_size != resultData[i]) { log_error("Data failed to verify: update_global_size != " - "resultData[%d]=%d\n", + "resultData[%zu]=%d\n", i, resultData[i]); return TEST_FAIL; } @@ -144,7 +144,7 @@ struct MutableDispatchGlobalSize : public InfoMutableCommandBufferTest && update_global_size != resultData[i]) { log_error("Data failed to verify: update_global_size != " - "resultData[%d]=%d\n", + "resultData[%zu]=%d\n", i, resultData[i]); return TEST_FAIL; } diff --git a/test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_image_arguments.cpp b/test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_image_arguments.cpp index 939a785d4..eb7cb266a 100644 --- a/test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_image_arguments.cpp +++ b/test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_image_arguments.cpp @@ -199,8 +199,8 @@ struct MutableDispatchImage1DArguments : public BasicMutableCommandBufferTest { if (imageValues_input[i] != outputData[i]) { - log_error("Data failed to verify: imageValues[%d]=%d != " - "outputData[%d]=%d\n", + log_error("Data failed to verify: imageValues[%zu]=%d != " + "outputData[%zu]=%d\n", i, imageValues_input[i], i, outputData[i]); return TEST_FAIL; @@ -399,8 +399,8 @@ struct MutableDispatchImage2DArguments : public BasicMutableCommandBufferTest { if (imageValues_input[i] != outputData[i]) { - log_error("Data failed to verify: imageValues[%d]=%d != " - "outputData[%d]=%d\n", + log_error("Data failed to verify: imageValues[%zu]=%d != " + "outputData[%zu]=%d\n", i, imageValues_input[i], i, outputData[i]); return TEST_FAIL; } diff --git a/test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_local_size.cpp b/test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_local_size.cpp index dbafbbaa8..823517f58 100644 --- a/test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_local_size.cpp +++ b/test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_local_size.cpp @@ -139,7 +139,7 @@ struct MutableDispatchLocalSize : public InfoMutableCommandBufferTest if (i < update_global_size && update_local_size != resultData[i]) { log_error("Data failed to verify: update_local_size != " - "resultData[%d]=%d\n", + "resultData[%zu]=%d\n", i, resultData[i]); return TEST_FAIL; } @@ -147,7 +147,7 @@ struct MutableDispatchLocalSize : public InfoMutableCommandBufferTest && local_work_size != resultData[i]) { log_error("Data failed to verify: update_local_size != " - "resultData[%d]=%d\n", + "resultData[%zu]=%d\n", i, resultData[i]); return TEST_FAIL; }