From 9137a5c377c294f1ed02377efbd9e1c2fe2e7692 Mon Sep 17 00:00:00 2001 From: Bogumil Sapinski Date: Thu, 13 Jul 2023 15:09:41 +0200 Subject: [PATCH] solved unittests for cl::khr namespace --- tests/test_openclhpp.cpp | 142 +++------------------------------------ 1 file changed, 9 insertions(+), 133 deletions(-) diff --git a/tests/test_openclhpp.cpp b/tests/test_openclhpp.cpp index d1f6f6d6..ec8354d8 100644 --- a/tests/test_openclhpp.cpp +++ b/tests/test_openclhpp.cpp @@ -3459,130 +3459,6 @@ void testLinkProgramWithVectorProgramInput(void) #endif } -/**************************************************************************** - * Tests for cl::khr::CommandBuffer - ****************************************************************************/ -// #if defined(cl_khr_command_buffer) -// void testMoveAssignCommandBufferKhrNonNull(void); -// void testMoveAssignCommandBufferKhrNull(void); -// void testMoveConstructCommandBufferKhrNonNull(void); -// void testMoveConstructCommandBufferKhrNull(void); -// #ifdef MAKE_MOVE_TESTS2 -// #undef MAKE_MOVE_TESTS2 -// #define MAKE_MOVE_TESTS2(prefix, type, makeFunc, releaseFunc, pool) \ -// void prefix##MoveAssign##type##NonNull(void) { \ -// releaseFunc##_ExpectAndReturn(makeFunc(0), CL_SUCCESS); \ -// pool[0] = std::move(pool[1]); \ -// TEST_ASSERT_EQUAL_PTR(makeFunc(1), pool[0]()); \ -// TEST_ASSERT_NULL(pool[1]()); \ -// } \ -// \ -// void prefix##MoveAssign##type##Null(void) { \ -// pool[0]() = nullptr; \ -// pool[0] = std::move(pool[1]); \ -// TEST_ASSERT_EQUAL_PTR(makeFunc(1), pool[0]()); \ -// TEST_ASSERT_NULL(pool[1]()); \ -// } \ -// \ -// void prefix##MoveConstruct##type##NonNull(void) { \ -// cl::khr::type tmp(std::move(pool[0])); \ -// TEST_ASSERT_EQUAL_PTR(makeFunc(0), tmp()); \ -// TEST_ASSERT_NULL(pool[0]()); \ -// tmp() = nullptr; \ -// } \ -// \ -// void prefix##MoveConstruct##type##Null(void) { \ -// cl::khr::type empty; \ -// cl::khr::type tmp(std::move(empty)); \ -// TEST_ASSERT_NULL(tmp()); \ -// TEST_ASSERT_NULL(empty()); \ -// } -// #endif -// MAKE_MOVE_TESTS(CommandBuffer, make_command_buffer_khr, -// clReleaseCommandBufferKHR, commandBufferKhrPool) -// #else -// void testMoveAssignCommandBufferKhrNonNull(void) {} -// void testMoveAssignCommandBufferKhrNull(void) {} -// void testMoveConstructCommandBufferKhrNonNull(void) {} -// void testMoveConstructCommandBufferKhrNull(void) {} -// #endif - -// // Stub for clGetCommandBufferInfoKHR that returns 1 -// static cl_int clGetCommandBufferInfoKHR_testCommandBufferKhrGetNumQueues( -// cl_command_buffer_khr command_buffer, -// cl_command_buffer_info_khr param_name, -// size_t param_value_size, -// void *param_value, -// size_t *param_value_size_ret, -// int /*num_calls*/) -// { -// TEST_ASSERT_EQUAL_PTR(make_command_buffer_khr(0), command_buffer); -// TEST_ASSERT_EQUAL_HEX(CL_COMMAND_BUFFER_NUM_QUEUES_KHR, param_name); -// TEST_ASSERT(param_value == nullptr || param_value_size >= sizeof(cl_uint)); -// if (param_value_size_ret != nullptr) -// *param_value_size_ret = sizeof(cl_uint); -// if (param_value != nullptr) -// *static_cast (param_value) = 1; -// return CL_SUCCESS; -// } - -// void testCommandBufferInfoKHRNumQueues(void) -// { -// #if defined(cl_khr_command_buffer) -// cl_uint expected = 1; - -// clGetCommandBufferInfoKHR_StubWithCallback(clGetCommandBufferInfoKHR_testCommandBufferKhrGetNumQueues); - -// cl_uint num = commandBufferKhrPool[0].getInfo(); -// TEST_ASSERT_EQUAL_HEX(expected, num); -// #endif -// } - -// // Stub for clGetCommandBufferInfoKHR that returns command queues array -// static cl_int clGetCommandBufferInfoKHR_testCommandBufferKhrGetCommandQueues( -// cl_command_buffer_khr command_buffer, -// cl_command_buffer_info_khr param_name, -// size_t param_value_size, -// void *param_value, -// size_t *param_value_size_ret, -// int /*num_calls*/) -// { -// TEST_ASSERT_EQUAL_PTR(make_command_buffer_khr(0), command_buffer); -// TEST_ASSERT_EQUAL_HEX(CL_COMMAND_BUFFER_QUEUES_KHR, param_name); -// TEST_ASSERT(param_value == nullptr || param_value_size >= 3 * sizeof(cl_command_queue)); -// if (param_value_size_ret != nullptr) -// *param_value_size_ret = 3 * sizeof(cl_command_queue); -// if (param_value != nullptr) -// { -// cl_command_queue *command_queues = static_cast (param_value); -// command_queues[0] = make_command_queue(0); -// command_queues[1] = make_command_queue(1); -// command_queues[2] = make_command_queue(2); -// } -// return CL_SUCCESS; -// } - -// void testCommandBufferInfoKHRCommandQueues(void) -// { -// #if defined(cl_khr_command_buffer) -// // creat expected values for refcounter -// VECTOR_CLASS expected_queue_vec; -// std::array refcount; -// for (int i=0;i<3;i++) { -// expected_queue_vec.push_back(commandQueuePool[i]()); -// refcount[i] = 1; -// } - -// clGetCommandBufferInfoKHR_StubWithCallback(clGetCommandBufferInfoKHR_testCommandBufferKhrGetCommandQueues); -// prepare_commandQueueRefcounts(expected_queue_vec.size(), expected_queue_vec.data(), refcount.data()); - -// VECTOR_CLASS command_queues = commandBufferKhrPool[0].getInfo(); -// TEST_ASSERT_EQUAL(3, command_queues.size()); -// TEST_ASSERT_EQUAL_PTR(make_command_queue(0), command_queues[0]()); -// TEST_ASSERT_EQUAL_PTR(make_command_queue(1), command_queues[1]()); -// TEST_ASSERT_EQUAL_PTR(make_command_queue(2), command_queues[2]()); -// #endif -// } // Tests for Device::GetInfo static cl_int clGetInfo_testDeviceGetInfoCLDeviceVendorId( cl_device_id device, cl_device_info param_name, size_t param_value_size, @@ -4422,12 +4298,13 @@ void testTemplateGetImageRequirementsInfo() {} * Some macros where redifined with cl::khr namespace. ****************************************************************************/ #if defined(cl_khr_command_buffer) -void testMoveAssignCommandBufferKhrNonNull(void); -void testMoveAssignCommandBufferKhrNull(void); -void testMoveConstructCommandBufferKhrNonNull(void); -void testMoveConstructCommandBufferKhrNull(void); +void testMoveAssignCommandBufferNonNull(void); +void testMoveAssignCommandBufferNull(void); +void testMoveConstructCommandBufferNonNull(void); +void testMoveConstructCommandBufferNull(void); #ifdef MAKE_MOVE_TESTS2 #undef MAKE_MOVE_TESTS2 +#endif #define MAKE_MOVE_TESTS2(prefix, type, makeFunc, releaseFunc, pool) \ void prefix##MoveAssign##type##NonNull(void) { \ releaseFunc##_ExpectAndReturn(makeFunc(0), CL_SUCCESS); \ @@ -4456,14 +4333,13 @@ void testMoveConstructCommandBufferKhrNull(void); TEST_ASSERT_NULL(tmp()); \ TEST_ASSERT_NULL(empty()); \ } -#endif MAKE_MOVE_TESTS(CommandBuffer, make_command_buffer_khr, clReleaseCommandBufferKHR, commandBufferKhrPool) #else -void testMoveAssignCommandBufferKhrNonNull(void) {} -void testMoveAssignCommandBufferKhrNull(void) {} -void testMoveConstructCommandBufferKhrNonNull(void) {} -void testMoveConstructCommandBufferKhrNull(void) {} +void testMoveAssignCommandBufferNonNull(void) {} +void testMoveAssignCommandBufferNull(void) {} +void testMoveConstructCommandBufferNonNull(void) {} +void testMoveConstructCommandBufferNull(void) {} #endif // Stub for clGetCommandBufferInfoKHR that returns 1