From 84d44a61f65471edd21cd3ec4468a0d9762fb013 Mon Sep 17 00:00:00 2001 From: Jitendra Sharma Date: Mon, 30 Oct 2023 10:25:31 +0000 Subject: [PATCH] refactor: Move sysman_driver/sysman_device files to driver/device directories Related-To: NEO-9376 Signed-off-by: Jitendra Sharma --- .../api/sysman/zes_sysman_api_entrypoints.h | 6 +++--- level_zero/core/source/global_teardown.cpp | 2 +- .../os_interface/global_teardown_tests.cpp | 2 +- level_zero/sysman/source/CMakeLists.txt | 13 ------------- .../api/diagnostics/sysman_diagnostics.cpp | 2 +- .../api/diagnostics/sysman_os_diagnostics.h | 2 +- .../sysman/source/api/ecc/sysman_ecc_imp.h | 2 +- .../api/engine/linux/sysman_os_engine_imp.h | 2 +- .../source/api/engine/sysman_engine.cpp | 4 ++-- .../sysman/source/api/engine/sysman_engine.h | 2 +- .../api/events/linux/sysman_os_events_imp.cpp | 2 +- .../source/api/events/sysman_os_events.h | 2 +- .../api/fabric_port/sysman_os_fabric_port.h | 2 +- .../source/api/firmware/sysman_os_firmware.h | 2 +- .../source/api/frequency/sysman_frequency.cpp | 2 +- .../api/frequency/sysman_frequency_imp.cpp | 2 +- .../api/frequency/sysman_os_frequency.h | 2 +- .../sysman_os_global_operations.h | 2 +- .../linux/sysman_os_memory_imp_prelim.h | 2 +- .../source/api/memory/sysman_memory.cpp | 2 +- .../api/performance/sysman_os_performance.h | 2 +- .../api/performance/sysman_performance.cpp | 2 +- .../performance/sysman_performance_imp.cpp | 2 +- .../sysman/source/api/power/sysman_power.cpp | 2 +- .../source/api/power/sysman_power_imp.cpp | 2 +- .../api/ras/linux/sysman_os_ras_imp_prelim.h | 2 +- .../sysman/source/api/ras/sysman_ras.cpp | 2 +- level_zero/sysman/source/api/ras/sysman_ras.h | 2 +- .../source/api/scheduler/sysman_scheduler.cpp | 2 +- .../api/scheduler/sysman_scheduler_imp.cpp | 2 +- .../source/api/standby/sysman_os_standby.h | 2 +- .../source/api/standby/sysman_standby_imp.cpp | 2 +- .../api/temperature/sysman_temperature.cpp | 2 +- .../temperature/sysman_temperature_imp.cpp | 2 +- .../sysman/source/device/CMakeLists.txt | 18 ++++++++++++++++++ .../sysman/source/{ => device}/os_sysman.h | 0 .../source/{ => device}/sysman_device.cpp | 2 +- .../source/{ => device}/sysman_device.h | 0 .../source/{ => device}/sysman_device_imp.cpp | 4 ++-- .../source/{ => device}/sysman_device_imp.h | 2 +- .../source/{ => device}/sysman_hw_device_id.h | 0 .../sysman/source/driver/CMakeLists.txt | 19 +++++++++++++++++++ .../source/{ => driver}/os_sysman_driver.h | 0 .../source/{ => driver}/sysman_driver.cpp | 6 +++--- .../source/{ => driver}/sysman_driver.h | 0 .../{ => driver}/sysman_driver_handle.h | 0 .../{ => driver}/sysman_driver_handle_imp.cpp | 8 ++++---- .../{ => driver}/sysman_driver_handle_imp.h | 2 +- .../source/{ => driver}/sysman_driver_imp.h | 2 +- .../sysman/source/linux/pmt/sysman_pmt.cpp | 2 +- .../linux/sysman_hw_device_id_linux.cpp | 2 +- .../source/linux/zes_os_sysman_driver_imp.h | 2 +- .../sysman/source/linux/zes_os_sysman_imp.h | 4 ++-- .../windows/sysman_hw_device_id_windows.cpp | 2 +- .../windows/zes_os_sysman_driver_imp.cpp | 4 ++-- .../source/windows/zes_os_sysman_driver_imp.h | 2 +- .../sysman/source/windows/zes_os_sysman_imp.h | 6 +++--- .../sources/linux/mock_sysman_driver.h | 2 +- .../sources/linux/mock_sysman_fixture.h | 6 +++--- .../sources/linux/test_sysman_driver.cpp | 6 +++--- .../memory/linux/test_sysman_memory.cpp | 2 +- .../memory/linux/test_sysman_memory_dg1.cpp | 2 +- .../sources/power/linux/mock_sysfs_power.h | 2 +- .../power/linux/mock_sysfs_power_prelim.h | 2 +- .../sources/windows/mock_sysman_driver.h | 2 +- .../sources/windows/mock_sysman_fixture.h | 4 ++-- 66 files changed, 112 insertions(+), 88 deletions(-) create mode 100644 level_zero/sysman/source/device/CMakeLists.txt rename level_zero/sysman/source/{ => device}/os_sysman.h (100%) rename level_zero/sysman/source/{ => device}/sysman_device.cpp (99%) rename level_zero/sysman/source/{ => device}/sysman_device.h (100%) rename level_zero/sysman/source/{ => device}/sysman_device_imp.cpp (98%) rename level_zero/sysman/source/{ => device}/sysman_device_imp.h (98%) rename level_zero/sysman/source/{ => device}/sysman_hw_device_id.h (100%) create mode 100644 level_zero/sysman/source/driver/CMakeLists.txt rename level_zero/sysman/source/{ => driver}/os_sysman_driver.h (100%) rename level_zero/sysman/source/{ => driver}/sysman_driver.cpp (95%) rename level_zero/sysman/source/{ => driver}/sysman_driver.h (100%) rename level_zero/sysman/source/{ => driver}/sysman_driver_handle.h (100%) rename level_zero/sysman/source/{ => driver}/sysman_driver_handle_imp.cpp (94%) rename level_zero/sysman/source/{ => driver}/sysman_driver_handle_imp.h (95%) rename level_zero/sysman/source/{ => driver}/sysman_driver_imp.h (88%) diff --git a/level_zero/api/sysman/zes_sysman_api_entrypoints.h b/level_zero/api/sysman/zes_sysman_api_entrypoints.h index 2c88f77157..511f74a3ac 100644 --- a/level_zero/api/sysman/zes_sysman_api_entrypoints.h +++ b/level_zero/api/sysman/zes_sysman_api_entrypoints.h @@ -8,9 +8,9 @@ #pragma once #include "level_zero/core/source/driver/driver.h" #include "level_zero/core/source/driver/driver_handle.h" -#include "level_zero/sysman/source/sysman_device.h" -#include "level_zero/sysman/source/sysman_driver.h" -#include "level_zero/sysman/source/sysman_driver_handle.h" +#include "level_zero/sysman/source/device/sysman_device.h" +#include "level_zero/sysman/source/driver/sysman_driver.h" +#include "level_zero/sysman/source/driver/sysman_driver_handle.h" #include "level_zero/tools/source/sysman/sysman.h" namespace L0 { diff --git a/level_zero/core/source/global_teardown.cpp b/level_zero/core/source/global_teardown.cpp index b8173efe0e..44ca5fb146 100644 --- a/level_zero/core/source/global_teardown.cpp +++ b/level_zero/core/source/global_teardown.cpp @@ -6,7 +6,7 @@ */ #include "level_zero/core/source/driver/driver_handle_imp.h" -#include "level_zero/sysman/source/sysman_driver_handle_imp.h" +#include "level_zero/sysman/source/driver/sysman_driver_handle_imp.h" namespace L0 { diff --git a/level_zero/core/test/unit_tests/os_interface/global_teardown_tests.cpp b/level_zero/core/test/unit_tests/os_interface/global_teardown_tests.cpp index 0e99ea1673..62a2732e43 100644 --- a/level_zero/core/test/unit_tests/os_interface/global_teardown_tests.cpp +++ b/level_zero/core/test/unit_tests/os_interface/global_teardown_tests.cpp @@ -13,7 +13,7 @@ #include "level_zero/core/source/driver/driver.h" #include "level_zero/core/source/driver/driver_handle_imp.h" #include "level_zero/core/source/global_teardown.h" -#include "level_zero/sysman/source/sysman_driver_handle_imp.h" +#include "level_zero/sysman/source/driver/sysman_driver_handle_imp.h" namespace L0 { namespace ult { diff --git a/level_zero/sysman/source/CMakeLists.txt b/level_zero/sysman/source/CMakeLists.txt index 7e5b50fce1..d8eada62fc 100644 --- a/level_zero/sysman/source/CMakeLists.txt +++ b/level_zero/sysman/source/CMakeLists.txt @@ -7,19 +7,6 @@ target_sources(${L0_STATIC_LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/sysman_driver.h - ${CMAKE_CURRENT_SOURCE_DIR}/sysman_driver_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/sysman_driver.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/sysman_driver_handle.h - ${CMAKE_CURRENT_SOURCE_DIR}/sysman_driver_handle_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/sysman_driver_handle_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/sysman_device.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/sysman_device.h - ${CMAKE_CURRENT_SOURCE_DIR}/sysman_device_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/sysman_device_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman.h - ${CMAKE_CURRENT_SOURCE_DIR}/sysman_hw_device_id.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_driver.h ) add_subdirectories() diff --git a/level_zero/sysman/source/api/diagnostics/sysman_diagnostics.cpp b/level_zero/sysman/source/api/diagnostics/sysman_diagnostics.cpp index 7d4ac17498..4c076fe753 100644 --- a/level_zero/sysman/source/api/diagnostics/sysman_diagnostics.cpp +++ b/level_zero/sysman/source/api/diagnostics/sysman_diagnostics.cpp @@ -11,7 +11,7 @@ #include "level_zero/sysman/source/api/diagnostics/sysman_diagnostics_imp.h" #include "level_zero/sysman/source/api/diagnostics/sysman_os_diagnostics.h" -#include "level_zero/sysman/source/os_sysman.h" +#include "level_zero/sysman/source/device/os_sysman.h" namespace L0 { namespace Sysman { diff --git a/level_zero/sysman/source/api/diagnostics/sysman_os_diagnostics.h b/level_zero/sysman/source/api/diagnostics/sysman_os_diagnostics.h index d2143a28b3..cef5160182 100644 --- a/level_zero/sysman/source/api/diagnostics/sysman_os_diagnostics.h +++ b/level_zero/sysman/source/api/diagnostics/sysman_os_diagnostics.h @@ -7,7 +7,7 @@ #pragma once -#include "level_zero/sysman/source/os_sysman.h" +#include "level_zero/sysman/source/device/os_sysman.h" #include #include diff --git a/level_zero/sysman/source/api/ecc/sysman_ecc_imp.h b/level_zero/sysman/source/api/ecc/sysman_ecc_imp.h index 72c1f63f46..d5043542db 100644 --- a/level_zero/sysman/source/api/ecc/sysman_ecc_imp.h +++ b/level_zero/sysman/source/api/ecc/sysman_ecc_imp.h @@ -9,7 +9,7 @@ #include "shared/source/helpers/non_copyable_or_moveable.h" #include "level_zero/sysman/source/api/ecc/sysman_ecc.h" -#include "level_zero/sysman/source/os_sysman.h" +#include "level_zero/sysman/source/device/os_sysman.h" namespace L0 { namespace Sysman { diff --git a/level_zero/sysman/source/api/engine/linux/sysman_os_engine_imp.h b/level_zero/sysman/source/api/engine/linux/sysman_os_engine_imp.h index bdc20a66e2..8b30838136 100644 --- a/level_zero/sysman/source/api/engine/linux/sysman_os_engine_imp.h +++ b/level_zero/sysman/source/api/engine/linux/sysman_os_engine_imp.h @@ -10,7 +10,7 @@ #include "shared/source/os_interface/linux/drm_neo.h" #include "level_zero/sysman/source/api/engine/sysman_os_engine.h" -#include "level_zero/sysman/source/sysman_device_imp.h" +#include "level_zero/sysman/source/device/sysman_device_imp.h" #include diff --git a/level_zero/sysman/source/api/engine/sysman_engine.cpp b/level_zero/sysman/source/api/engine/sysman_engine.cpp index 85d9fc4ce7..90b05971f4 100644 --- a/level_zero/sysman/source/api/engine/sysman_engine.cpp +++ b/level_zero/sysman/source/api/engine/sysman_engine.cpp @@ -10,8 +10,8 @@ #include "shared/source/helpers/basic_math.h" #include "level_zero/sysman/source/api/engine/sysman_engine_imp.h" -#include "level_zero/sysman/source/os_sysman.h" -#include "level_zero/sysman/source/sysman_device_imp.h" +#include "level_zero/sysman/source/device/os_sysman.h" +#include "level_zero/sysman/source/device/sysman_device_imp.h" namespace L0 { namespace Sysman { diff --git a/level_zero/sysman/source/api/engine/sysman_engine.h b/level_zero/sysman/source/api/engine/sysman_engine.h index eed64f4c39..1c01d7edc6 100644 --- a/level_zero/sysman/source/api/engine/sysman_engine.h +++ b/level_zero/sysman/source/api/engine/sysman_engine.h @@ -7,7 +7,7 @@ #pragma once #include "level_zero/api/sysman/zes_handles_struct.h" -#include "level_zero/sysman/source/sysman_device.h" +#include "level_zero/sysman/source/device/sysman_device.h" #include #include diff --git a/level_zero/sysman/source/api/events/linux/sysman_os_events_imp.cpp b/level_zero/sysman/source/api/events/linux/sysman_os_events_imp.cpp index b81e966bf3..299552d4a6 100644 --- a/level_zero/sysman/source/api/events/linux/sysman_os_events_imp.cpp +++ b/level_zero/sysman/source/api/events/linux/sysman_os_events_imp.cpp @@ -12,9 +12,9 @@ #include "level_zero/sysman/source/api/events/sysman_events_imp.h" #include "level_zero/sysman/source/api/memory/linux/sysman_os_memory_imp_prelim.h" +#include "level_zero/sysman/source/driver/sysman_driver_handle_imp.h" #include "level_zero/sysman/source/linux/zes_os_sysman_driver_imp.h" #include "level_zero/sysman/source/linux/zes_os_sysman_imp.h" -#include "level_zero/sysman/source/sysman_driver_handle_imp.h" #include diff --git a/level_zero/sysman/source/api/events/sysman_os_events.h b/level_zero/sysman/source/api/events/sysman_os_events.h index 823d5f0d9b..09da2aeba0 100644 --- a/level_zero/sysman/source/api/events/sysman_os_events.h +++ b/level_zero/sysman/source/api/events/sysman_os_events.h @@ -7,7 +7,7 @@ #pragma once -#include "level_zero/sysman/source/os_sysman.h" +#include "level_zero/sysman/source/device/os_sysman.h" #include namespace L0 { diff --git a/level_zero/sysman/source/api/fabric_port/sysman_os_fabric_port.h b/level_zero/sysman/source/api/fabric_port/sysman_os_fabric_port.h index a654e2d939..68b4080c91 100644 --- a/level_zero/sysman/source/api/fabric_port/sysman_os_fabric_port.h +++ b/level_zero/sysman/source/api/fabric_port/sysman_os_fabric_port.h @@ -7,7 +7,7 @@ #pragma once -#include "level_zero/sysman/source/os_sysman.h" +#include "level_zero/sysman/source/device/os_sysman.h" #include namespace L0 { diff --git a/level_zero/sysman/source/api/firmware/sysman_os_firmware.h b/level_zero/sysman/source/api/firmware/sysman_os_firmware.h index 2123d2fcbc..5b4ddae46c 100644 --- a/level_zero/sysman/source/api/firmware/sysman_os_firmware.h +++ b/level_zero/sysman/source/api/firmware/sysman_os_firmware.h @@ -7,7 +7,7 @@ #pragma once -#include "level_zero/sysman/source/os_sysman.h" +#include "level_zero/sysman/source/device/os_sysman.h" #include #include diff --git a/level_zero/sysman/source/api/frequency/sysman_frequency.cpp b/level_zero/sysman/source/api/frequency/sysman_frequency.cpp index 54bf8430b9..c1fc53b87f 100644 --- a/level_zero/sysman/source/api/frequency/sysman_frequency.cpp +++ b/level_zero/sysman/source/api/frequency/sysman_frequency.cpp @@ -11,7 +11,7 @@ #include "level_zero/sysman/source/api/frequency/sysman_frequency_imp.h" #include "level_zero/sysman/source/api/frequency/sysman_os_frequency.h" -#include "level_zero/sysman/source/os_sysman.h" +#include "level_zero/sysman/source/device/os_sysman.h" namespace L0 { namespace Sysman { diff --git a/level_zero/sysman/source/api/frequency/sysman_frequency_imp.cpp b/level_zero/sysman/source/api/frequency/sysman_frequency_imp.cpp index 340c72cfbe..6574a71d5e 100644 --- a/level_zero/sysman/source/api/frequency/sysman_frequency_imp.cpp +++ b/level_zero/sysman/source/api/frequency/sysman_frequency_imp.cpp @@ -9,7 +9,7 @@ #include "shared/source/helpers/debug_helpers.h" -#include "level_zero/sysman/source/sysman_device_imp.h" +#include "level_zero/sysman/source/device/sysman_device_imp.h" #include #include diff --git a/level_zero/sysman/source/api/frequency/sysman_os_frequency.h b/level_zero/sysman/source/api/frequency/sysman_os_frequency.h index f94d6d77ce..6a916493ee 100644 --- a/level_zero/sysman/source/api/frequency/sysman_os_frequency.h +++ b/level_zero/sysman/source/api/frequency/sysman_os_frequency.h @@ -7,7 +7,7 @@ #pragma once -#include "level_zero/sysman/source/os_sysman.h" +#include "level_zero/sysman/source/device/os_sysman.h" namespace L0 { namespace Sysman { diff --git a/level_zero/sysman/source/api/global_operations/sysman_os_global_operations.h b/level_zero/sysman/source/api/global_operations/sysman_os_global_operations.h index c139df48f1..12583af891 100644 --- a/level_zero/sysman/source/api/global_operations/sysman_os_global_operations.h +++ b/level_zero/sysman/source/api/global_operations/sysman_os_global_operations.h @@ -11,7 +11,7 @@ #include "shared/source/os_interface/driver_info.h" #include "shared/source/os_interface/product_helper.h" -#include "level_zero/sysman/source/os_sysman.h" +#include "level_zero/sysman/source/device/os_sysman.h" #include #include diff --git a/level_zero/sysman/source/api/memory/linux/sysman_os_memory_imp_prelim.h b/level_zero/sysman/source/api/memory/linux/sysman_os_memory_imp_prelim.h index 73084588ed..5ce3747030 100644 --- a/level_zero/sysman/source/api/memory/linux/sysman_os_memory_imp_prelim.h +++ b/level_zero/sysman/source/api/memory/linux/sysman_os_memory_imp_prelim.h @@ -10,9 +10,9 @@ #include "shared/source/os_interface/linux/drm_neo.h" #include "level_zero/sysman/source/api/memory/sysman_os_memory.h" +#include "level_zero/sysman/source/device/sysman_device_imp.h" #include "level_zero/sysman/source/linux/pmt/sysman_pmt.h" #include "level_zero/sysman/source/linux/sysman_fs_access.h" -#include "level_zero/sysman/source/sysman_device_imp.h" #include diff --git a/level_zero/sysman/source/api/memory/sysman_memory.cpp b/level_zero/sysman/source/api/memory/sysman_memory.cpp index 8f74c71ebd..8c0bd660b7 100644 --- a/level_zero/sysman/source/api/memory/sysman_memory.cpp +++ b/level_zero/sysman/source/api/memory/sysman_memory.cpp @@ -9,7 +9,7 @@ #include "shared/source/memory_manager/memory_manager.h" #include "level_zero/sysman/source/api/memory/sysman_memory_imp.h" -#include "level_zero/sysman/source/os_sysman.h" +#include "level_zero/sysman/source/device/os_sysman.h" namespace L0 { namespace Sysman { diff --git a/level_zero/sysman/source/api/performance/sysman_os_performance.h b/level_zero/sysman/source/api/performance/sysman_os_performance.h index 2631ef776d..2f4baa7964 100644 --- a/level_zero/sysman/source/api/performance/sysman_os_performance.h +++ b/level_zero/sysman/source/api/performance/sysman_os_performance.h @@ -7,7 +7,7 @@ #pragma once -#include "level_zero/sysman/source/os_sysman.h" +#include "level_zero/sysman/source/device/os_sysman.h" #include namespace L0 { diff --git a/level_zero/sysman/source/api/performance/sysman_performance.cpp b/level_zero/sysman/source/api/performance/sysman_performance.cpp index f4be5db2e1..2fbbc6b418 100644 --- a/level_zero/sysman/source/api/performance/sysman_performance.cpp +++ b/level_zero/sysman/source/api/performance/sysman_performance.cpp @@ -8,7 +8,7 @@ #include "level_zero/sysman/source/api/performance/sysman_performance.h" #include "level_zero/sysman/source/api/performance/sysman_performance_imp.h" -#include "level_zero/sysman/source/os_sysman.h" +#include "level_zero/sysman/source/device/os_sysman.h" #include diff --git a/level_zero/sysman/source/api/performance/sysman_performance_imp.cpp b/level_zero/sysman/source/api/performance/sysman_performance_imp.cpp index 17173c1aa5..b6dac08598 100644 --- a/level_zero/sysman/source/api/performance/sysman_performance_imp.cpp +++ b/level_zero/sysman/source/api/performance/sysman_performance_imp.cpp @@ -9,7 +9,7 @@ #include "shared/source/helpers/debug_helpers.h" -#include "level_zero/sysman/source/sysman_device_imp.h" +#include "level_zero/sysman/source/device/sysman_device_imp.h" namespace L0 { namespace Sysman { diff --git a/level_zero/sysman/source/api/power/sysman_power.cpp b/level_zero/sysman/source/api/power/sysman_power.cpp index 3d9dec926b..126f24f870 100644 --- a/level_zero/sysman/source/api/power/sysman_power.cpp +++ b/level_zero/sysman/source/api/power/sysman_power.cpp @@ -10,7 +10,7 @@ #include "shared/source/helpers/basic_math.h" #include "level_zero/sysman/source/api/power/sysman_power_imp.h" -#include "level_zero/sysman/source/os_sysman.h" +#include "level_zero/sysman/source/device/os_sysman.h" namespace L0 { namespace Sysman { diff --git a/level_zero/sysman/source/api/power/sysman_power_imp.cpp b/level_zero/sysman/source/api/power/sysman_power_imp.cpp index 1765842e5f..ef2c07e45a 100644 --- a/level_zero/sysman/source/api/power/sysman_power_imp.cpp +++ b/level_zero/sysman/source/api/power/sysman_power_imp.cpp @@ -10,7 +10,7 @@ #include "shared/source/helpers/debug_helpers.h" #include "level_zero/sysman/source/api/power/sysman_os_power.h" -#include "level_zero/sysman/source/sysman_device_imp.h" +#include "level_zero/sysman/source/device/sysman_device_imp.h" namespace L0 { namespace Sysman { diff --git a/level_zero/sysman/source/api/ras/linux/sysman_os_ras_imp_prelim.h b/level_zero/sysman/source/api/ras/linux/sysman_os_ras_imp_prelim.h index 9478798669..2631945808 100644 --- a/level_zero/sysman/source/api/ras/linux/sysman_os_ras_imp_prelim.h +++ b/level_zero/sysman/source/api/ras/linux/sysman_os_ras_imp_prelim.h @@ -9,10 +9,10 @@ #include "shared/source/helpers/non_copyable_or_moveable.h" #include "level_zero/sysman/source/api/ras/sysman_os_ras.h" +#include "level_zero/sysman/source/device/sysman_device_imp.h" #include "level_zero/sysman/source/linux/pmu/sysman_pmu_imp.h" #include "level_zero/sysman/source/linux/sysman_fs_access.h" #include "level_zero/sysman/source/sysman_const.h" -#include "level_zero/sysman/source/sysman_device_imp.h" #include #include diff --git a/level_zero/sysman/source/api/ras/sysman_ras.cpp b/level_zero/sysman/source/api/ras/sysman_ras.cpp index d4d0049250..05a72baf37 100644 --- a/level_zero/sysman/source/api/ras/sysman_ras.cpp +++ b/level_zero/sysman/source/api/ras/sysman_ras.cpp @@ -8,7 +8,7 @@ #include "shared/source/helpers/basic_math.h" #include "level_zero/sysman/source/api/ras/sysman_ras_imp.h" -#include "level_zero/sysman/source/os_sysman.h" +#include "level_zero/sysman/source/device/os_sysman.h" namespace L0 { namespace Sysman { diff --git a/level_zero/sysman/source/api/ras/sysman_ras.h b/level_zero/sysman/source/api/ras/sysman_ras.h index e15d7454d8..a10a2eeed7 100644 --- a/level_zero/sysman/source/api/ras/sysman_ras.h +++ b/level_zero/sysman/source/api/ras/sysman_ras.h @@ -7,7 +7,7 @@ #pragma once #include "level_zero/api/sysman/zes_handles_struct.h" -#include "level_zero/sysman/source/sysman_device.h" +#include "level_zero/sysman/source/device/sysman_device.h" #include #include diff --git a/level_zero/sysman/source/api/scheduler/sysman_scheduler.cpp b/level_zero/sysman/source/api/scheduler/sysman_scheduler.cpp index cc14a250cb..ff5af89c8f 100644 --- a/level_zero/sysman/source/api/scheduler/sysman_scheduler.cpp +++ b/level_zero/sysman/source/api/scheduler/sysman_scheduler.cpp @@ -6,7 +6,7 @@ */ #include "level_zero/sysman/source/api/scheduler/sysman_scheduler_imp.h" -#include "level_zero/sysman/source/os_sysman.h" +#include "level_zero/sysman/source/device/os_sysman.h" #include diff --git a/level_zero/sysman/source/api/scheduler/sysman_scheduler_imp.cpp b/level_zero/sysman/source/api/scheduler/sysman_scheduler_imp.cpp index 52b3a02930..66b6e5d50c 100644 --- a/level_zero/sysman/source/api/scheduler/sysman_scheduler_imp.cpp +++ b/level_zero/sysman/source/api/scheduler/sysman_scheduler_imp.cpp @@ -9,8 +9,8 @@ #include "shared/source/helpers/debug_helpers.h" +#include "level_zero/sysman/source/device/sysman_device_imp.h" #include "level_zero/sysman/source/sysman_const.h" -#include "level_zero/sysman/source/sysman_device_imp.h" namespace L0 { namespace Sysman { diff --git a/level_zero/sysman/source/api/standby/sysman_os_standby.h b/level_zero/sysman/source/api/standby/sysman_os_standby.h index b579c57282..878c51c989 100644 --- a/level_zero/sysman/source/api/standby/sysman_os_standby.h +++ b/level_zero/sysman/source/api/standby/sysman_os_standby.h @@ -7,7 +7,7 @@ #pragma once -#include "level_zero/sysman/source/os_sysman.h" +#include "level_zero/sysman/source/device/os_sysman.h" #include #include diff --git a/level_zero/sysman/source/api/standby/sysman_standby_imp.cpp b/level_zero/sysman/source/api/standby/sysman_standby_imp.cpp index cd893f2a42..cb7e484db1 100644 --- a/level_zero/sysman/source/api/standby/sysman_standby_imp.cpp +++ b/level_zero/sysman/source/api/standby/sysman_standby_imp.cpp @@ -9,7 +9,7 @@ #include "shared/source/helpers/debug_helpers.h" -#include "level_zero/sysman/source/sysman_device_imp.h" +#include "level_zero/sysman/source/device/sysman_device_imp.h" namespace L0 { namespace Sysman { diff --git a/level_zero/sysman/source/api/temperature/sysman_temperature.cpp b/level_zero/sysman/source/api/temperature/sysman_temperature.cpp index 0074bbd77a..17016df102 100644 --- a/level_zero/sysman/source/api/temperature/sysman_temperature.cpp +++ b/level_zero/sysman/source/api/temperature/sysman_temperature.cpp @@ -8,7 +8,7 @@ #include "shared/source/helpers/basic_math.h" #include "level_zero/sysman/source/api/temperature/sysman_temperature_imp.h" -#include "level_zero/sysman/source/os_sysman.h" +#include "level_zero/sysman/source/device/os_sysman.h" namespace L0 { namespace Sysman { diff --git a/level_zero/sysman/source/api/temperature/sysman_temperature_imp.cpp b/level_zero/sysman/source/api/temperature/sysman_temperature_imp.cpp index 26acb9fe9a..6906c8a825 100644 --- a/level_zero/sysman/source/api/temperature/sysman_temperature_imp.cpp +++ b/level_zero/sysman/source/api/temperature/sysman_temperature_imp.cpp @@ -7,7 +7,7 @@ #include "level_zero/sysman/source/api/temperature/sysman_temperature_imp.h" -#include "level_zero/sysman/source/sysman_device_imp.h" +#include "level_zero/sysman/source/device/sysman_device_imp.h" namespace L0 { namespace Sysman { diff --git a/level_zero/sysman/source/device/CMakeLists.txt b/level_zero/sysman/source/device/CMakeLists.txt new file mode 100644 index 0000000000..dda34547e9 --- /dev/null +++ b/level_zero/sysman/source/device/CMakeLists.txt @@ -0,0 +1,18 @@ +# +# Copyright (C) 2023 Intel Corporation +# +# SPDX-License-Identifier: MIT +# + +target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman.h + ${CMAKE_CURRENT_SOURCE_DIR}/sysman_device_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/sysman_device_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/sysman_device.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/sysman_device.h + ${CMAKE_CURRENT_SOURCE_DIR}/sysman_hw_device_id.h +) + +add_subdirectories() diff --git a/level_zero/sysman/source/os_sysman.h b/level_zero/sysman/source/device/os_sysman.h similarity index 100% rename from level_zero/sysman/source/os_sysman.h rename to level_zero/sysman/source/device/os_sysman.h diff --git a/level_zero/sysman/source/sysman_device.cpp b/level_zero/sysman/source/device/sysman_device.cpp similarity index 99% rename from level_zero/sysman/source/sysman_device.cpp rename to level_zero/sysman/source/device/sysman_device.cpp index 1f38bb72b4..277f19c6a9 100644 --- a/level_zero/sysman/source/sysman_device.cpp +++ b/level_zero/sysman/source/device/sysman_device.cpp @@ -7,7 +7,7 @@ #include "shared/source/execution_environment/execution_environment.h" -#include "level_zero/sysman/source/sysman_device_imp.h" +#include "level_zero/sysman/source/device/sysman_device_imp.h" #include #include diff --git a/level_zero/sysman/source/sysman_device.h b/level_zero/sysman/source/device/sysman_device.h similarity index 100% rename from level_zero/sysman/source/sysman_device.h rename to level_zero/sysman/source/device/sysman_device.h diff --git a/level_zero/sysman/source/sysman_device_imp.cpp b/level_zero/sysman/source/device/sysman_device_imp.cpp similarity index 98% rename from level_zero/sysman/source/sysman_device_imp.cpp rename to level_zero/sysman/source/device/sysman_device_imp.cpp index f5ec3faa56..b8e5a2f76d 100644 --- a/level_zero/sysman/source/sysman_device_imp.cpp +++ b/level_zero/sysman/source/device/sysman_device_imp.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/sysman/source/sysman_device_imp.h" +#include "level_zero/sysman/source/device/sysman_device_imp.h" #include "shared/source/helpers/debug_helpers.h" @@ -14,7 +14,7 @@ #include "level_zero/sysman/source/api/fan/sysman_fan_imp.h" #include "level_zero/sysman/source/api/global_operations/sysman_global_operations_imp.h" #include "level_zero/sysman/source/api/pci/sysman_pci_imp.h" -#include "level_zero/sysman/source/os_sysman.h" +#include "level_zero/sysman/source/device/os_sysman.h" #include diff --git a/level_zero/sysman/source/sysman_device_imp.h b/level_zero/sysman/source/device/sysman_device_imp.h similarity index 98% rename from level_zero/sysman/source/sysman_device_imp.h rename to level_zero/sysman/source/device/sysman_device_imp.h index 8b49e9d932..68bcafe03b 100644 --- a/level_zero/sysman/source/sysman_device_imp.h +++ b/level_zero/sysman/source/device/sysman_device_imp.h @@ -11,7 +11,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/non_copyable_or_moveable.h" -#include "level_zero/sysman/source/sysman_device.h" +#include "level_zero/sysman/source/device/sysman_device.h" #include diff --git a/level_zero/sysman/source/sysman_hw_device_id.h b/level_zero/sysman/source/device/sysman_hw_device_id.h similarity index 100% rename from level_zero/sysman/source/sysman_hw_device_id.h rename to level_zero/sysman/source/device/sysman_hw_device_id.h diff --git a/level_zero/sysman/source/driver/CMakeLists.txt b/level_zero/sysman/source/driver/CMakeLists.txt new file mode 100644 index 0000000000..bc7aefc57a --- /dev/null +++ b/level_zero/sysman/source/driver/CMakeLists.txt @@ -0,0 +1,19 @@ +# +# Copyright (C) 2023 Intel Corporation +# +# SPDX-License-Identifier: MIT +# + +target_sources(${L0_STATIC_LIB_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/sysman_driver.h + ${CMAKE_CURRENT_SOURCE_DIR}/sysman_driver_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/sysman_driver.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/sysman_driver_handle.h + ${CMAKE_CURRENT_SOURCE_DIR}/sysman_driver_handle_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/sysman_driver_handle_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_driver.h +) + +add_subdirectories() diff --git a/level_zero/sysman/source/os_sysman_driver.h b/level_zero/sysman/source/driver/os_sysman_driver.h similarity index 100% rename from level_zero/sysman/source/os_sysman_driver.h rename to level_zero/sysman/source/driver/os_sysman_driver.h diff --git a/level_zero/sysman/source/sysman_driver.cpp b/level_zero/sysman/source/driver/sysman_driver.cpp similarity index 95% rename from level_zero/sysman/source/sysman_driver.cpp rename to level_zero/sysman/source/driver/sysman_driver.cpp index 4654fd2da2..159552b207 100644 --- a/level_zero/sysman/source/sysman_driver.cpp +++ b/level_zero/sysman/source/driver/sysman_driver.cpp @@ -12,9 +12,9 @@ #include "shared/source/os_interface/os_interface.h" #include "level_zero/core/source/driver/driver.h" -#include "level_zero/sysman/source/sysman_driver_handle_imp.h" -#include "level_zero/sysman/source/sysman_driver_imp.h" -#include "level_zero/sysman/source/sysman_hw_device_id.h" +#include "level_zero/sysman/source/device/sysman_hw_device_id.h" +#include "level_zero/sysman/source/driver/sysman_driver_handle_imp.h" +#include "level_zero/sysman/source/driver/sysman_driver_imp.h" #include #include diff --git a/level_zero/sysman/source/sysman_driver.h b/level_zero/sysman/source/driver/sysman_driver.h similarity index 100% rename from level_zero/sysman/source/sysman_driver.h rename to level_zero/sysman/source/driver/sysman_driver.h diff --git a/level_zero/sysman/source/sysman_driver_handle.h b/level_zero/sysman/source/driver/sysman_driver_handle.h similarity index 100% rename from level_zero/sysman/source/sysman_driver_handle.h rename to level_zero/sysman/source/driver/sysman_driver_handle.h diff --git a/level_zero/sysman/source/sysman_driver_handle_imp.cpp b/level_zero/sysman/source/driver/sysman_driver_handle_imp.cpp similarity index 94% rename from level_zero/sysman/source/sysman_driver_handle_imp.cpp rename to level_zero/sysman/source/driver/sysman_driver_handle_imp.cpp index 500dc4b0a9..541d82c744 100644 --- a/level_zero/sysman/source/sysman_driver_handle_imp.cpp +++ b/level_zero/sysman/source/driver/sysman_driver_handle_imp.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/sysman/source/sysman_driver_handle_imp.h" +#include "level_zero/sysman/source/driver/sysman_driver_handle_imp.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/execution_environment/execution_environment.h" @@ -14,9 +14,9 @@ #include "shared/source/os_interface/os_interface.h" #include "level_zero/core/source/get_extension_function_lookup_map.h" -#include "level_zero/sysman/source/os_sysman_driver.h" -#include "level_zero/sysman/source/sysman_device.h" -#include "level_zero/sysman/source/sysman_driver.h" +#include "level_zero/sysman/source/device/sysman_device.h" +#include "level_zero/sysman/source/driver/os_sysman_driver.h" +#include "level_zero/sysman/source/driver/sysman_driver.h" #include #include diff --git a/level_zero/sysman/source/sysman_driver_handle_imp.h b/level_zero/sysman/source/driver/sysman_driver_handle_imp.h similarity index 95% rename from level_zero/sysman/source/sysman_driver_handle_imp.h rename to level_zero/sysman/source/driver/sysman_driver_handle_imp.h index bea5d2151f..e42eeea130 100644 --- a/level_zero/sysman/source/sysman_driver_handle_imp.h +++ b/level_zero/sysman/source/driver/sysman_driver_handle_imp.h @@ -6,7 +6,7 @@ */ #pragma once -#include "level_zero/sysman/source/sysman_driver_handle.h" +#include "level_zero/sysman/source/driver/sysman_driver_handle.h" #include #include diff --git a/level_zero/sysman/source/sysman_driver_imp.h b/level_zero/sysman/source/driver/sysman_driver_imp.h similarity index 88% rename from level_zero/sysman/source/sysman_driver_imp.h rename to level_zero/sysman/source/driver/sysman_driver_imp.h index 93d6c8a747..969c85356b 100644 --- a/level_zero/sysman/source/sysman_driver_imp.h +++ b/level_zero/sysman/source/driver/sysman_driver_imp.h @@ -6,7 +6,7 @@ */ #pragma once -#include "level_zero/sysman/source/sysman_driver.h" +#include "level_zero/sysman/source/driver/sysman_driver.h" #include diff --git a/level_zero/sysman/source/linux/pmt/sysman_pmt.cpp b/level_zero/sysman/source/linux/pmt/sysman_pmt.cpp index 1f6632a67a..7691efa14c 100644 --- a/level_zero/sysman/source/linux/pmt/sysman_pmt.cpp +++ b/level_zero/sysman/source/linux/pmt/sysman_pmt.cpp @@ -10,8 +10,8 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/os_interface/linux/file_descriptor.h" +#include "level_zero/sysman/source/device/sysman_device_imp.h" #include "level_zero/sysman/source/linux/zes_os_sysman_imp.h" -#include "level_zero/sysman/source/sysman_device_imp.h" #include #include diff --git a/level_zero/sysman/source/linux/sysman_hw_device_id_linux.cpp b/level_zero/sysman/source/linux/sysman_hw_device_id_linux.cpp index f47de126be..b71378213e 100644 --- a/level_zero/sysman/source/linux/sysman_hw_device_id_linux.cpp +++ b/level_zero/sysman/source/linux/sysman_hw_device_id_linux.cpp @@ -9,7 +9,7 @@ #include "shared/source/os_interface/linux/sys_calls.h" -#include "level_zero/sysman/source/sysman_hw_device_id.h" +#include "level_zero/sysman/source/device/sysman_hw_device_id.h" #include diff --git a/level_zero/sysman/source/linux/zes_os_sysman_driver_imp.h b/level_zero/sysman/source/linux/zes_os_sysman_driver_imp.h index 17600beabf..78f5c7e396 100644 --- a/level_zero/sysman/source/linux/zes_os_sysman_driver_imp.h +++ b/level_zero/sysman/source/linux/zes_os_sysman_driver_imp.h @@ -8,8 +8,8 @@ #pragma once #include "shared/source/helpers/non_copyable_or_moveable.h" +#include "level_zero/sysman/source/driver/os_sysman_driver.h" #include "level_zero/sysman/source/linux/udev/udev_lib.h" -#include "level_zero/sysman/source/os_sysman_driver.h" namespace L0 { namespace Sysman { diff --git a/level_zero/sysman/source/linux/zes_os_sysman_imp.h b/level_zero/sysman/source/linux/zes_os_sysman_imp.h index e14ad77354..5b5b651fe0 100644 --- a/level_zero/sysman/source/linux/zes_os_sysman_imp.h +++ b/level_zero/sysman/source/linux/zes_os_sysman_imp.h @@ -11,10 +11,10 @@ #include "shared/source/helpers/non_copyable_or_moveable.h" #include "shared/source/os_interface/linux/sys_calls.h" +#include "level_zero/sysman/source/device/os_sysman.h" +#include "level_zero/sysman/source/device/sysman_device_imp.h" #include "level_zero/sysman/source/linux/sysman_hw_device_id_linux.h" -#include "level_zero/sysman/source/os_sysman.h" #include "level_zero/sysman/source/sysman_const.h" -#include "level_zero/sysman/source/sysman_device_imp.h" #include #include diff --git a/level_zero/sysman/source/windows/sysman_hw_device_id_windows.cpp b/level_zero/sysman/source/windows/sysman_hw_device_id_windows.cpp index c0eec63742..6ee510a318 100644 --- a/level_zero/sysman/source/windows/sysman_hw_device_id_windows.cpp +++ b/level_zero/sysman/source/windows/sysman_hw_device_id_windows.cpp @@ -7,7 +7,7 @@ #include "shared/source/os_interface/os_interface.h" -#include "level_zero/sysman/source/sysman_hw_device_id.h" +#include "level_zero/sysman/source/device/sysman_hw_device_id.h" namespace L0 { namespace Sysman { diff --git a/level_zero/sysman/source/windows/zes_os_sysman_driver_imp.cpp b/level_zero/sysman/source/windows/zes_os_sysman_driver_imp.cpp index a508dc8aa0..538aa14dab 100644 --- a/level_zero/sysman/source/windows/zes_os_sysman_driver_imp.cpp +++ b/level_zero/sysman/source/windows/zes_os_sysman_driver_imp.cpp @@ -10,9 +10,9 @@ #include "shared/source/helpers/sleep.h" #include "shared/source/os_interface/windows/wddm/wddm.h" -#include "level_zero/sysman/source/os_sysman.h" +#include "level_zero/sysman/source/device/os_sysman.h" +#include "level_zero/sysman/source/device/sysman_device.h" #include "level_zero/sysman/source/sysman_const.h" -#include "level_zero/sysman/source/sysman_device.h" namespace L0 { namespace Sysman { diff --git a/level_zero/sysman/source/windows/zes_os_sysman_driver_imp.h b/level_zero/sysman/source/windows/zes_os_sysman_driver_imp.h index 43dbdce07b..2b546e7177 100644 --- a/level_zero/sysman/source/windows/zes_os_sysman_driver_imp.h +++ b/level_zero/sysman/source/windows/zes_os_sysman_driver_imp.h @@ -7,7 +7,7 @@ #pragma once -#include "level_zero/sysman/source/os_sysman_driver.h" +#include "level_zero/sysman/source/driver/os_sysman_driver.h" namespace L0 { namespace Sysman { diff --git a/level_zero/sysman/source/windows/zes_os_sysman_imp.h b/level_zero/sysman/source/windows/zes_os_sysman_imp.h index d90cd14a0f..6a3885a605 100644 --- a/level_zero/sysman/source/windows/zes_os_sysman_imp.h +++ b/level_zero/sysman/source/windows/zes_os_sysman_imp.h @@ -9,10 +9,10 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/non_copyable_or_moveable.h" +#include "level_zero/sysman/source/device/os_sysman.h" +#include "level_zero/sysman/source/device/sysman_device.h" +#include "level_zero/sysman/source/device/sysman_device_imp.h" #include "level_zero/sysman/source/firmware_util/sysman_firmware_util.h" -#include "level_zero/sysman/source/os_sysman.h" -#include "level_zero/sysman/source/sysman_device.h" -#include "level_zero/sysman/source/sysman_device_imp.h" #include "level_zero/sysman/source/windows/sysman_kmd_sys_manager.h" namespace NEO { diff --git a/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_driver.h b/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_driver.h index c438244883..0f64f0b032 100644 --- a/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_driver.h +++ b/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_driver.h @@ -7,7 +7,7 @@ #pragma once -#include "level_zero/sysman/source/sysman_driver_imp.h" +#include "level_zero/sysman/source/driver/sysman_driver_imp.h" namespace L0 { namespace Sysman { diff --git a/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h b/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h index 6e42b5ca61..69d372a530 100644 --- a/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h +++ b/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h @@ -15,12 +15,12 @@ #include "shared/test/common/test_macros/hw_test.h" #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h" +#include "level_zero/sysman/source/device/sysman_device.h" +#include "level_zero/sysman/source/driver/sysman_driver.h" +#include "level_zero/sysman/source/driver/sysman_driver_handle_imp.h" #include "level_zero/sysman/source/linux/sysman_fs_access.h" #include "level_zero/sysman/source/linux/zes_os_sysman_driver_imp.h" #include "level_zero/sysman/source/linux/zes_os_sysman_imp.h" -#include "level_zero/sysman/source/sysman_device.h" -#include "level_zero/sysman/source/sysman_driver.h" -#include "level_zero/sysman/source/sysman_driver_handle_imp.h" #include "level_zero/sysman/test/unit_tests/sources/firmware_util/mock_fw_util_fixture.h" #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_drm.h" diff --git a/level_zero/sysman/test/unit_tests/sources/linux/test_sysman_driver.cpp b/level_zero/sysman/test/unit_tests/sources/linux/test_sysman_driver.cpp index 20e07fc168..09574186c9 100644 --- a/level_zero/sysman/test/unit_tests/sources/linux/test_sysman_driver.cpp +++ b/level_zero/sysman/test/unit_tests/sources/linux/test_sysman_driver.cpp @@ -12,9 +12,9 @@ #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/os_interface/linux/sys_calls_linux_ult.h" -#include "level_zero/sysman/source/sysman_device.h" -#include "level_zero/sysman/source/sysman_driver_handle.h" -#include "level_zero/sysman/source/sysman_driver_handle_imp.h" +#include "level_zero/sysman/source/device/sysman_device.h" +#include "level_zero/sysman/source/driver/sysman_driver_handle.h" +#include "level_zero/sysman/source/driver/sysman_driver_handle_imp.h" #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_driver.h" #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_drm.h" diff --git a/level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory.cpp b/level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory.cpp index 54ae019a73..039ba4f023 100644 --- a/level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory.cpp +++ b/level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory.cpp @@ -5,8 +5,8 @@ * */ +#include "level_zero/sysman/source/device/sysman_device_imp.h" #include "level_zero/sysman/source/shared/linux/product_helper/sysman_product_helper.h" -#include "level_zero/sysman/source/sysman_device_imp.h" #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h" #include "level_zero/sysman/test/unit_tests/sources/memory/linux/mock_memory.h" diff --git a/level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory_dg1.cpp b/level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory_dg1.cpp index 5c9c35be50..0db75d2b19 100644 --- a/level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory_dg1.cpp +++ b/level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory_dg1.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/sysman/source/sysman_device_imp.h" +#include "level_zero/sysman/source/device/sysman_device_imp.h" #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h" #include "level_zero/sysman/test/unit_tests/sources/memory/linux/mock_memory.h" diff --git a/level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power.h b/level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power.h index 586021bb4c..1b2392e379 100644 --- a/level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power.h +++ b/level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power.h @@ -11,9 +11,9 @@ #include "level_zero/sysman/source/api/power/linux/sysman_os_power_imp.h" #include "level_zero/sysman/source/api/power/sysman_power_imp.h" +#include "level_zero/sysman/source/device/sysman_device_imp.h" #include "level_zero/sysman/source/linux/pmt/sysman_pmt.h" #include "level_zero/sysman/source/sysman_const.h" -#include "level_zero/sysman/source/sysman_device_imp.h" #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h" namespace L0 { diff --git a/level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power_prelim.h b/level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power_prelim.h index 94222d8fd6..b95129fadb 100644 --- a/level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power_prelim.h +++ b/level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power_prelim.h @@ -11,9 +11,9 @@ #include "level_zero/sysman/source/api/power/linux/sysman_os_power_imp_prelim.h" #include "level_zero/sysman/source/api/power/sysman_power_imp.h" +#include "level_zero/sysman/source/device/sysman_device_imp.h" #include "level_zero/sysman/source/linux/pmt/sysman_pmt.h" #include "level_zero/sysman/source/sysman_const.h" -#include "level_zero/sysman/source/sysman_device_imp.h" #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h" namespace L0 { diff --git a/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_driver.h b/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_driver.h index c438244883..0f64f0b032 100644 --- a/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_driver.h +++ b/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_driver.h @@ -7,7 +7,7 @@ #pragma once -#include "level_zero/sysman/source/sysman_driver_imp.h" +#include "level_zero/sysman/source/driver/sysman_driver_imp.h" namespace L0 { namespace Sysman { diff --git a/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h b/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h index 6dbe4c542f..09b6916e93 100644 --- a/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h +++ b/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h @@ -9,8 +9,8 @@ #include "shared/test/common/helpers/default_hw_info.h" -#include "level_zero/sysman/source/sysman_driver.h" -#include "level_zero/sysman/source/sysman_driver_handle_imp.h" +#include "level_zero/sysman/source/driver/sysman_driver.h" +#include "level_zero/sysman/source/driver/sysman_driver_handle_imp.h" #include "level_zero/sysman/source/windows/zes_os_sysman_imp.h" #include "level_zero/sysman/test/unit_tests/sources/firmware_util/mock_fw_util_fixture.h" #include "level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_wddm.h"