From f275eea6ec3d7a2cf3242779c4ed3901b9d39c3e Mon Sep 17 00:00:00 2001 From: "Warchulski, Jaroslaw" Date: Thu, 15 Dec 2022 17:32:03 +0000 Subject: [PATCH] Cleanup includes 14 Cleaned up files: shared/source/device/device.h Related-To: NEO-5548 Signed-off-by: Warchulski, Jaroslaw --- level_zero/core/source/cmdlist/cmdlist_hw.inl | 1 + .../core/source/cmdqueue/cmdqueue_hw.inl | 1 + .../core/source/context/context_imp.cpp | 2 ++ .../context/context_imp_drm_or_wddm.cpp | 1 + .../device/device_imp_drm/device_imp_peer.cpp | 1 + .../device_imp_drm_or_wddm/device_imp.cpp | 1 + .../core/source/driver/driver_handle_imp.cpp | 1 + .../source/fabric/linux/fabric_device_iaf.cpp | 1 + level_zero/core/source/image/image_hw.inl | 1 + level_zero/core/source/module/module_imp.cpp | 2 ++ .../tools/source/debug/debug_session_imp.cpp | 1 + .../source/debug/windows/debug_session.cpp | 1 + .../linux/os_global_operations_imp.cpp | 1 + .../source/sysman/linux/os_sysman_imp.cpp | 1 + .../tools/source/sysman/linux/os_sysman_imp.h | 1 + opencl/source/cl_device/cl_device_caps.cpp | 1 + opencl/source/cl_device/cl_device_info.cpp | 1 + opencl/source/command_queue/command_queue.cpp | 1 + opencl/source/event/event.cpp | 1 + opencl/source/kernel/kernel.cpp | 1 + opencl/source/mem_obj/buffer.cpp | 1 + opencl/source/mem_obj/image.cpp | 1 + opencl/source/mem_obj/mem_obj_helper.cpp | 1 + .../source/os_interface/windows/api_win.cpp | 1 + .../source/program/process_device_binary.cpp | 1 + opencl/source/program/program.cpp | 2 ++ opencl/source/sharings/d3d/d3d_texture.cpp | 1 + .../source/sharings/gl/windows/cl_gl_api.cpp | 1 + .../sharings/gl/windows/gl_buffer_windows.cpp | 1 + .../source/sharings/va/va_device_shared.cpp | 1 + .../xe_hpg_core/cl_hw_helper_xe_hpg_core.cpp | 1 + .../fixtures/kernel_data_fixture.cpp | 1 + .../unit_test/mocks/mock_debug_program.cpp | 2 ++ .../unit_test/test_macros/test_checks_ocl.cpp | 1 + shared/source/built_ins/built_ins_storage.cpp | 1 + shared/source/built_ins/sip.cpp | 1 + .../command_container/command_encoder.inl | 1 + .../command_encoder_xehp_and_later.inl | 1 + shared/source/command_stream/preemption.cpp | 1 + .../scratch_space_controller_base.cpp | 1 + shared/source/debugger/debugger_l0.cpp | 1 + .../debugger/linux/debugger_l0_linux.cpp | 2 ++ .../debugger/windows/debugger_l0_windows.cpp | 1 + shared/source/device/device.cpp | 31 +++++++++++++++++ shared/source/device/device.h | 34 ++++++------------- shared/source/device/device_caps.cpp | 1 + shared/source/device/root_device.cpp | 1 + .../source/device/windows/device_windows.cpp | 1 + .../direct_submission_hw.inl | 1 + .../dll/linux/debugger_l0_dll_linux.cpp | 1 + .../dll/windows/debugger_l0_windows.cpp | 1 + shared/source/gen12lp/preamble_gen12lp.cpp | 1 + shared/source/helpers/engine_node_helper.cpp | 1 + shared/source/helpers/kernel_helpers.cpp | 1 + .../source/memory_manager/memory_manager.cpp | 1 + .../memory_manager/unified_memory_manager.cpp | 2 ++ shared/source/os_interface/device_factory.cpp | 1 + .../drm_memory_operations_handler_bind.cpp | 2 ++ .../windows/wddm_memory_manager.cpp | 1 + .../cpu_page_fault_manager.cpp | 1 + .../linux/cpu_page_fault_manager_linux.cpp | 3 +- .../xe_hpc_core/linux/hw_info_config_pvc.cpp | 1 + .../xe_hpc_core/preemption_xe_hpc_core.cpp | 1 + .../xe_hpg_core/linux/hw_info_config_dg2.cpp | 1 + .../xe_hpg_core/preamble_xe_hpg_core.cpp | 1 + .../xe_hpg_core/preemption_xe_hpg_core.cpp | 1 + .../test/common/mocks/debugger_l0_create.cpp | 1 + shared/test/common/mocks/mock_device.h | 2 ++ .../windows/gmm_callbacks_tests_gen12lp.cpp | 1 + 69 files changed, 118 insertions(+), 24 deletions(-) diff --git a/level_zero/core/source/cmdlist/cmdlist_hw.inl b/level_zero/core/source/cmdlist/cmdlist_hw.inl index 1adb5ea55d..c5053b3bca 100644 --- a/level_zero/core/source/cmdlist/cmdlist_hw.inl +++ b/level_zero/core/source/cmdlist/cmdlist_hw.inl @@ -12,6 +12,7 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/debugger/debugger_l0.h" #include "shared/source/device/device.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/api_specific_config.h" #include "shared/source/helpers/blit_commands_helper.h" diff --git a/level_zero/core/source/cmdqueue/cmdqueue_hw.inl b/level_zero/core/source/cmdqueue/cmdqueue_hw.inl index b514a7ac27..eab9f1c504 100644 --- a/level_zero/core/source/cmdqueue/cmdqueue_hw.inl +++ b/level_zero/core/source/cmdqueue/cmdqueue_hw.inl @@ -19,6 +19,7 @@ #include "shared/source/command_stream/wait_status.h" #include "shared/source/debugger/debugger_l0.h" #include "shared/source/device/device.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/logical_state_helper.h" diff --git a/level_zero/core/source/context/context_imp.cpp b/level_zero/core/source/context/context_imp.cpp index b708e793f0..30f1ec87cc 100644 --- a/level_zero/core/source/context/context_imp.cpp +++ b/level_zero/core/source/context/context_imp.cpp @@ -8,6 +8,8 @@ #include "level_zero/core/source/context/context_imp.h" #include "shared/source/command_container/implicit_scaling.h" +#include "shared/source/execution_environment/root_device_environment.h" +#include "shared/source/helpers/basic_math.h" #include "shared/source/memory_manager/allocation_properties.h" #include "shared/source/memory_manager/memory_operations_handler.h" #include "shared/source/memory_manager/unified_memory_manager.h" diff --git a/level_zero/core/source/context/context_imp_drm_or_wddm.cpp b/level_zero/core/source/context/context_imp_drm_or_wddm.cpp index 4ed7573db5..e1c1450248 100644 --- a/level_zero/core/source/context/context_imp_drm_or_wddm.cpp +++ b/level_zero/core/source/context/context_imp_drm_or_wddm.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/memory_manager/memory_manager.h" #include "shared/source/os_interface/os_interface.h" diff --git a/level_zero/core/source/device/device_imp_drm/device_imp_peer.cpp b/level_zero/core/source/device/device_imp_drm/device_imp_peer.cpp index 11a1744774..9dbb390d36 100644 --- a/level_zero/core/source/device/device_imp_drm/device_imp_peer.cpp +++ b/level_zero/core/source/device/device_imp_drm/device_imp_peer.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/os_interface/linux/drm_neo.h" #include "shared/source/os_interface/linux/sys_calls.h" #include "shared/source/utilities/directory.h" diff --git a/level_zero/core/source/device/device_imp_drm_or_wddm/device_imp.cpp b/level_zero/core/source/device/device_imp_drm_or_wddm/device_imp.cpp index 8c9ed38492..dee7bb06a0 100644 --- a/level_zero/core/source/device/device_imp_drm_or_wddm/device_imp.cpp +++ b/level_zero/core/source/device/device_imp_drm_or_wddm/device_imp.cpp @@ -8,6 +8,7 @@ #include "level_zero/core/source/device/device_imp.h" #include "shared/source/command_stream/command_stream_receiver.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/os_interface/os_interface.h" #include "shared/source/os_interface/windows/hw_device_id.h" #include "shared/source/os_interface/windows/os_context_win.h" diff --git a/level_zero/core/source/driver/driver_handle_imp.cpp b/level_zero/core/source/driver/driver_handle_imp.cpp index 0972285afd..0e821e5b95 100644 --- a/level_zero/core/source/driver/driver_handle_imp.cpp +++ b/level_zero/core/source/driver/driver_handle_imp.cpp @@ -10,6 +10,7 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/debugger/debugger_l0.h" #include "shared/source/device/device.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/string.h" #include "shared/source/memory_manager/allocation_properties.h" #include "shared/source/memory_manager/memory_manager.h" diff --git a/level_zero/core/source/fabric/linux/fabric_device_iaf.cpp b/level_zero/core/source/fabric/linux/fabric_device_iaf.cpp index 4f58426c6e..b51bc48567 100644 --- a/level_zero/core/source/fabric/linux/fabric_device_iaf.cpp +++ b/level_zero/core/source/fabric/linux/fabric_device_iaf.cpp @@ -8,6 +8,7 @@ #include "level_zero/core/source/fabric/linux/fabric_device_iaf.h" #include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/os_interface/linux/drm_neo.h" #include "shared/source/os_interface/linux/pci_path.h" #include "shared/source/os_interface/os_interface.h" diff --git a/level_zero/core/source/image/image_hw.inl b/level_zero/core/source/image/image_hw.inl index 2cd593b137..2a00f7e392 100644 --- a/level_zero/core/source/image/image_hw.inl +++ b/level_zero/core/source/image/image_hw.inl @@ -8,6 +8,7 @@ #pragma once #include "shared/source/command_container/command_encoder.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/gmm_helper/gmm.h" #include "shared/source/helpers/string.h" #include "shared/source/helpers/surface_format_info.h" diff --git a/level_zero/core/source/module/module_imp.cpp b/level_zero/core/source/module/module_imp.cpp index 40cfc2c77a..472c12fcc0 100644 --- a/level_zero/core/source/module/module_imp.cpp +++ b/level_zero/core/source/module/module_imp.cpp @@ -18,6 +18,8 @@ #include "shared/source/device_binary_format/elf/elf.h" #include "shared/source/device_binary_format/elf/elf_encoder.h" #include "shared/source/device_binary_format/elf/ocl_elf.h" +#include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/addressing_mode_helper.h" #include "shared/source/helpers/api_specific_config.h" #include "shared/source/helpers/compiler_hw_info_config.h" diff --git a/level_zero/tools/source/debug/debug_session_imp.cpp b/level_zero/tools/source/debug/debug_session_imp.cpp index b976046b42..390eaafdfc 100644 --- a/level_zero/tools/source/debug/debug_session_imp.cpp +++ b/level_zero/tools/source/debug/debug_session_imp.cpp @@ -8,6 +8,7 @@ #include "level_zero/tools/source/debug/debug_session_imp.h" #include "shared/source/built_ins/sip.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/helpers/sleep.h" diff --git a/level_zero/tools/source/debug/windows/debug_session.cpp b/level_zero/tools/source/debug/windows/debug_session.cpp index b901a93d10..0681977770 100644 --- a/level_zero/tools/source/debug/windows/debug_session.cpp +++ b/level_zero/tools/source/debug/windows/debug_session.cpp @@ -7,6 +7,7 @@ #include "level_zero/tools/source/debug/windows/debug_session.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/register_offsets.h" #include "shared/source/os_interface/windows/wddm_debug.h" diff --git a/level_zero/tools/source/sysman/global_operations/linux/os_global_operations_imp.cpp b/level_zero/tools/source/sysman/global_operations/linux/os_global_operations_imp.cpp index 1c75a5ec3b..fb4a0e4ca4 100644 --- a/level_zero/tools/source/sysman/global_operations/linux/os_global_operations_imp.cpp +++ b/level_zero/tools/source/sysman/global_operations/linux/os_global_operations_imp.cpp @@ -7,6 +7,7 @@ #include "level_zero/tools/source/sysman/global_operations/linux/os_global_operations_imp.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/os_interface/device_factory.h" #include "shared/source/os_interface/linux/pci_path.h" diff --git a/level_zero/tools/source/sysman/linux/os_sysman_imp.cpp b/level_zero/tools/source/sysman/linux/os_sysman_imp.cpp index a4ebca4476..682c5d923d 100644 --- a/level_zero/tools/source/sysman/linux/os_sysman_imp.cpp +++ b/level_zero/tools/source/sysman/linux/os_sysman_imp.cpp @@ -7,6 +7,7 @@ #include "level_zero/tools/source/sysman/linux/os_sysman_imp.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/sleep.h" #include "shared/source/memory_manager/memory_manager.h" #include "shared/source/os_interface/device_factory.h" diff --git a/level_zero/tools/source/sysman/linux/os_sysman_imp.h b/level_zero/tools/source/sysman/linux/os_sysman_imp.h index f1422d149d..448819b649 100644 --- a/level_zero/tools/source/sysman/linux/os_sysman_imp.h +++ b/level_zero/tools/source/sysman/linux/os_sysman_imp.h @@ -6,6 +6,7 @@ */ #pragma once +#include "shared/source/execution_environment/execution_environment.h" #include "shared/source/helpers/non_copyable_or_moveable.h" #include "shared/source/os_interface/linux/drm_neo.h" #include "shared/source/os_interface/os_interface.h" diff --git a/opencl/source/cl_device/cl_device_caps.cpp b/opencl/source/cl_device/cl_device_caps.cpp index 0e292868b3..b5e7642cf7 100644 --- a/opencl/source/cl_device/cl_device_caps.cpp +++ b/opencl/source/cl_device/cl_device_caps.cpp @@ -7,6 +7,7 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/device/device.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/helpers/string.h" #include "shared/source/os_interface/driver_info.h" diff --git a/opencl/source/cl_device/cl_device_info.cpp b/opencl/source/cl_device/cl_device_info.cpp index 276a157efa..cefccf2873 100644 --- a/opencl/source/cl_device/cl_device_info.cpp +++ b/opencl/source/cl_device/cl_device_info.cpp @@ -9,6 +9,7 @@ #include "shared/source/device/device.h" #include "shared/source/device/device_info.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/get_info.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/os_time.h" diff --git a/opencl/source/command_queue/command_queue.cpp b/opencl/source/command_queue/command_queue.cpp index 1a54b48df7..f263620599 100644 --- a/opencl/source/command_queue/command_queue.cpp +++ b/opencl/source/command_queue/command_queue.cpp @@ -9,6 +9,7 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/debugger/debugger_l0.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/array_count.h" #include "shared/source/helpers/bit_helpers.h" diff --git a/opencl/source/event/event.cpp b/opencl/source/event/event.cpp index 3dedeb1673..05e4d6fef0 100644 --- a/opencl/source/event/event.cpp +++ b/opencl/source/event/event.cpp @@ -10,6 +10,7 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/command_stream/task_count_helper.h" #include "shared/source/device/device.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/get_info.h" #include "shared/source/helpers/mt_helpers.h" diff --git a/opencl/source/kernel/kernel.cpp b/opencl/source/kernel/kernel.cpp index 3bd12a89ca..b88de768c2 100644 --- a/opencl/source/kernel/kernel.cpp +++ b/opencl/source/kernel/kernel.cpp @@ -10,6 +10,7 @@ #include "shared/source/built_ins/built_ins.h" #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/basic_math.h" diff --git a/opencl/source/mem_obj/buffer.cpp b/opencl/source/mem_obj/buffer.cpp index eb9aef37d9..feece3d728 100644 --- a/opencl/source/mem_obj/buffer.cpp +++ b/opencl/source/mem_obj/buffer.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/command_container/implicit_scaling.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/local_memory_access_modes.h" #include "shared/source/memory_manager/host_ptr_manager.h" #include "shared/source/memory_manager/memory_operations_handler.h" diff --git a/opencl/source/mem_obj/image.cpp b/opencl/source/mem_obj/image.cpp index 742adfb57d..31341d5d5d 100644 --- a/opencl/source/mem_obj/image.cpp +++ b/opencl/source/mem_obj/image.cpp @@ -8,6 +8,7 @@ #include "opencl/source/mem_obj/image.h" #include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/gmm_helper/gmm.h" #include "shared/source/gmm_helper/resource_info.h" #include "shared/source/helpers/aligned_memory.h" diff --git a/opencl/source/mem_obj/mem_obj_helper.cpp b/opencl/source/mem_obj/mem_obj_helper.cpp index ee28b47217..fe7279d2a2 100644 --- a/opencl/source/mem_obj/mem_obj_helper.cpp +++ b/opencl/source/mem_obj/mem_obj_helper.cpp @@ -7,6 +7,7 @@ #include "opencl/source/mem_obj/mem_obj_helper.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/memory_properties_helpers.h" #include "opencl/source/cl_device/cl_device.h" diff --git a/opencl/source/os_interface/windows/api_win.cpp b/opencl/source/os_interface/windows/api_win.cpp index 4928b285df..a935147b27 100644 --- a/opencl/source/os_interface/windows/api_win.cpp +++ b/opencl/source/os_interface/windows/api_win.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/get_info.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/os_interface.h" diff --git a/opencl/source/program/process_device_binary.cpp b/opencl/source/program/process_device_binary.cpp index cb32631cad..c46582a6fa 100644 --- a/opencl/source/program/process_device_binary.cpp +++ b/opencl/source/program/process_device_binary.cpp @@ -8,6 +8,7 @@ #include "shared/source/device/device.h" #include "shared/source/device_binary_format/device_binary_formats.h" #include "shared/source/device_binary_format/zebin_decoder.h" +#include "shared/source/execution_environment/execution_environment.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/debug_helpers.h" #include "shared/source/helpers/ptr_math.h" diff --git a/opencl/source/program/program.cpp b/opencl/source/program/program.cpp index 41d371189f..addad60375 100644 --- a/opencl/source/program/program.cpp +++ b/opencl/source/program/program.cpp @@ -12,6 +12,8 @@ #include "shared/source/device/device.h" #include "shared/source/device_binary_format/elf/elf_encoder.h" #include "shared/source/device_binary_format/elf/ocl_elf.h" +#include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/api_specific_config.h" #include "shared/source/helpers/compiler_hw_info_config.h" #include "shared/source/helpers/compiler_options_parser.h" diff --git a/opencl/source/sharings/d3d/d3d_texture.cpp b/opencl/source/sharings/d3d/d3d_texture.cpp index e574a94cf7..4fab944025 100644 --- a/opencl/source/sharings/d3d/d3d_texture.cpp +++ b/opencl/source/sharings/d3d/d3d_texture.cpp @@ -7,6 +7,7 @@ #include "opencl/source/sharings/d3d/d3d_texture.h" +#include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/gmm_helper/gmm.h" #include "shared/source/gmm_helper/resource_info.h" diff --git a/opencl/source/sharings/gl/windows/cl_gl_api.cpp b/opencl/source/sharings/gl/windows/cl_gl_api.cpp index 412c5f823b..a0f6fc9426 100644 --- a/opencl/source/sharings/gl/windows/cl_gl_api.cpp +++ b/opencl/source/sharings/gl/windows/cl_gl_api.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/get_info.h" #include "shared/source/os_interface/os_interface.h" #include "shared/source/os_interface/windows/wddm/wddm.h" diff --git a/opencl/source/sharings/gl/windows/gl_buffer_windows.cpp b/opencl/source/sharings/gl/windows/gl_buffer_windows.cpp index 08600e3177..c705a46baf 100644 --- a/opencl/source/sharings/gl/windows/gl_buffer_windows.cpp +++ b/opencl/source/sharings/gl/windows/gl_buffer_windows.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/gmm_helper/gmm.h" #include "shared/source/helpers/get_info.h" #include "shared/source/memory_manager/allocation_properties.h" diff --git a/opencl/source/sharings/va/va_device_shared.cpp b/opencl/source/sharings/va/va_device_shared.cpp index e01a9d020a..a24c809c75 100644 --- a/opencl/source/sharings/va/va_device_shared.cpp +++ b/opencl/source/sharings/va/va_device_shared.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/device/device.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/os_interface/linux/drm_neo.h" #include "shared/source/os_interface/linux/pci_path.h" #include "shared/source/os_interface/os_interface.h" diff --git a/opencl/source/xe_hpg_core/cl_hw_helper_xe_hpg_core.cpp b/opencl/source/xe_hpg_core/cl_hw_helper_xe_hpg_core.cpp index cc254dfa27..735d253236 100644 --- a/opencl/source/xe_hpg_core/cl_hw_helper_xe_hpg_core.cpp +++ b/opencl/source/xe_hpg_core/cl_hw_helper_xe_hpg_core.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/populate_factory.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" diff --git a/opencl/test/unit_test/fixtures/kernel_data_fixture.cpp b/opencl/test/unit_test/fixtures/kernel_data_fixture.cpp index f87f891c73..f70370f6ad 100644 --- a/opencl/test/unit_test/fixtures/kernel_data_fixture.cpp +++ b/opencl/test/unit_test/fixtures/kernel_data_fixture.cpp @@ -8,6 +8,7 @@ #include "opencl/test/unit_test/fixtures/kernel_data_fixture.h" #include "shared/source/device_binary_format/patchtokens_decoder.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/string.h" #include "shared/source/memory_manager/graphics_allocation.h" diff --git a/opencl/test/unit_test/mocks/mock_debug_program.cpp b/opencl/test/unit_test/mocks/mock_debug_program.cpp index 6fd0901bc2..17811b3c3a 100644 --- a/opencl/test/unit_test/mocks/mock_debug_program.cpp +++ b/opencl/test/unit_test/mocks/mock_debug_program.cpp @@ -8,6 +8,8 @@ #include "opencl/test/unit_test/mocks/mock_debug_program.h" #include "shared/source/device/device.h" +#include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/ptr_math.h" #include "shared/source/program/kernel_info.h" #include "shared/test/common/mocks/mock_compiler_interface.h" diff --git a/opencl/test/unit_test/test_macros/test_checks_ocl.cpp b/opencl/test/unit_test/test_macros/test_checks_ocl.cpp index 0484835951..89c495c70e 100644 --- a/opencl/test/unit_test/test_macros/test_checks_ocl.cpp +++ b/opencl/test/unit_test/test_macros/test_checks_ocl.cpp @@ -8,6 +8,7 @@ #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" #include "shared/source/device/device_info.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/hw_helper.h" #include "shared/test/common/helpers/default_hw_info.h" diff --git a/shared/source/built_ins/built_ins_storage.cpp b/shared/source/built_ins/built_ins_storage.cpp index cd6bb3b527..e22550b855 100644 --- a/shared/source/built_ins/built_ins_storage.cpp +++ b/shared/source/built_ins/built_ins_storage.cpp @@ -8,6 +8,7 @@ #include "shared/source/built_ins/built_ins.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/device/device.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/api_specific_config.h" #include "shared/source/helpers/hw_helper.h" diff --git a/shared/source/built_ins/sip.cpp b/shared/source/built_ins/sip.cpp index 55dfd2b5b9..963acff2d3 100644 --- a/shared/source/built_ins/sip.cpp +++ b/shared/source/built_ins/sip.cpp @@ -12,6 +12,7 @@ #include "shared/source/debugger/debugger.h" #include "shared/source/device/device.h" #include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/debug_helpers.h" #include "shared/source/helpers/hw_helper.h" diff --git a/shared/source/command_container/command_encoder.inl b/shared/source/command_container/command_encoder.inl index 042eabb31e..15b93b5540 100644 --- a/shared/source/command_container/command_encoder.inl +++ b/shared/source/command_container/command_encoder.inl @@ -11,6 +11,7 @@ #include "shared/source/debugger/debugger_l0.h" #include "shared/source/device/device.h" #include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/gmm_helper/gmm.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/api_specific_config.h" diff --git a/shared/source/command_container/command_encoder_xehp_and_later.inl b/shared/source/command_container/command_encoder_xehp_and_later.inl index 81d468eade..203ea8cad2 100644 --- a/shared/source/command_container/command_encoder_xehp_and_later.inl +++ b/shared/source/command_container/command_encoder_xehp_and_later.inl @@ -14,6 +14,7 @@ #include "shared/source/command_stream/stream_properties.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/gmm_helper/client_context/gmm_client_context.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/basic_math.h" diff --git a/shared/source/command_stream/preemption.cpp b/shared/source/command_stream/preemption.cpp index ee7b04b318..7d55c27948 100644 --- a/shared/source/command_stream/preemption.cpp +++ b/shared/source/command_stream/preemption.cpp @@ -9,6 +9,7 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/device/device.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/string.h" #include "shared/source/kernel/kernel_descriptor.h" diff --git a/shared/source/command_stream/scratch_space_controller_base.cpp b/shared/source/command_stream/scratch_space_controller_base.cpp index 67356b1348..05e5d9ebf9 100644 --- a/shared/source/command_stream/scratch_space_controller_base.cpp +++ b/shared/source/command_stream/scratch_space_controller_base.cpp @@ -8,6 +8,7 @@ #include "shared/source/command_stream/scratch_space_controller_base.h" #include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/constants.h" #include "shared/source/helpers/hw_helper.h" diff --git a/shared/source/debugger/debugger_l0.cpp b/shared/source/debugger/debugger_l0.cpp index 76e8087a2e..4a4364d143 100644 --- a/shared/source/debugger/debugger_l0.cpp +++ b/shared/source/debugger/debugger_l0.cpp @@ -10,6 +10,7 @@ #include "shared/source/command_container/cmdcontainer.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/device/device.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/constants.h" #include "shared/source/helpers/hw_helper.h" diff --git a/shared/source/debugger/linux/debugger_l0_linux.cpp b/shared/source/debugger/linux/debugger_l0_linux.cpp index 6e6d506660..70ef16a810 100644 --- a/shared/source/debugger/linux/debugger_l0_linux.cpp +++ b/shared/source/debugger/linux/debugger_l0_linux.cpp @@ -7,6 +7,8 @@ #include "shared/source/debugger/debugger_l0.h" #include "shared/source/device/sub_device.h" +#include "shared/source/execution_environment/root_device_environment.h" +#include "shared/source/helpers/basic_math.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/kernel/debug_data.h" #include "shared/source/os_interface/linux/drm_allocation.h" diff --git a/shared/source/debugger/windows/debugger_l0_windows.cpp b/shared/source/debugger/windows/debugger_l0_windows.cpp index 5c8216af9c..eef0466d48 100644 --- a/shared/source/debugger/windows/debugger_l0_windows.cpp +++ b/shared/source/debugger/windows/debugger_l0_windows.cpp @@ -7,6 +7,7 @@ #include "shared/source/debugger/debugger_l0.h" #include "shared/source/device/device.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/kernel/debug_data.h" #include "shared/source/os_interface/windows/wddm/wddm.h" diff --git a/shared/source/device/device.cpp b/shared/source/device/device.cpp index 7cff92fb01..3bb35c4cf5 100644 --- a/shared/source/device/device.cpp +++ b/shared/source/device/device.cpp @@ -435,6 +435,10 @@ bool Device::isDebuggerActive() const { return deviceInfo.debuggerActive; } +Debugger *Device::getDebugger() const { + return getRootDeviceEnvironment().debugger.get(); +} + bool Device::areSharedSystemAllocationsAllowed() const { auto sharedSystemAllocationsSupport = static_cast(getHardwareInfo().capabilityTable.sharedSystemMemCapabilities); if (DebugManager.flags.EnableSharedSystemUsmSupport.get() != -1) { @@ -578,6 +582,18 @@ const std::vector &Device::getAllEngines() const { return this->allEngines; } +const RootDeviceEnvironment &Device::getRootDeviceEnvironment() const { + return *executionEnvironment->rootDeviceEnvironments[getRootDeviceIndex()]; +} + +RootDeviceEnvironment &Device::getRootDeviceEnvironmentRef() const { + return *executionEnvironment->rootDeviceEnvironments[getRootDeviceIndex()]; +} + +bool Device::isFullRangeSvm() const { + return getRootDeviceEnvironment().isFullRangeSvm(); +} + EngineControl &Device::getInternalEngine() { if (this->allEngines[0].commandStreamReceiver->getType() != CommandStreamReceiverType::CSR_HW) { return this->getDefaultEngine(); @@ -842,4 +858,19 @@ void Device::allocateRTDispatchGlobals(uint32_t maxBvhLevels) { rtDispatchGlobalsInfos[maxBvhLevels] = dispatchGlobalsInfo.release(); } +MemoryManager *Device::getMemoryManager() const { + return executionEnvironment->memoryManager.get(); +} + +GmmHelper *Device::getGmmHelper() const { + return getRootDeviceEnvironment().getGmmHelper(); +} + +CompilerInterface *Device::getCompilerInterface() const { + return executionEnvironment->rootDeviceEnvironments[getRootDeviceIndex()]->getCompilerInterface(); +} + +BuiltIns *Device::getBuiltIns() const { + return executionEnvironment->rootDeviceEnvironments[getRootDeviceIndex()]->getBuiltIns(); +} } // namespace NEO diff --git a/shared/source/device/device.h b/shared/source/device/device.h index 3c52da3c97..e67046e0bf 100644 --- a/shared/source/device/device.h +++ b/shared/source/device/device.h @@ -7,8 +7,6 @@ #pragma once #include "shared/source/device/device_info.h" -#include "shared/source/execution_environment/execution_environment.h" -#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/engine_control.h" #include "shared/source/helpers/engine_node_helper.h" #include "shared/source/helpers/non_copyable_or_moveable.h" @@ -16,6 +14,13 @@ #include "shared/source/os_interface/performance_counters.h" namespace NEO { +class BindlessHeapsHelper; +class BuiltIns; +class CompilerInterface; +class ExecutionEnvironment; +class Debugger; +class GmmClientContext; +class GmmHelper; class SyncBufferHandler; enum class EngineGroupType : uint32_t; class DebuggerL0; @@ -89,18 +94,16 @@ class Device : public ReferenceTrackedObject { PerformanceCounters *getPerformanceCounters() { return performanceCounters.get(); } PreemptionMode getPreemptionMode() const { return preemptionMode; } MOCKABLE_VIRTUAL bool isDebuggerActive() const; - Debugger *getDebugger() const { return getRootDeviceEnvironment().debugger.get(); } + Debugger *getDebugger() const; NEO::SourceLevelDebugger *getSourceLevelDebugger(); DebuggerL0 *getL0Debugger(); const EnginesT &getAllEngines() const; const std::string getDeviceName(const HardwareInfo &hwInfo) const; ExecutionEnvironment *getExecutionEnvironment() const { return executionEnvironment; } - const RootDeviceEnvironment &getRootDeviceEnvironment() const { return *executionEnvironment->rootDeviceEnvironments[getRootDeviceIndex()]; } - RootDeviceEnvironment &getRootDeviceEnvironmentRef() const { return *executionEnvironment->rootDeviceEnvironments[getRootDeviceIndex()]; } - bool isFullRangeSvm() const { - return getRootDeviceEnvironment().isFullRangeSvm(); - } + const RootDeviceEnvironment &getRootDeviceEnvironment() const; + RootDeviceEnvironment &getRootDeviceEnvironmentRef() const; + bool isFullRangeSvm() const; static bool isBlitSplitEnabled(); bool isBcsSplitSupported(); bool areSharedSystemAllocationsAllowed() const; @@ -227,21 +230,6 @@ inline EngineControl &Device::getDefaultEngine() { return allEngines[defaultEngineIndex]; } -inline MemoryManager *Device::getMemoryManager() const { - return executionEnvironment->memoryManager.get(); -} - -inline GmmHelper *Device::getGmmHelper() const { - return getRootDeviceEnvironment().getGmmHelper(); -} - -inline CompilerInterface *Device::getCompilerInterface() const { - return executionEnvironment->rootDeviceEnvironments[getRootDeviceIndex()]->getCompilerInterface(); -} -inline BuiltIns *Device::getBuiltIns() const { - return executionEnvironment->rootDeviceEnvironments[getRootDeviceIndex()]->getBuiltIns(); -} - inline SelectorCopyEngine &Device::getSelectorCopyEngine() { return selectorCopyEngine; } diff --git a/shared/source/device/device_caps.cpp b/shared/source/device/device_caps.cpp index c6cfd93976..4d42f20741 100644 --- a/shared/source/device/device_caps.cpp +++ b/shared/source/device/device_caps.cpp @@ -10,6 +10,7 @@ #include "shared/source/compiler_interface/compiler_interface.h" #include "shared/source/debugger/debugger.h" #include "shared/source/device/device.h" +#include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/api_specific_config.h" diff --git a/shared/source/device/root_device.cpp b/shared/source/device/root_device.cpp index 47de8c8e19..28c76aca8a 100644 --- a/shared/source/device/root_device.cpp +++ b/shared/source/device/root_device.cpp @@ -11,6 +11,7 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/device/sub_device.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/api_specific_config.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/memory_manager/memory_manager.h" diff --git a/shared/source/device/windows/device_windows.cpp b/shared/source/device/windows/device_windows.cpp index 9c1d7e211c..92b98aa867 100644 --- a/shared/source/device/windows/device_windows.cpp +++ b/shared/source/device/windows/device_windows.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/device/device.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/os_interface/windows/wddm/wddm.h" namespace NEO { diff --git a/shared/source/direct_submission/direct_submission_hw.inl b/shared/source/direct_submission/direct_submission_hw.inl index 51e1f869ad..eaee007ccc 100644 --- a/shared/source/direct_submission/direct_submission_hw.inl +++ b/shared/source/direct_submission/direct_submission_hw.inl @@ -13,6 +13,7 @@ #include "shared/source/direct_submission/direct_submission_hw.h" #include "shared/source/direct_submission/direct_submission_hw_diagnostic_mode.h" #include "shared/source/direct_submission/relaxed_ordering_helper.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/flush_stamp.h" #include "shared/source/helpers/logical_state_helper.h" #include "shared/source/helpers/ptr_math.h" diff --git a/shared/source/dll/linux/debugger_l0_dll_linux.cpp b/shared/source/dll/linux/debugger_l0_dll_linux.cpp index 089d3c4ff6..e98e1323d5 100644 --- a/shared/source/dll/linux/debugger_l0_dll_linux.cpp +++ b/shared/source/dll/linux/debugger_l0_dll_linux.cpp @@ -7,6 +7,7 @@ #include "shared/source/debugger/debugger_l0.h" #include "shared/source/device/device.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/os_interface/linux/drm_neo.h" #include "shared/source/os_interface/os_interface.h" diff --git a/shared/source/dll/windows/debugger_l0_windows.cpp b/shared/source/dll/windows/debugger_l0_windows.cpp index d980c0f646..92dba47ddd 100644 --- a/shared/source/dll/windows/debugger_l0_windows.cpp +++ b/shared/source/dll/windows/debugger_l0_windows.cpp @@ -7,6 +7,7 @@ #include "shared/source/debugger/debugger_l0.h" #include "shared/source/device/device.h" +#include "shared/source/execution_environment/root_device_environment.h" namespace NEO { std::unique_ptr DebuggerL0::create(NEO::Device *device) { diff --git a/shared/source/gen12lp/preamble_gen12lp.cpp b/shared/source/gen12lp/preamble_gen12lp.cpp index b0d283d580..9092187cb4 100644 --- a/shared/source/gen12lp/preamble_gen12lp.cpp +++ b/shared/source/gen12lp/preamble_gen12lp.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/command_stream/csr_definitions.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/gen12lp/hw_cmds_base.h" #include "shared/source/helpers/pipe_control_args.h" #include "shared/source/helpers/pipeline_select_helper.h" diff --git a/shared/source/helpers/engine_node_helper.cpp b/shared/source/helpers/engine_node_helper.cpp index aecd1e8ac7..4d2e4f8016 100644 --- a/shared/source/helpers/engine_node_helper.cpp +++ b/shared/source/helpers/engine_node_helper.cpp @@ -9,6 +9,7 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/device/device.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/hw_helper.h" namespace NEO::EngineHelpers { diff --git a/shared/source/helpers/kernel_helpers.cpp b/shared/source/helpers/kernel_helpers.cpp index ecb18286d9..cff537b19a 100644 --- a/shared/source/helpers/kernel_helpers.cpp +++ b/shared/source/helpers/kernel_helpers.cpp @@ -9,6 +9,7 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/device/device.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/basic_math.h" #include "shared/source/helpers/debug_helpers.h" #include "shared/source/helpers/hw_helper.h" diff --git a/shared/source/memory_manager/memory_manager.cpp b/shared/source/memory_manager/memory_manager.cpp index 28ca6d1ba7..71343e0a44 100644 --- a/shared/source/memory_manager/memory_manager.cpp +++ b/shared/source/memory_manager/memory_manager.cpp @@ -9,6 +9,7 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/gmm_helper/gmm.h" #include "shared/source/gmm_helper/gmm_helper.h" diff --git a/shared/source/memory_manager/unified_memory_manager.cpp b/shared/source/memory_manager/unified_memory_manager.cpp index 2880bdd336..5af54c7c2d 100644 --- a/shared/source/memory_manager/unified_memory_manager.cpp +++ b/shared/source/memory_manager/unified_memory_manager.cpp @@ -8,6 +8,8 @@ #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/source/command_stream/command_stream_receiver.h" +#include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/api_specific_config.h" #include "shared/source/helpers/memory_properties_helpers.h" diff --git a/shared/source/os_interface/device_factory.cpp b/shared/source/os_interface/device_factory.cpp index 860f9497d2..b54885e41e 100644 --- a/shared/source/os_interface/device_factory.cpp +++ b/shared/source/os_interface/device_factory.cpp @@ -10,6 +10,7 @@ #include "shared/source/aub/aub_center.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/device/root_device.h" +#include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/compiler_hw_info_config.h" #include "shared/source/helpers/hw_helper.h" diff --git a/shared/source/os_interface/linux/drm_memory_operations_handler_bind.cpp b/shared/source/os_interface/linux/drm_memory_operations_handler_bind.cpp index be7c5e0e7f..d6d9b88c1a 100644 --- a/shared/source/os_interface/linux/drm_memory_operations_handler_bind.cpp +++ b/shared/source/os_interface/linux/drm_memory_operations_handler_bind.cpp @@ -10,6 +10,8 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/device/device.h" +#include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/linux/drm_allocation.h" #include "shared/source/os_interface/linux/drm_buffer_object.h" diff --git a/shared/source/os_interface/windows/wddm_memory_manager.cpp b/shared/source/os_interface/windows/wddm_memory_manager.cpp index 90cb076ce1..9e9dcd26ea 100644 --- a/shared/source/os_interface/windows/wddm_memory_manager.cpp +++ b/shared/source/os_interface/windows/wddm_memory_manager.cpp @@ -9,6 +9,7 @@ #include "shared/source/command_stream/command_stream_receiver_hw.h" #include "shared/source/debugger/debugger_l0.h" +#include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/gmm_helper/cache_settings_helper.h" #include "shared/source/gmm_helper/client_context/gmm_client_context.h" diff --git a/shared/source/page_fault_manager/cpu_page_fault_manager.cpp b/shared/source/page_fault_manager/cpu_page_fault_manager.cpp index e853e3a3c4..d771efbcf1 100644 --- a/shared/source/page_fault_manager/cpu_page_fault_manager.cpp +++ b/shared/source/page_fault_manager/cpu_page_fault_manager.cpp @@ -9,6 +9,7 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/memory_properties_helpers.h" +#include "shared/source/helpers/options.h" #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/source/utilities/spinlock.h" diff --git a/shared/source/page_fault_manager/linux/cpu_page_fault_manager_linux.cpp b/shared/source/page_fault_manager/linux/cpu_page_fault_manager_linux.cpp index 6cd99e6c2b..9af6bbb3d0 100644 --- a/shared/source/page_fault_manager/linux/cpu_page_fault_manager_linux.cpp +++ b/shared/source/page_fault_manager/linux/cpu_page_fault_manager_linux.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,6 +9,7 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/device/device.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/debug_helpers.h" #include "shared/source/memory_manager/memory_operations_handler.h" diff --git a/shared/source/xe_hpc_core/linux/hw_info_config_pvc.cpp b/shared/source/xe_hpc_core/linux/hw_info_config_pvc.cpp index f8f4ccd553..91ba26006f 100644 --- a/shared/source/xe_hpc_core/linux/hw_info_config_pvc.cpp +++ b/shared/source/xe_hpc_core/linux/hw_info_config_pvc.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/device/sub_device.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/constants.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/kernel/kernel_properties.h" diff --git a/shared/source/xe_hpc_core/preemption_xe_hpc_core.cpp b/shared/source/xe_hpc_core/preemption_xe_hpc_core.cpp index c76b5bff4d..7b91d2627e 100644 --- a/shared/source/xe_hpc_core/preemption_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/preemption_xe_hpc_core.cpp @@ -7,6 +7,7 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/command_stream/preemption.inl" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h" namespace NEO { diff --git a/shared/source/xe_hpg_core/linux/hw_info_config_dg2.cpp b/shared/source/xe_hpg_core/linux/hw_info_config_dg2.cpp index c57081499b..cd72ceb11a 100644 --- a/shared/source/xe_hpg_core/linux/hw_info_config_dg2.cpp +++ b/shared/source/xe_hpg_core/linux/hw_info_config_dg2.cpp @@ -8,6 +8,7 @@ #include "shared/source/command_stream/stream_properties.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/device/device.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/driver_model_type.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/string.h" diff --git a/shared/source/xe_hpg_core/preamble_xe_hpg_core.cpp b/shared/source/xe_hpg_core/preamble_xe_hpg_core.cpp index 463431ea41..3bfc166c61 100644 --- a/shared/source/xe_hpg_core/preamble_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/preamble_xe_hpg_core.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" namespace NEO { diff --git a/shared/source/xe_hpg_core/preemption_xe_hpg_core.cpp b/shared/source/xe_hpg_core/preemption_xe_hpg_core.cpp index e90262ba5d..b5ce665b68 100644 --- a/shared/source/xe_hpg_core/preemption_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/preemption_xe_hpg_core.cpp @@ -7,6 +7,7 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/command_stream/preemption.inl" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h" namespace NEO { diff --git a/shared/test/common/mocks/debugger_l0_create.cpp b/shared/test/common/mocks/debugger_l0_create.cpp index 003866e781..e291b2c43a 100644 --- a/shared/test/common/mocks/debugger_l0_create.cpp +++ b/shared/test/common/mocks/debugger_l0_create.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/device/device.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/test/common/mocks/mock_l0_debugger.h" NEO::DebugerL0CreateFn mockDebuggerL0HwFactory[IGFX_MAX_CORE]; diff --git a/shared/test/common/mocks/mock_device.h b/shared/test/common/mocks/mock_device.h index a144a044ec..ea3a1ec72a 100644 --- a/shared/test/common/mocks/mock_device.h +++ b/shared/test/common/mocks/mock_device.h @@ -10,6 +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/execution_environment/execution_environment.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/variable_backup.h" diff --git a/shared/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp b/shared/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp index 8992993c85..cb448b8582 100644 --- a/shared/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp +++ b/shared/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp @@ -9,6 +9,7 @@ #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.h" #include "shared/source/command_stream/linear_stream.h" #include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/helpers/windows/gmm_callbacks.h" #include "shared/source/os_interface/windows/wddm_device_command_stream.h"