Cleanup includes in mock_device.h

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

level_zero/core/test/unit_tests/fixtures/device_fixture.h

@@ -19,6 +19,7 @@ class MockPageFaultManager;
 namespace NEO {
 struct UltDeviceFactory;
 class MockMemoryManager;
+class OsAgnosticMemoryManager;
 class MemoryManagerMemHandleMock;
 } // namespace NEO
 

level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_2.cpp

@@ -12,6 +12,7 @@
 #include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/libult/ult_command_stream_receiver.h"
 #include "shared/test/common/mocks/mock_command_stream_receiver.h"
+#include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/mock_memory_operations_handler.h"
 #include "shared/test/common/mocks/ult_device_factory.h"

level_zero/core/test/unit_tests/sources/image/test_image.cpp

@@ -8,6 +8,7 @@
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/resource_info.h"
 #include "shared/source/helpers/surface_format_info.h"
+#include "shared/source/memory_manager/os_agnostic_memory_manager.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/mocks/mock_device.h"

level_zero/core/test/unit_tests/sources/kernel/test_kernel_2.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/mock_l0_debugger.h"
 #include "shared/test/common/test_macros/hw_test.h"
 #include "shared/test/common/test_macros/test.h"

opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/gen9/hw_cmds_glk.h"
+#include "shared/source/memory_manager/memory_manager.h"
 #include "shared/test/common/fixtures/device_fixture.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"

opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp

@@ -15,6 +15,7 @@
 #include "shared/test/common/helpers/kernel_filename_helper.h"
 #include "shared/test/common/libult/global_environment.h"
 #include "shared/test/common/mocks/mock_compiler_interface.h"
+#include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/mock_modules_zebin.h"
 #include "shared/test/common/mocks/mock_source_level_debugger.h"
 #include "shared/test/common/test_macros/hw_test.h"
@@ -415,4 +416,4 @@ TEST_F(ProgramWithKernelDebuggingTest, givenProgramWithNonZebinaryFormatAndKerne
         EXPECT_TRUE(program->wasProcessDebugDataCalled);
         EXPECT_EQ(++counter, sourceLevelDebugger->notifyKernelDebugDataCalled);
     }
-}
+}

opencl/test/unit_test/program/program_with_zebin.cpp

@@ -10,6 +10,7 @@
 #include "shared/test/common/mocks/mock_modules_zebin.h"
 
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
+#include "opencl/test/unit_test/mocks/mock_program.h"
 
 using namespace NEO;
 
@@ -49,4 +50,6 @@ void ProgramWithZebinFixture::populateProgramWithSegments(NEO::MockProgram *prog
 
     program->buildInfos[rootDeviceIndex].constStringSectionData.initData = &strings;
     program->buildInfos[rootDeviceIndex].constStringSectionData.size = sizeof(strings);
-}
+}
+ProgramWithZebinFixture::ProgramWithZebinFixture() = default;
+ProgramWithZebinFixture::~ProgramWithZebinFixture() = default;

opencl/test/unit_test/program/program_with_zebin.h

@@ -6,9 +6,13 @@
  */
 
 #pragma once
-#include "opencl/test/unit_test/mocks/mock_program.h"
 #include "opencl/test/unit_test/program/program_tests.h"
 
+namespace NEO {
+class MockGraphicsAllocation;
+class MockProgram;
+} // namespace NEO
+
 using namespace NEO;
 
 class MockBuffer;
@@ -24,5 +28,6 @@ class ProgramWithZebinFixture : public ProgramTests {
     void TearDown() override;
     void addEmptyZebin(MockProgram *program);
     void populateProgramWithSegments(MockProgram *program);
-    ~ProgramWithZebinFixture() override = default;
+    ~ProgramWithZebinFixture() override;
+    ProgramWithZebinFixture();
 };

opencl/test/unit_test/program/program_with_zebin_tests.cpp

@@ -10,6 +10,7 @@
 #include "shared/test/common/test_macros/test.h"
 
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
+#include "opencl/test/unit_test/mocks/mock_program.h"
 #include "opencl/test/unit_test/program/program_with_zebin.h"
 
 #include <memory>
@@ -152,4 +153,4 @@ TEST_F(ProgramWithZebinFixture, givenZebinFormatAndDebuggerAvailableWhenNotifyin
     EXPECT_GT(program->buildInfos[rootDeviceIndex].debugDataSize, 0u);
 
     EXPECT_EQ(1u, sourceLevelDebugger->notifyKernelDebugDataCalled);
-}
+}

opencl/test/unit_test/sharings/gl/windows/gl_arb_sync_event_tests.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/execution_environment/execution_environment.h"
+#include "shared/source/memory_manager/os_agnostic_memory_manager.h"
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/test/common/mocks/mock_csr.h"
 #include "shared/test/common/mocks/mock_device.h"

opencl/test/unit_test/xe_hpc_core/pvc/engine_node_helper_tests_pvc.cpp

@@ -8,6 +8,7 @@
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/xe_hpc_core/hw_cmds_pvc.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
 
@@ -544,4 +545,4 @@ PVCTEST_F(EngineNodeHelperPvcTests, givenNonTile0AccessWhenGettingIsBlitCopyRequ
         memoryBanks = 0b1;
         EXPECT_FALSE(hwInfoConfig.isBlitCopyRequiredForLocalMemory(hwInfo, graphicsAllocation));
     }
-}
+}

shared/test/common/fixtures/command_stream_receiver_fixture.cpp

@@ -8,6 +8,7 @@
 #include "shared/test/common/fixtures/command_stream_receiver_fixture.h"
 
 #include "shared/source/command_stream/preemption.h"
+#include "shared/test/common/mocks/mock_graphics_allocation.h"
 
 using namespace NEO;
 

shared/test/common/mocks/mock_device.cpp

@@ -10,6 +10,7 @@
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/os_interface/os_context.h"
+#include "shared/test/common/fixtures/mock_aub_center_fixture.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/mock_ostime.h"
@@ -105,6 +106,19 @@ bool MockDevice::verifyAdapterLuid() {
     return verifyAdapterLuidReturnValue;
 }
 
+ExecutionEnvironment *MockDevice::prepareExecutionEnvironment(const HardwareInfo *pHwInfo) {
+    auto executionEnvironment = new ExecutionEnvironment();
+    executionEnvironment->prepareRootDeviceEnvironments(1);
+
+    auto hwInfo = pHwInfo ? pHwInfo : defaultHwInfo.get();
+
+    executionEnvironment->rootDeviceEnvironments[0]->setHwInfo(hwInfo);
+
+    MockAubCenterFixture::setMockAubCenter(*executionEnvironment->rootDeviceEnvironments[0]);
+    executionEnvironment->initializeMemoryManager();
+    return executionEnvironment;
+}
+
 bool MockSubDevice::createEngine(uint32_t deviceCsrIndex, EngineTypeUsage engineTypeUsage) {
     if (failOnCreateEngine) {
         return false;

shared/test/common/mocks/mock_device.h

@@ -10,11 +10,8 @@
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/device/root_device.h"
 #include "shared/source/device/sub_device.h"
-#include "shared/source/memory_manager/memory_manager.h"
-#include "shared/test/common/fixtures/mock_aub_center_fixture.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/helpers/variable_backup.h"
-#include "shared/test/common/mocks/mock_graphics_allocation.h"
 
 namespace NEO {
 class CommandStreamReceiver;
@@ -186,7 +183,7 @@ class MockDevice : public RootDevice {
     void setRTDispatchGlobalsForceAllocation() {
         rtDispatchGlobalsForceAllocation = true;
     }
-
+    static ExecutionEnvironment *prepareExecutionEnvironment(const HardwareInfo *pHwInfo);
     static decltype(&createCommandStream) createCommandStreamReceiverFunc;
 
     bool isDebuggerActiveParentCall = true;
@@ -200,15 +197,7 @@ class MockDevice : public RootDevice {
 
 template <>
 inline Device *MockDevice::createWithNewExecutionEnvironment<Device>(const HardwareInfo *pHwInfo, uint32_t rootDeviceIndex) {
-    auto executionEnvironment = new ExecutionEnvironment();
-    executionEnvironment->prepareRootDeviceEnvironments(1);
-
-    auto hwInfo = pHwInfo ? pHwInfo : defaultHwInfo.get();
-
-    executionEnvironment->rootDeviceEnvironments[0]->setHwInfo(hwInfo);
-
-    MockAubCenterFixture::setMockAubCenter(*executionEnvironment->rootDeviceEnvironments[0]);
-    executionEnvironment->initializeMemoryManager();
+    auto executionEnvironment = MockDevice::prepareExecutionEnvironment(pHwInfo);
     return Device::create<RootDevice>(executionEnvironment, 0u);
 }
 

shared/test/unit_test/built_ins/builtin_tests.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/built_ins/built_ins.h"
+#include "shared/source/helpers/hw_helper.h"
 #include "shared/test/common/fixtures/device_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/mocks/mock_builtinslib.h"

shared/test/unit_test/command_container/command_encoder_tests_xe_hpg_core_and_later.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
+#include "shared/source/memory_manager/memory_manager.h"
 #include "shared/test/common/fixtures/device_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/test_macros/hw_test.h"

shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp

@@ -19,6 +19,7 @@
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/mocks/mock_csr.h"
 #include "shared/test/common/mocks/mock_direct_submission_hw.h"
+#include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/mock_io_functions.h"
 #include "shared/test/common/test_macros/hw_test.h"
 #include "shared/test/unit_test/fixtures/direct_submission_fixture.h"

shared/test/unit_test/direct_submission/dispatchers/render_dispatcher_tests.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/direct_submission/dispatchers/render_dispatcher.h"
+#include "shared/source/helpers/hw_helper.h"
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/test_macros/test.h"

shared/test/unit_test/direct_submission/linux/drm_direct_submission_tests.cpp

@@ -20,6 +20,7 @@
 #include "shared/test/common/libult/ult_command_stream_receiver.h"
 #include "shared/test/common/mocks/linux/mock_drm_allocation.h"
 #include "shared/test/common/mocks/mock_device.h"
+#include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/os_interface/linux/drm_memory_manager_fixture.h"
 #include "shared/test/common/test_macros/hw_test.h"
 

shared/test/unit_test/encoders/test_command_encoder.cpp

@@ -9,6 +9,7 @@
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/fixtures/device_fixture.h"
+#include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
 using namespace NEO;

shared/test/unit_test/fixtures/direct_submission_fixture.h

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/os_interface/device_factory.h"
 #include "shared/source/os_interface/os_context.h"
 #include "shared/test/common/fixtures/device_fixture.h"

shared/test/unit_test/gen12lp/rkl/test_hw_helper_rkl.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/gen12lp/hw_cmds_rkl.h"
+#include "shared/source/helpers/hw_helper.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/test/common/helpers/hw_helper_tests.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"

shared/test/unit_test/gen12lp/test_command_encoder_gen12lp.cpp

@@ -8,6 +8,7 @@
 #include "shared/source/command_container/cmdcontainer.h"
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
+#include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/pipeline_select_helper.h"
 #include "shared/source/helpers/preamble.h"
 #include "shared/source/os_interface/os_context.h"

shared/test/unit_test/gen12lp/tgllp/test_hw_helper_tgllp.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/gen12lp/hw_cmds_tgllp.h"
+#include "shared/source/helpers/hw_helper.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/test/common/helpers/hw_helper_tests.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"

shared/test/unit_test/heap_assigner/heap_assigner_tests.cpp

@@ -6,6 +6,8 @@
  */
 
 #include "shared/source/helpers/heap_assigner.h"
+#include "shared/source/memory_manager/allocation_type.h"
+#include "shared/source/memory_manager/gfx_partition.h"
 #include "shared/test/common/fixtures/device_fixture.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
@@ -48,4 +50,4 @@ HWTEST_F(AlocationHelperTests, givenNotInternalHeapTypeWhenUseInternalAllocatorC
     EXPECT_FALSE(heapAssigner.useInternal32BitHeap(AllocationType::BUFFER));
 }
 
-} // namespace NEO
+} // namespace NEO

shared/test/unit_test/helpers/engine_node_helper_tests_xehp_and_later.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/helpers/engine_node_helper.h"
+#include "shared/source/helpers/hw_helper.h"
 #include "shared/test/common/fixtures/device_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/test_macros/hw_test.h"

shared/test/unit_test/helpers/hw_helper_default_tests.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/test/common/helpers/hw_helper_tests.h"
 #include "shared/test/common/test_macros/hw_test.h"

shared/test/unit_test/helpers/hw_helper_tests_pvc_and_later.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/engine_node_helper.h"
+#include "shared/source/helpers/hw_helper.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/hw_helper_tests.h"

shared/test/unit_test/memory_manager/unified_memory_manager_cache_tests.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/mocks/mock_device.h"
+#include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/mock_svm_manager.h"
 #include "shared/test/common/mocks/ult_device_factory.h"
@@ -346,4 +347,4 @@ TEST(SvmDeviceAllocationCacheTest, givenCachedAllocationsWhenDestructorIsCalledT
     ASSERT_EQ(memoryManager->freeGraphicsMemoryCalled, 0u);
     svmManager.reset();
     EXPECT_EQ(memoryManager->freeGraphicsMemoryCalled, testDataset.size());
-}
+}

shared/test/unit_test/xe_hpg_core/hw_helper_tests_xe_hpg_core.cpp

@@ -6,6 +6,8 @@
  */
 
 #include "shared/source/command_stream/stream_properties.h"
+#include "shared/source/helpers/hw_helper.h"
+#include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/cmd_parse/hw_parse.h"