Split command queue hw tests

Signed-off-by: Zbigniew Zdanowicz <zbigniew.zdanowicz@intel.com>

Author: zzdanowicz

opencl/test/unit_test/command_queue/CMakeLists.txt

@@ -9,7 +9,8 @@ set(IGDRCL_SRCS_tests_command_queue
     ${CMAKE_CURRENT_SOURCE_DIR}/blit_enqueue_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/buffer_operations_fixture.h
     ${CMAKE_CURRENT_SOURCE_DIR}/command_enqueue_fixture.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_hw_tests.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_hw_1_tests.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_hw_2_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/csr_selection_args_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker_tests.cpp

opencl/test/unit_test/command_queue/command_queue_fixture.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -124,4 +124,37 @@ void CommandQueueFixture::TearDown() {
     delete pCmdQ;
     pCmdQ = nullptr;
 }
+
+void OOQueueFixture ::SetUp(ClDevice *pDevice, cl_command_queue_properties properties) {
+    ASSERT_NE(nullptr, pDevice);
+    BaseClass::pCmdQ = BaseClass::createCommandQueue(pDevice, CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE);
+    ASSERT_NE(nullptr, BaseClass::pCmdQ);
+}
+
+void CommandQueueHwTest::SetUp() {
+    ClDeviceFixture::SetUp();
+    cl_device_id device = pClDevice;
+    ContextFixture::SetUp(1, &device);
+    CommandQueueHwFixture::SetUp(pClDevice, 0);
+}
+
+void CommandQueueHwTest::TearDown() {
+    CommandQueueHwFixture::TearDown();
+    ContextFixture::TearDown();
+    ClDeviceFixture::TearDown();
+}
+
+void OOQueueHwTest::SetUp() {
+    ClDeviceFixture::SetUp();
+    cl_device_id device = pClDevice;
+    ContextFixture::SetUp(1, &device);
+    OOQueueFixture::SetUp(pClDevice, 0);
+}
+
+void OOQueueHwTest::TearDown() {
+    OOQueueFixture::TearDown();
+    ContextFixture::TearDown();
+    ClDeviceFixture::TearDown();
+}
+
 } // namespace NEO

opencl/test/unit_test/command_queue/command_queue_fixture.h

@@ -54,11 +54,7 @@ struct CommandQueueHwFixture {
 struct OOQueueFixture : public CommandQueueHwFixture {
     typedef CommandQueueHwFixture BaseClass;
 
-    void SetUp(ClDevice *pDevice, cl_command_queue_properties properties) override {
-        ASSERT_NE(nullptr, pDevice);
-        BaseClass::pCmdQ = BaseClass::createCommandQueue(pDevice, CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE);
-        ASSERT_NE(nullptr, BaseClass::pCmdQ);
-    }
+    void SetUp(ClDevice *pDevice, cl_command_queue_properties properties) override;
 };
 
 struct CommandQueueFixture {
@@ -123,4 +119,37 @@ struct CommandQueueHwBlitTest : ClDeviceFixture, ContextFixture, CommandQueueHwF
 using IoqCommandQueueHwBlitTest = CommandQueueHwBlitTest<false>;
 using OoqCommandQueueHwBlitTest = CommandQueueHwBlitTest<true>;
 
+struct CommandQueueHwTest
+    : public ClDeviceFixture,
+      public ContextFixture,
+      public CommandQueueHwFixture,
+      ::testing::Test {
+
+    using ContextFixture::SetUp;
+
+    void SetUp() override;
+
+    void TearDown() override;
+
+    cl_command_queue_properties properties;
+    const HardwareInfo *pHwInfo = nullptr;
+};
+
+struct OOQueueHwTest : public ClDeviceFixture,
+                       public ContextFixture,
+                       public OOQueueFixture,
+                       ::testing::Test {
+    using ContextFixture::SetUp;
+
+    OOQueueHwTest() {
+    }
+
+    void SetUp() override;
+
+    void SetUp(ClDevice *pDevice, cl_command_queue_properties properties) override {
+    }
+
+    void TearDown() override;
+};
+
 } // namespace NEO