From d3e3bdabaa0008810c7b5dcc832cf2e028c4b36c Mon Sep 17 00:00:00 2001 From: Kamil-Goras-Mobica <141216953+kamil-goras-mobica@users.noreply.github.com> Date: Wed, 22 May 2024 10:18:36 +0200 Subject: [PATCH] Negative tests clCommandSvmMem[cpy, Fill]KHR (#1956) According to description https://github.com/KhronosGroup/OpenCL-CTS/issues/1668 --- .../cl_khr_command_buffer/CMakeLists.txt | 1 + .../extensions/cl_khr_command_buffer/main.cpp | 5 + .../negative_command_buffer_svm_mem.cpp | 275 ++++++++++++++++++ .../extensions/cl_khr_command_buffer/procs.h | 16 + 4 files changed, 297 insertions(+) create mode 100644 test_conformance/extensions/cl_khr_command_buffer/negative_command_buffer_svm_mem.cpp diff --git a/test_conformance/extensions/cl_khr_command_buffer/CMakeLists.txt b/test_conformance/extensions/cl_khr_command_buffer/CMakeLists.txt index fe39b951..193dfde1 100644 --- a/test_conformance/extensions/cl_khr_command_buffer/CMakeLists.txt +++ b/test_conformance/extensions/cl_khr_command_buffer/CMakeLists.txt @@ -17,6 +17,7 @@ set(${MODULE_NAME}_SOURCES command_buffer_test_event_info.cpp command_buffer_finalize.cpp negative_command_buffer_finalize.cpp + negative_command_buffer_svm_mem.cpp negative_command_buffer_copy_image.cpp negative_command_buffer_retain_release.cpp negative_command_buffer_create.cpp diff --git a/test_conformance/extensions/cl_khr_command_buffer/main.cpp b/test_conformance/extensions/cl_khr_command_buffer/main.cpp index fed0d351..acc0be0e 100644 --- a/test_conformance/extensions/cl_khr_command_buffer/main.cpp +++ b/test_conformance/extensions/cl_khr_command_buffer/main.cpp @@ -92,6 +92,11 @@ test_definition test_list[] = { ADD_TEST(negative_get_command_buffer_info_state), ADD_TEST(negative_get_command_buffer_info_prop_array), ADD_TEST(negative_get_command_buffer_info_context), + ADD_TEST(negative_command_buffer_command_svm_queue_not_null), + ADD_TEST(negative_command_buffer_command_svm_sync_points_null_or_num_zero), + ADD_TEST(negative_command_buffer_command_svm_invalid_command_buffer), + ADD_TEST(negative_command_buffer_command_svm_finalized_command_buffer), + ADD_TEST(negative_command_buffer_command_svm_mutable_handle_not_null), ADD_TEST(negative_command_buffer_copy_image_queue_not_null), ADD_TEST(negative_command_buffer_copy_image_context_not_same), ADD_TEST(negative_command_buffer_copy_image_sync_points_null_or_num_zero), diff --git a/test_conformance/extensions/cl_khr_command_buffer/negative_command_buffer_svm_mem.cpp b/test_conformance/extensions/cl_khr_command_buffer/negative_command_buffer_svm_mem.cpp new file mode 100644 index 00000000..4d4e2cfb --- /dev/null +++ b/test_conformance/extensions/cl_khr_command_buffer/negative_command_buffer_svm_mem.cpp @@ -0,0 +1,275 @@ +// +// Copyright (c) 2024 The Khronos Group Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#include "basic_command_buffer.h" +#include "svm_command_basic.h" +#include "procs.h" + + +//-------------------------------------------------------------------------- +namespace { + +// CL_INVALID_COMMAND_QUEUE if command_queue is not NULL. +struct CommandBufferCommandSVMQueueNotNull : public BasicSVMCommandBufferTest +{ + using BasicSVMCommandBufferTest::BasicSVMCommandBufferTest; + + cl_int Run() override + { + cl_int error = clCommandSVMMemcpyKHR( + command_buffer, queue, svm_out_mem(), svm_in_mem(), data_size(), 0, + nullptr, nullptr, nullptr); + + test_failure_error_ret( + error, CL_INVALID_COMMAND_QUEUE, + "clCommandSVMMemcpyKHR should return CL_INVALID_COMMAND_QUEUE", + TEST_FAIL); + + error = clCommandSVMMemFillKHR(command_buffer, queue, svm_in_mem(), + &pattern_1, sizeof(cl_char), data_size(), + 0, nullptr, nullptr, nullptr); + + test_failure_error_ret( + error, CL_INVALID_COMMAND_QUEUE, + "clCommandSVMMemFillKHR should return CL_INVALID_COMMAND_QUEUE", + TEST_FAIL); + + return CL_SUCCESS; + } + + const cl_char pattern_1 = 0x14; +}; + +// CL_INVALID_SYNC_POINT_WAIT_LIST_KHR if sync_point_wait_list is NULL and +// num_sync_points_in_wait_list is > 0, or sync_point_wait_list is not NULL and +// num_sync_points_in_wait_list is 0, or if synchronization-point objects in +// sync_point_wait_list are not valid synchronization-points. +struct CommandBufferCommandSVMSyncPointsNullOrNumZero + : public BasicSVMCommandBufferTest +{ + using BasicSVMCommandBufferTest::BasicSVMCommandBufferTest; + + cl_int Run() override + { + cl_sync_point_khr invalid_point = 0; + + cl_int error = clCommandSVMMemcpyKHR( + command_buffer, nullptr, svm_out_mem(), svm_in_mem(), data_size(), + 1, &invalid_point, nullptr, nullptr); + + test_failure_error_ret(error, CL_INVALID_SYNC_POINT_WAIT_LIST_KHR, + "clCommandSVMMemcpyKHR should return " + "CL_INVALID_SYNC_POINT_WAIT_LIST_KHR", + TEST_FAIL); + + error = clCommandSVMMemFillKHR(command_buffer, nullptr, svm_in_mem(), + &pattern_1, sizeof(cl_char), data_size(), + 1, &invalid_point, nullptr, nullptr); + + test_failure_error_ret(error, CL_INVALID_SYNC_POINT_WAIT_LIST_KHR, + "clCommandSVMMemFillKHR should return " + "CL_INVALID_SYNC_POINT_WAIT_LIST_KHR", + TEST_FAIL); + + + error = clCommandSVMMemcpyKHR(command_buffer, nullptr, svm_out_mem(), + svm_in_mem(), data_size(), 1, nullptr, + nullptr, nullptr); + + test_failure_error_ret(error, CL_INVALID_SYNC_POINT_WAIT_LIST_KHR, + "clCommandSVMMemcpyKHR should return " + "CL_INVALID_SYNC_POINT_WAIT_LIST_KHR", + TEST_FAIL); + + error = clCommandSVMMemFillKHR(command_buffer, nullptr, svm_in_mem(), + &pattern_1, sizeof(cl_char), data_size(), + 1, nullptr, nullptr, nullptr); + + test_failure_error_ret(error, CL_INVALID_SYNC_POINT_WAIT_LIST_KHR, + "clCommandSVMMemFillKHR should return " + "CL_INVALID_SYNC_POINT_WAIT_LIST_KHR", + TEST_FAIL); + + + cl_sync_point_khr point; + error = clCommandBarrierWithWaitListKHR(command_buffer, nullptr, 0, + nullptr, &point, nullptr); + test_error(error, "clCommandBarrierWithWaitListKHR failed"); + + error = clCommandSVMMemcpyKHR(command_buffer, nullptr, svm_out_mem(), + svm_in_mem(), data_size(), 0, &point, + nullptr, nullptr); + + test_failure_error_ret(error, CL_INVALID_SYNC_POINT_WAIT_LIST_KHR, + "clCommandSVMMemcpyKHR should return " + "CL_INVALID_SYNC_POINT_WAIT_LIST_KHR", + TEST_FAIL); + + error = clCommandSVMMemFillKHR(command_buffer, nullptr, svm_in_mem(), + &pattern_1, sizeof(cl_char), data_size(), + 0, &point, nullptr, nullptr); + + test_failure_error_ret(error, CL_INVALID_SYNC_POINT_WAIT_LIST_KHR, + "clCommandSVMMemFillKHR should return " + "CL_INVALID_SYNC_POINT_WAIT_LIST_KHR", + TEST_FAIL); + + + return CL_SUCCESS; + } + + const cl_char pattern_1 = 0x14; +}; + +// CL_INVALID_COMMAND_BUFFER_KHR if command_buffer is not a valid +// command-buffer. +struct CommandBufferCommandSVMInvalidCommandBuffer + : public BasicSVMCommandBufferTest +{ + using BasicSVMCommandBufferTest::BasicSVMCommandBufferTest; + + cl_int Run() override + { + cl_int error = + clCommandSVMMemcpyKHR(nullptr, nullptr, svm_out_mem(), svm_in_mem(), + data_size(), 0, nullptr, nullptr, nullptr); + + test_failure_error_ret( + error, CL_INVALID_COMMAND_BUFFER_KHR, + "clCommandSVMMemcpyKHR should return CL_INVALID_COMMAND_BUFFER_KHR", + TEST_FAIL); + + error = clCommandSVMMemFillKHR(nullptr, nullptr, svm_in_mem(), + &pattern_1, sizeof(cl_char), data_size(), + 0, nullptr, nullptr, nullptr); + + test_failure_error_ret(error, CL_INVALID_COMMAND_BUFFER_KHR, + "clCommandSVMMemFillKHR should return " + "CL_INVALID_COMMAND_BUFFER_KHR", + TEST_FAIL); + + return CL_SUCCESS; + } + + const cl_char pattern_1 = 0x14; +}; + +// CL_INVALID_OPERATION if command_buffer has been finalized. +struct CommandBufferCommandSVMFinalizedCommandBuffer + : public BasicSVMCommandBufferTest +{ + using BasicSVMCommandBufferTest::BasicSVMCommandBufferTest; + + cl_int Run() override + { + cl_int error = clFinalizeCommandBufferKHR(command_buffer); + test_error(error, "clFinalizeCommandBufferKHR failed"); + + error = clCommandSVMMemcpyKHR(command_buffer, nullptr, svm_out_mem(), + svm_in_mem(), data_size(), 0, nullptr, + nullptr, nullptr); + + test_failure_error_ret( + error, CL_INVALID_OPERATION, + "clCommandSVMMemcpyKHR should return CL_INVALID_OPERATION", + TEST_FAIL); + + error = clCommandSVMMemFillKHR(command_buffer, nullptr, svm_in_mem(), + &pattern_1, sizeof(cl_char), data_size(), + 0, nullptr, nullptr, nullptr); + + test_failure_error_ret( + error, CL_INVALID_OPERATION, + "clCommandSVMMemFillKHR should return CL_INVALID_OPERATION", + TEST_FAIL); + + return CL_SUCCESS; + } + + const cl_char pattern_1 = 0x14; +}; + +// CL_INVALID_VALUE if mutable_handle is not NULL. +struct CommandBufferCommandSVMMutableHandleNotNull + : public BasicSVMCommandBufferTest +{ + using BasicSVMCommandBufferTest::BasicSVMCommandBufferTest; + + cl_int Run() override + { + cl_mutable_command_khr mutable_handle; + + cl_int error = clCommandSVMMemcpyKHR( + command_buffer, nullptr, svm_out_mem(), svm_in_mem(), data_size(), + 0, nullptr, nullptr, &mutable_handle); + + test_failure_error_ret( + error, CL_INVALID_VALUE, + "clCommandSVMMemcpyKHR should return CL_INVALID_VALUE", TEST_FAIL); + + error = clCommandSVMMemFillKHR(command_buffer, nullptr, svm_in_mem(), + &pattern_1, sizeof(cl_char), data_size(), + 0, nullptr, nullptr, &mutable_handle); + + test_failure_error_ret( + error, CL_INVALID_VALUE, + "clCommandSVMMemFillKHR should return CL_INVALID_VALUE", TEST_FAIL); + + return CL_SUCCESS; + } + + const cl_char pattern_1 = 0x14; +}; +} + +int test_negative_command_buffer_command_svm_queue_not_null( + cl_device_id device, cl_context context, cl_command_queue queue, + int num_elements) +{ + return MakeAndRunTest( + device, context, queue, num_elements); +} + +int test_negative_command_buffer_command_svm_sync_points_null_or_num_zero( + cl_device_id device, cl_context context, cl_command_queue queue, + int num_elements) +{ + return MakeAndRunTest( + device, context, queue, num_elements); +} + +int test_negative_command_buffer_command_svm_invalid_command_buffer( + cl_device_id device, cl_context context, cl_command_queue queue, + int num_elements) +{ + return MakeAndRunTest( + device, context, queue, num_elements); +} + +int test_negative_command_buffer_command_svm_finalized_command_buffer( + cl_device_id device, cl_context context, cl_command_queue queue, + int num_elements) +{ + return MakeAndRunTest( + device, context, queue, num_elements); +} + +int test_negative_command_buffer_command_svm_mutable_handle_not_null( + cl_device_id device, cl_context context, cl_command_queue queue, + int num_elements) +{ + return MakeAndRunTest( + device, context, queue, num_elements); +} diff --git a/test_conformance/extensions/cl_khr_command_buffer/procs.h b/test_conformance/extensions/cl_khr_command_buffer/procs.h index 8c7db913..a7cdc703 100644 --- a/test_conformance/extensions/cl_khr_command_buffer/procs.h +++ b/test_conformance/extensions/cl_khr_command_buffer/procs.h @@ -224,6 +224,22 @@ extern int test_negative_get_command_buffer_info_context(cl_device_id device, cl_context context, cl_command_queue queue, int num_elements); +extern int test_negative_command_buffer_command_svm_queue_not_null( + cl_device_id device, cl_context context, cl_command_queue queue, + int num_elements); +extern int +test_negative_command_buffer_command_svm_sync_points_null_or_num_zero( + cl_device_id device, cl_context context, cl_command_queue queue, + int num_elements); +extern int test_negative_command_buffer_command_svm_invalid_command_buffer( + cl_device_id device, cl_context context, cl_command_queue queue, + int num_elements); +extern int test_negative_command_buffer_command_svm_finalized_command_buffer( + cl_device_id device, cl_context context, cl_command_queue queue, + int num_elements); +extern int test_negative_command_buffer_command_svm_mutable_handle_not_null( + cl_device_id device, cl_context context, cl_command_queue queue, + int num_elements); extern int test_negative_command_buffer_barrier_not_null_queue( cl_device_id device, cl_context context, cl_command_queue queue, int num_elements);