From d394b0f274e56b6c3f8f35aef55ad12bff45366d Mon Sep 17 00:00:00 2001 From: John Kesapides <46718829+JohnKesapidesARM@users.noreply.github.com> Date: Tue, 30 Jan 2024 17:23:42 +0000 Subject: [PATCH] Minor fixes in mutable dispatch tests. (#1829) * Minor fixes in mutable dispatch tests. * Fix size of newWrapper in MutableDispatchSVMArguments. * Fix errnoneus clCommandNDRangeKernelKHR call. Signed-off-by: John Kesapides * * Set the row_pitch for imageInfo in MutableDispatchImage1DArguments and MutableDispatchImage2DArguments. The row_pitch is used by get_image_size() to calculate the size of the host pointers by generate_random_image_data. Signed-off-by: John Kesapides --------- Signed-off-by: John Kesapides --- .../mutable_command_arguments.cpp | 4 ++-- .../mutable_command_image_arguments.cpp | 2 ++ .../mutable_command_info.cpp | 3 ++- 3 files changed, 6 insertions(+), 3 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 5c8291f0..55c27ccf 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 @@ -664,8 +664,8 @@ struct MutableDispatchSVMArguments : public BasicMutableCommandBufferTest // Allocate and initialize SVM for modified execution - cl_int *newWrapper = - (cl_int *)clSVMAlloc(context, CL_MEM_READ_WRITE, sizeof(cl_int), 0); + cl_int *newWrapper = (cl_int *)clSVMAlloc(context, CL_MEM_READ_WRITE, + sizeof(cl_int *), 0); cl_int *newBuffer = (cl_int *)clSVMAlloc( context, CL_MEM_READ_WRITE, num_elements * sizeof(cl_int), 0); test_assert_error(newWrapper != nullptr && newBuffer != nullptr, 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 b1ce25ec..d8036e17 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 @@ -92,6 +92,7 @@ struct MutableDispatchImage1DArguments : public BasicMutableCommandBufferTest imageInfo.type = CL_MEM_OBJECT_IMAGE1D; imageInfo.format = &formats; imageInfo.width = 4; + imageInfo.rowPitch = imageInfo.width * get_pixel_size(imageInfo.format); BufferOwningPtr imageValues_input, imageValues_output, outputData; MTdataHolder d(gRandomSeed); @@ -285,6 +286,7 @@ struct MutableDispatchImage2DArguments : public BasicMutableCommandBufferTest imageInfo.width = 4; imageInfo.height = 4; imageInfo.format = &formats; + imageInfo.rowPitch = imageInfo.width * get_pixel_size(imageInfo.format); BufferOwningPtr imageValues_input, imageValues_output; diff --git a/test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_info.cpp b/test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_info.cpp index 61600dc9..71b9017e 100644 --- a/test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_info.cpp +++ b/test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_info.cpp @@ -207,7 +207,7 @@ struct Dimensions : public InfoMutableCommandBufferTest { cl_int error = clCommandNDRangeKernelKHR( command_buffer, nullptr, nullptr, kernel, dimensions, nullptr, - &global_work_size, nullptr, 0, nullptr, nullptr, &command); + global_work_size_3d, nullptr, 0, nullptr, nullptr, &command); test_error(error, "clCommandNDRangeKernelKHR failed"); cl_uint test_dimensions = 0; @@ -231,6 +231,7 @@ struct Dimensions : public InfoMutableCommandBufferTest cl_mutable_command_khr command = nullptr; const size_t dimensions = 3; + const size_t global_work_size_3d[3] = { 64, 1, 1 }; }; struct InfoType : public InfoMutableCommandBufferTest