Move IndirectHeap to core and improve unit tests

Change-Id: If7e329fc12fe934eb0f6b1762d3b0d86aab287e6
Signed-off-by: Dunajski, Bartosz <bartosz.dunajski@intel.com>

core/command_container/cmdcontainer.cpp

@@ -10,9 +10,9 @@
 #include "core/command_stream/linear_stream.h"
 #include "core/helpers/debug_helpers.h"
 #include "core/helpers/heap_helper.h"
+#include "core/indirect_heap/indirect_heap.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/device/device.h"
-#include "runtime/indirect_heap/indirect_heap.h"
 #include "runtime/memory_manager/memory_manager.h"
 
 #include <cassert>

core/command_container/cmdcontainer.h

@@ -8,8 +8,8 @@
 #pragma once
 #include "core/helpers/heap_helper.h"
 #include "core/helpers/non_copyable_or_moveable.h"
+#include "core/indirect_heap/indirect_heap.h"
 #include "runtime/command_stream/csr_definitions.h"
-#include "runtime/indirect_heap/indirect_heap.h"
 
 #include <cstdint>
 #include <limits>

core/indirect_heap/CMakeLists.txt

@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2019 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+set(NEO_CORE_INDIRECT_HEAP
+  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/indirect_heap.h
+)
+
+set_property(GLOBAL PROPERTY NEO_CORE_INDIRECT_HEAP ${NEO_CORE_INDIRECT_HEAP})
+add_subdirectories()

core/indirect_heap/indirect_heap.h

@@ -30,9 +30,10 @@ class IndirectHeap : public LinearStream {
         NUM_TYPES
     };
 
-    IndirectHeap(void *buffer, size_t bufferSize);
-    IndirectHeap(GraphicsAllocation *buffer);
-    IndirectHeap(GraphicsAllocation *buffer, bool canBeUtilizedAs4GbHeap);
+    IndirectHeap(void *graphicsAllocation, size_t bufferSize) : BaseClass(graphicsAllocation, bufferSize){};
+    IndirectHeap(GraphicsAllocation *graphicsAllocation) : BaseClass(graphicsAllocation) {}
+    IndirectHeap(GraphicsAllocation *graphicsAllocation, bool canBeUtilizedAs4GbHeap)
+        : BaseClass(graphicsAllocation), canBeUtilizedAs4GbHeap(canBeUtilizedAs4GbHeap) {}
 
     // Disallow copy'ing
     IndirectHeap(const IndirectHeap &) = delete;

core/unit_tests/indirect_heap/CMakeLists.txt

@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2019 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+set(NEO_CORE_INDIRECT_HEAP_TESTS
+  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/indirect_heap_tests.cpp
+)
+
+set_property(GLOBAL PROPERTY NEO_CORE_INDIRECT_HEAP_TESTS ${NEO_CORE_INDIRECT_HEAP_TESTS})
+add_subdirectories()

core/unit_tests/indirect_heap/indirect_heap_tests.cpp

@@ -5,15 +5,21 @@
  *
  */
 
-#include "unit_tests/command_queue/command_queue_fixture.h"
-#include "unit_tests/indirect_heap/indirect_heap_fixture.h"
-#include "unit_tests/mocks/mock_graphics_allocation.h"
+#include "core/indirect_heap/indirect_heap.h"
+#include "core/memory_manager/graphics_allocation.h"
+#include "test.h"
 
 using namespace NEO;
 
 struct IndirectHeapTest : public ::testing::Test {
+    class MyMockGraphicsAllocation : public GraphicsAllocation {
+      public:
+        MyMockGraphicsAllocation(void *ptr, size_t size)
+            : GraphicsAllocation(0, AllocationType::UNKNOWN, ptr, castToUint64(ptr), 0, size, MemoryPool::System4KBPages) {}
+    };
+
     uint8_t buffer[256];
-    MockGraphicsAllocation gfxAllocation = {(void *)buffer, sizeof(buffer)};
+    MyMockGraphicsAllocation gfxAllocation = {(void *)buffer, sizeof(buffer)};
     IndirectHeap indirectHeap = {&gfxAllocation};
 };
 
@@ -86,54 +92,56 @@ TEST_F(IndirectHeapTest, givenIndirectHeapWhenGetCpuBaseIsCalledThenCpuAddressIs
     EXPECT_EQ(base, buffer);
 }
 
-TEST(IndirectHeapWith4GbAllocatorTest, givenIndirectHeapNotSupporting4GbModeWhenAskedForHeapGpuStartOffsetThenZeroIsReturned) {
+using IndirectHeapWith4GbAllocatorTest = IndirectHeapTest;
+
+TEST_F(IndirectHeapWith4GbAllocatorTest, givenIndirectHeapNotSupporting4GbModeWhenAskedForHeapGpuStartOffsetThenZeroIsReturned) {
     auto cpuBaseAddress = reinterpret_cast<void *>(0x3000);
-    MockGraphicsAllocation graphicsAllocation(cpuBaseAddress, 4096u);
+    MyMockGraphicsAllocation graphicsAllocation(cpuBaseAddress, 4096u);
     graphicsAllocation.setGpuBaseAddress(4096u);
     IndirectHeap indirectHeap(&graphicsAllocation, false);
 
     EXPECT_EQ(0u, indirectHeap.getHeapGpuStartOffset());
 }
 
-TEST(IndirectHeapWith4GbAllocatorTest, givenIndirectHeapSupporting4GbModeWhenAskedForHeapGpuStartOffsetThenZeroIsReturned) {
+TEST_F(IndirectHeapWith4GbAllocatorTest, givenIndirectHeapSupporting4GbModeWhenAskedForHeapGpuStartOffsetThenZeroIsReturned) {
     auto cpuBaseAddress = reinterpret_cast<void *>(0x3000);
-    MockGraphicsAllocation graphicsAllocation(cpuBaseAddress, 4096u);
+    MyMockGraphicsAllocation graphicsAllocation(cpuBaseAddress, 4096u);
     graphicsAllocation.setGpuBaseAddress(4096u);
     IndirectHeap indirectHeap(&graphicsAllocation, true);
 
     EXPECT_EQ(8192u, indirectHeap.getHeapGpuStartOffset());
 }
 
-TEST(IndirectHeapWith4GbAllocatorTest, givenIndirectHeapSupporting4GbModeWhenAskedForHeapBaseThenGpuBaseIsReturned) {
+TEST_F(IndirectHeapWith4GbAllocatorTest, givenIndirectHeapSupporting4GbModeWhenAskedForHeapBaseThenGpuBaseIsReturned) {
     auto cpuBaseAddress = reinterpret_cast<void *>(0x2000);
-    MockGraphicsAllocation graphicsAllocation(cpuBaseAddress, 4096u);
+    MyMockGraphicsAllocation graphicsAllocation(cpuBaseAddress, 4096u);
     graphicsAllocation.setGpuBaseAddress(4096u);
     IndirectHeap indirectHeap(&graphicsAllocation, true);
 
     EXPECT_EQ(4096u, indirectHeap.getHeapGpuBase());
 }
 
-TEST(IndirectHeapWith4GbAllocatorTest, givenIndirectHeapNotSupporting4GbModeWhenAskedForHeapBaseThenGpuAddressIsReturned) {
+TEST_F(IndirectHeapWith4GbAllocatorTest, givenIndirectHeapNotSupporting4GbModeWhenAskedForHeapBaseThenGpuAddressIsReturned) {
     auto cpuBaseAddress = reinterpret_cast<void *>(0x2000);
-    MockGraphicsAllocation graphicsAllocation(cpuBaseAddress, 4096u);
+    MyMockGraphicsAllocation graphicsAllocation(cpuBaseAddress, 4096u);
     graphicsAllocation.setGpuBaseAddress(4096u);
     IndirectHeap indirectHeap(&graphicsAllocation, false);
 
     EXPECT_EQ(8192u, indirectHeap.getHeapGpuBase());
 }
 
-TEST(IndirectHeapWith4GbAllocatorTest, givenIndirectHeapNotSupporting4GbModeWhenAskedForHeapSizeThenGraphicsAllocationSizeInPagesIsReturned) {
+TEST_F(IndirectHeapWith4GbAllocatorTest, givenIndirectHeapNotSupporting4GbModeWhenAskedForHeapSizeThenGraphicsAllocationSizeInPagesIsReturned) {
     auto cpuBaseAddress = reinterpret_cast<void *>(0x2000);
-    MockGraphicsAllocation graphicsAllocation(cpuBaseAddress, 4096u);
+    MyMockGraphicsAllocation graphicsAllocation(cpuBaseAddress, 4096u);
     graphicsAllocation.setGpuBaseAddress(4096u);
     IndirectHeap indirectHeap(&graphicsAllocation, false);
 
     EXPECT_EQ(1u, indirectHeap.getHeapSizeInPages());
 }
 
-TEST(IndirectHeapWith4GbAllocatorTest, givenIndirectHeapSupporting4GbModeWhenAskedForHeapSizeThen4GbSizeInPagesIsReturned) {
+TEST_F(IndirectHeapWith4GbAllocatorTest, givenIndirectHeapSupporting4GbModeWhenAskedForHeapSizeThen4GbSizeInPagesIsReturned) {
     auto cpuBaseAddress = reinterpret_cast<void *>(0x2000);
-    MockGraphicsAllocation graphicsAllocation(cpuBaseAddress, 4096u);
+    MyMockGraphicsAllocation graphicsAllocation(cpuBaseAddress, 4096u);
     graphicsAllocation.setGpuBaseAddress(4096u);
     IndirectHeap indirectHeap(&graphicsAllocation, true);
 

runtime/command_queue/gpgpu_walker.h

@@ -11,6 +11,7 @@
 #include "core/command_stream/preemption.h"
 #include "core/helpers/register_offsets.h"
 #include "core/helpers/vec.h"
+#include "core/indirect_heap/indirect_heap.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/context/context.h"
@@ -21,7 +22,6 @@
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/helpers/task_information.h"
 #include "runtime/helpers/timestamp_packet.h"
-#include "runtime/indirect_heap/indirect_heap.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/program/kernel_info.h"
 #include "runtime/utilities/tag_allocator.h"

runtime/command_queue/gpgpu_walker_base.inl

@@ -9,6 +9,7 @@
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/debug_helpers.h"
 #include "core/helpers/hw_helper.h"
+#include "core/indirect_heap/indirect_heap.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/command_queue/gpgpu_walker.h"
@@ -21,7 +22,6 @@
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/helpers/queue_helpers.h"
 #include "runtime/helpers/validators.h"
-#include "runtime/indirect_heap/indirect_heap.h"
 #include "runtime/mem_obj/mem_obj.h"
 #include "runtime/os_interface/os_context.h"
 #include "runtime/utilities/tag_allocator.h"

runtime/command_stream/command_stream_receiver.h

@@ -9,6 +9,7 @@
 #include "core/command_stream/linear_stream.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/completion_stamp.h"
+#include "core/indirect_heap/indirect_heap.h"
 #include "runtime/command_stream/aub_subcapture.h"
 #include "runtime/command_stream/csr_definitions.h"
 #include "runtime/command_stream/submissions_aggregator.h"
@@ -17,7 +18,6 @@
 #include "runtime/helpers/blit_commands_helper.h"
 #include "runtime/helpers/flat_batch_buffer_helper.h"
 #include "runtime/helpers/options.h"
-#include "runtime/indirect_heap/indirect_heap.h"
 #include "runtime/kernel/grf_config.h"
 
 #include <cstddef>

runtime/command_stream/command_stream_receiver_hw_base.inl

@@ -11,6 +11,7 @@
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/preamble.h"
 #include "core/helpers/ptr_math.h"
+#include "core/indirect_heap/indirect_heap.h"
 #include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/command_stream/command_stream_receiver_hw.h"
 #include "runtime/command_stream/experimental_command_buffer.h"
@@ -25,7 +26,6 @@
 #include "runtime/helpers/state_base_address.h"
 #include "runtime/helpers/state_compute_mode_helper.h"
 #include "runtime/helpers/timestamp_packet.h"
-#include "runtime/indirect_heap/indirect_heap.h"
 #include "runtime/memory_manager/internal_allocation_storage.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/os_interface/debug_settings_manager.h"

runtime/command_stream/scratch_space_controller.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/indirect_heap/indirect_heap.h"
+#include "core/indirect_heap/indirect_heap.h"
 
 #include <cstddef>
 #include <cstdint>

runtime/core_files.cmake

@@ -13,6 +13,7 @@ append_sources_from_properties(NEO_CORE_SOURCES
   NEO_CORE_EXECUTION_ENVIRONMENT
   NEO_CORE_GMM_HELPER
   NEO_CORE_HELPERS
+  NEO_CORE_INDIRECT_HEAP
   NEO_CORE_MEMORY_MANAGER
   NEO_CORE_OS_INTERFACE
   NEO_CORE_PAGE_FAULT_MANAGER

runtime/device_queue/device_queue.h

@@ -7,11 +7,11 @@
 
 #pragma once
 #include "core/helpers/hw_info.h"
+#include "core/indirect_heap/indirect_heap.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "runtime/api/cl_types.h"
 #include "runtime/execution_model/device_enqueue.h"
 #include "runtime/helpers/base_object.h"
-#include "runtime/indirect_heap/indirect_heap.h"
 
 namespace NEO {
 class CommandQueue;

runtime/device_queue/device_queue_hw.h

@@ -9,8 +9,8 @@
 #include "core/command_stream/linear_stream.h"
 #include "core/helpers/hw_cmds.h"
 #include "core/helpers/ptr_math.h"
+#include "core/indirect_heap/indirect_heap.h"
 #include "runtime/device_queue/device_queue.h"
-#include "runtime/indirect_heap/indirect_heap.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/program/program.h"
 #include "runtime/scheduler/scheduler_kernel.h"

runtime/helpers/dirty_state_helpers.cpp

@@ -7,7 +7,7 @@
 
 #include "runtime/helpers/dirty_state_helpers.h"
 
-#include "runtime/indirect_heap/indirect_heap.h"
+#include "core/indirect_heap/indirect_heap.h"
 
 using namespace NEO;
 

runtime/helpers/hardware_commands_helper.h

@@ -6,11 +6,11 @@
  */
 
 #pragma once
+#include "core/indirect_heap/indirect_heap.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/device/device.h"
 #include "runtime/device_queue/device_queue.h"
 #include "runtime/helpers/per_thread_data.h"
-#include "runtime/indirect_heap/indirect_heap.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/scheduler/scheduler_kernel.h"
 

runtime/helpers/hardware_commands_helper.inl

@@ -10,11 +10,11 @@
 #include "core/helpers/basic_math.h"
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/string.h"
+#include "core/indirect_heap/indirect_heap.h"
 #include "runtime/command_queue/local_id_gen.h"
 #include "runtime/command_stream/csr_definitions.h"
 #include "runtime/helpers/address_patch.h"
 #include "runtime/helpers/dispatch_info.h"
-#include "runtime/indirect_heap/indirect_heap.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/program/block_kernel_manager.h"

runtime/helpers/state_base_address_base.inl

@@ -7,10 +7,10 @@
 
 #include "core/helpers/cache_policy.h"
 #include "core/helpers/hw_cmds.h"
+#include "core/indirect_heap/indirect_heap.h"
 #include "core/memory_manager/memory_constants.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/helpers/state_base_address.h"
-#include "runtime/indirect_heap/indirect_heap.h"
 
 namespace NEO {
 template <typename GfxFamily>

runtime/helpers/task_information.h

@@ -9,11 +9,11 @@
 #include "core/command_stream/linear_stream.h"
 #include "core/helpers/completion_stamp.h"
 #include "core/helpers/hw_info.h"
+#include "core/indirect_heap/indirect_heap.h"
 #include "core/utilities/iflist.h"
 #include "runtime/helpers/blit_commands_helper.h"
 #include "runtime/helpers/properties_helper.h"
 #include "runtime/helpers/timestamp_packet.h"
-#include "runtime/indirect_heap/indirect_heap.h"
 
 #include <memory>
 #include <vector>

runtime/indirect_heap/CMakeLists.txt

@@ -1,13 +0,0 @@
-#
-# Copyright (C) 2018 Intel Corporation
-#
-# SPDX-License-Identifier: MIT
-#
-
-set(RUNTIME_SRCS_INDIRECT_HEAP
-  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/indirect_heap.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/indirect_heap.h
-)
-target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_INDIRECT_HEAP})
-set_property(GLOBAL PROPERTY RUNTIME_SRCS_INDIRECT_HEAP ${RUNTIME_SRCS_INDIRECT_HEAP})

runtime/indirect_heap/indirect_heap.cpp

@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2017-2019 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include "indirect_heap.h"
-
-namespace NEO {
-
-IndirectHeap::IndirectHeap(GraphicsAllocation *gfxAllocation) : BaseClass(gfxAllocation) {
-}
-
-IndirectHeap::IndirectHeap(GraphicsAllocation *gfxAllocation, bool canBeUtilizedAs4GbHeap) : BaseClass(gfxAllocation), canBeUtilizedAs4GbHeap(canBeUtilizedAs4GbHeap) {
-}
-
-IndirectHeap::IndirectHeap(void *buffer, size_t bufferSize) : BaseClass(buffer, bufferSize) {
-}
-
-} // namespace NEO

unit_tests/CMakeLists.txt

@@ -98,6 +98,8 @@ add_executable(igdrcl_tests
   ${IGDRCL_SRCS_tests_local}
 )
 
+include(${NEO_SOURCE_DIR}/unit_tests/core_unit_tests_files.cmake)
+
 hide_subdir(gen_common)
 add_subdirectory(gen_common)
 

unit_tests/aub_tests/command_queue/command_enqueue_fixture.h

@@ -13,7 +13,6 @@
 #include "unit_tests/fixtures/built_in_fixture.h"
 #include "unit_tests/fixtures/device_fixture.h"
 #include "unit_tests/helpers/hw_parse.h"
-#include "unit_tests/indirect_heap/indirect_heap_fixture.h"
 
 namespace NEO {
 

unit_tests/aub_tests/fixtures/simple_arg_fixture.h

@@ -20,7 +20,8 @@ namespace NEO {
 ////////////////////////////////////////////////////////////////////////////////
 // Factory where all command stream traffic funnels to an AUB file
 ////////////////////////////////////////////////////////////////////////////////
-struct AUBSimpleArgFixtureFactory : public SimpleArgFixtureFactory {
+struct AUBSimpleArgFixtureFactory : public SimpleArgFixtureFactory,
+                                    public IndirectHeapFixture {
     typedef AUBCommandStreamFixture CommandStreamFixture;
 };
 

unit_tests/command_queue/flush_tests.cpp

@@ -9,7 +9,6 @@
 #include "unit_tests/command_queue/command_queue_fixture.h"
 #include "unit_tests/command_stream/command_stream_fixture.h"
 #include "unit_tests/fixtures/device_fixture.h"
-#include "unit_tests/indirect_heap/indirect_heap_fixture.h"
 
 #include "gtest/gtest.h"
 
@@ -19,21 +18,17 @@ struct FlushTest
     : public DeviceFixture,
       public CommandQueueFixture,
       public CommandStreamFixture,
-      public IndirectHeapFixture,
       public ::testing::Test {
 
     using CommandQueueFixture::SetUp;
-    using IndirectHeapFixture::SetUp;
 
     void SetUp() override {
         DeviceFixture::SetUp();
         CommandQueueFixture::SetUp(nullptr, pDevice, 0);
         CommandStreamFixture::SetUp(pCmdQ);
-        IndirectHeapFixture::SetUp(pCmdQ);
     }
 
     void TearDown() override {
-        IndirectHeapFixture::TearDown();
         CommandStreamFixture::TearDown();
         CommandQueueFixture::TearDown();
         DeviceFixture::TearDown();

unit_tests/command_queue/oom_tests.cpp

@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/indirect_heap/indirect_heap.h"
 #include "runtime/event/event.h"
-#include "runtime/indirect_heap/indirect_heap.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "test.h"
 #include "unit_tests/command_queue/command_queue_fixture.h"

unit_tests/core_unit_tests_files.cmake

@@ -0,0 +1,15 @@
+#
+# Copyright (C) 2019 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+target_sources(igdrcl_tests PRIVATE ${NEO_SOURCE_DIR}/unit_tests/core_unit_tests_files.cmake)
+
+append_sources_from_properties(NEO_CORE_UNIT_TESTS_SOURCES
+  NEO_CORE_INDIRECT_HEAP_TESTS
+)
+
+set_property(GLOBAL PROPERTY NEO_CORE_UNIT_TESTS_SOURCES ${NEO_CORE_UNIT_TESTS_SOURCES})
+
+target_sources(igdrcl_tests PRIVATE ${NEO_CORE_UNIT_TESTS_SOURCES})

unit_tests/device/device_tests.cpp

@@ -6,11 +6,11 @@
  */
 
 #include "core/helpers/hw_helper.h"
+#include "core/indirect_heap/indirect_heap.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/device/device.h"
 #include "runtime/helpers/device_helpers.h"
 #include "runtime/helpers/options.h"
-#include "runtime/indirect_heap/indirect_heap.h"
 #include "runtime/os_interface/os_context.h"
 #include "runtime/platform/platform.h"
 #include "test.h"

unit_tests/event/event_fixture.h

@@ -16,7 +16,6 @@
 #include "unit_tests/command_stream/command_stream_fixture.h"
 #include "unit_tests/fixtures/device_fixture.h"
 #include "unit_tests/fixtures/hello_world_fixture.h"
-#include "unit_tests/indirect_heap/indirect_heap_fixture.h"
 #include "unit_tests/mocks/mock_buffer.h"
 #include "unit_tests/mocks/mock_context.h"
 
@@ -28,21 +27,17 @@ struct EventTest
     : public DeviceFixture,
       public CommandQueueFixture,
       public CommandStreamFixture,
-      public IndirectHeapFixture,
       public ::testing::Test {
 
     using CommandQueueFixture::SetUp;
-    using IndirectHeapFixture::SetUp;
 
     void SetUp() override {
         DeviceFixture::SetUp();
         CommandQueueFixture::SetUp(&mockContext, pDevice, 0);
         CommandStreamFixture::SetUp(pCmdQ);
-        IndirectHeapFixture::SetUp(pCmdQ);
     }
 
     void TearDown() override {
-        IndirectHeapFixture::TearDown();
         CommandStreamFixture::TearDown();
         CommandQueueFixture::TearDown();
         DeviceFixture::TearDown();

unit_tests/fixtures/simple_arg_fixture.h

@@ -12,12 +12,10 @@
 #include "unit_tests/command_stream/command_stream_fixture.h"
 #include "unit_tests/fixtures/memory_management_fixture.h"
 #include "unit_tests/fixtures/simple_arg_kernel_fixture.h"
-#include "unit_tests/indirect_heap/indirect_heap_fixture.h"
 
 namespace NEO {
 
 struct SimpleArgFixtureFactory {
-    typedef NEO::IndirectHeapFixture IndirectHeapFixture;
     typedef NEO::CommandStreamFixture CommandStreamFixture;
     typedef NEO::CommandQueueHwFixture CommandQueueFixture;
     typedef NEO::SimpleArgKernelFixture KernelFixture;

unit_tests/gen_common/gen_commands_common_validation.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
+#include "core/indirect_heap/indirect_heap.h"
 #include "core/memory_manager/memory_constants.h"
-#include "runtime/indirect_heap/indirect_heap.h"
 #include "unit_tests/gen_common/gen_cmd_parse.h"
 #include "unit_tests/helpers/unit_test_helper.h"
 

unit_tests/helpers/dirty_state_helpers_tests.cpp

@@ -6,9 +6,9 @@
  */
 
 #include "core/helpers/ptr_math.h"
+#include "core/indirect_heap/indirect_heap.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "runtime/helpers/dirty_state_helpers.h"
-#include "runtime/indirect_heap/indirect_heap.h"
 #include "unit_tests/mocks/mock_graphics_allocation.h"
 
 #include "gtest/gtest.h"

unit_tests/helpers/hardware_commands_helper_tests.cpp

@@ -20,7 +20,6 @@
 #include "unit_tests/fixtures/hello_world_fixture.h"
 #include "unit_tests/fixtures/image_fixture.h"
 #include "unit_tests/helpers/hw_parse.h"
-#include "unit_tests/indirect_heap/indirect_heap_fixture.h"
 #include "unit_tests/mocks/mock_graphics_allocation.h"
 
 using namespace NEO;

unit_tests/indirect_heap/CMakeLists.txt

@@ -1,11 +0,0 @@
-#
-# Copyright (C) 2017-2018 Intel Corporation
-#
-# SPDX-License-Identifier: MIT
-#
-
-set(IGDRCL_SRCS_tests_indirect_heap
-  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/indirect_heap_tests.cpp
-)
-target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_indirect_heap})

unit_tests/indirect_heap/indirect_heap_fixture.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "runtime/indirect_heap/indirect_heap.h"
+#include "core/indirect_heap/indirect_heap.h"
 
 namespace NEO {
 

unit_tests/program/program_nonuniform.cpp

@@ -11,7 +11,6 @@
 #include "core/memory_manager/graphics_allocation.h"
 #include "runtime/command_stream/command_stream_receiver_hw.h"
 #include "runtime/helpers/hardware_commands_helper.h"
-#include "runtime/indirect_heap/indirect_heap.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/memory_manager/surface.h"
 #include "test.h"

unit_tests/program/program_tests.cpp

@@ -21,7 +21,6 @@
 #include "runtime/compiler_interface/patchtokens_decoder.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/helpers/hardware_commands_helper.h"
-#include "runtime/indirect_heap/indirect_heap.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/memory_manager/allocations_list.h"
 #include "runtime/memory_manager/surface.h"