more ULTs cleanup

- removing not used BuiltInsFixture

Change-Id: Iba35db629d155522070a143da26ee2ac44fc9568
Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>

manifests/manifest.yml

@@ -31,7 +31,7 @@ components:
     branch: infra
     clean_on_sync: true
     dest_dir: infra
-    revision: 5fdea6a1f0d0badc981f66d847eebda5e9e686c5
+    revision: 0de39c7266b4902f24658c15e856ac300e1bf960
     type: git
   internal:
     branch: master

unit_tests/api/cl_api_tests.cpp

@@ -51,7 +51,6 @@ void api_fixture::SetUp() {
 
     pKernel = new MockKernel(pProgram, *pProgram->MockProgram::getKernelInfo(), *pDevice);
     ASSERT_NE(nullptr, pKernel);
-    BuiltInFixture::SetUp(pDevice);
 }
 
 void api_fixture::TearDown() {
@@ -60,7 +59,6 @@ void api_fixture::TearDown() {
     pContext->release();
     pProgram->release();
 
-    BuiltInFixture::TearDown();
     PlatformFixture::TearDown();
 }
 
@@ -83,7 +81,6 @@ void api_fixture_using_aligned_memory_manager::SetUp() {
 
     kernel = new MockKernel(prgPtr, *program->MockProgram::getKernelInfo(), *devPtr);
     ASSERT_NE(nullptr, kernel);
-    BuiltInFixture::SetUp(devPtr);
 }
 
 void api_fixture_using_aligned_memory_manager::TearDown() {
@@ -92,7 +89,5 @@ void api_fixture_using_aligned_memory_manager::TearDown() {
     context->release();
     program->release();
     delete device;
-
-    BuiltInFixture::TearDown();
 }
 } // namespace OCLRT

unit_tests/api/cl_api_tests.h

@@ -23,7 +23,6 @@
 #pragma once
 #include "gtest/gtest.h"
 #include "unit_tests/fixtures/platform_fixture.h"
-#include "unit_tests/fixtures/built_in_fixture.h"
 #include "runtime/api/api.h"
 #include "test.h"
 
@@ -37,9 +36,7 @@ class MockKernel;
 class MockProgram;
 class MockAlignedMallocManagerDevice;
 
-struct api_fixture : public PlatformFixture,
-                     public BuiltInFixture {
-    using BuiltInFixture::SetUp;
+struct api_fixture : public PlatformFixture {
     using PlatformFixture::SetUp;
 
   public:
@@ -68,9 +65,7 @@ struct api_tests : public api_fixture,
     }
 };
 
-struct api_fixture_using_aligned_memory_manager : public BuiltInFixture {
-    using BuiltInFixture::SetUp;
-
+struct api_fixture_using_aligned_memory_manager {
   public:
     virtual void SetUp();
     virtual void TearDown();

unit_tests/command_queue/command_enqueue_fixture.h

@@ -23,7 +23,6 @@
 #pragma once
 #include "unit_tests/fixtures/buffer_fixture.h"
 #include "unit_tests/fixtures/device_fixture.h"
-#include "unit_tests/fixtures/built_in_fixture.h"
 #include "unit_tests/fixtures/image_fixture.h"
 #include "unit_tests/command_stream/command_stream_fixture.h"
 #include "unit_tests/command_queue/command_queue_fixture.h"
@@ -33,19 +32,14 @@
 namespace OCLRT {
 
 struct CommandDeviceFixture : public DeviceFixture,
-                              public BuiltInFixture,
                               public CommandQueueHwFixture {
-    using BuiltInFixture::SetUp;
     using CommandQueueHwFixture::SetUp;
     void SetUp(cl_command_queue_properties cmdQueueProperties = 0) {
         DeviceFixture::SetUp();
-        BuiltInFixture::SetUp(pDevice);
-        ASSERT_NE(nullptr, pBuiltIns);
         CommandQueueHwFixture::SetUp(pDevice, cmdQueueProperties);
     }
 
     void TearDown() {
-        BuiltInFixture::TearDown();
         CommandQueueHwFixture::TearDown();
         DeviceFixture::TearDown();
     }

unit_tests/command_queue/enqueue_svm_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,12 +20,10 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "runtime/built_ins/built_ins.h"
 #include "unit_tests/command_queue/command_queue_fixture.h"
 #include "unit_tests/command_queue/enqueue_map_buffer_fixture.h"
 #include "unit_tests/fixtures/device_fixture.h"
 #include "unit_tests/fixtures/buffer_fixture.h"
-#include "unit_tests/fixtures/built_in_fixture.h"
 #include "unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/memory_manager/svm_memory_manager.h"
 #include "unit_tests/mocks/mock_context.h"
@@ -40,25 +38,20 @@ using namespace OCLRT;
 
 struct EnqueueSvmTest : public DeviceFixture,
                         public CommandQueueHwFixture,
-                        public BuiltInFixture,
                         public ::testing::Test {
     typedef CommandQueueHwFixture CommandQueueFixture;
 
-    using BuiltInFixture::SetUp;
-
     EnqueueSvmTest() {
     }
 
     void SetUp() override {
         DeviceFixture::SetUp();
         CommandQueueFixture::SetUp(pDevice, 0);
-        BuiltInFixture::SetUp(pDevice);
         ptrSVM = context->getSVMAllocsManager()->createSVMAlloc(256);
     }
 
     void TearDown() override {
         context->getSVMAllocsManager()->freeSVMAlloc(ptrSVM);
-        BuiltInFixture::TearDown();
         CommandQueueFixture::TearDown();
         DeviceFixture::TearDown();
     }
@@ -597,4 +590,4 @@ TEST_F(EnqueueSvmTest, enqueueSVMMigrateMem_Success) {
         nullptr  // cL_event *event
         );
     EXPECT_EQ(CL_SUCCESS, retVal);
-}
+}

unit_tests/command_queue/enqueue_thread_tests.cpp

@@ -28,7 +28,6 @@
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "unit_tests/libult/ult_command_stream_receiver.h"
-#include "unit_tests/fixtures/built_in_fixture.h"
 #include "unit_tests/fixtures/device_fixture.h"
 #include "unit_tests/mocks/mock_context.h"
 #include "test.h"
@@ -75,21 +74,15 @@ class CommandStreamReceiverMock : public UltCommandStreamReceiver<FamilyType> {
     }
 };
 
-struct EnqueueThreadingFixture : public DeviceFixture,
-                                 public BuiltInFixture {
-    using BuiltInFixture::SetUp;
-
+struct EnqueueThreadingFixture : public DeviceFixture {
     void SetUp() {
         DeviceFixture::SetUp();
-        BuiltInFixture::SetUp(pDevice);
         context = new MockContext(pDevice);
-        ASSERT_NE(nullptr, pBuiltIns);
         pCmdQ = nullptr;
     }
 
     void TearDown() {
         delete pCmdQ;
-        BuiltInFixture::TearDown();
         context->release();
         DeviceFixture::TearDown();
     }

unit_tests/command_queue/oom_buffer_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,7 +25,6 @@
 #include "runtime/memory_manager/memory_manager.h"
 #include "unit_tests/command_queue/command_queue_fixture.h"
 #include "unit_tests/command_queue/enqueue_fixture.h"
-#include "unit_tests/fixtures/built_in_fixture.h"
 #include "unit_tests/fixtures/device_fixture.h"
 #include "unit_tests/fixtures/hello_world_kernel_fixture.h"
 #include "unit_tests/fixtures/memory_management_fixture.h"
@@ -48,7 +47,6 @@ static OOMSetting oomSettings[] = {
 struct OOMCommandQueueBufferTest : public MemoryManagementFixture,
                                    public DeviceFixture,
                                    public CommandQueueFixture,
-                                   public BuiltInFixture,
                                    public SimpleArgKernelFixture,
                                    public HelloWorldKernelFixture,
                                    public ::testing::TestWithParam<OOMSetting> {
@@ -56,7 +54,6 @@ struct OOMCommandQueueBufferTest : public MemoryManagementFixture,
     using CommandQueueFixture::SetUp;
     using SimpleArgKernelFixture::SetUp;
     using HelloWorldKernelFixture::SetUp;
-    using BuiltInFixture::SetUp;
 
     OOMCommandQueueBufferTest() {
     }
@@ -68,7 +65,6 @@ struct OOMCommandQueueBufferTest : public MemoryManagementFixture,
         context = new MockContext(pDevice);
         BufferDefaults::context = context;
         CommandQueueFixture::SetUp(context, pDevice, 0);
-        BuiltInFixture::SetUp(pDevice);
         SimpleArgKernelFixture::SetUp(pDevice);
         HelloWorldKernelFixture::SetUp(pDevice, "CopyBuffer_simd", "CopyBuffer");
 
@@ -97,7 +93,6 @@ struct OOMCommandQueueBufferTest : public MemoryManagementFixture,
     void TearDown() override {
         delete dstBuffer;
         delete srcBuffer;
-        BuiltInFixture::TearDown();
         context->release();
         HelloWorldKernelFixture::TearDown();
         SimpleArgKernelFixture::TearDown();

unit_tests/command_queue/oom_image_tests.cpp

@@ -25,7 +25,6 @@
 #include "runtime/memory_manager/memory_manager.h"
 #include "unit_tests/command_queue/command_queue_fixture.h"
 #include "unit_tests/command_queue/enqueue_fixture.h"
-#include "unit_tests/fixtures/built_in_fixture.h"
 #include "unit_tests/fixtures/device_fixture.h"
 #include "test.h"
 
@@ -43,10 +42,8 @@ static OOMSetting oomSettings[] = {
 
 struct OOMCommandQueueImageTest : public DeviceFixture,
                                   public CommandQueueFixture,
-                                  public BuiltInFixture,
                                   public ::testing::TestWithParam<OOMSetting> {
 
-    using BuiltInFixture::SetUp;
     using CommandQueueFixture::SetUp;
 
     OOMCommandQueueImageTest() {
@@ -56,7 +53,6 @@ struct OOMCommandQueueImageTest : public DeviceFixture,
         DeviceFixture::SetUp();
         context = new MockContext(pDevice);
         CommandQueueFixture::SetUp(context, pDevice, 0);
-        BuiltInFixture::SetUp(pDevice);
 
         srcImage = Image2dHelper<>::create(context);
         dstImage = Image2dHelper<>::create(context);
@@ -85,7 +81,6 @@ struct OOMCommandQueueImageTest : public DeviceFixture,
         delete srcImage;
         context->release();
 
-        BuiltInFixture::TearDown();
         CommandQueueFixture::TearDown();
         DeviceFixture::TearDown();
     }

unit_tests/context/driver_diagnostics_tests.h

@@ -28,7 +28,6 @@
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/kernel/kernel.h"
 #include "unit_tests/command_queue/command_queue_fixture.h"
-#include "unit_tests/fixtures/built_in_fixture.h"
 #include "unit_tests/fixtures/image_fixture.h"
 #include "unit_tests/fixtures/platform_fixture.h"
 #include "unit_tests/fixtures/program_fixture.h"
@@ -86,12 +85,10 @@ struct VerboseLevelTest : public DriverDiagnosticsTest,
 };
 
 struct PerformanceHintTest : public DriverDiagnosticsTest,
-                             public BuiltInFixture,
                              public CommandQueueHwFixture {
 
     void SetUp() override {
         DriverDiagnosticsTest::SetUp();
-        BuiltInFixture::SetUp(pPlatform->getDevice(0));
         cl_device_id deviceID = devices[0];
         cl_context_properties validProperties[3] = {CL_CONTEXT_SHOW_DIAGNOSTICS_INTEL, CL_CONTEXT_DIAGNOSTICS_LEVEL_ALL_INTEL, 0};
         context = Context::create<OCLRT::MockContext>(validProperties, DeviceVector(&deviceID, 1), callbackFunction, (void *)userData, retVal);
@@ -100,7 +97,6 @@ struct PerformanceHintTest : public DriverDiagnosticsTest,
 
     void TearDown() override {
         CommandQueueHwFixture::TearDown();
-        BuiltInFixture::TearDown();
         DriverDiagnosticsTest::TearDown();
     }
 };

unit_tests/fixtures/hello_world_fixture.h

@@ -29,7 +29,6 @@
 #include "unit_tests/command_stream/command_stream_fixture.h"
 #include "unit_tests/command_queue/command_queue_fixture.h"
 #include "unit_tests/indirect_heap/indirect_heap_fixture.h"
-#include "unit_tests/fixtures/built_in_fixture.h"
 #include "unit_tests/fixtures/hello_world_kernel_fixture.h"
 #include "gen_cmd_parse.h"
 #include "unit_tests/fixtures/buffer_fixture.h"
@@ -51,8 +50,7 @@ struct HelloWorldFixture : public FixtureFactory::IndirectHeapFixture,
                            public FixtureFactory::CommandStreamFixture,
                            public FixtureFactory::CommandQueueFixture,
                            public FixtureFactory::KernelFixture,
-                           public DeviceFixture,
-                           public BuiltInFixture {
+                           public DeviceFixture {
 
     typedef typename FixtureFactory::IndirectHeapFixture IndirectHeapFixture;
     typedef typename FixtureFactory::CommandStreamFixture CommandStreamFixture;
@@ -63,7 +61,6 @@ struct HelloWorldFixture : public FixtureFactory::IndirectHeapFixture,
     using CommandStreamFixture::pCS;
     using KernelFixture::pKernel;
     using IndirectHeapFixture::SetUp;
-    using BuiltInFixture::SetUp;
     using HelloWorldKernelFixture::SetUp;
     using CommandStreamFixture::SetUp;
     using CommandQueueFixture::SetUp;
@@ -79,8 +76,6 @@ struct HelloWorldFixture : public FixtureFactory::IndirectHeapFixture,
     virtual void SetUp() {
         DeviceFixture::SetUp();
         ASSERT_NE(nullptr, pDevice);
-        BuiltInFixture::SetUp(pDevice);
-        ASSERT_NE(nullptr, pBuiltIns);
         CommandQueueFixture::SetUp(pDevice, 0);
         ASSERT_NE(nullptr, pCmdQ);
         CommandStreamFixture::SetUp(pCmdQ);
@@ -111,7 +106,6 @@ struct HelloWorldFixture : public FixtureFactory::IndirectHeapFixture,
         CommandStreamFixture::TearDown();
         CommandQueueFixture::TearDown();
         delete BufferDefaults::context;
-        BuiltInFixture::TearDown();
         DeviceFixture::TearDown();
     }
 

unit_tests/fixtures/scenario_test_fixture.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Intel Corporation
+ * Copyright (c) 2017 - 2018, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,7 +22,6 @@
 #pragma once
 
 #include "unit_tests/fixtures/platform_fixture.h"
-#include "unit_tests/fixtures/built_in_fixture.h"
 #include "unit_tests/mocks/mock_command_queue.h"
 #include "unit_tests/mocks/mock_kernel.h"
 #include "runtime/helpers/options.h"
@@ -33,9 +32,7 @@
 using namespace OCLRT;
 
 class ScenarioTest : public ::testing::Test,
-                     public PlatformFixture,
-                     public BuiltInFixture {
-    using BuiltInFixture::SetUp;
+                     public PlatformFixture {
     using PlatformFixture::SetUp;
 
   public:
@@ -58,7 +55,6 @@ class ScenarioTest : public ::testing::Test,
         kernel = kernelInternals->mockKernel;
 
         ASSERT_NE(nullptr, kernel);
-        BuiltInFixture::SetUp(pDevice);
     }
     void TearDown() override {
         delete kernelInternals;
@@ -66,7 +62,6 @@ class ScenarioTest : public ::testing::Test,
         context->release();
         program->release();
 
-        BuiltInFixture::TearDown();
         PlatformFixture::TearDown();
     }
 

unit_tests/fixtures/ult_command_stream_receiver_fixture.h

@@ -26,7 +26,6 @@
 #include "runtime/helpers/cache_policy.h"
 #include "runtime/memory_manager/graphics_allocation.h"
 #include "unit_tests/fixtures/device_fixture.h"
-#include "unit_tests/fixtures/built_in_fixture.h"
 #include "unit_tests/helpers/hw_parse.h"
 #include "unit_tests/libult/ult_command_stream_receiver.h"
 
@@ -34,13 +33,11 @@ namespace OCLRT {
 
 struct UltCommandStreamReceiverTest
     : public DeviceFixture,
-      public BuiltInFixture,
       public HardwareParse,
       ::testing::Test {
 
     void SetUp() override {
         DeviceFixture::SetUp();
-        BuiltInFixture::SetUp(pDevice);
         HardwareParse::SetUp();
 
         size_t sizeStream = 256;
@@ -85,7 +82,6 @@ struct UltCommandStreamReceiverTest
         alignedFree(dshBuffer);
         alignedFree(cmdBuffer);
         HardwareParse::TearDown();
-        BuiltInFixture::TearDown();
         DeviceFixture::TearDown();
     }