@@ -3459,130 +3459,6 @@ void testLinkProgramWithVectorProgramInput(void)
34593459#endif
34603460}
34613461
3462- /* ***************************************************************************
3463- * Tests for cl::khr::CommandBuffer
3464- ****************************************************************************/
3465- // #if defined(cl_khr_command_buffer)
3466- // void testMoveAssignCommandBufferKhrNonNull(void);
3467- // void testMoveAssignCommandBufferKhrNull(void);
3468- // void testMoveConstructCommandBufferKhrNonNull(void);
3469- // void testMoveConstructCommandBufferKhrNull(void);
3470- // #ifdef MAKE_MOVE_TESTS2
3471- // #undef MAKE_MOVE_TESTS2
3472- // #define MAKE_MOVE_TESTS2(prefix, type, makeFunc, releaseFunc, pool) \
3473- // void prefix##MoveAssign##type##NonNull(void) { \
3474- // releaseFunc##_ExpectAndReturn(makeFunc(0), CL_SUCCESS); \
3475- // pool[0] = std::move(pool[1]); \
3476- // TEST_ASSERT_EQUAL_PTR(makeFunc(1), pool[0]()); \
3477- // TEST_ASSERT_NULL(pool[1]()); \
3478- // } \
3479- // \
3480- // void prefix##MoveAssign##type##Null(void) { \
3481- // pool[0]() = nullptr; \
3482- // pool[0] = std::move(pool[1]); \
3483- // TEST_ASSERT_EQUAL_PTR(makeFunc(1), pool[0]()); \
3484- // TEST_ASSERT_NULL(pool[1]()); \
3485- // } \
3486- // \
3487- // void prefix##MoveConstruct##type##NonNull(void) { \
3488- // cl::khr::type tmp(std::move(pool[0])); \
3489- // TEST_ASSERT_EQUAL_PTR(makeFunc(0), tmp()); \
3490- // TEST_ASSERT_NULL(pool[0]()); \
3491- // tmp() = nullptr; \
3492- // } \
3493- // \
3494- // void prefix##MoveConstruct##type##Null(void) { \
3495- // cl::khr::type empty; \
3496- // cl::khr::type tmp(std::move(empty)); \
3497- // TEST_ASSERT_NULL(tmp()); \
3498- // TEST_ASSERT_NULL(empty()); \
3499- // }
3500- // #endif
3501- // MAKE_MOVE_TESTS(CommandBuffer, make_command_buffer_khr,
3502- // clReleaseCommandBufferKHR, commandBufferKhrPool)
3503- // #else
3504- // void testMoveAssignCommandBufferKhrNonNull(void) {}
3505- // void testMoveAssignCommandBufferKhrNull(void) {}
3506- // void testMoveConstructCommandBufferKhrNonNull(void) {}
3507- // void testMoveConstructCommandBufferKhrNull(void) {}
3508- // #endif
3509-
3510- // // Stub for clGetCommandBufferInfoKHR that returns 1
3511- // static cl_int clGetCommandBufferInfoKHR_testCommandBufferKhrGetNumQueues(
3512- // cl_command_buffer_khr command_buffer,
3513- // cl_command_buffer_info_khr param_name,
3514- // size_t param_value_size,
3515- // void *param_value,
3516- // size_t *param_value_size_ret,
3517- // int /*num_calls*/)
3518- // {
3519- // TEST_ASSERT_EQUAL_PTR(make_command_buffer_khr(0), command_buffer);
3520- // TEST_ASSERT_EQUAL_HEX(CL_COMMAND_BUFFER_NUM_QUEUES_KHR, param_name);
3521- // TEST_ASSERT(param_value == nullptr || param_value_size >= sizeof(cl_uint));
3522- // if (param_value_size_ret != nullptr)
3523- // *param_value_size_ret = sizeof(cl_uint);
3524- // if (param_value != nullptr)
3525- // *static_cast<cl_uint *> (param_value) = 1;
3526- // return CL_SUCCESS;
3527- // }
3528-
3529- // void testCommandBufferInfoKHRNumQueues(void)
3530- // {
3531- // #if defined(cl_khr_command_buffer)
3532- // cl_uint expected = 1;
3533-
3534- // clGetCommandBufferInfoKHR_StubWithCallback(clGetCommandBufferInfoKHR_testCommandBufferKhrGetNumQueues);
3535-
3536- // cl_uint num = commandBufferKhrPool[0].getInfo<CL_COMMAND_BUFFER_NUM_QUEUES_KHR>();
3537- // TEST_ASSERT_EQUAL_HEX(expected, num);
3538- // #endif
3539- // }
3540-
3541- // // Stub for clGetCommandBufferInfoKHR that returns command queues array
3542- // static cl_int clGetCommandBufferInfoKHR_testCommandBufferKhrGetCommandQueues(
3543- // cl_command_buffer_khr command_buffer,
3544- // cl_command_buffer_info_khr param_name,
3545- // size_t param_value_size,
3546- // void *param_value,
3547- // size_t *param_value_size_ret,
3548- // int /*num_calls*/)
3549- // {
3550- // TEST_ASSERT_EQUAL_PTR(make_command_buffer_khr(0), command_buffer);
3551- // TEST_ASSERT_EQUAL_HEX(CL_COMMAND_BUFFER_QUEUES_KHR, param_name);
3552- // TEST_ASSERT(param_value == nullptr || param_value_size >= 3 * sizeof(cl_command_queue));
3553- // if (param_value_size_ret != nullptr)
3554- // *param_value_size_ret = 3 * sizeof(cl_command_queue);
3555- // if (param_value != nullptr)
3556- // {
3557- // cl_command_queue *command_queues = static_cast<cl_command_queue *> (param_value);
3558- // command_queues[0] = make_command_queue(0);
3559- // command_queues[1] = make_command_queue(1);
3560- // command_queues[2] = make_command_queue(2);
3561- // }
3562- // return CL_SUCCESS;
3563- // }
3564-
3565- // void testCommandBufferInfoKHRCommandQueues(void)
3566- // {
3567- // #if defined(cl_khr_command_buffer)
3568- // // creat expected values for refcounter
3569- // VECTOR_CLASS<cl_command_queue> expected_queue_vec;
3570- // std::array<int, 3> refcount;
3571- // for (int i=0;i<3;i++) {
3572- // expected_queue_vec.push_back(commandQueuePool[i]());
3573- // refcount[i] = 1;
3574- // }
3575-
3576- // clGetCommandBufferInfoKHR_StubWithCallback(clGetCommandBufferInfoKHR_testCommandBufferKhrGetCommandQueues);
3577- // prepare_commandQueueRefcounts(expected_queue_vec.size(), expected_queue_vec.data(), refcount.data());
3578-
3579- // VECTOR_CLASS<cl::CommandQueue> command_queues = commandBufferKhrPool[0].getInfo<CL_COMMAND_BUFFER_QUEUES_KHR>();
3580- // TEST_ASSERT_EQUAL(3, command_queues.size());
3581- // TEST_ASSERT_EQUAL_PTR(make_command_queue(0), command_queues[0]());
3582- // TEST_ASSERT_EQUAL_PTR(make_command_queue(1), command_queues[1]());
3583- // TEST_ASSERT_EQUAL_PTR(make_command_queue(2), command_queues[2]());
3584- // #endif
3585- // }
35863462// Tests for Device::GetInfo
35873463static cl_int clGetInfo_testDeviceGetInfoCLDeviceVendorId (
35883464 cl_device_id device, cl_device_info param_name, size_t param_value_size,
@@ -4422,12 +4298,13 @@ void testTemplateGetImageRequirementsInfo() {}
44224298 * Some macros where redifined with cl::khr namespace.
44234299 ****************************************************************************/
44244300#if defined(cl_khr_command_buffer)
4425- void testMoveAssignCommandBufferKhrNonNull (void );
4426- void testMoveAssignCommandBufferKhrNull (void );
4427- void testMoveConstructCommandBufferKhrNonNull (void );
4428- void testMoveConstructCommandBufferKhrNull (void );
4301+ void testMoveAssignCommandBufferNonNull (void );
4302+ void testMoveAssignCommandBufferNull (void );
4303+ void testMoveConstructCommandBufferNonNull (void );
4304+ void testMoveConstructCommandBufferNull (void );
44294305#ifdef MAKE_MOVE_TESTS2
44304306#undef MAKE_MOVE_TESTS2
4307+ #endif
44314308#define MAKE_MOVE_TESTS2 (prefix, type, makeFunc, releaseFunc, pool ) \
44324309 void prefix##MoveAssign##type##NonNull(void ) { \
44334310 releaseFunc##_ExpectAndReturn (makeFunc (0 ), CL_SUCCESS); \
@@ -4456,14 +4333,13 @@ void testMoveConstructCommandBufferKhrNull(void);
44564333 TEST_ASSERT_NULL (tmp ()); \
44574334 TEST_ASSERT_NULL (empty ()); \
44584335 }
4459- #endif
44604336MAKE_MOVE_TESTS (CommandBuffer, make_command_buffer_khr,
44614337 clReleaseCommandBufferKHR, commandBufferKhrPool)
44624338#else
4463- void testMoveAssignCommandBufferKhrNonNull (void ) {}
4464- void testMoveAssignCommandBufferKhrNull (void ) {}
4465- void testMoveConstructCommandBufferKhrNonNull (void ) {}
4466- void testMoveConstructCommandBufferKhrNull (void ) {}
4339+ void testMoveAssignCommandBufferNonNull (void ) {}
4340+ void testMoveAssignCommandBufferNull (void ) {}
4341+ void testMoveConstructCommandBufferNonNull (void ) {}
4342+ void testMoveConstructCommandBufferNull (void ) {}
44674343#endif
44684344
44694345// Stub for clGetCommandBufferInfoKHR that returns 1
0 commit comments