Remove command queue constructor

Signed-off-by: Maciej Dziuban <[email protected]>

Author: DziubanMaciejIntel

opencl/source/command_queue/command_queue.cpp

@@ -59,9 +59,6 @@ CommandQueue *CommandQueue::create(Context *context,
     return funcCreate(context, device, properties, internalUsage);
 }
 
-CommandQueue::CommandQueue(Context *context, ClDevice *device, const cl_queue_properties *properties)
-    : CommandQueue(context, device, properties, false) {}
-
 CommandQueue::CommandQueue(Context *context, ClDevice *device, const cl_queue_properties *properties, bool internalUsage)
     : context(context), device(device) {
     if (context) {

opencl/source/command_queue/command_queue.h

@@ -69,9 +69,6 @@ class CommandQueue : public BaseObject<_cl_command_queue> {
 
     CommandQueue(Context *context, ClDevice *device, const cl_queue_properties *properties, bool internalUsage);
 
-    CommandQueue(Context *context, ClDevice *device,
-                 const cl_queue_properties *properties);
-
     CommandQueue &operator=(const CommandQueue &) = delete;
     CommandQueue(const CommandQueue &) = delete;
 

opencl/test/unit_test/api/cl_api_tests.cpp

@@ -30,7 +30,7 @@ void api_fixture_using_aligned_memory_manager::SetUp() {
     EXPECT_EQ(CL_SUCCESS, retVal);
     Context *ctxPtr = reinterpret_cast<Context *>(context);
 
-    commandQueue = new MockCommandQueue(context, device, 0);
+    commandQueue = new MockCommandQueue(context, device, 0, false);
 
     program = new MockProgram(ctxPtr, false, toClDeviceVector(*device));
     Program *prgPtr = reinterpret_cast<Program *>(program);

opencl/test/unit_test/api/cl_api_tests.h

@@ -45,7 +45,7 @@ struct ApiFixture {
         pContext = Context::create<MockContext>(nullptr, ClDeviceVector(&testedClDevice, 1), nullptr, nullptr, retVal);
         EXPECT_EQ(retVal, CL_SUCCESS);
 
-        pCommandQueue = new MockCommandQueue(pContext, pDevice, nullptr);
+        pCommandQueue = new MockCommandQueue(pContext, pDevice, nullptr, false);
 
         pProgram = new MockProgram(pContext, false, toClDeviceVector(*pDevice));
 

opencl/test/unit_test/api/cl_enqueue_copy_buffer_rect_tests.inl

@@ -255,7 +255,7 @@ TEST_F(clEnqueueCopyBufferRectTests, givenNonProperDstBufferSizeWhenCallClEnqueu
 TEST_F(clEnqueueCopyBufferRectTests, givenPitchesEqualZeroAndNotZeroRegionWhenCallClEnqueueCopyBufferRectThenPitchIsSetBasedOnRegionAndClSuccessIsReturned) {
     class CommandQueueMock : public MockCommandQueue {
       public:
-        CommandQueueMock(Context *context, ClDevice *device, const cl_queue_properties *props) : MockCommandQueue(context, device, props) {}
+        CommandQueueMock(Context *context, ClDevice *device, const cl_queue_properties *props) : MockCommandQueue(context, device, props, false) {}
         cl_int enqueueCopyBufferRect(Buffer *srcBuffer, Buffer *dstBuffer, const size_t *srcOrigin, const size_t *dstOrigin,
                                      const size_t *region, size_t argSrcRowPitch, size_t argSrcSlicePitch, size_t argDstRowPitch,
                                      size_t argDstSlicePitch, cl_uint numEventsInWaitList,

opencl/test/unit_test/api/cl_enqueue_image_tests.inl

@@ -20,7 +20,7 @@ using ImageEnqueueCall = std::function<void(MockCommandQueue *, Image *, size_t
 struct ValidateRegionAndOriginTests : public ::testing::TestWithParam<ImageEnqueueCall> {
     void SetUp() override {
         context.reset(new MockContext());
-        cmdQ.reset(new MockCommandQueue(context.get(), context->getDevice(0), 0));
+        cmdQ.reset(new MockCommandQueue(context.get(), context->getDevice(0), nullptr, false));
     }
 
     static void readImage(MockCommandQueue *cmdQ, Image *image, size_t *origin, size_t *region, int32_t &retVal) {

opencl/test/unit_test/api/cl_enqueue_svm_free_tests.inl

@@ -152,7 +152,7 @@ TEST_F(clEnqueueSVMFreeTests, GivenDeviceNotSupportingSvmWhenEnqueuingSVMFreeThe
     auto pDevice = std::make_unique<MockClDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfo, 0));
     cl_device_id deviceId = pDevice.get();
     auto pContext = std::unique_ptr<MockContext>(Context::create<MockContext>(nullptr, ClDeviceVector(&deviceId, 1), nullptr, nullptr, retVal));
-    auto pCommandQueue = std::make_unique<MockCommandQueue>(pContext.get(), pDevice.get(), nullptr);
+    auto pCommandQueue = std::make_unique<MockCommandQueue>(pContext.get(), pDevice.get(), nullptr, false);
 
     auto retVal = clEnqueueSVMFree(
         pCommandQueue.get(), // cl_command_queue command_queue

opencl/test/unit_test/api/cl_enqueue_svm_map_tests.inl

@@ -156,7 +156,7 @@ TEST_F(clEnqueueSVMMapTests, GivenDeviceNotSupportingSvmWhenEnqueuingSVMMapThenI
     auto pDevice = std::make_unique<MockClDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfo, 0));
     cl_device_id deviceId = pDevice.get();
     auto pContext = std::unique_ptr<MockContext>(Context::create<MockContext>(nullptr, ClDeviceVector(&deviceId, 1), nullptr, nullptr, retVal));
-    auto pCommandQueue = std::make_unique<MockCommandQueue>(pContext.get(), pDevice.get(), nullptr);
+    auto pCommandQueue = std::make_unique<MockCommandQueue>(pContext.get(), pDevice.get(), nullptr, false);
 
     auto retVal = clEnqueueSVMMap(
         pCommandQueue.get(), // cl_command_queue command_queue

opencl/test/unit_test/api/cl_enqueue_svm_mem_fill_tests.inl

@@ -156,7 +156,7 @@ TEST_F(clEnqueueSVMMemFillTests, GivenDeviceNotSupportingSvmWhenEnqueuingSVMMemF
     auto pDevice = std::make_unique<MockClDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfo, 0));
     cl_device_id deviceId = pDevice.get();
     auto pContext = std::unique_ptr<MockContext>(Context::create<MockContext>(nullptr, ClDeviceVector(&deviceId, 1), nullptr, nullptr, retVal));
-    auto pCommandQueue = std::make_unique<MockCommandQueue>(pContext.get(), pDevice.get(), nullptr);
+    auto pCommandQueue = std::make_unique<MockCommandQueue>(pContext.get(), pDevice.get(), nullptr, false);
 
     auto retVal = clEnqueueSVMMemFill(
         pCommandQueue.get(), // cl_command_queue command_queue

opencl/test/unit_test/api/cl_enqueue_svm_memcpy_tests.inl

@@ -192,7 +192,7 @@ TEST_F(clEnqueueSVMMemcpyTests, GivenDeviceNotSupportingSvmWhenEnqueuingSVMMemcp
     auto pDevice = std::make_unique<MockClDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfo, 0));
     cl_device_id deviceId = pDevice.get();
     auto pContext = std::unique_ptr<MockContext>(Context::create<MockContext>(nullptr, ClDeviceVector(&deviceId, 1), nullptr, nullptr, retVal));
-    auto pCommandQueue = std::make_unique<MockCommandQueue>(pContext.get(), pDevice.get(), nullptr);
+    auto pCommandQueue = std::make_unique<MockCommandQueue>(pContext.get(), pDevice.get(), nullptr, false);
 
     auto retVal = clEnqueueSVMMemcpy(
         pCommandQueue.get(), // cl_command_queue command_queue