Rename ocl DeviceFixture and add shared tests specific one

Change-Id: Ib61e987388ba14b721a573e3e84332a7f6c9ef9c
Signed-off-by: Konstanty Misiak <[email protected]>

Author: KonstantyMisiak

opencl/test/unit_test/accelerators/media_image_arg_tests.cpp

@@ -12,22 +12,22 @@
 #include "opencl/source/helpers/surface_formats.h"
 #include "opencl/source/kernel/kernel.h"
 #include "opencl/source/mem_obj/image.h"
-#include "opencl/test/unit_test/fixtures/device_fixture.h"
+#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/fixtures/image_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 #include "opencl/test/unit_test/mocks/mock_program.h"
 #include "test.h"
 
 using namespace NEO;
 
-class MediaImageSetArgTest : public DeviceFixture,
+class MediaImageSetArgTest : public ClDeviceFixture,
                              public testing::Test {
   public:
     MediaImageSetArgTest() = default;
 
   protected:
     void SetUp() override {
-        DeviceFixture::SetUp();
+        ClDeviceFixture::SetUp();
 
         pKernelInfo = std::make_unique<KernelInfo>();
         program = std::make_unique<MockProgram>(*pDevice->getExecutionEnvironment());
@@ -65,7 +65,7 @@ class MediaImageSetArgTest : public DeviceFixture,
         delete pKernel;
 
         delete context;
-        DeviceFixture::TearDown();
+        ClDeviceFixture::TearDown();
     }
 
     cl_int retVal = CL_SUCCESS;

opencl/test/unit_test/api/cl_get_device_and_host_timer.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "opencl/test/unit_test/fixtures/device_fixture.h"
+#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_ostime.h"
 
 #include "cl_api_tests.h"

opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl

@@ -7,7 +7,7 @@
 
 #include "shared/source/memory_manager/unified_memory_manager.h"
 
-#include "opencl/test/unit_test/fixtures/device_fixture.h"
+#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 #include "opencl/test/unit_test/test_macros/test_checks_ocl.h"
 #include "test.h"
@@ -16,11 +16,11 @@
 
 using namespace NEO;
 
-class KernelArgSvmFixture : public ApiFixture<>, public DeviceFixture {
+class KernelArgSvmFixture : public ApiFixture<>, public ClDeviceFixture {
   protected:
     void SetUp() override {
         ApiFixture::SetUp();
-        DeviceFixture::SetUp();
+        ClDeviceFixture::SetUp();
         REQUIRE_SVM_OR_SKIP(defaultHwInfo);
 
         // define kernel info
@@ -50,7 +50,7 @@ class KernelArgSvmFixture : public ApiFixture<>, public DeviceFixture {
             delete pMockKernel;
         }
 
-        DeviceFixture::TearDown();
+        ClDeviceFixture::TearDown();
         ApiFixture::TearDown();
     }
 

opencl/test/unit_test/aub/aub_helper_tests.inl

@@ -13,7 +13,7 @@
 #include "opencl/source/aub_mem_dump/aub_mem_dump.h"
 #include "opencl/source/aub_mem_dump/page_table_entry_bits.h"
 #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h"
-#include "opencl/test/unit_test/fixtures/device_fixture.h"
+#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_lrca_helper.h"
 #include "test.h"
 
@@ -52,7 +52,7 @@ TEST(AubHelper, GivenMultipleSubDevicesWhenGettingDeviceCountThenCorrectValueIsR
     EXPECT_EQ(devicesCount, 1u);
 }
 
-typedef Test<DeviceFixture> AubHelperHwTest;
+typedef Test<ClDeviceFixture> AubHelperHwTest;
 
 HWTEST_F(AubHelperHwTest, GivenDisabledLocalMemoryWhenGetDataHintForPml4EntryIsCalledThenTraceNotypeIsReturned) {
     AubHelperHw<FamilyType> aubHelper(false);

opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp

@@ -11,7 +11,7 @@
 
 #include "opencl/source/aub_mem_dump/aub_alloc_dump.h"
 #include "opencl/source/mem_obj/buffer.h"
-#include "opencl/test/unit_test/fixtures/device_fixture.h"
+#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/fixtures/image_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_gmm.h"
@@ -21,7 +21,7 @@
 
 using namespace NEO;
 
-typedef Test<DeviceFixture> AubAllocDumpTests;
+typedef Test<ClDeviceFixture> AubAllocDumpTests;
 
 struct AubFileStreamMock : public AubMemDump::AubFileStream {
     void write(const char *data, size_t size) override {

opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h

@@ -13,7 +13,7 @@
 #include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
 #include "opencl/test/unit_test/command_stream/command_stream_fixture.h"
 #include "opencl/test/unit_test/fixtures/built_in_fixture.h"
-#include "opencl/test/unit_test/fixtures/device_fixture.h"
+#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 
 namespace NEO {
 

opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp

@@ -12,7 +12,7 @@
 
 #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h"
 #include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
-#include "opencl/test/unit_test/fixtures/device_fixture.h"
+#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "test.h"
 
 #include "aub_command_stream_fixture.h"
@@ -23,21 +23,21 @@ using namespace NEO;
 
 struct AUBFixture : public AUBCommandStreamFixture,
                     public CommandQueueFixture,
-                    public DeviceFixture {
+                    public ClDeviceFixture {
 
     using AUBCommandStreamFixture::SetUp;
     using CommandQueueFixture::SetUp;
 
     void SetUp() {
-        DeviceFixture::SetUp();
+        ClDeviceFixture::SetUp();
         CommandQueueFixture::SetUp(nullptr, pClDevice, 0);
         AUBCommandStreamFixture::SetUp(pCmdQ);
     }
 
     void TearDown() override {
         AUBCommandStreamFixture::TearDown();
         CommandQueueFixture::TearDown();
-        DeviceFixture::TearDown();
+        ClDeviceFixture::TearDown();
     }
 
     template <typename FamilyType>

opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.cpp

@@ -11,13 +11,13 @@
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
 #include "opencl/source/aub/aub_helper.h"
-#include "opencl/test/unit_test/fixtures/device_fixture.h"
+#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_aub_csr.h"
 
 using NEO::AUBCommandStreamReceiver;
 using NEO::AUBCommandStreamReceiverHw;
 using NEO::AUBFamilyMapper;
-using NEO::DeviceFixture;
+using NEO::ClDeviceFixture;
 using NEO::folderAUB;
 
 std::string getAubFileName(const NEO::Device *pDevice, const std::string baseName) {
@@ -42,7 +42,7 @@ TEST(PageTableTraits, when32BitTraitsAreUsedThenPageTableAddressesAreCorrect) {
     EXPECT_EQ(BIT(36), AubMemDump::PageTableTraits<32>::pdpBaseAddress);
 }
 
-typedef Test<DeviceFixture> AubMemDumpTests;
+typedef Test<ClDeviceFixture> AubMemDumpTests;
 
 HWTEST_F(AubMemDumpTests, givenAubFileStreamWhenOpenAndCloseIsCalledThenFileNameIsReportedCorrectly) {
     AUBCommandStreamReceiver::AubFileStream aubFile;

opencl/test/unit_test/aub_tests/fixtures/simple_arg_fixture.h

@@ -37,7 +37,7 @@ struct SimpleArgFixture : public FixtureFactory::IndirectHeapFixture,
                           public FixtureFactory::CommandStreamFixture,
                           public FixtureFactory::CommandQueueFixture,
                           public FixtureFactory::KernelFixture,
-                          public DeviceFixture {
+                          public ClDeviceFixture {
     typedef typename FixtureFactory::IndirectHeapFixture IndirectHeapFixture;
     typedef typename FixtureFactory::CommandStreamFixture CommandStreamFixture;
     typedef typename FixtureFactory::CommandQueueFixture CommandQueueFixture;
@@ -52,7 +52,7 @@ struct SimpleArgFixture : public FixtureFactory::IndirectHeapFixture,
 
   public:
     void SetUp() override {
-        DeviceFixture::SetUp();
+        ClDeviceFixture::SetUp();
         ASSERT_NE(nullptr, pClDevice);
         CommandQueueFixture::SetUp(pClDevice, 0);
         ASSERT_NE(nullptr, pCmdQ);
@@ -96,7 +96,7 @@ struct SimpleArgFixture : public FixtureFactory::IndirectHeapFixture,
         IndirectHeapFixture::TearDown();
         CommandStreamFixture::TearDown();
         CommandQueueFixture::TearDown();
-        DeviceFixture::TearDown();
+        ClDeviceFixture::TearDown();
     }
 
     int argVal = 0;

opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.cpp

@@ -7,9 +7,9 @@
 
 #include "aub_batch_buffer_tests_gen11.h"
 
-#include "opencl/test/unit_test/fixtures/device_fixture.h"
+#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 
-using Gen11AubBatchBufferTests = Test<NEO::DeviceFixture>;
+using Gen11AubBatchBufferTests = Test<NEO::ClDeviceFixture>;
 
 static constexpr auto gpuBatchBufferAddr = 0x800400001000; // 48-bit GPU address