diff --git a/level_zero/CMakeLists.txt b/level_zero/CMakeLists.txt index 3088ea1fdc..09cf11f3c2 100644 --- a/level_zero/CMakeLists.txt +++ b/level_zero/CMakeLists.txt @@ -162,8 +162,8 @@ if(BUILD_WITH_L0 AND "${NEO_BITS}" STREQUAL "64") include_directories(${NEO_SOURCE_DIR}/level_zero/api/experimental${BRANCH_DIR_SUFFIX}) include_directories(${NEO_SOURCE_DIR}/shared/source/compiler_interface/compiler_options${BRANCH_DIR_SUFFIX}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/core/source/hw_helpers${BRANCH_DIR_SUFFIX}) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/core/source/cmdlist_extended${BRANCH_DIR_SUFFIX}) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/core/source/cmdqueue_extended${BRANCH_DIR_SUFFIX}) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/core/source/cmdlist/cmdlist_extended${BRANCH_DIR_SUFFIX}) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/core/source/cmdqueue/cmdqueue_extended${BRANCH_DIR_SUFFIX}) include_directories("${CMAKE_CURRENT_SOURCE_DIR}") include_directories(ddi${BRANCH_DIR_SUFFIX}) include_directories(tools/source) diff --git a/level_zero/api/core/ze_barrier.cpp b/level_zero/api/core/ze_barrier.cpp index a6479e0b9c..04a1702bd5 100644 --- a/level_zero/api/core/ze_barrier.cpp +++ b/level_zero/api/core/ze_barrier.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/cmdlist.h" +#include "level_zero/core/source/cmdlist/cmdlist.h" #include extern "C" { diff --git a/level_zero/api/core/ze_cl_interop.cpp b/level_zero/api/core/ze_cl_interop.cpp index 47da2add44..20c3cd514a 100644 --- a/level_zero/api/core/ze_cl_interop.cpp +++ b/level_zero/api/core/ze_cl_interop.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/device.h" +#include "level_zero/core/source/device/device.h" #include extern "C" { diff --git a/level_zero/api/core/ze_cmdlist.cpp b/level_zero/api/core/ze_cmdlist.cpp index 854df02d1e..1980ba43a2 100644 --- a/level_zero/api/core/ze_cmdlist.cpp +++ b/level_zero/api/core/ze_cmdlist.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/cmdlist.h" +#include "level_zero/core/source/cmdlist/cmdlist.h" #include extern "C" { diff --git a/level_zero/api/core/ze_cmdqueue.cpp b/level_zero/api/core/ze_cmdqueue.cpp index b2247a3738..64b9375f51 100644 --- a/level_zero/api/core/ze_cmdqueue.cpp +++ b/level_zero/api/core/ze_cmdqueue.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/cmdqueue.h" +#include "level_zero/core/source/cmdqueue/cmdqueue.h" #include extern "C" { diff --git a/level_zero/api/core/ze_copy.cpp b/level_zero/api/core/ze_copy.cpp index 9bbd8dc831..c4dec6961b 100644 --- a/level_zero/api/core/ze_copy.cpp +++ b/level_zero/api/core/ze_copy.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/cmdlist.h" +#include "level_zero/core/source/cmdlist/cmdlist.h" #include extern "C" { diff --git a/level_zero/api/core/ze_device.cpp b/level_zero/api/core/ze_device.cpp index bf0617ee44..6c397177b7 100644 --- a/level_zero/api/core/ze_device.cpp +++ b/level_zero/api/core/ze_device.cpp @@ -5,9 +5,9 @@ * */ -#include "level_zero/core/source/device.h" -#include "level_zero/core/source/driver.h" -#include "level_zero/core/source/driver_handle.h" +#include "level_zero/core/source/device/device.h" +#include "level_zero/core/source/driver/driver.h" +#include "level_zero/core/source/driver/driver_handle.h" #include #include diff --git a/level_zero/api/core/ze_driver.cpp b/level_zero/api/core/ze_driver.cpp index 5d49dbdda3..1a7455b525 100644 --- a/level_zero/api/core/ze_driver.cpp +++ b/level_zero/api/core/ze_driver.cpp @@ -5,8 +5,8 @@ * */ -#include "level_zero/core/source/driver.h" -#include "level_zero/core/source/driver_handle.h" +#include "level_zero/core/source/driver/driver.h" +#include "level_zero/core/source/driver/driver_handle.h" #include extern "C" { diff --git a/level_zero/api/core/ze_event.cpp b/level_zero/api/core/ze_event.cpp index 3d45db9464..8d264aaeff 100644 --- a/level_zero/api/core/ze_event.cpp +++ b/level_zero/api/core/ze_event.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/event.h" +#include "level_zero/core/source/event/event.h" #include extern "C" { diff --git a/level_zero/api/core/ze_fence.cpp b/level_zero/api/core/ze_fence.cpp index 300f03b865..2c4a70c69b 100644 --- a/level_zero/api/core/ze_fence.cpp +++ b/level_zero/api/core/ze_fence.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/fence.h" +#include "level_zero/core/source/fence/fence.h" #include extern "C" { diff --git a/level_zero/api/core/ze_image.cpp b/level_zero/api/core/ze_image.cpp index 95340b6d34..f96a647a36 100644 --- a/level_zero/api/core/ze_image.cpp +++ b/level_zero/api/core/ze_image.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/image.h" +#include "level_zero/core/source/image/image.h" #include extern "C" { diff --git a/level_zero/api/core/ze_memory.cpp b/level_zero/api/core/ze_memory.cpp index 85779fea4e..ddad8aa744 100644 --- a/level_zero/api/core/ze_memory.cpp +++ b/level_zero/api/core/ze_memory.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/driver_handle.h" +#include "level_zero/core/source/driver/driver_handle.h" #include extern "C" { diff --git a/level_zero/api/core/ze_module.cpp b/level_zero/api/core/ze_module.cpp index 82a32306a1..c1953ff25c 100644 --- a/level_zero/api/core/ze_module.cpp +++ b/level_zero/api/core/ze_module.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/module.h" +#include "level_zero/core/source/module/module.h" #include extern "C" { diff --git a/level_zero/api/core/ze_residency.cpp b/level_zero/api/core/ze_residency.cpp index 12839766eb..11c08647e1 100644 --- a/level_zero/api/core/ze_residency.cpp +++ b/level_zero/api/core/ze_residency.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/device.h" +#include "level_zero/core/source/device/device.h" #include extern "C" { diff --git a/level_zero/api/core/ze_sampler.cpp b/level_zero/api/core/ze_sampler.cpp index fdfe611ab7..565c086f3a 100644 --- a/level_zero/api/core/ze_sampler.cpp +++ b/level_zero/api/core/ze_sampler.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/sampler.h" +#include "level_zero/core/source/sampler/sampler.h" #include extern "C" { diff --git a/level_zero/api/tools/zet_metric.cpp b/level_zero/api/tools/zet_metric.cpp index 9535ddc79f..70d7fc07fb 100644 --- a/level_zero/api/tools/zet_metric.cpp +++ b/level_zero/api/tools/zet_metric.cpp @@ -5,8 +5,8 @@ * */ -#include "level_zero/core/source/cmdlist.h" -#include "level_zero/core/source/device.h" +#include "level_zero/core/source/cmdlist/cmdlist.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/tools/source/metrics/metric.h" #include diff --git a/level_zero/api/tools/zet_module.cpp b/level_zero/api/tools/zet_module.cpp index e6687f4c72..8ea2c4a7d5 100644 --- a/level_zero/api/tools/zet_module.cpp +++ b/level_zero/api/tools/zet_module.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/module.h" +#include "level_zero/core/source/module/module.h" #include extern "C" { diff --git a/level_zero/core/source/CMakeLists.txt b/level_zero/core/source/CMakeLists.txt index 12a91b842c..b556d52359 100644 --- a/level_zero/core/source/CMakeLists.txt +++ b/level_zero/core/source/CMakeLists.txt @@ -7,68 +7,68 @@ set(L0_RUNTIME_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/additional_kernel_properties.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/builtin_functions_lib.h - ${CMAKE_CURRENT_SOURCE_DIR}/builtin_functions_lib_impl.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/builtin_functions_lib_impl.h - ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist.h - ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_hw.h - ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_hw.inl - ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_hw_base.inl - ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue.h - ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue_hw.h - ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_hw_immediate.h - ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_hw_immediate.inl - ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue_hw.inl - ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue_hw_base.inl - ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/cpu_page_fault_memory_manager.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/debug_manager.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/debugger.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/device.h - ${CMAKE_CURRENT_SOURCE_DIR}/driver_handle.h - ${CMAKE_CURRENT_SOURCE_DIR}/device_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/driver_handle_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/device_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/driver_handle_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/driver.h - ${CMAKE_CURRENT_SOURCE_DIR}/driver_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/event.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/event.h - ${CMAKE_CURRENT_SOURCE_DIR}/fence.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/fence.h - ${CMAKE_CURRENT_SOURCE_DIR}/kernel.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/kernel.h - ${CMAKE_CURRENT_SOURCE_DIR}/kernel_hw.h - ${CMAKE_CURRENT_SOURCE_DIR}/kernel_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/kernel_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/image.h - ${CMAKE_CURRENT_SOURCE_DIR}/image_hw.h - ${CMAKE_CURRENT_SOURCE_DIR}/image_hw.inl - ${CMAKE_CURRENT_SOURCE_DIR}/image_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/image_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/memory.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/memory_operations_helper.h - ${CMAKE_CURRENT_SOURCE_DIR}/module.h - ${CMAKE_CURRENT_SOURCE_DIR}/module_build_log.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/module_build_log.h - ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/module_extra_options.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/module_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/module_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/printf_handler.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/printf_handler.h - ${CMAKE_CURRENT_SOURCE_DIR}/sampler.h - ${CMAKE_CURRENT_SOURCE_DIR}/sampler_hw.h - ${CMAKE_CURRENT_SOURCE_DIR}/sampler_hw.inl - ${CMAKE_CURRENT_SOURCE_DIR}/sampler_imp.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/sampler_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/builtin/builtin_functions_lib.h + ${CMAKE_CURRENT_SOURCE_DIR}/builtin/builtin_functions_lib_impl.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/builtin/builtin_functions_lib_impl.h + ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist/cmdlist.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist/cmdlist.h + ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist/cmdlist_hw.h + ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist/cmdlist_hw.inl + ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist/cmdlist_hw_base.inl + ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist/cmdlist_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist/cmdlist_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist/cmdlist_hw_immediate.h + ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist/cmdlist_hw_immediate.inl + ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist/cmdlist_extended${BRANCH_DIR_SUFFIX}/cmdlist_extended.inl + ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue/cmdqueue.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue/cmdqueue.h + ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue/cmdqueue_hw.h + ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue/cmdqueue_hw.inl + ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue/cmdqueue_hw_base.inl + ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue/cmdqueue_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue/cmdqueue_extended${BRANCH_DIR_SUFFIX}/cmdqueue_extended.inl + ${CMAKE_CURRENT_SOURCE_DIR}/debugger/debug_manager.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/debugger/debugger.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/device/device.h + ${CMAKE_CURRENT_SOURCE_DIR}/device/device_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/device/device_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/driver/driver_handle.h + ${CMAKE_CURRENT_SOURCE_DIR}/driver/driver_handle_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/driver/driver_handle_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/driver/driver.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/driver/driver.h + ${CMAKE_CURRENT_SOURCE_DIR}/driver/driver_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/event/event.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/event/event.h + ${CMAKE_CURRENT_SOURCE_DIR}/fence/fence.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/fence/fence.h ${CMAKE_CURRENT_SOURCE_DIR}/hw_helpers${BRANCH_DIR_SUFFIX}/hw_helpers.h - ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_extended${BRANCH_DIR_SUFFIX}/cmdlist_extended.inl - ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue_extended${BRANCH_DIR_SUFFIX}/cmdqueue_extended.inl + ${CMAKE_CURRENT_SOURCE_DIR}/kernel/kernel.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/kernel/kernel.h + ${CMAKE_CURRENT_SOURCE_DIR}/kernel/kernel_hw.h + ${CMAKE_CURRENT_SOURCE_DIR}/kernel/kernel_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/kernel/kernel_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/image/image.h + ${CMAKE_CURRENT_SOURCE_DIR}/image/image_hw.h + ${CMAKE_CURRENT_SOURCE_DIR}/image/image_hw.inl + ${CMAKE_CURRENT_SOURCE_DIR}/image/image_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/image/image_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/memory/memory.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/memory/memory_operations_helper.h + ${CMAKE_CURRENT_SOURCE_DIR}/memory/cpu_page_fault_memory_manager.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/module/module.h + ${CMAKE_CURRENT_SOURCE_DIR}/module/module_build_log.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/module/module_build_log.h + ${CMAKE_CURRENT_SOURCE_DIR}/module${BRANCH_DIR_SUFFIX}/module_extra_options.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/module/module_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/module/module_imp.h + ${CMAKE_CURRENT_SOURCE_DIR}/printf_handler/printf_handler.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/printf_handler/printf_handler.h + ${CMAKE_CURRENT_SOURCE_DIR}/sampler/sampler.h + ${CMAKE_CURRENT_SOURCE_DIR}/sampler/sampler_hw.h + ${CMAKE_CURRENT_SOURCE_DIR}/sampler/sampler_hw.inl + ${CMAKE_CURRENT_SOURCE_DIR}/sampler/sampler_imp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/sampler/sampler_imp.h ) target_include_directories(${L0_STATIC_LIB_NAME} @@ -104,7 +104,7 @@ if(NOT DEFINED L0_DRIVER_VERSION) set(L0_DRIVER_VERSION 1) endif() -configure_file(driver_version.h.in ${CMAKE_BINARY_DIR}/driver_version_l0.h) # Put Driver version into define +configure_file(driver/driver_version.h.in ${CMAKE_BINARY_DIR}/driver_version_l0.h) # Put Driver version into define # Make our source files visible to parent set_property(GLOBAL PROPERTY L0_RUNTIME_SOURCES ${L0_RUNTIME_SOURCES}) diff --git a/level_zero/core/source/additional_kernel_properties.cpp b/level_zero/core/source/additional_kernel_properties.cpp index b4753b264e..cffd09a718 100644 --- a/level_zero/core/source/additional_kernel_properties.cpp +++ b/level_zero/core/source/additional_kernel_properties.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/device_imp.h" +#include "level_zero/core/source/device/device_imp.h" namespace L0 { diff --git a/level_zero/core/source/builtin_functions_lib.h b/level_zero/core/source/builtin/builtin_functions_lib.h similarity index 100% rename from level_zero/core/source/builtin_functions_lib.h rename to level_zero/core/source/builtin/builtin_functions_lib.h diff --git a/level_zero/core/source/builtin_functions_lib_impl.cpp b/level_zero/core/source/builtin/builtin_functions_lib_impl.cpp similarity index 97% rename from level_zero/core/source/builtin_functions_lib_impl.cpp rename to level_zero/core/source/builtin/builtin_functions_lib_impl.cpp index 06d56ca206..ac954e5351 100644 --- a/level_zero/core/source/builtin_functions_lib_impl.cpp +++ b/level_zero/core/source/builtin/builtin_functions_lib_impl.cpp @@ -5,12 +5,12 @@ * */ -#include "level_zero/core/source/builtin_functions_lib_impl.h" +#include "level_zero/core/source/builtin/builtin_functions_lib_impl.h" #include "shared/source/built_ins/built_ins.h" -#include "level_zero/core/source/device.h" -#include "level_zero/core/source/module.h" +#include "level_zero/core/source/device/device.h" +#include "level_zero/core/source/module/module.h" namespace L0 { diff --git a/level_zero/core/source/builtin_functions_lib_impl.h b/level_zero/core/source/builtin/builtin_functions_lib_impl.h similarity index 94% rename from level_zero/core/source/builtin_functions_lib_impl.h rename to level_zero/core/source/builtin/builtin_functions_lib_impl.h index 60ccf93164..fc00221515 100644 --- a/level_zero/core/source/builtin_functions_lib_impl.h +++ b/level_zero/core/source/builtin/builtin_functions_lib_impl.h @@ -7,7 +7,7 @@ #pragma once -#include "level_zero/core/source/builtin_functions_lib.h" +#include "level_zero/core/source/builtin/builtin_functions_lib.h" namespace NEO { namespace EBuiltInOps { diff --git a/level_zero/core/source/cmdlist.cpp b/level_zero/core/source/cmdlist/cmdlist.cpp similarity index 98% rename from level_zero/core/source/cmdlist.cpp rename to level_zero/core/source/cmdlist/cmdlist.cpp index 8de363a16a..638d400f93 100644 --- a/level_zero/core/source/cmdlist.cpp +++ b/level_zero/core/source/cmdlist/cmdlist.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/cmdlist.h" +#include "level_zero/core/source/cmdlist/cmdlist.h" #include "shared/source/command_stream/preemption.h" #include "shared/source/device/device_info.h" diff --git a/level_zero/core/source/cmdlist.h b/level_zero/core/source/cmdlist/cmdlist.h similarity index 98% rename from level_zero/core/source/cmdlist.h rename to level_zero/core/source/cmdlist/cmdlist.h index 3ac6bb6c0f..c72cb57354 100644 --- a/level_zero/core/source/cmdlist.h +++ b/level_zero/core/source/cmdlist/cmdlist.h @@ -10,9 +10,9 @@ #include "shared/source/command_container/cmdcontainer.h" #include "shared/source/command_stream/preemption_mode.h" -#include "level_zero/core/source/cmdqueue.h" -#include "level_zero/core/source/device.h" -#include "level_zero/core/source/kernel.h" +#include "level_zero/core/source/cmdqueue/cmdqueue.h" +#include "level_zero/core/source/device/device.h" +#include "level_zero/core/source/kernel/kernel.h" #include #include diff --git a/level_zero/core/source/cmdlist_extended/cmdlist_extended.inl b/level_zero/core/source/cmdlist/cmdlist_extended/cmdlist_extended.inl similarity index 97% rename from level_zero/core/source/cmdlist_extended/cmdlist_extended.inl rename to level_zero/core/source/cmdlist/cmdlist_extended/cmdlist_extended.inl index 2b1240b02a..bb575eb317 100644 --- a/level_zero/core/source/cmdlist_extended/cmdlist_extended.inl +++ b/level_zero/core/source/cmdlist/cmdlist_extended/cmdlist_extended.inl @@ -9,7 +9,7 @@ #include "shared/source/command_stream/linear_stream.h" -#include "level_zero/core/source/cmdlist_hw.h" +#include "level_zero/core/source/cmdlist/cmdlist_hw.h" namespace L0 { diff --git a/level_zero/core/source/cmdlist_hw.h b/level_zero/core/source/cmdlist/cmdlist_hw.h similarity index 98% rename from level_zero/core/source/cmdlist_hw.h rename to level_zero/core/source/cmdlist/cmdlist_hw.h index 81ed1f266c..ce4b5a6ade 100644 --- a/level_zero/core/source/cmdlist_hw.h +++ b/level_zero/core/source/cmdlist/cmdlist_hw.h @@ -7,8 +7,8 @@ #pragma once -#include "level_zero/core/source/builtin_functions_lib.h" -#include "level_zero/core/source/cmdlist_imp.h" +#include "level_zero/core/source/builtin/builtin_functions_lib.h" +#include "level_zero/core/source/cmdlist/cmdlist_imp.h" #include "igfxfmid.h" diff --git a/level_zero/core/source/cmdlist_hw.inl b/level_zero/core/source/cmdlist/cmdlist_hw.inl similarity index 99% rename from level_zero/core/source/cmdlist_hw.inl rename to level_zero/core/source/cmdlist/cmdlist_hw.inl index 22c9b55cf5..9b30ba1c6b 100644 --- a/level_zero/core/source/cmdlist_hw.inl +++ b/level_zero/core/source/cmdlist/cmdlist_hw.inl @@ -21,11 +21,11 @@ #include "opencl/source/helpers/hardware_commands_helper.h" -#include "level_zero/core/source/cmdlist_hw.h" -#include "level_zero/core/source/device_imp.h" -#include "level_zero/core/source/event.h" -#include "level_zero/core/source/image.h" -#include "level_zero/core/source/module.h" +#include "level_zero/core/source/cmdlist/cmdlist_hw.h" +#include "level_zero/core/source/device/device_imp.h" +#include "level_zero/core/source/event/event.h" +#include "level_zero/core/source/image/image.h" +#include "level_zero/core/source/module/module.h" #include diff --git a/level_zero/core/source/cmdlist_hw_base.inl b/level_zero/core/source/cmdlist/cmdlist_hw_base.inl similarity index 100% rename from level_zero/core/source/cmdlist_hw_base.inl rename to level_zero/core/source/cmdlist/cmdlist_hw_base.inl diff --git a/level_zero/core/source/cmdlist_hw_immediate.h b/level_zero/core/source/cmdlist/cmdlist_hw_immediate.h similarity index 98% rename from level_zero/core/source/cmdlist_hw_immediate.h rename to level_zero/core/source/cmdlist/cmdlist_hw_immediate.h index 25c2cd9fe6..1e17c10d0e 100644 --- a/level_zero/core/source/cmdlist_hw_immediate.h +++ b/level_zero/core/source/cmdlist/cmdlist_hw_immediate.h @@ -7,7 +7,7 @@ #pragma once -#include "level_zero/core/source/cmdlist_hw.h" +#include "level_zero/core/source/cmdlist/cmdlist_hw.h" namespace L0 { diff --git a/level_zero/core/source/cmdlist_hw_immediate.inl b/level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl similarity index 99% rename from level_zero/core/source/cmdlist_hw_immediate.inl rename to level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl index afa502fccd..9dc5cc6dc4 100644 --- a/level_zero/core/source/cmdlist_hw_immediate.inl +++ b/level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl @@ -7,7 +7,7 @@ #pragma once -#include "level_zero/core/source/cmdlist_hw_immediate.h" +#include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h" namespace L0 { template diff --git a/level_zero/core/source/cmdlist_imp.cpp b/level_zero/core/source/cmdlist/cmdlist_imp.cpp similarity index 95% rename from level_zero/core/source/cmdlist_imp.cpp rename to level_zero/core/source/cmdlist/cmdlist_imp.cpp index 93aa85c631..ddc0c6701d 100644 --- a/level_zero/core/source/cmdlist_imp.cpp +++ b/level_zero/core/source/cmdlist/cmdlist_imp.cpp @@ -5,15 +5,15 @@ * */ -#include "level_zero/core/source/cmdlist_imp.h" +#include "level_zero/core/source/cmdlist/cmdlist_imp.h" #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/command_stream/linear_stream.h" #include "shared/source/device/device.h" #include "shared/source/indirect_heap/indirect_heap.h" -#include "level_zero/core/source/device.h" -#include "level_zero/core/source/device_imp.h" +#include "level_zero/core/source/device/device.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/tools/source/metrics/metric.h" #include "igfxfmid.h" diff --git a/level_zero/core/source/cmdlist_imp.h b/level_zero/core/source/cmdlist/cmdlist_imp.h similarity index 89% rename from level_zero/core/source/cmdlist_imp.h rename to level_zero/core/source/cmdlist/cmdlist_imp.h index e46c8929b7..cc9725e62c 100644 --- a/level_zero/core/source/cmdlist_imp.h +++ b/level_zero/core/source/cmdlist/cmdlist_imp.h @@ -7,8 +7,8 @@ #pragma once -#include "level_zero/core/source/cmdlist.h" -#include "level_zero/core/source/device.h" +#include "level_zero/core/source/cmdlist/cmdlist.h" +#include "level_zero/core/source/device/device.h" namespace L0 { diff --git a/level_zero/core/source/cmdqueue.cpp b/level_zero/core/source/cmdqueue/cmdqueue.cpp similarity index 96% rename from level_zero/core/source/cmdqueue.cpp rename to level_zero/core/source/cmdqueue/cmdqueue.cpp index 512aae08d9..d838b25345 100644 --- a/level_zero/core/source/cmdqueue.cpp +++ b/level_zero/core/source/cmdqueue/cmdqueue.cpp @@ -11,10 +11,10 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/memory_manager/memory_manager.h" -#include "level_zero/core/source/cmdlist_hw.h" -#include "level_zero/core/source/cmdqueue_imp.h" -#include "level_zero/core/source/device.h" -#include "level_zero/core/source/device_imp.h" +#include "level_zero/core/source/cmdlist/cmdlist_hw.h" +#include "level_zero/core/source/cmdqueue/cmdqueue_imp.h" +#include "level_zero/core/source/device/device.h" +#include "level_zero/core/source/device/device_imp.h" #include "hw_helpers.h" #include "igfxfmid.h" diff --git a/level_zero/core/source/cmdqueue.h b/level_zero/core/source/cmdqueue/cmdqueue.h similarity index 98% rename from level_zero/core/source/cmdqueue.h rename to level_zero/core/source/cmdqueue/cmdqueue.h index ad548e0348..b4c5658b16 100644 --- a/level_zero/core/source/cmdqueue.h +++ b/level_zero/core/source/cmdqueue/cmdqueue.h @@ -7,7 +7,7 @@ #pragma once -#include "level_zero/core/source/device.h" +#include "level_zero/core/source/device/device.h" #include #include diff --git a/level_zero/core/source/cmdqueue_extended/cmdqueue_extended.inl b/level_zero/core/source/cmdqueue/cmdqueue_extended/cmdqueue_extended.inl similarity index 89% rename from level_zero/core/source/cmdqueue_extended/cmdqueue_extended.inl rename to level_zero/core/source/cmdqueue/cmdqueue_extended/cmdqueue_extended.inl index 13c9828945..d6fae2c262 100644 --- a/level_zero/core/source/cmdqueue_extended/cmdqueue_extended.inl +++ b/level_zero/core/source/cmdqueue/cmdqueue_extended/cmdqueue_extended.inl @@ -7,7 +7,7 @@ #pragma once -#include "level_zero/core/source/cmdqueue_hw.h" +#include "level_zero/core/source/cmdqueue/cmdqueue_hw.h" namespace L0 { template diff --git a/level_zero/core/source/cmdqueue_hw.h b/level_zero/core/source/cmdqueue/cmdqueue_hw.h similarity index 97% rename from level_zero/core/source/cmdqueue_hw.h rename to level_zero/core/source/cmdqueue/cmdqueue_hw.h index bd492442ac..5784e28f36 100644 --- a/level_zero/core/source/cmdqueue_hw.h +++ b/level_zero/core/source/cmdqueue/cmdqueue_hw.h @@ -13,7 +13,7 @@ #include "shared/source/memory_manager/memory_constants.h" #include "shared/source/memory_manager/residency_container.h" -#include "level_zero/core/source/cmdqueue_imp.h" +#include "level_zero/core/source/cmdqueue/cmdqueue_imp.h" #include "igfxfmid.h" diff --git a/level_zero/core/source/cmdqueue_hw.inl b/level_zero/core/source/cmdqueue/cmdqueue_hw.inl similarity index 98% rename from level_zero/core/source/cmdqueue_hw.inl rename to level_zero/core/source/cmdqueue/cmdqueue_hw.inl index 2511c4065e..0fff6372bf 100644 --- a/level_zero/core/source/cmdqueue_hw.inl +++ b/level_zero/core/source/cmdqueue/cmdqueue_hw.inl @@ -21,11 +21,11 @@ #include "shared/source/os_interface/os_context.h" #include "shared/source/page_fault_manager/cpu_page_fault_manager.h" -#include "level_zero/core/source/cmdlist.h" -#include "level_zero/core/source/cmdlist_hw.h" -#include "level_zero/core/source/cmdqueue_hw.h" -#include "level_zero/core/source/device.h" -#include "level_zero/core/source/fence.h" +#include "level_zero/core/source/cmdlist/cmdlist.h" +#include "level_zero/core/source/cmdlist/cmdlist_hw.h" +#include "level_zero/core/source/cmdqueue/cmdqueue_hw.h" +#include "level_zero/core/source/device/device.h" +#include "level_zero/core/source/fence/fence.h" #include "level_zero/tools/source/metrics/metric.h" #include diff --git a/level_zero/core/source/cmdqueue_hw_base.inl b/level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl similarity index 94% rename from level_zero/core/source/cmdqueue_hw_base.inl rename to level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl index 4acad51129..e1e416ac6b 100644 --- a/level_zero/core/source/cmdqueue_hw_base.inl +++ b/level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl @@ -16,10 +16,10 @@ #include "shared/source/helpers/state_base_address.h" #include "shared/source/os_interface/os_context.h" -#include "level_zero/core/source/cmdlist.h" -#include "level_zero/core/source/cmdqueue_hw.h" -#include "level_zero/core/source/device.h" -#include "level_zero/core/source/fence.h" +#include "level_zero/core/source/cmdlist/cmdlist.h" +#include "level_zero/core/source/cmdqueue/cmdqueue_hw.h" +#include "level_zero/core/source/device/device.h" +#include "level_zero/core/source/fence/fence.h" #include "level_zero/tools/source/metrics/metric.h" #include diff --git a/level_zero/core/source/cmdqueue_imp.h b/level_zero/core/source/cmdqueue/cmdqueue_imp.h similarity index 98% rename from level_zero/core/source/cmdqueue_imp.h rename to level_zero/core/source/cmdqueue/cmdqueue_imp.h index 60fed73d85..36e3119791 100644 --- a/level_zero/core/source/cmdqueue_imp.h +++ b/level_zero/core/source/cmdqueue/cmdqueue_imp.h @@ -11,7 +11,7 @@ #include "shared/source/command_stream/submissions_aggregator.h" #include "shared/source/memory_manager/memory_constants.h" -#include "level_zero/core/source/cmdqueue.h" +#include "level_zero/core/source/cmdqueue/cmdqueue.h" #include diff --git a/level_zero/core/source/debug_manager.cpp b/level_zero/core/source/debugger/debug_manager.cpp similarity index 100% rename from level_zero/core/source/debug_manager.cpp rename to level_zero/core/source/debugger/debug_manager.cpp diff --git a/level_zero/core/source/debugger.cpp b/level_zero/core/source/debugger/debugger.cpp similarity index 100% rename from level_zero/core/source/debugger.cpp rename to level_zero/core/source/debugger/debugger.cpp diff --git a/level_zero/core/source/device.h b/level_zero/core/source/device/device.h similarity index 98% rename from level_zero/core/source/device.h rename to level_zero/core/source/device/device.h index a39ad13a15..76401ef460 100644 --- a/level_zero/core/source/device.h +++ b/level_zero/core/source/device/device.h @@ -13,8 +13,8 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/os_interface.h" -#include "level_zero/core/source/driver.h" -#include "level_zero/core/source/driver_handle.h" +#include "level_zero/core/source/driver/driver.h" +#include "level_zero/core/source/driver/driver_handle.h" #include #include diff --git a/level_zero/core/source/device_imp.cpp b/level_zero/core/source/device/device_imp.cpp similarity index 97% rename from level_zero/core/source/device_imp.cpp rename to level_zero/core/source/device/device_imp.cpp index 2c8f364f23..ebf520830f 100644 --- a/level_zero/core/source/device_imp.cpp +++ b/level_zero/core/source/device/device_imp.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/device_imp.h" +#include "level_zero/core/source/device/device_imp.h" #include "shared/source/built_ins/sip.h" #include "shared/source/debug_settings/debug_settings_manager.h" @@ -27,16 +27,16 @@ #include "opencl/source/mem_obj/mem_obj.h" #include "opencl/source/program/program.h" -#include "level_zero/core/source/builtin_functions_lib.h" -#include "level_zero/core/source/cmdlist.h" -#include "level_zero/core/source/cmdqueue.h" -#include "level_zero/core/source/driver_handle_imp.h" -#include "level_zero/core/source/event.h" -#include "level_zero/core/source/image.h" -#include "level_zero/core/source/memory_operations_helper.h" -#include "level_zero/core/source/module.h" -#include "level_zero/core/source/printf_handler.h" -#include "level_zero/core/source/sampler.h" +#include "level_zero/core/source/builtin/builtin_functions_lib.h" +#include "level_zero/core/source/cmdlist/cmdlist.h" +#include "level_zero/core/source/cmdqueue/cmdqueue.h" +#include "level_zero/core/source/driver/driver_handle_imp.h" +#include "level_zero/core/source/event/event.h" +#include "level_zero/core/source/image/image.h" +#include "level_zero/core/source/memory/memory_operations_helper.h" +#include "level_zero/core/source/module/module.h" +#include "level_zero/core/source/printf_handler/printf_handler.h" +#include "level_zero/core/source/sampler/sampler.h" #include "level_zero/tools/source/metrics/metric.h" #include "hw_helpers.h" diff --git a/level_zero/core/source/device_imp.h b/level_zero/core/source/device/device_imp.h similarity index 95% rename from level_zero/core/source/device_imp.h rename to level_zero/core/source/device/device_imp.h index 3b93d66ada..814ae909ff 100644 --- a/level_zero/core/source/device_imp.h +++ b/level_zero/core/source/device/device_imp.h @@ -7,10 +7,10 @@ #pragma once -#include "level_zero/core/source/builtin_functions_lib.h" -#include "level_zero/core/source/cmdlist.h" -#include "level_zero/core/source/device.h" -#include "level_zero/core/source/driver_handle.h" +#include "level_zero/core/source/builtin/builtin_functions_lib.h" +#include "level_zero/core/source/cmdlist/cmdlist.h" +#include "level_zero/core/source/device/device.h" +#include "level_zero/core/source/driver/driver_handle.h" #include "level_zero/tools/source/metrics/metric.h" #include "level_zero/tools/source/tracing/tracing.h" diff --git a/level_zero/core/source/driver.cpp b/level_zero/core/source/driver/driver.cpp similarity index 89% rename from level_zero/core/source/driver.cpp rename to level_zero/core/source/driver/driver.cpp index e9d93953ae..963dbec31b 100644 --- a/level_zero/core/source/driver.cpp +++ b/level_zero/core/source/driver/driver.cpp @@ -5,15 +5,15 @@ * */ -#include "level_zero/core/source/driver.h" +#include "level_zero/core/source/driver/driver.h" #include "shared/source/device/device.h" #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/os_interface/device_factory.h" -#include "level_zero/core/source/device.h" -#include "level_zero/core/source/driver_handle.h" -#include "level_zero/core/source/driver_imp.h" +#include "level_zero/core/source/device/device.h" +#include "level_zero/core/source/driver/driver_handle.h" +#include "level_zero/core/source/driver/driver_imp.h" #include #include diff --git a/level_zero/core/source/driver.h b/level_zero/core/source/driver/driver.h similarity index 100% rename from level_zero/core/source/driver.h rename to level_zero/core/source/driver/driver.h diff --git a/level_zero/core/source/driver_handle.h b/level_zero/core/source/driver/driver_handle.h similarity index 98% rename from level_zero/core/source/driver_handle.h rename to level_zero/core/source/driver/driver_handle.h index 2712793d4b..ef63d9d93a 100644 --- a/level_zero/core/source/driver_handle.h +++ b/level_zero/core/source/driver/driver_handle.h @@ -9,7 +9,7 @@ #include "shared/source/memory_manager/unified_memory_manager.h" -#include "level_zero/core/source/device.h" +#include "level_zero/core/source/device/device.h" #include struct _ze_driver_handle_t { diff --git a/level_zero/core/source/driver_handle_imp.cpp b/level_zero/core/source/driver/driver_handle_imp.cpp similarity index 98% rename from level_zero/core/source/driver_handle_imp.cpp rename to level_zero/core/source/driver/driver_handle_imp.cpp index 91b3619ec2..8269adb54b 100644 --- a/level_zero/core/source/driver_handle_imp.cpp +++ b/level_zero/core/source/driver/driver_handle_imp.cpp @@ -5,14 +5,14 @@ * */ -#include "level_zero/core/source/driver_handle_imp.h" +#include "level_zero/core/source/driver/driver_handle_imp.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/device/device.h" #include "shared/source/memory_manager/memory_manager.h" #include "shared/source/os_interface/os_library.h" -#include "level_zero/core/source/device_imp.h" +#include "level_zero/core/source/device/device_imp.h" #include "driver_version_l0.h" diff --git a/level_zero/core/source/driver_handle_imp.h b/level_zero/core/source/driver/driver_handle_imp.h similarity index 98% rename from level_zero/core/source/driver_handle_imp.h rename to level_zero/core/source/driver/driver_handle_imp.h index 297e3872c8..68c069c492 100644 --- a/level_zero/core/source/driver_handle_imp.h +++ b/level_zero/core/source/driver/driver_handle_imp.h @@ -9,7 +9,7 @@ #include "shared/source/os_interface/os_library.h" -#include "level_zero/core/source/driver_handle.h" +#include "level_zero/core/source/driver/driver_handle.h" #include "level_zero/tools/source/tracing/tracing.h" namespace L0 { diff --git a/level_zero/core/source/driver_imp.h b/level_zero/core/source/driver/driver_imp.h similarity index 88% rename from level_zero/core/source/driver_imp.h rename to level_zero/core/source/driver/driver_imp.h index f6037b37c4..4c6ee4a669 100644 --- a/level_zero/core/source/driver_imp.h +++ b/level_zero/core/source/driver/driver_imp.h @@ -7,7 +7,7 @@ #pragma once -#include "level_zero/core/source/driver.h" +#include "level_zero/core/source/driver/driver.h" #include diff --git a/level_zero/core/source/driver_version.h.in b/level_zero/core/source/driver/driver_version.h.in similarity index 99% rename from level_zero/core/source/driver_version.h.in rename to level_zero/core/source/driver/driver_version.h.in index 811985adc4..f18ba535a6 100644 --- a/level_zero/core/source/driver_version.h.in +++ b/level_zero/core/source/driver/driver_version.h.in @@ -11,4 +11,3 @@ #define L0_DRIVER_VERSION @L0_DRIVER_VERSION@ #endif /* L0_DRIVER_VERSION_H */ - diff --git a/level_zero/core/source/event.cpp b/level_zero/core/source/event/event.cpp similarity index 98% rename from level_zero/core/source/event.cpp rename to level_zero/core/source/event/event.cpp index 53f8d15a04..582aa45cab 100644 --- a/level_zero/core/source/event.cpp +++ b/level_zero/core/source/event/event.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/event.h" +#include "level_zero/core/source/event/event.h" #include "shared/source/command_stream/command_stream_receiver_hw.h" #include "shared/source/command_stream/csr_definitions.h" @@ -19,8 +19,8 @@ #include "shared/source/memory_manager/memory_operations_handler.h" #include "shared/source/utilities/cpuintrinsics.h" -#include "level_zero/core/source/device.h" -#include "level_zero/core/source/device_imp.h" +#include "level_zero/core/source/device/device.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/tools/source/metrics/metric.h" #include diff --git a/level_zero/core/source/event.h b/level_zero/core/source/event/event.h similarity index 95% rename from level_zero/core/source/event.h rename to level_zero/core/source/event/event.h index 1c73c4f088..aaea8aeeaa 100644 --- a/level_zero/core/source/event.h +++ b/level_zero/core/source/event/event.h @@ -7,9 +7,9 @@ #pragma once -#include "level_zero/core/source/cmdlist.h" -#include "level_zero/core/source/device.h" -#include "level_zero/core/source/driver_handle.h" +#include "level_zero/core/source/cmdlist/cmdlist.h" +#include "level_zero/core/source/device/device.h" +#include "level_zero/core/source/driver/driver_handle.h" #include struct _ze_event_handle_t {}; diff --git a/level_zero/core/source/fence.cpp b/level_zero/core/source/fence/fence.cpp similarity index 98% rename from level_zero/core/source/fence.cpp rename to level_zero/core/source/fence/fence.cpp index ffc13c9f94..f9527ecd34 100644 --- a/level_zero/core/source/fence.cpp +++ b/level_zero/core/source/fence/fence.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/fence.h" +#include "level_zero/core/source/fence/fence.h" #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/memory_manager/memory_constants.h" diff --git a/level_zero/core/source/fence.h b/level_zero/core/source/fence/fence.h similarity index 92% rename from level_zero/core/source/fence.h rename to level_zero/core/source/fence/fence.h index 0e22b63c34..0aa9cf5830 100644 --- a/level_zero/core/source/fence.h +++ b/level_zero/core/source/fence/fence.h @@ -9,8 +9,8 @@ #include "shared/source/command_stream/csr_definitions.h" -#include "level_zero/core/source/cmdqueue.h" -#include "level_zero/core/source/cmdqueue_imp.h" +#include "level_zero/core/source/cmdqueue/cmdqueue.h" +#include "level_zero/core/source/cmdqueue/cmdqueue_imp.h" #include #include diff --git a/level_zero/core/source/gen11/icllp/cmdlist_icllp.cpp b/level_zero/core/source/gen11/icllp/cmdlist_icllp.cpp index 92b0cc3f8c..a9307f49bd 100644 --- a/level_zero/core/source/gen11/icllp/cmdlist_icllp.cpp +++ b/level_zero/core/source/gen11/icllp/cmdlist_icllp.cpp @@ -8,9 +8,9 @@ #include "shared/source/gen11/hw_cmds.h" #include "shared/source/gen11/hw_info.h" -#include "level_zero/core/source/cmdlist_hw.inl" -#include "level_zero/core/source/cmdlist_hw_base.inl" -#include "level_zero/core/source/cmdlist_hw_immediate.inl" +#include "level_zero/core/source/cmdlist/cmdlist_hw.inl" +#include "level_zero/core/source/cmdlist/cmdlist_hw_base.inl" +#include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl" #include "level_zero/core/source/gen11/cmdlist_gen11.inl" #include "cmdlist_extended.inl" diff --git a/level_zero/core/source/gen11/icllp/cmdqueue_icllp.cpp b/level_zero/core/source/gen11/icllp/cmdqueue_icllp.cpp index d17106a6db..8c3651c1a2 100644 --- a/level_zero/core/source/gen11/icllp/cmdqueue_icllp.cpp +++ b/level_zero/core/source/gen11/icllp/cmdqueue_icllp.cpp @@ -8,8 +8,8 @@ #include "shared/source/gen11/hw_cmds.h" #include "shared/source/gen11/hw_info.h" -#include "level_zero/core/source/cmdqueue_hw.inl" -#include "level_zero/core/source/cmdqueue_hw_base.inl" +#include "level_zero/core/source/cmdqueue/cmdqueue_hw.inl" +#include "level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl" #include "cmdqueue_extended.inl" #include "igfxfmid.h" diff --git a/level_zero/core/source/gen11/icllp/image_icllp.cpp b/level_zero/core/source/gen11/icllp/image_icllp.cpp index ecd1ef6fe5..5afb7f859c 100644 --- a/level_zero/core/source/gen11/icllp/image_icllp.cpp +++ b/level_zero/core/source/gen11/icllp/image_icllp.cpp @@ -8,7 +8,7 @@ #include "shared/source/gen11/hw_cmds.h" #include "shared/source/gen11/hw_info.h" -#include "level_zero/core/source/image_hw.inl" +#include "level_zero/core/source/image/image_hw.inl" namespace L0 { diff --git a/level_zero/core/source/gen11/icllp/kernel_icllp.cpp b/level_zero/core/source/gen11/icllp/kernel_icllp.cpp index 19eb25ec7b..c692f4a29a 100644 --- a/level_zero/core/source/gen11/icllp/kernel_icllp.cpp +++ b/level_zero/core/source/gen11/icllp/kernel_icllp.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/kernel_hw.h" +#include "level_zero/core/source/kernel/kernel_hw.h" namespace L0 { diff --git a/level_zero/core/source/gen11/icllp/sampler_icllp.cpp b/level_zero/core/source/gen11/icllp/sampler_icllp.cpp index c3bbf70fcd..c82f585bcb 100644 --- a/level_zero/core/source/gen11/icllp/sampler_icllp.cpp +++ b/level_zero/core/source/gen11/icllp/sampler_icllp.cpp @@ -8,7 +8,7 @@ #include "shared/source/gen11/hw_cmds.h" #include "shared/source/gen11/hw_info.h" -#include "level_zero/core/source/sampler_hw.inl" +#include "level_zero/core/source/sampler/sampler_hw.inl" namespace L0 { diff --git a/level_zero/core/source/gen12lp/cmdlist_gen12lp.h b/level_zero/core/source/gen12lp/cmdlist_gen12lp.h index 2809c7e906..ad60ba13ae 100644 --- a/level_zero/core/source/gen12lp/cmdlist_gen12lp.h +++ b/level_zero/core/source/gen12lp/cmdlist_gen12lp.h @@ -7,8 +7,8 @@ #pragma once -#include "level_zero/core/source/cmdlist_hw.h" -#include "level_zero/core/source/cmdlist_hw_immediate.h" +#include "level_zero/core/source/cmdlist/cmdlist_hw.h" +#include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h" namespace L0 { diff --git a/level_zero/core/source/gen12lp/definitions/cache_flush_gen12lp.inl b/level_zero/core/source/gen12lp/definitions/cache_flush_gen12lp.inl index c53d8c91dd..b0c489bb80 100644 --- a/level_zero/core/source/gen12lp/definitions/cache_flush_gen12lp.inl +++ b/level_zero/core/source/gen12lp/definitions/cache_flush_gen12lp.inl @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/cmdlist_hw.h" +#include "level_zero/core/source/cmdlist/cmdlist_hw.h" namespace L0 { diff --git a/level_zero/core/source/gen12lp/tgllp/cmdlist_tgllp.cpp b/level_zero/core/source/gen12lp/tgllp/cmdlist_tgllp.cpp index 972b1dd0b7..4f1e9ca6fe 100644 --- a/level_zero/core/source/gen12lp/tgllp/cmdlist_tgllp.cpp +++ b/level_zero/core/source/gen12lp/tgllp/cmdlist_tgllp.cpp @@ -8,9 +8,9 @@ #include "shared/source/gen12lp/hw_cmds.h" #include "shared/source/gen12lp/hw_info.h" -#include "level_zero/core/source/cmdlist_hw.inl" -#include "level_zero/core/source/cmdlist_hw_base.inl" -#include "level_zero/core/source/cmdlist_hw_immediate.inl" +#include "level_zero/core/source/cmdlist/cmdlist_hw.inl" +#include "level_zero/core/source/cmdlist/cmdlist_hw_base.inl" +#include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl" #include "level_zero/core/source/gen12lp/cmdlist_gen12lp.h" #include "cache_flush_gen12lp.inl" diff --git a/level_zero/core/source/gen12lp/tgllp/cmdqueue_tgllp.cpp b/level_zero/core/source/gen12lp/tgllp/cmdqueue_tgllp.cpp index 360b50eb95..d9ecc954e1 100644 --- a/level_zero/core/source/gen12lp/tgllp/cmdqueue_tgllp.cpp +++ b/level_zero/core/source/gen12lp/tgllp/cmdqueue_tgllp.cpp @@ -8,8 +8,8 @@ #include "shared/source/gen12lp/hw_cmds.h" #include "shared/source/gen12lp/hw_info.h" -#include "level_zero/core/source/cmdqueue_hw.inl" -#include "level_zero/core/source/cmdqueue_hw_base.inl" +#include "level_zero/core/source/cmdqueue/cmdqueue_hw.inl" +#include "level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl" #include "cmdqueue_extended.inl" #include "igfxfmid.h" diff --git a/level_zero/core/source/gen12lp/tgllp/image_tgllp.cpp b/level_zero/core/source/gen12lp/tgllp/image_tgllp.cpp index 45f93f21cc..de4194a873 100644 --- a/level_zero/core/source/gen12lp/tgllp/image_tgllp.cpp +++ b/level_zero/core/source/gen12lp/tgllp/image_tgllp.cpp @@ -8,7 +8,7 @@ #include "shared/source/gen12lp/hw_cmds.h" #include "shared/source/gen12lp/hw_info.h" -#include "level_zero/core/source/image_hw.inl" +#include "level_zero/core/source/image/image_hw.inl" namespace L0 { diff --git a/level_zero/core/source/gen12lp/tgllp/kernel_tgllp.cpp b/level_zero/core/source/gen12lp/tgllp/kernel_tgllp.cpp index 5734779893..84eef26912 100644 --- a/level_zero/core/source/gen12lp/tgllp/kernel_tgllp.cpp +++ b/level_zero/core/source/gen12lp/tgllp/kernel_tgllp.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/kernel_hw.h" +#include "level_zero/core/source/kernel/kernel_hw.h" namespace L0 { diff --git a/level_zero/core/source/gen12lp/tgllp/sampler_tgllp.cpp b/level_zero/core/source/gen12lp/tgllp/sampler_tgllp.cpp index 8aacecd533..e8b88f6323 100644 --- a/level_zero/core/source/gen12lp/tgllp/sampler_tgllp.cpp +++ b/level_zero/core/source/gen12lp/tgllp/sampler_tgllp.cpp @@ -8,7 +8,7 @@ #include "shared/source/gen12lp/hw_cmds.h" #include "shared/source/gen12lp/hw_info.h" -#include "level_zero/core/source/sampler_hw.inl" +#include "level_zero/core/source/sampler/sampler_hw.inl" namespace L0 { diff --git a/level_zero/core/source/gen9/cfl/cmdlist_cfl.cpp b/level_zero/core/source/gen9/cfl/cmdlist_cfl.cpp index 5961f6954c..fade6504d7 100644 --- a/level_zero/core/source/gen9/cfl/cmdlist_cfl.cpp +++ b/level_zero/core/source/gen9/cfl/cmdlist_cfl.cpp @@ -8,9 +8,9 @@ #include "shared/source/gen9/hw_cmds.h" #include "shared/source/gen9/hw_info.h" -#include "level_zero/core/source/cmdlist_hw.inl" -#include "level_zero/core/source/cmdlist_hw_base.inl" -#include "level_zero/core/source/cmdlist_hw_immediate.inl" +#include "level_zero/core/source/cmdlist/cmdlist_hw.inl" +#include "level_zero/core/source/cmdlist/cmdlist_hw_base.inl" +#include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl" #include "level_zero/core/source/gen9/cmdlist_gen9.h" #include "level_zero/core/source/gen9/cmdlist_gen9.inl" diff --git a/level_zero/core/source/gen9/cfl/cmdqueue_cfl.cpp b/level_zero/core/source/gen9/cfl/cmdqueue_cfl.cpp index c407a1980b..9036453c73 100644 --- a/level_zero/core/source/gen9/cfl/cmdqueue_cfl.cpp +++ b/level_zero/core/source/gen9/cfl/cmdqueue_cfl.cpp @@ -8,8 +8,8 @@ #include "shared/source/gen9/hw_cmds.h" #include "shared/source/gen9/hw_info.h" -#include "level_zero/core/source/cmdqueue_hw.inl" -#include "level_zero/core/source/cmdqueue_hw_base.inl" +#include "level_zero/core/source/cmdqueue/cmdqueue_hw.inl" +#include "level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl" #include "cmdqueue_extended.inl" #include "igfxfmid.h" diff --git a/level_zero/core/source/gen9/cfl/image_cfl.cpp b/level_zero/core/source/gen9/cfl/image_cfl.cpp index 88fb83524b..acf28c36de 100644 --- a/level_zero/core/source/gen9/cfl/image_cfl.cpp +++ b/level_zero/core/source/gen9/cfl/image_cfl.cpp @@ -8,7 +8,7 @@ #include "shared/source/gen9/hw_cmds.h" #include "shared/source/gen9/hw_info.h" -#include "level_zero/core/source/image_hw.inl" +#include "level_zero/core/source/image/image_hw.inl" namespace L0 { diff --git a/level_zero/core/source/gen9/cfl/kernel_cfl.cpp b/level_zero/core/source/gen9/cfl/kernel_cfl.cpp index 7188889acd..df6cfa3eb1 100644 --- a/level_zero/core/source/gen9/cfl/kernel_cfl.cpp +++ b/level_zero/core/source/gen9/cfl/kernel_cfl.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/kernel_hw.h" +#include "level_zero/core/source/kernel/kernel_hw.h" namespace L0 { diff --git a/level_zero/core/source/gen9/cfl/sampler_cfl.cpp b/level_zero/core/source/gen9/cfl/sampler_cfl.cpp index 48ca7cd95f..d185ce9388 100644 --- a/level_zero/core/source/gen9/cfl/sampler_cfl.cpp +++ b/level_zero/core/source/gen9/cfl/sampler_cfl.cpp @@ -8,7 +8,7 @@ #include "shared/source/gen9/hw_cmds.h" #include "shared/source/gen9/hw_info.h" -#include "level_zero/core/source/sampler_hw.inl" +#include "level_zero/core/source/sampler/sampler_hw.inl" namespace L0 { diff --git a/level_zero/core/source/gen9/cmdlist_gen9.h b/level_zero/core/source/gen9/cmdlist_gen9.h index c40629081e..888dcdaa9b 100644 --- a/level_zero/core/source/gen9/cmdlist_gen9.h +++ b/level_zero/core/source/gen9/cmdlist_gen9.h @@ -11,8 +11,8 @@ #include "shared/source/gen9/hw_cmds.h" #include "shared/source/gen9/hw_info.h" -#include "level_zero/core/source/cmdlist_hw.h" -#include "level_zero/core/source/cmdlist_hw_immediate.h" +#include "level_zero/core/source/cmdlist/cmdlist_hw.h" +#include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h" #include "igfxfmid.h" diff --git a/level_zero/core/source/gen9/cmdlist_gen9.inl b/level_zero/core/source/gen9/cmdlist_gen9.inl index 7fa9aac0e9..277ec08f55 100644 --- a/level_zero/core/source/gen9/cmdlist_gen9.inl +++ b/level_zero/core/source/gen9/cmdlist_gen9.inl @@ -10,7 +10,7 @@ #include "shared/source/gen9/hw_cmds.h" #include "shared/source/gen9/hw_info.h" -#include "level_zero/core/source/cmdlist_hw.h" +#include "level_zero/core/source/cmdlist/cmdlist_hw.h" namespace L0 { diff --git a/level_zero/core/source/gen9/glk/cmdlist_glk.cpp b/level_zero/core/source/gen9/glk/cmdlist_glk.cpp index 565419526f..661cec2369 100644 --- a/level_zero/core/source/gen9/glk/cmdlist_glk.cpp +++ b/level_zero/core/source/gen9/glk/cmdlist_glk.cpp @@ -9,9 +9,9 @@ #include "shared/source/gen9/hw_cmds.h" #include "shared/source/gen9/hw_info.h" -#include "level_zero/core/source/cmdlist_hw.inl" -#include "level_zero/core/source/cmdlist_hw_base.inl" -#include "level_zero/core/source/cmdlist_hw_immediate.inl" +#include "level_zero/core/source/cmdlist/cmdlist_hw.inl" +#include "level_zero/core/source/cmdlist/cmdlist_hw_base.inl" +#include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl" #include "level_zero/core/source/gen9/cmdlist_gen9.h" #include "level_zero/core/source/gen9/cmdlist_gen9.inl" diff --git a/level_zero/core/source/gen9/glk/cmdqueue_glk.cpp b/level_zero/core/source/gen9/glk/cmdqueue_glk.cpp index 63c6c38996..21aa9f8b86 100644 --- a/level_zero/core/source/gen9/glk/cmdqueue_glk.cpp +++ b/level_zero/core/source/gen9/glk/cmdqueue_glk.cpp @@ -8,8 +8,8 @@ #include "shared/source/gen9/hw_cmds.h" #include "shared/source/gen9/hw_info.h" -#include "level_zero/core/source/cmdqueue_hw.inl" -#include "level_zero/core/source/cmdqueue_hw_base.inl" +#include "level_zero/core/source/cmdqueue/cmdqueue_hw.inl" +#include "level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl" #include "cmdqueue_extended.inl" #include "igfxfmid.h" diff --git a/level_zero/core/source/gen9/glk/image_glk.cpp b/level_zero/core/source/gen9/glk/image_glk.cpp index 42a044305d..3340218193 100644 --- a/level_zero/core/source/gen9/glk/image_glk.cpp +++ b/level_zero/core/source/gen9/glk/image_glk.cpp @@ -8,7 +8,7 @@ #include "shared/source/gen9/hw_cmds.h" #include "shared/source/gen9/hw_info.h" -#include "level_zero/core/source/image_hw.inl" +#include "level_zero/core/source/image/image_hw.inl" namespace L0 { diff --git a/level_zero/core/source/gen9/glk/kernel_glk.cpp b/level_zero/core/source/gen9/glk/kernel_glk.cpp index 6ce014409f..4d06891520 100644 --- a/level_zero/core/source/gen9/glk/kernel_glk.cpp +++ b/level_zero/core/source/gen9/glk/kernel_glk.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/kernel_hw.h" +#include "level_zero/core/source/kernel/kernel_hw.h" namespace L0 { diff --git a/level_zero/core/source/gen9/glk/sampler_glk.cpp b/level_zero/core/source/gen9/glk/sampler_glk.cpp index 89839160a7..1fcd75cea3 100644 --- a/level_zero/core/source/gen9/glk/sampler_glk.cpp +++ b/level_zero/core/source/gen9/glk/sampler_glk.cpp @@ -8,7 +8,7 @@ #include "shared/source/gen9/hw_cmds.h" #include "shared/source/gen9/hw_info.h" -#include "level_zero/core/source/sampler_hw.inl" +#include "level_zero/core/source/sampler/sampler_hw.inl" namespace L0 { diff --git a/level_zero/core/source/gen9/kbl/cmdlist_kbl.cpp b/level_zero/core/source/gen9/kbl/cmdlist_kbl.cpp index dc8d9f2134..d84ff61774 100644 --- a/level_zero/core/source/gen9/kbl/cmdlist_kbl.cpp +++ b/level_zero/core/source/gen9/kbl/cmdlist_kbl.cpp @@ -8,9 +8,9 @@ #include "shared/source/gen9/hw_cmds.h" #include "shared/source/gen9/hw_info.h" -#include "level_zero/core/source/cmdlist_hw.inl" -#include "level_zero/core/source/cmdlist_hw_base.inl" -#include "level_zero/core/source/cmdlist_hw_immediate.inl" +#include "level_zero/core/source/cmdlist/cmdlist_hw.inl" +#include "level_zero/core/source/cmdlist/cmdlist_hw_base.inl" +#include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl" #include "level_zero/core/source/gen9/cmdlist_gen9.h" #include "level_zero/core/source/gen9/cmdlist_gen9.inl" diff --git a/level_zero/core/source/gen9/kbl/cmdqueue_kbl.cpp b/level_zero/core/source/gen9/kbl/cmdqueue_kbl.cpp index 234ecf4995..ef40654b2c 100644 --- a/level_zero/core/source/gen9/kbl/cmdqueue_kbl.cpp +++ b/level_zero/core/source/gen9/kbl/cmdqueue_kbl.cpp @@ -8,8 +8,8 @@ #include "shared/source/gen9/hw_cmds.h" #include "shared/source/gen9/hw_info.h" -#include "level_zero/core/source/cmdqueue_hw.inl" -#include "level_zero/core/source/cmdqueue_hw_base.inl" +#include "level_zero/core/source/cmdqueue/cmdqueue_hw.inl" +#include "level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl" #include "cmdqueue_extended.inl" #include "igfxfmid.h" diff --git a/level_zero/core/source/gen9/kbl/image_kbl.cpp b/level_zero/core/source/gen9/kbl/image_kbl.cpp index 567fdfd2f3..75e32a1e3e 100644 --- a/level_zero/core/source/gen9/kbl/image_kbl.cpp +++ b/level_zero/core/source/gen9/kbl/image_kbl.cpp @@ -8,7 +8,7 @@ #include "shared/source/gen9/hw_cmds.h" #include "shared/source/gen9/hw_info.h" -#include "level_zero/core/source/image_hw.inl" +#include "level_zero/core/source/image/image_hw.inl" namespace L0 { diff --git a/level_zero/core/source/gen9/kbl/kernel_kbl.cpp b/level_zero/core/source/gen9/kbl/kernel_kbl.cpp index a892161aef..30e4cb140b 100644 --- a/level_zero/core/source/gen9/kbl/kernel_kbl.cpp +++ b/level_zero/core/source/gen9/kbl/kernel_kbl.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/kernel_hw.h" +#include "level_zero/core/source/kernel/kernel_hw.h" namespace L0 { diff --git a/level_zero/core/source/gen9/kbl/sampler_kbl.cpp b/level_zero/core/source/gen9/kbl/sampler_kbl.cpp index 95adce90de..9acf60ffd3 100644 --- a/level_zero/core/source/gen9/kbl/sampler_kbl.cpp +++ b/level_zero/core/source/gen9/kbl/sampler_kbl.cpp @@ -8,7 +8,7 @@ #include "shared/source/gen9/hw_cmds.h" #include "shared/source/gen9/hw_info.h" -#include "level_zero/core/source/sampler_hw.inl" +#include "level_zero/core/source/sampler/sampler_hw.inl" namespace L0 { diff --git a/level_zero/core/source/gen9/skl/cmdlist_skl.cpp b/level_zero/core/source/gen9/skl/cmdlist_skl.cpp index 8e5acae70f..cf25405b12 100644 --- a/level_zero/core/source/gen9/skl/cmdlist_skl.cpp +++ b/level_zero/core/source/gen9/skl/cmdlist_skl.cpp @@ -8,9 +8,9 @@ #include "shared/source/gen9/hw_cmds.h" #include "shared/source/gen9/hw_info.h" -#include "level_zero/core/source/cmdlist_hw.inl" -#include "level_zero/core/source/cmdlist_hw_base.inl" -#include "level_zero/core/source/cmdlist_hw_immediate.inl" +#include "level_zero/core/source/cmdlist/cmdlist_hw.inl" +#include "level_zero/core/source/cmdlist/cmdlist_hw_base.inl" +#include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl" #include "level_zero/core/source/gen9/cmdlist_gen9.h" #include "level_zero/core/source/gen9/cmdlist_gen9.inl" diff --git a/level_zero/core/source/gen9/skl/cmdqueue_skl.cpp b/level_zero/core/source/gen9/skl/cmdqueue_skl.cpp index c98c151284..84fdb4bb4b 100644 --- a/level_zero/core/source/gen9/skl/cmdqueue_skl.cpp +++ b/level_zero/core/source/gen9/skl/cmdqueue_skl.cpp @@ -8,8 +8,8 @@ #include "shared/source/gen9/hw_cmds.h" #include "shared/source/gen9/hw_info.h" -#include "level_zero/core/source/cmdqueue_hw.inl" -#include "level_zero/core/source/cmdqueue_hw_base.inl" +#include "level_zero/core/source/cmdqueue/cmdqueue_hw.inl" +#include "level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl" #include "cmdqueue_extended.inl" #include "igfxfmid.h" diff --git a/level_zero/core/source/gen9/skl/image_skl.cpp b/level_zero/core/source/gen9/skl/image_skl.cpp index 1fbf40f9c9..0ce993bfb9 100644 --- a/level_zero/core/source/gen9/skl/image_skl.cpp +++ b/level_zero/core/source/gen9/skl/image_skl.cpp @@ -8,7 +8,7 @@ #include "shared/source/gen9/hw_cmds.h" #include "shared/source/gen9/hw_info.h" -#include "level_zero/core/source/image_hw.inl" +#include "level_zero/core/source/image/image_hw.inl" namespace L0 { diff --git a/level_zero/core/source/gen9/skl/kernel_skl.cpp b/level_zero/core/source/gen9/skl/kernel_skl.cpp index 621971517a..7a9b3dd593 100644 --- a/level_zero/core/source/gen9/skl/kernel_skl.cpp +++ b/level_zero/core/source/gen9/skl/kernel_skl.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/kernel_hw.h" +#include "level_zero/core/source/kernel/kernel_hw.h" namespace L0 { diff --git a/level_zero/core/source/gen9/skl/sampler_skl.cpp b/level_zero/core/source/gen9/skl/sampler_skl.cpp index 6afb9fb313..1cbd9821eb 100644 --- a/level_zero/core/source/gen9/skl/sampler_skl.cpp +++ b/level_zero/core/source/gen9/skl/sampler_skl.cpp @@ -8,7 +8,7 @@ #include "shared/source/gen9/hw_cmds.h" #include "shared/source/gen9/hw_info.h" -#include "level_zero/core/source/sampler_hw.inl" +#include "level_zero/core/source/sampler/sampler_hw.inl" namespace L0 { diff --git a/level_zero/core/source/image.h b/level_zero/core/source/image/image.h similarity index 96% rename from level_zero/core/source/image.h rename to level_zero/core/source/image/image.h index 019bfd9706..129f4c6830 100644 --- a/level_zero/core/source/image.h +++ b/level_zero/core/source/image/image.h @@ -9,7 +9,7 @@ #include "shared/source/command_container/cmdcontainer.h" -#include "level_zero/core/source/device.h" +#include "level_zero/core/source/device/device.h" #include struct _ze_image_handle_t {}; diff --git a/level_zero/core/source/image_formats_append.h b/level_zero/core/source/image/image_formats_append.h similarity index 95% rename from level_zero/core/source/image_formats_append.h rename to level_zero/core/source/image/image_formats_append.h index 00a0a276b9..0721e99a01 100644 --- a/level_zero/core/source/image_formats_append.h +++ b/level_zero/core/source/image/image_formats_append.h @@ -7,7 +7,7 @@ #pragma once -#include "level_zero/core/source/image_imp.h" +#include "level_zero/core/source/image/image_imp.h" #define GEN10PLUS_IMAGE_FORMATS() \ { \ diff --git a/level_zero/core/source/image_hw.h b/level_zero/core/source/image/image_hw.h similarity index 99% rename from level_zero/core/source/image_hw.h rename to level_zero/core/source/image/image_hw.h index b37484a320..fdc9b9df30 100644 --- a/level_zero/core/source/image_hw.h +++ b/level_zero/core/source/image/image_hw.h @@ -12,8 +12,8 @@ #include "shared/source/helpers/surface_format_info.h" #include "shared/source/indirect_heap/indirect_heap.h" -#include "level_zero/core/source/image_formats_append.h" -#include "level_zero/core/source/image_imp.h" +#include "level_zero/core/source/image/image_formats_append.h" +#include "level_zero/core/source/image/image_imp.h" namespace L0 { diff --git a/level_zero/core/source/image_hw.inl b/level_zero/core/source/image/image_hw.inl similarity index 99% rename from level_zero/core/source/image_hw.inl rename to level_zero/core/source/image/image_hw.inl index 274df48e4d..0ef5d7b759 100644 --- a/level_zero/core/source/image_hw.inl +++ b/level_zero/core/source/image/image_hw.inl @@ -16,7 +16,7 @@ #include "shared/source/memory_manager/memory_manager.h" #include "shared/source/utilities/compiler_support.h" -#include "level_zero/core/source/image_hw.h" +#include "level_zero/core/source/image/image_hw.h" inline NEO::ImageType convertType(const ze_image_type_t type) { switch (type) { diff --git a/level_zero/core/source/image_imp.cpp b/level_zero/core/source/image/image_imp.cpp similarity index 94% rename from level_zero/core/source/image_imp.cpp rename to level_zero/core/source/image/image_imp.cpp index 4cb10e1772..65a178c865 100644 --- a/level_zero/core/source/image_imp.cpp +++ b/level_zero/core/source/image/image_imp.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/image_imp.h" +#include "level_zero/core/source/image/image_imp.h" #include "shared/source/memory_manager/memory_manager.h" diff --git a/level_zero/core/source/image_imp.h b/level_zero/core/source/image/image_imp.h similarity index 98% rename from level_zero/core/source/image_imp.h rename to level_zero/core/source/image/image_imp.h index 272781270a..40ccb6dd14 100644 --- a/level_zero/core/source/image_imp.h +++ b/level_zero/core/source/image/image_imp.h @@ -9,7 +9,7 @@ #include "shared/source/helpers/surface_format_info.h" -#include "level_zero/core/source/image.h" +#include "level_zero/core/source/image/image.h" namespace L0 { diff --git a/level_zero/core/source/kernel.cpp b/level_zero/core/source/kernel/kernel.cpp similarity index 80% rename from level_zero/core/source/kernel.cpp rename to level_zero/core/source/kernel/kernel.cpp index 9a396fcce9..eacd304630 100644 --- a/level_zero/core/source/kernel.cpp +++ b/level_zero/core/source/kernel/kernel.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/kernel.h" +#include "level_zero/core/source/kernel/kernel.h" #include "igfxfmid.h" diff --git a/level_zero/core/source/kernel.h b/level_zero/core/source/kernel/kernel.h similarity index 100% rename from level_zero/core/source/kernel.h rename to level_zero/core/source/kernel/kernel.h diff --git a/level_zero/core/source/kernel_hw.h b/level_zero/core/source/kernel/kernel_hw.h similarity index 98% rename from level_zero/core/source/kernel_hw.h rename to level_zero/core/source/kernel/kernel_hw.h index 4b8d5de479..a54b698e0b 100644 --- a/level_zero/core/source/kernel_hw.h +++ b/level_zero/core/source/kernel/kernel_hw.h @@ -10,8 +10,8 @@ #include "shared/source/command_container/command_encoder.h" #include "shared/source/helpers/string.h" -#include "level_zero/core/source/kernel_imp.h" -#include "level_zero/core/source/module.h" +#include "level_zero/core/source/kernel/kernel_imp.h" +#include "level_zero/core/source/module/module.h" #include "igfxfmid.h" diff --git a/level_zero/core/source/kernel_imp.cpp b/level_zero/core/source/kernel/kernel_imp.cpp similarity index 98% rename from level_zero/core/source/kernel_imp.cpp rename to level_zero/core/source/kernel/kernel_imp.cpp index e4dc3af862..0896114f24 100644 --- a/level_zero/core/source/kernel_imp.cpp +++ b/level_zero/core/source/kernel/kernel_imp.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/kernel_imp.h" +#include "level_zero/core/source/kernel/kernel_imp.h" #include "shared/source/helpers/basic_math.h" #include "shared/source/helpers/hw_helper.h" @@ -19,12 +19,12 @@ #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/program/kernel_info.h" -#include "level_zero/core/source/device.h" -#include "level_zero/core/source/image.h" -#include "level_zero/core/source/module.h" -#include "level_zero/core/source/module_imp.h" -#include "level_zero/core/source/printf_handler.h" -#include "level_zero/core/source/sampler.h" +#include "level_zero/core/source/device/device.h" +#include "level_zero/core/source/image/image.h" +#include "level_zero/core/source/module/module.h" +#include "level_zero/core/source/module/module_imp.h" +#include "level_zero/core/source/printf_handler/printf_handler.h" +#include "level_zero/core/source/sampler/sampler.h" #include diff --git a/level_zero/core/source/kernel_imp.h b/level_zero/core/source/kernel/kernel_imp.h similarity index 99% rename from level_zero/core/source/kernel_imp.h rename to level_zero/core/source/kernel/kernel_imp.h index 757a444c19..847235c4d0 100644 --- a/level_zero/core/source/kernel_imp.h +++ b/level_zero/core/source/kernel/kernel_imp.h @@ -10,7 +10,7 @@ #include "shared/source/kernel/dispatch_kernel_encoder_interface.h" #include "shared/source/unified_memory/unified_memory.h" -#include "level_zero/core/source/kernel.h" +#include "level_zero/core/source/kernel/kernel.h" #include diff --git a/level_zero/core/source/cpu_page_fault_memory_manager.cpp b/level_zero/core/source/memory/cpu_page_fault_memory_manager.cpp similarity index 86% rename from level_zero/core/source/cpu_page_fault_memory_manager.cpp rename to level_zero/core/source/memory/cpu_page_fault_memory_manager.cpp index 4f10c95d2e..2cdc6c8050 100644 --- a/level_zero/core/source/cpu_page_fault_memory_manager.cpp +++ b/level_zero/core/source/memory/cpu_page_fault_memory_manager.cpp @@ -7,10 +7,10 @@ #include "shared/source/page_fault_manager/cpu_page_fault_manager.h" -#include "level_zero/core/source/cmdlist.h" -#include "level_zero/core/source/device.h" -#include "level_zero/core/source/device_imp.h" -#include "level_zero/core/source/driver_handle_imp.h" +#include "level_zero/core/source/cmdlist/cmdlist.h" +#include "level_zero/core/source/device/device.h" +#include "level_zero/core/source/device/device_imp.h" +#include "level_zero/core/source/driver/driver_handle_imp.h" namespace NEO { void PageFaultManager::transferToCpu(void *ptr, size_t size, void *device) { diff --git a/level_zero/core/source/memory.cpp b/level_zero/core/source/memory/memory.cpp similarity index 98% rename from level_zero/core/source/memory.cpp rename to level_zero/core/source/memory/memory.cpp index 6f73e28c85..c132fea282 100644 --- a/level_zero/core/source/memory.cpp +++ b/level_zero/core/source/memory/memory.cpp @@ -8,8 +8,8 @@ #include "shared/source/helpers/string.h" #include "shared/source/memory_manager/memory_manager.h" -#include "level_zero/core/source/device.h" -#include "level_zero/core/source/driver_handle_imp.h" +#include "level_zero/core/source/device/device.h" +#include "level_zero/core/source/driver/driver_handle_imp.h" namespace L0 { diff --git a/level_zero/core/source/memory_operations_helper.h b/level_zero/core/source/memory/memory_operations_helper.h similarity index 100% rename from level_zero/core/source/memory_operations_helper.h rename to level_zero/core/source/memory/memory_operations_helper.h diff --git a/level_zero/core/source/module.h b/level_zero/core/source/module/module.h similarity index 91% rename from level_zero/core/source/module.h rename to level_zero/core/source/module/module.h index 9f88cd808b..d89d77aa78 100644 --- a/level_zero/core/source/module.h +++ b/level_zero/core/source/module/module.h @@ -7,9 +7,9 @@ #pragma once -#include "level_zero/core/source/cmdlist.h" -#include "level_zero/core/source/kernel.h" -#include "level_zero/core/source/module_build_log.h" +#include "level_zero/core/source/cmdlist/cmdlist.h" +#include "level_zero/core/source/kernel/kernel.h" +#include "level_zero/core/source/module/module_build_log.h" #include #include diff --git a/level_zero/core/source/module_build_log.cpp b/level_zero/core/source/module/module_build_log.cpp similarity index 96% rename from level_zero/core/source/module_build_log.cpp rename to level_zero/core/source/module/module_build_log.cpp index 96bb809865..59e657ccc9 100644 --- a/level_zero/core/source/module_build_log.cpp +++ b/level_zero/core/source/module/module_build_log.cpp @@ -8,7 +8,7 @@ #include "shared/source/helpers/debug_helpers.h" #include "shared/source/helpers/string.h" -#include "level_zero/core/source/module.h" +#include "level_zero/core/source/module/module.h" #include diff --git a/level_zero/core/source/module_build_log.h b/level_zero/core/source/module/module_build_log.h similarity index 100% rename from level_zero/core/source/module_build_log.h rename to level_zero/core/source/module/module_build_log.h diff --git a/level_zero/core/source/module_extra_options.cpp b/level_zero/core/source/module/module_extra_options.cpp similarity index 80% rename from level_zero/core/source/module_extra_options.cpp rename to level_zero/core/source/module/module_extra_options.cpp index 5b01de6fe3..09921dd011 100644 --- a/level_zero/core/source/module_extra_options.cpp +++ b/level_zero/core/source/module/module_extra_options.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/module_imp.h" +#include "level_zero/core/source/module/module_imp.h" namespace L0 { diff --git a/level_zero/core/source/module_imp.cpp b/level_zero/core/source/module/module_imp.cpp similarity index 99% rename from level_zero/core/source/module_imp.cpp rename to level_zero/core/source/module/module_imp.cpp index bbf91ad300..e3f6fbb3d4 100644 --- a/level_zero/core/source/module_imp.cpp +++ b/level_zero/core/source/module/module_imp.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/module_imp.h" +#include "level_zero/core/source/module/module_imp.h" #include "shared/source/compiler_interface/compiler_interface.h" #include "shared/source/compiler_interface/intermediate_representations.h" @@ -20,9 +20,9 @@ #include "opencl/source/program/kernel_info.h" -#include "level_zero/core/source/device.h" -#include "level_zero/core/source/kernel.h" -#include "level_zero/core/source/module_build_log.h" +#include "level_zero/core/source/device/device.h" +#include "level_zero/core/source/kernel/kernel.h" +#include "level_zero/core/source/module/module_build_log.h" #include "compiler_options.h" #include "program_debug_data.h" diff --git a/level_zero/core/source/module_imp.h b/level_zero/core/source/module/module_imp.h similarity index 96% rename from level_zero/core/source/module_imp.h rename to level_zero/core/source/module/module_imp.h index ad5f977f2d..5dd5431b34 100644 --- a/level_zero/core/source/module_imp.h +++ b/level_zero/core/source/module/module_imp.h @@ -10,8 +10,8 @@ #include "shared/source/compiler_interface/linker.h" #include "shared/source/utilities/const_stringref.h" -#include "level_zero/core/source/device.h" -#include "level_zero/core/source/module.h" +#include "level_zero/core/source/device/device.h" +#include "level_zero/core/source/module/module.h" #include "igfxfmid.h" diff --git a/level_zero/core/source/printf_handler.cpp b/level_zero/core/source/printf_handler/printf_handler.cpp similarity index 93% rename from level_zero/core/source/printf_handler.cpp rename to level_zero/core/source/printf_handler/printf_handler.cpp index 28d2263858..2d6217362c 100644 --- a/level_zero/core/source/printf_handler.cpp +++ b/level_zero/core/source/printf_handler/printf_handler.cpp @@ -5,13 +5,13 @@ * */ -#include "level_zero/core/source/printf_handler.h" +#include "level_zero/core/source/printf_handler/printf_handler.h" #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/memory_manager/memory_manager.h" #include "shared/source/program/print_formatter.h" -#include "level_zero/core/source/device_imp.h" +#include "level_zero/core/source/device/device_imp.h" namespace L0 { diff --git a/level_zero/core/source/printf_handler.h b/level_zero/core/source/printf_handler/printf_handler.h similarity index 94% rename from level_zero/core/source/printf_handler.h rename to level_zero/core/source/printf_handler/printf_handler.h index efb3274910..68feb31bc4 100644 --- a/level_zero/core/source/printf_handler.h +++ b/level_zero/core/source/printf_handler/printf_handler.h @@ -9,7 +9,7 @@ #include "shared/source/memory_manager/memory_constants.h" -#include "level_zero/core/source/kernel.h" +#include "level_zero/core/source/kernel/kernel.h" #include diff --git a/level_zero/core/source/sampler.h b/level_zero/core/source/sampler/sampler.h similarity index 96% rename from level_zero/core/source/sampler.h rename to level_zero/core/source/sampler/sampler.h index 2e64252aa2..6b53331c87 100644 --- a/level_zero/core/source/sampler.h +++ b/level_zero/core/source/sampler/sampler.h @@ -7,7 +7,7 @@ #pragma once -#include "level_zero/core/source/device.h" +#include "level_zero/core/source/device/device.h" #include struct _ze_sampler_handle_t {}; diff --git a/level_zero/core/source/sampler_hw.h b/level_zero/core/source/sampler/sampler_hw.h similarity index 94% rename from level_zero/core/source/sampler_hw.h rename to level_zero/core/source/sampler/sampler_hw.h index 63f28dac27..83f6327ce9 100644 --- a/level_zero/core/source/sampler_hw.h +++ b/level_zero/core/source/sampler/sampler_hw.h @@ -7,7 +7,7 @@ #pragma once -#include "level_zero/core/source/sampler_imp.h" +#include "level_zero/core/source/sampler/sampler_imp.h" namespace L0 { diff --git a/level_zero/core/source/sampler_hw.inl b/level_zero/core/source/sampler/sampler_hw.inl similarity index 98% rename from level_zero/core/source/sampler_hw.inl rename to level_zero/core/source/sampler/sampler_hw.inl index 6527412550..cefe1c5de1 100644 --- a/level_zero/core/source/sampler_hw.inl +++ b/level_zero/core/source/sampler/sampler_hw.inl @@ -10,7 +10,7 @@ #include "shared/source/helpers/string.h" #include "shared/source/utilities/numeric.h" -#include "level_zero/core/source/sampler_hw.h" +#include "level_zero/core/source/sampler/sampler_hw.h" namespace L0 { template diff --git a/level_zero/core/source/sampler_imp.cpp b/level_zero/core/source/sampler/sampler_imp.cpp similarity index 90% rename from level_zero/core/source/sampler_imp.cpp rename to level_zero/core/source/sampler/sampler_imp.cpp index 3380b9c736..e5cc48a137 100644 --- a/level_zero/core/source/sampler_imp.cpp +++ b/level_zero/core/source/sampler/sampler_imp.cpp @@ -5,9 +5,9 @@ * */ -#include "level_zero/core/source/sampler_imp.h" +#include "level_zero/core/source/sampler/sampler_imp.h" -#include "level_zero/core/source/device.h" +#include "level_zero/core/source/device/device.h" namespace L0 { diff --git a/level_zero/core/source/sampler_imp.h b/level_zero/core/source/sampler/sampler_imp.h similarity index 88% rename from level_zero/core/source/sampler_imp.h rename to level_zero/core/source/sampler/sampler_imp.h index 3ce221306c..8a32e612fe 100644 --- a/level_zero/core/source/sampler_imp.h +++ b/level_zero/core/source/sampler/sampler_imp.h @@ -7,7 +7,7 @@ #pragma once -#include "level_zero/core/source/sampler.h" +#include "level_zero/core/source/sampler/sampler.h" namespace L0 { diff --git a/level_zero/core/test/unit_tests/main.cpp b/level_zero/core/test/unit_tests/main.cpp index 300b1a8d63..66b85d1673 100644 --- a/level_zero/core/test/unit_tests/main.cpp +++ b/level_zero/core/test/unit_tests/main.cpp @@ -18,7 +18,7 @@ #include "opencl/test/unit_test/mocks/mock_gmm_client_context.h" #include "opencl/test/unit_test/mocks/mock_sip.h" -#include "level_zero/core/source/cmdlist.h" +#include "level_zero/core/source/cmdlist/cmdlist.h" #include "gmock/gmock.h" #include "igfxfmid.h" diff --git a/level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h b/level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h index 61663c8615..906118f54b 100644 --- a/level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h +++ b/level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h @@ -6,8 +6,8 @@ */ #pragma once -#include "level_zero/core/source/cmdqueue_hw.h" -#include "level_zero/core/source/cmdqueue_imp.h" +#include "level_zero/core/source/cmdqueue/cmdqueue_hw.h" +#include "level_zero/core/source/cmdqueue/cmdqueue_imp.h" #include "level_zero/core/test/unit_tests/mock.h" #include "level_zero/core/test/unit_tests/white_box.h" diff --git a/level_zero/core/test/unit_tests/mocks/mock_device.h b/level_zero/core/test/unit_tests/mocks/mock_device.h index 48d8f3bc4e..05efc9ee6b 100644 --- a/level_zero/core/test/unit_tests/mocks/mock_device.h +++ b/level_zero/core/test/unit_tests/mocks/mock_device.h @@ -11,8 +11,8 @@ #include "shared/source/device/device.h" #include "shared/source/device/device_info.h" -#include "level_zero/core/source/device.h" -#include "level_zero/core/source/driver_handle.h" +#include "level_zero/core/source/device/device.h" +#include "level_zero/core/source/driver/driver_handle.h" #include "level_zero/core/test/unit_tests/mock.h" #include "level_zero/core/test/unit_tests/white_box.h" #include "level_zero/tools/source/metrics/metric.h" diff --git a/level_zero/core/test/unit_tests/mocks/mock_driver.h b/level_zero/core/test/unit_tests/mocks/mock_driver.h index 4589633c87..02b1744a00 100644 --- a/level_zero/core/test/unit_tests/mocks/mock_driver.h +++ b/level_zero/core/test/unit_tests/mocks/mock_driver.h @@ -6,7 +6,7 @@ */ #pragma once -#include "level_zero/core/source/driver_imp.h" +#include "level_zero/core/source/driver/driver_imp.h" #include "level_zero/core/test/unit_tests/mock.h" #include "level_zero/core/test/unit_tests/white_box.h" diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_debugger.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_debugger.cpp index 4a0fe52d95..e28930ec2c 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_debugger.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_debugger.cpp @@ -15,8 +15,8 @@ #include "opencl/test/unit_test/mocks/mock_source_level_debugger.h" #include "test.h" -#include "level_zero/core/source/cmdqueue_hw.h" -#include "level_zero/core/source/fence.h" +#include "level_zero/core/source/cmdqueue/cmdqueue_hw.h" +#include "level_zero/core/source/fence/fence.h" #include "level_zero/core/test/unit_tests/mocks/mock_built_ins.h" #include "level_zero/core/test/unit_tests/mocks/mock_cmdqueue.h" #include "level_zero/core/test/unit_tests/mocks/mock_device.h" diff --git a/level_zero/tools/source/metrics/linux/os_metric_query_imp_linux.cpp b/level_zero/tools/source/metrics/linux/os_metric_query_imp_linux.cpp index 12540a2766..c7930ae590 100644 --- a/level_zero/tools/source/metrics/linux/os_metric_query_imp_linux.cpp +++ b/level_zero/tools/source/metrics/linux/os_metric_query_imp_linux.cpp @@ -5,7 +5,7 @@ * */ -#include "level_zero/core/source/device.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/tools/source/metrics/metric_query_imp.h" using namespace MetricsLibraryApi; diff --git a/level_zero/tools/source/metrics/metric.cpp b/level_zero/tools/source/metrics/metric.cpp index d8d67f7324..5fce4fb163 100644 --- a/level_zero/tools/source/metrics/metric.cpp +++ b/level_zero/tools/source/metrics/metric.cpp @@ -9,9 +9,9 @@ #include "shared/source/os_interface/os_library.h" -#include "level_zero/core/source/device.h" -#include "level_zero/core/source/driver.h" -#include "level_zero/core/source/driver_handle_imp.h" +#include "level_zero/core/source/device/device.h" +#include "level_zero/core/source/driver/driver.h" +#include "level_zero/core/source/driver/driver_handle_imp.h" #include "level_zero/source/inc/ze_intel_gpu.h" #include "level_zero/tools/source/metrics/metric_enumeration_imp.h" #include "level_zero/tools/source/metrics/metric_query_imp.h" diff --git a/level_zero/tools/source/metrics/metric.h b/level_zero/tools/source/metrics/metric.h index ce2bdd7191..5268c58369 100644 --- a/level_zero/tools/source/metrics/metric.h +++ b/level_zero/tools/source/metrics/metric.h @@ -6,7 +6,7 @@ */ #pragma once -#include "level_zero/core/source/event.h" +#include "level_zero/core/source/event/event.h" #include #include diff --git a/level_zero/tools/source/metrics/metric_query_imp.cpp b/level_zero/tools/source/metrics/metric_query_imp.cpp index 972657b97c..2728256a71 100644 --- a/level_zero/tools/source/metrics/metric_query_imp.cpp +++ b/level_zero/tools/source/metrics/metric_query_imp.cpp @@ -15,9 +15,9 @@ #include "shared/source/os_interface/os_context.h" #include "shared/source/os_interface/os_library.h" -#include "level_zero/core/source/cmdlist.h" -#include "level_zero/core/source/device.h" -#include "level_zero/core/source/device_imp.h" +#include "level_zero/core/source/cmdlist/cmdlist.h" +#include "level_zero/core/source/device/device.h" +#include "level_zero/core/source/device/device_imp.h" #include "level_zero/tools/source/metrics/metric_enumeration_imp.h" using namespace MetricsLibraryApi; diff --git a/level_zero/tools/source/metrics/metric_stubs.cpp b/level_zero/tools/source/metrics/metric_stubs.cpp index a3ab29cd78..1a12b56b73 100644 --- a/level_zero/tools/source/metrics/metric_stubs.cpp +++ b/level_zero/tools/source/metrics/metric_stubs.cpp @@ -7,9 +7,9 @@ #include "shared/source/os_interface/os_library.h" -#include "level_zero/core/source/device.h" -#include "level_zero/core/source/driver.h" -#include "level_zero/core/source/driver_handle_imp.h" +#include "level_zero/core/source/device/device.h" +#include "level_zero/core/source/driver/driver.h" +#include "level_zero/core/source/driver/driver_handle_imp.h" #include "level_zero/source/inc/ze_intel_gpu.h" #include "level_zero/tools/source/metrics/metric.h" #include "level_zero/tools/source/metrics/metric_query_imp.h" diff --git a/level_zero/tools/source/metrics/metric_tracer_imp.cpp b/level_zero/tools/source/metrics/metric_tracer_imp.cpp index 1345134c0c..aba39d21e4 100644 --- a/level_zero/tools/source/metrics/metric_tracer_imp.cpp +++ b/level_zero/tools/source/metrics/metric_tracer_imp.cpp @@ -9,7 +9,7 @@ #include "shared/source/helpers/debug_helpers.h" -#include "level_zero/core/source/device.h" +#include "level_zero/core/source/device/device.h" namespace L0 { diff --git a/level_zero/tools/source/metrics/windows/os_metric_query_imp_windows.cpp b/level_zero/tools/source/metrics/windows/os_metric_query_imp_windows.cpp index d0634786bb..2aaa23ad64 100644 --- a/level_zero/tools/source/metrics/windows/os_metric_query_imp_windows.cpp +++ b/level_zero/tools/source/metrics/windows/os_metric_query_imp_windows.cpp @@ -7,7 +7,7 @@ #include "shared/source/os_interface/windows/os_interface.h" -#include "level_zero/core/source/device.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/tools/source/metrics/metric_query_imp.h" #if defined(_WIN64) diff --git a/level_zero/tools/source/pin/pin.cpp b/level_zero/tools/source/pin/pin.cpp index cf0b2592e2..e1099f3932 100644 --- a/level_zero/tools/source/pin/pin.cpp +++ b/level_zero/tools/source/pin/pin.cpp @@ -7,7 +7,7 @@ #include "pin.h" -#include "level_zero/core/source/module.h" +#include "level_zero/core/source/module/module.h" #include "level_zero/source/inc/ze_intel_gpu.h" namespace L0 { diff --git a/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp.cpp b/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp.cpp index 450f82af80..fa7d3a04f5 100644 --- a/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp.cpp +++ b/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp.cpp @@ -8,7 +8,7 @@ #include "shared/source/os_interface/linux/drm_neo.h" #include "shared/source/os_interface/linux/os_interface.h" -#include "level_zero/core/source/device.h" +#include "level_zero/core/source/device/device.h" #include "sysman/frequency/frequency_imp.h" #include "sysman/frequency/os_frequency.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 79690f9de5..2de587ce41 100644 --- a/level_zero/tools/source/sysman/linux/os_sysman_imp.h +++ b/level_zero/tools/source/sysman/linux/os_sysman_imp.h @@ -8,7 +8,7 @@ #include "shared/source/os_interface/linux/drm_neo.h" #include "shared/source/os_interface/linux/os_interface.h" -#include "level_zero/core/source/device.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/tools/source/sysman/linux/fs_access.h" #include "level_zero/tools/source/sysman/sysman_imp.h" diff --git a/level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp b/level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp index 2c023954f3..f14c45c3d0 100644 --- a/level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp +++ b/level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp @@ -8,7 +8,7 @@ #include "shared/source/os_interface/linux/drm_neo.h" #include "shared/source/os_interface/linux/os_interface.h" -#include "level_zero/core/source/device.h" +#include "level_zero/core/source/device/device.h" #include "sysman/linux/os_sysman_imp.h" #include "sysman/pci/os_pci.h" diff --git a/level_zero/tools/source/sysman/standby/linux/os_standby_imp.cpp b/level_zero/tools/source/sysman/standby/linux/os_standby_imp.cpp index ba368cd185..47b0cc7116 100644 --- a/level_zero/tools/source/sysman/standby/linux/os_standby_imp.cpp +++ b/level_zero/tools/source/sysman/standby/linux/os_standby_imp.cpp @@ -8,7 +8,7 @@ #include "shared/source/os_interface/linux/drm_neo.h" #include "shared/source/os_interface/linux/os_interface.h" -#include "level_zero/core/source/device.h" +#include "level_zero/core/source/device/device.h" #include "sysman/linux/os_sysman_imp.h" #include "sysman/standby/os_standby.h" diff --git a/level_zero/tools/source/sysman/sysman.cpp b/level_zero/tools/source/sysman/sysman.cpp index 87e6719d6e..5ac96ba268 100644 --- a/level_zero/tools/source/sysman/sysman.cpp +++ b/level_zero/tools/source/sysman/sysman.cpp @@ -7,8 +7,8 @@ #include "level_zero/tools/source/sysman/sysman.h" -#include "level_zero/core/source/driver.h" -#include "level_zero/core/source/driver_handle_imp.h" +#include "level_zero/core/source/driver/driver.h" +#include "level_zero/core/source/driver/driver_handle_imp.h" #include "level_zero/tools/source/sysman/sysman_imp.h" #include diff --git a/level_zero/tools/source/sysman/sysman_device/linux/os_sysman_device_imp.cpp b/level_zero/tools/source/sysman/sysman_device/linux/os_sysman_device_imp.cpp index f0df61beb5..bcab4b2aa7 100644 --- a/level_zero/tools/source/sysman/sysman_device/linux/os_sysman_device_imp.cpp +++ b/level_zero/tools/source/sysman/sysman_device/linux/os_sysman_device_imp.cpp @@ -8,7 +8,7 @@ #include "shared/source/os_interface/linux/drm_neo.h" #include "shared/source/os_interface/linux/os_interface.h" -#include "level_zero/core/source/device.h" +#include "level_zero/core/source/device/device.h" #include "level_zero/tools/source/sysman/linux/fs_access.h" #include "level_zero/tools/source/sysman/linux/os_sysman_imp.h" #include "level_zero/tools/source/sysman/sysman_device/os_sysman_device.h" diff --git a/level_zero/tools/source/sysman/sysman_device/sysman_device_imp.cpp b/level_zero/tools/source/sysman/sysman_device/sysman_device_imp.cpp index 230cd14367..fee7406d4a 100644 --- a/level_zero/tools/source/sysman/sysman_device/sysman_device_imp.cpp +++ b/level_zero/tools/source/sysman/sysman_device/sysman_device_imp.cpp @@ -10,7 +10,7 @@ #include "shared/source/helpers/basic_math.h" #include "shared/source/helpers/debug_helpers.h" -#include "level_zero/core/source/device.h" +#include "level_zero/core/source/device/device.h" namespace L0 { diff --git a/level_zero/tools/source/sysman/sysman_imp.cpp b/level_zero/tools/source/sysman/sysman_imp.cpp index 702d43d028..eaeae2b7bb 100644 --- a/level_zero/tools/source/sysman/sysman_imp.cpp +++ b/level_zero/tools/source/sysman/sysman_imp.cpp @@ -7,8 +7,8 @@ #include "level_zero/tools/source/sysman/sysman_imp.h" -#include "level_zero/core/source/driver.h" -#include "level_zero/core/source/driver_handle_imp.h" +#include "level_zero/core/source/driver/driver.h" +#include "level_zero/core/source/driver/driver_handle_imp.h" #include "level_zero/tools/source/sysman/pci/pci_imp.h" #include "level_zero/tools/source/sysman/sysman.h" #include "level_zero/tools/source/sysman/sysman_device/sysman_device_imp.h"