diff --git a/opencl/source/api/api.cpp b/opencl/source/api/api.cpp index d76dc23aa6..da9cb07ea6 100644 --- a/opencl/source/api/api.cpp +++ b/opencl/source/api/api.cpp @@ -25,10 +25,10 @@ #include "opencl/source/api/additional_extensions.h" #include "opencl/source/aub/aub_center.h" #include "opencl/source/built_ins/vme_builtin.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/source/context/driver_diagnostics.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/device_queue/device_queue.h" #include "opencl/source/event/user_event.h" #include "opencl/source/gtpin/gtpin_notify.h" diff --git a/opencl/source/built_ins/builtins_dispatch_builder.cpp b/opencl/source/built_ins/builtins_dispatch_builder.cpp index 098ba2913b..954fff47d5 100644 --- a/opencl/source/built_ins/builtins_dispatch_builder.cpp +++ b/opencl/source/built_ins/builtins_dispatch_builder.cpp @@ -16,7 +16,7 @@ #include "opencl/source/built_ins/aux_translation_builtin.h" #include "opencl/source/built_ins/built_ins.inl" #include "opencl/source/built_ins/vme_dispatch_builder.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/helpers/built_ins_helper.h" #include "opencl/source/helpers/convert_color.h" #include "opencl/source/helpers/dispatch_info_builder.h" diff --git a/opencl/source/device/CMakeLists.txt b/opencl/source/cl_device/CMakeLists.txt similarity index 76% rename from opencl/source/device/CMakeLists.txt rename to opencl/source/cl_device/CMakeLists.txt index d8c3f28422..b371eda01f 100644 --- a/opencl/source/device/CMakeLists.txt +++ b/opencl/source/cl_device/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # -set(RUNTIME_SRCS_DEVICE +set(RUNTIME_SRCS_CL_DEVICE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/cl_device.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cl_device.h @@ -15,7 +15,7 @@ set(RUNTIME_SRCS_DEVICE ${CMAKE_CURRENT_SOURCE_DIR}/cl_device_info_map.h ${CMAKE_CURRENT_SOURCE_DIR}/cl_device_vector.h ) -target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_DEVICE}) -set_property(GLOBAL PROPERTY RUNTIME_SRCS_DEVICE ${RUNTIME_SRCS_DEVICE}) +target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_CL_DEVICE}) +set_property(GLOBAL PROPERTY RUNTIME_SRCS_CL_DEVICE ${RUNTIME_SRCS_CL_DEVICE}) add_subdirectories() diff --git a/opencl/source/device/cl_device.cpp b/opencl/source/cl_device/cl_device.cpp similarity index 99% rename from opencl/source/device/cl_device.cpp rename to opencl/source/cl_device/cl_device.cpp index 56d3c5e983..977a0e3e3e 100644 --- a/opencl/source/device/cl_device.cpp +++ b/opencl/source/cl_device/cl_device.cpp @@ -5,7 +5,7 @@ * */ -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "shared/source/device/device.h" #include "shared/source/device/sub_device.h" diff --git a/opencl/source/device/cl_device.h b/opencl/source/cl_device/cl_device.h similarity index 98% rename from opencl/source/device/cl_device.h rename to opencl/source/cl_device/cl_device.h index d5df7306d8..def0a19fa4 100644 --- a/opencl/source/device/cl_device.h +++ b/opencl/source/cl_device/cl_device.h @@ -10,7 +10,7 @@ #include "shared/source/utilities/reference_tracked_object.h" #include "opencl/source/api/cl_types.h" -#include "opencl/source/device/cl_device_info.h" +#include "opencl/source/cl_device/cl_device_info.h" #include "opencl/source/helpers/base_object.h" #include "engine_node.h" diff --git a/opencl/source/device/cl_device_caps.cpp b/opencl/source/cl_device/cl_device_caps.cpp similarity index 99% rename from opencl/source/device/cl_device_caps.cpp rename to opencl/source/cl_device/cl_device_caps.cpp index 165656593d..5f59a9a4c9 100644 --- a/opencl/source/device/cl_device_caps.cpp +++ b/opencl/source/cl_device/cl_device_caps.cpp @@ -11,7 +11,7 @@ #include "shared/source/os_interface/driver_info.h" #include "shared/source/os_interface/hw_info_config.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/platform/extensions.h" #include "opencl/source/sharings/sharing_factory.h" diff --git a/opencl/source/device/cl_device_get_cap.inl b/opencl/source/cl_device/cl_device_get_cap.inl similarity index 80% rename from opencl/source/device/cl_device_get_cap.inl rename to opencl/source/cl_device/cl_device_get_cap.inl index beb475a822..4b2e614810 100644 --- a/opencl/source/device/cl_device_get_cap.inl +++ b/opencl/source/cl_device/cl_device_get_cap.inl @@ -5,8 +5,8 @@ * */ -#include "opencl/source/device/cl_device.h" -#include "opencl/source/device/cl_device_info_map.h" +#include "opencl/source/cl_device/cl_device.h" +#include "opencl/source/cl_device/cl_device_info_map.h" namespace NEO { diff --git a/opencl/source/device/cl_device_info.cpp b/opencl/source/cl_device/cl_device_info.cpp similarity index 98% rename from opencl/source/device/cl_device_info.cpp rename to opencl/source/cl_device/cl_device_info.cpp index f1faac986d..4fda0726c3 100644 --- a/opencl/source/device/cl_device_info.cpp +++ b/opencl/source/cl_device/cl_device_info.cpp @@ -5,17 +5,17 @@ * */ -#include "opencl/source/device/cl_device_info.h" +#include "opencl/source/cl_device/cl_device_info.h" #include "shared/source/device/device.h" #include "shared/source/device/device_info.h" #include "shared/source/helpers/get_info.h" #include "shared/source/os_interface/os_time.h" -#include "opencl/source/device/cl_device.h" -#include "opencl/source/device/cl_device_get_cap.inl" -#include "opencl/source/device/cl_device_info_map.h" -#include "opencl/source/device/cl_device_vector.h" +#include "opencl/source/cl_device/cl_device.h" +#include "opencl/source/cl_device/cl_device_get_cap.inl" +#include "opencl/source/cl_device/cl_device_info_map.h" +#include "opencl/source/cl_device/cl_device_vector.h" #include "opencl/source/helpers/cl_device_helpers.h" #include "opencl/source/helpers/get_info_status_mapper.h" #include "opencl/source/platform/platform.h" diff --git a/opencl/source/device/cl_device_info.h b/opencl/source/cl_device/cl_device_info.h similarity index 100% rename from opencl/source/device/cl_device_info.h rename to opencl/source/cl_device/cl_device_info.h diff --git a/opencl/source/device/cl_device_info_map.h b/opencl/source/cl_device/cl_device_info_map.h similarity index 99% rename from opencl/source/device/cl_device_info_map.h rename to opencl/source/cl_device/cl_device_info_map.h index 896e1015da..5314b896ca 100644 --- a/opencl/source/device/cl_device_info_map.h +++ b/opencl/source/cl_device/cl_device_info_map.h @@ -9,8 +9,8 @@ #include "shared/source/device/device_info.h" #include "opencl/extensions/public/cl_ext_private.h" -#include "opencl/source/device/cl_device.h" -#include "opencl/source/device/cl_device_info.h" +#include "opencl/source/cl_device/cl_device.h" +#include "opencl/source/cl_device/cl_device_info.h" #include "CL/cl_ext_intel.h" #include diff --git a/opencl/source/device/cl_device_vector.h b/opencl/source/cl_device/cl_device_vector.h similarity index 100% rename from opencl/source/device/cl_device_vector.h rename to opencl/source/cl_device/cl_device_vector.h diff --git a/opencl/source/cl_device/linux/CMakeLists.txt b/opencl/source/cl_device/linux/CMakeLists.txt new file mode 100644 index 0000000000..7867dcb6be --- /dev/null +++ b/opencl/source/cl_device/linux/CMakeLists.txt @@ -0,0 +1,15 @@ +# +# Copyright (C) 2020 Intel Corporation +# +# SPDX-License-Identifier: MIT +# + +set(RUNTIME_SRCS_CL_DEVICE_LINUX + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/fp64_override.cpp +) +if(UNIX) + target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_CL_DEVICE_LINUX}) +endif() + +set_property(GLOBAL PROPERTY RUNTIME_SRCS_CL_DEVICE_LINUX ${RUNTIME_SRCS_CL_DEVICE_LINUX}) \ No newline at end of file diff --git a/opencl/source/device/linux/fp64_override.cpp b/opencl/source/cl_device/linux/fp64_override.cpp similarity index 100% rename from opencl/source/device/linux/fp64_override.cpp rename to opencl/source/cl_device/linux/fp64_override.cpp diff --git a/opencl/source/cl_device/windows/CMakeLists.txt b/opencl/source/cl_device/windows/CMakeLists.txt new file mode 100644 index 0000000000..94f2a10ef5 --- /dev/null +++ b/opencl/source/cl_device/windows/CMakeLists.txt @@ -0,0 +1,15 @@ +# +# Copyright (C) 2020 Intel Corporation +# +# SPDX-License-Identifier: MIT +# + +set(RUNTIME_SRCS_CL_DEVICE_WINDOWS + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/fp64_override.cpp +) +if(WIN32) + target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_CL_DEVICE_WINDOWS}) +endif() + +set_property(GLOBAL PROPERTY RUNTIME_SRCS_CL_DEVICE_WINDOWS ${RUNTIME_SRCS_CL_DEVICE_WINDOWS}) \ No newline at end of file diff --git a/opencl/source/device/windows/fp64_override.cpp b/opencl/source/cl_device/windows/fp64_override.cpp similarity index 100% rename from opencl/source/device/windows/fp64_override.cpp rename to opencl/source/cl_device/windows/fp64_override.cpp diff --git a/opencl/source/command_queue/command_queue.cpp b/opencl/source/command_queue/command_queue.cpp index 8960977da0..bfd7af1f2d 100644 --- a/opencl/source/command_queue/command_queue.cpp +++ b/opencl/source/command_queue/command_queue.cpp @@ -21,8 +21,8 @@ #include "shared/source/utilities/tag_allocator.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/device_queue/device_queue.h" #include "opencl/source/event/event_builder.h" #include "opencl/source/event/user_event.h" diff --git a/opencl/source/command_queue/command_queue_hw.h b/opencl/source/command_queue/command_queue_hw.h index 893c330dd4..ca093c904e 100644 --- a/opencl/source/command_queue/command_queue_hw.h +++ b/opencl/source/command_queue/command_queue_hw.h @@ -12,9 +12,9 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/memory_manager/graphics_allocation.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/command_queue/gpgpu_walker.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/device_queue/device_queue_hw.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/helpers/queue_helpers.h" diff --git a/opencl/source/command_queue/gpgpu_walker_bdw_plus.inl b/opencl/source/command_queue/gpgpu_walker_bdw_plus.inl index d3fc87a27f..2c8a0bfdec 100644 --- a/opencl/source/command_queue/gpgpu_walker_bdw_plus.inl +++ b/opencl/source/command_queue/gpgpu_walker_bdw_plus.inl @@ -9,8 +9,8 @@ #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/simd_helper.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/command_queue/gpgpu_walker_base.inl" -#include "opencl/source/device/cl_device.h" namespace NEO { diff --git a/opencl/source/context/context.cpp b/opencl/source/context/context.cpp index d2a53a1f55..3f0e64d967 100644 --- a/opencl/source/context/context.cpp +++ b/opencl/source/context/context.cpp @@ -18,8 +18,8 @@ #include "shared/source/memory_manager/memory_manager.h" #include "shared/source/memory_manager/unified_memory_manager.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/command_queue/command_queue.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/device_queue/device_queue.h" #include "opencl/source/gtpin/gtpin_notify.h" #include "opencl/source/helpers/get_info_status_mapper.h" diff --git a/opencl/source/context/context.h b/opencl/source/context/context.h index cfcc7445a5..ef87af3d37 100644 --- a/opencl/source/context/context.h +++ b/opencl/source/context/context.h @@ -9,9 +9,9 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/vec.h" +#include "opencl/source/cl_device/cl_device_vector.h" #include "opencl/source/context/context_type.h" #include "opencl/source/context/driver_diagnostics.h" -#include "opencl/source/device/cl_device_vector.h" #include "opencl/source/helpers/base_object.h" #include diff --git a/opencl/source/device/linux/CMakeLists.txt b/opencl/source/device/linux/CMakeLists.txt deleted file mode 100644 index 7148717cc5..0000000000 --- a/opencl/source/device/linux/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (C) 2020 Intel Corporation -# -# SPDX-License-Identifier: MIT -# - -set(RUNTIME_SRCS_DEVICE_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/fp64_override.cpp -) -if(UNIX) - target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_DEVICE_LINUX}) -endif() - -set_property(GLOBAL PROPERTY RUNTIME_SRCS_DEVICE_LINUX ${RUNTIME_SRCS_DEVICE_LINUX}) \ No newline at end of file diff --git a/opencl/source/device/windows/CMakeLists.txt b/opencl/source/device/windows/CMakeLists.txt deleted file mode 100644 index 7b2267a3b8..0000000000 --- a/opencl/source/device/windows/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (C) 2020 Intel Corporation -# -# SPDX-License-Identifier: MIT -# - -set(RUNTIME_SRCS_DEVICE_WINDOWS - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/fp64_override.cpp -) -if(WIN32) - target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_DEVICE_WINDOWS}) -endif() - -set_property(GLOBAL PROPERTY RUNTIME_SRCS_DEVICE_WINDOWS ${RUNTIME_SRCS_DEVICE_WINDOWS}) \ No newline at end of file diff --git a/opencl/source/device_queue/device_queue.cpp b/opencl/source/device_queue/device_queue.cpp index 09df7fe2fa..5ba903da32 100644 --- a/opencl/source/device_queue/device_queue.cpp +++ b/opencl/source/device_queue/device_queue.cpp @@ -10,8 +10,8 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/memory_manager/memory_manager.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/device_queue/device_queue_hw.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/helpers/queue_helpers.h" diff --git a/opencl/source/device_queue/device_queue_hw_bdw_plus.inl b/opencl/source/device_queue/device_queue_hw_bdw_plus.inl index 2bd78acab0..9b8718c163 100644 --- a/opencl/source/device_queue/device_queue_hw_bdw_plus.inl +++ b/opencl/source/device_queue/device_queue_hw_bdw_plus.inl @@ -5,7 +5,7 @@ * */ -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/device_queue/device_queue_hw_base.inl" #include "opencl/source/program/block_kernel_manager.h" diff --git a/opencl/source/gtpin/gtpin_callbacks.cpp b/opencl/source/gtpin/gtpin_callbacks.cpp index 16294fc4ae..ed15eb2ca4 100644 --- a/opencl/source/gtpin/gtpin_callbacks.cpp +++ b/opencl/source/gtpin/gtpin_callbacks.cpp @@ -9,9 +9,9 @@ #include "shared/source/memory_manager/surface.h" #include "shared/source/utilities/spinlock.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/gtpin/gtpin_defs.h" #include "opencl/source/gtpin/gtpin_hw_helper.h" #include "opencl/source/gtpin/gtpin_notify.h" diff --git a/opencl/source/helpers/hardware_commands_helper.inl b/opencl/source/helpers/hardware_commands_helper.inl index fe06ad235a..c17f5ef091 100644 --- a/opencl/source/helpers/hardware_commands_helper.inl +++ b/opencl/source/helpers/hardware_commands_helper.inl @@ -16,9 +16,9 @@ #include "shared/source/helpers/string.h" #include "shared/source/indirect_heap/indirect_heap.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/command_queue/local_id_gen.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/program/block_kernel_manager.h" diff --git a/opencl/source/helpers/queue_helpers.h b/opencl/source/helpers/queue_helpers.h index 886a0b3230..28862fa4ab 100644 --- a/opencl/source/helpers/queue_helpers.h +++ b/opencl/source/helpers/queue_helpers.h @@ -9,8 +9,8 @@ #include "shared/source/device/device.h" #include "shared/source/helpers/get_info.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/command_queue/command_queue.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/device_queue/device_queue.h" #include "opencl/source/helpers/get_info_status_mapper.h" diff --git a/opencl/source/helpers/task_information.cpp b/opencl/source/helpers/task_information.cpp index d709a999d8..8b21cdf517 100644 --- a/opencl/source/helpers/task_information.cpp +++ b/opencl/source/helpers/task_information.cpp @@ -18,9 +18,9 @@ #include "shared/source/memory_manager/surface.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/command_queue/enqueue_common.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/device_queue/device_queue.h" #include "opencl/source/gtpin/gtpin_notify.h" #include "opencl/source/helpers/enqueue_properties.h" diff --git a/opencl/source/helpers/validators.cpp b/opencl/source/helpers/validators.cpp index 186a73f900..c9976dbfef 100644 --- a/opencl/source/helpers/validators.cpp +++ b/opencl/source/helpers/validators.cpp @@ -7,9 +7,9 @@ #include "opencl/source/helpers/validators.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/event/event.h" #include "opencl/source/helpers/base_object.h" #include "opencl/source/kernel/kernel.h" diff --git a/opencl/source/kernel/kernel.cpp b/opencl/source/kernel/kernel.cpp index 5d0981830f..04d81b4a67 100644 --- a/opencl/source/kernel/kernel.cpp +++ b/opencl/source/kernel/kernel.cpp @@ -24,10 +24,10 @@ #include "opencl/source/accelerators/intel_accelerator.h" #include "opencl/source/accelerators/intel_motion_estimation.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/device_queue/device_queue.h" #include "opencl/source/execution_model/device_enqueue.h" #include "opencl/source/gtpin/gtpin_notify.h" diff --git a/opencl/source/mem_obj/buffer.cpp b/opencl/source/mem_obj/buffer.cpp index 8abc591f1f..8451b13f4e 100644 --- a/opencl/source/mem_obj/buffer.cpp +++ b/opencl/source/mem_obj/buffer.cpp @@ -23,9 +23,9 @@ #include "shared/source/memory_manager/memory_operations_handler.h" #include "shared/source/memory_manager/unified_memory_manager.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/helpers/validators.h" #include "opencl/source/mem_obj/mem_obj_helper.h" diff --git a/opencl/source/mem_obj/image.cpp b/opencl/source/mem_obj/image.cpp index 64101c2c70..bd3c15b91b 100644 --- a/opencl/source/mem_obj/image.cpp +++ b/opencl/source/mem_obj/image.cpp @@ -20,10 +20,10 @@ #include "shared/source/memory_manager/memory_manager.h" #include "shared/source/utilities/compiler_support.h" +#include "opencl/source/cl_device/cl_device.h" +#include "opencl/source/cl_device/cl_device_get_cap.inl" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" -#include "opencl/source/device/cl_device_get_cap.inl" #include "opencl/source/helpers/get_info_status_mapper.h" #include "opencl/source/helpers/gmm_types_converter.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" diff --git a/opencl/source/mem_obj/mem_obj.cpp b/opencl/source/mem_obj/mem_obj.cpp index 4869a6e38f..03f46ffe46 100644 --- a/opencl/source/mem_obj/mem_obj.cpp +++ b/opencl/source/mem_obj/mem_obj.cpp @@ -18,9 +18,9 @@ #include "shared/source/memory_manager/memory_manager.h" #include "shared/source/os_interface/os_context.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/helpers/get_info_status_mapper.h" #include diff --git a/opencl/source/mem_obj/pipe.cpp b/opencl/source/mem_obj/pipe.cpp index b8baf03203..83a69a905c 100644 --- a/opencl/source/mem_obj/pipe.cpp +++ b/opencl/source/mem_obj/pipe.cpp @@ -10,8 +10,8 @@ #include "shared/source/helpers/get_info.h" #include "shared/source/memory_manager/memory_manager.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/helpers/get_info_status_mapper.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/mem_obj_helper.h" diff --git a/opencl/source/os_interface/linux/device_caps_init_linux.cpp b/opencl/source/os_interface/linux/device_caps_init_linux.cpp index 39838c11d2..339bf7703c 100644 --- a/opencl/source/os_interface/linux/device_caps_init_linux.cpp +++ b/opencl/source/os_interface/linux/device_caps_init_linux.cpp @@ -5,7 +5,7 @@ * */ -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" namespace NEO { diff --git a/opencl/source/os_interface/windows/api_win.cpp b/opencl/source/os_interface/windows/api_win.cpp index 86643a3d6e..39fb32c2b5 100644 --- a/opencl/source/os_interface/windows/api_win.cpp +++ b/opencl/source/os_interface/windows/api_win.cpp @@ -11,9 +11,9 @@ #include "opencl/source/api/api.h" #include "opencl/source/api/dispatch.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/platform/platform.h" #include "opencl/source/sharings/d3d/d3d_buffer.h" diff --git a/opencl/source/os_interface/windows/device_caps_init_win.cpp b/opencl/source/os_interface/windows/device_caps_init_win.cpp index 722b2d2434..d1151750b5 100644 --- a/opencl/source/os_interface/windows/device_caps_init_win.cpp +++ b/opencl/source/os_interface/windows/device_caps_init_win.cpp @@ -9,7 +9,7 @@ #include "shared/source/device/device.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" namespace NEO { diff --git a/opencl/source/platform/platform.cpp b/opencl/source/platform/platform.cpp index 937723116b..784eaae580 100644 --- a/opencl/source/platform/platform.cpp +++ b/opencl/source/platform/platform.cpp @@ -23,7 +23,7 @@ #include "shared/source/source_level_debugger/source_level_debugger.h" #include "opencl/source/api/api.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/event/async_events_handler.h" #include "opencl/source/gtpin/gtpin_notify.h" #include "opencl/source/helpers/built_ins_helper.h" diff --git a/opencl/source/platform/platform.h b/opencl/source/platform/platform.h index 3e31bf3daa..0b26fc89a5 100644 --- a/opencl/source/platform/platform.h +++ b/opencl/source/platform/platform.h @@ -7,7 +7,7 @@ #pragma once #include "opencl/source/api/cl_types.h" -#include "opencl/source/device/cl_device_vector.h" +#include "opencl/source/cl_device/cl_device_vector.h" #include "opencl/source/helpers/base_object.h" #include "platform_info.h" diff --git a/opencl/source/program/build.cpp b/opencl/source/program/build.cpp index a0df085837..24e10cddab 100644 --- a/opencl/source/program/build.cpp +++ b/opencl/source/program/build.cpp @@ -12,7 +12,7 @@ #include "shared/source/source_level_debugger/source_level_debugger.h" #include "shared/source/utilities/time_measure_wrapper.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/gtpin/gtpin_notify.h" #include "opencl/source/helpers/validators.h" #include "opencl/source/platform/platform.h" diff --git a/opencl/source/program/compile.cpp b/opencl/source/program/compile.cpp index d598166065..6e02f5290f 100644 --- a/opencl/source/program/compile.cpp +++ b/opencl/source/program/compile.cpp @@ -13,7 +13,7 @@ #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/source_level_debugger/source_level_debugger.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/helpers/validators.h" #include "opencl/source/platform/platform.h" diff --git a/opencl/source/program/create.inl b/opencl/source/program/create.inl index d123b711cb..277939152c 100644 --- a/opencl/source/program/create.inl +++ b/opencl/source/program/create.inl @@ -9,8 +9,8 @@ #include "shared/source/device/device.h" #include "shared/source/memory_manager/memory_constants.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/helpers/string_helpers.h" #include "opencl/source/platform/platform.h" #include "opencl/source/program/program.h" diff --git a/opencl/source/program/get_info.cpp b/opencl/source/program/get_info.cpp index 53e4b626d1..991db7379e 100644 --- a/opencl/source/program/get_info.cpp +++ b/opencl/source/program/get_info.cpp @@ -9,8 +9,8 @@ #include "shared/source/device/device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/helpers/base_object.h" #include "opencl/source/helpers/get_info_status_mapper.h" #include "opencl/source/helpers/validators.h" diff --git a/opencl/source/program/kernel_info.cpp b/opencl/source/program/kernel_info.cpp index 1815211e1a..fb683731c8 100644 --- a/opencl/source/program/kernel_info.cpp +++ b/opencl/source/program/kernel_info.cpp @@ -12,7 +12,7 @@ #include "shared/source/helpers/string.h" #include "shared/source/memory_manager/memory_manager.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/opencl/source/program/link.cpp b/opencl/source/program/link.cpp index 7827db3d9c..112fb17d94 100644 --- a/opencl/source/program/link.cpp +++ b/opencl/source/program/link.cpp @@ -14,7 +14,7 @@ #include "shared/source/source_level_debugger/source_level_debugger.h" #include "shared/source/utilities/stackvec.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/gtpin/gtpin_notify.h" #include "opencl/source/helpers/validators.h" #include "opencl/source/platform/platform.h" diff --git a/opencl/source/program/printf_handler.cpp b/opencl/source/program/printf_handler.cpp index d4dbf666ae..b7179b7a10 100644 --- a/opencl/source/program/printf_handler.cpp +++ b/opencl/source/program/printf_handler.cpp @@ -12,7 +12,7 @@ #include "shared/source/memory_manager/memory_manager.h" #include "shared/source/program/print_formatter.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/opencl/source/program/process_device_binary.cpp b/opencl/source/program/process_device_binary.cpp index be55c9125b..24f4dcaee7 100644 --- a/opencl/source/program/process_device_binary.cpp +++ b/opencl/source/program/process_device_binary.cpp @@ -15,8 +15,8 @@ #include "shared/source/program/program_info.h" #include "shared/source/program/program_initialization.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/gtpin/gtpin_notify.h" #include "opencl/source/program/kernel_info.h" #include "opencl/source/program/program.h" diff --git a/opencl/source/program/program.cpp b/opencl/source/program/program.cpp index 0032ee6aeb..e7a145af14 100644 --- a/opencl/source/program/program.cpp +++ b/opencl/source/program/program.cpp @@ -20,8 +20,8 @@ #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/source/os_interface/os_context.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/platform/platform.h" #include "opencl/source/program/block_kernel_manager.h" #include "opencl/source/program/kernel_info.h" diff --git a/opencl/source/sampler/sampler.cpp b/opencl/source/sampler/sampler.cpp index 6f987bc0b6..bbfd10e7ad 100644 --- a/opencl/source/sampler/sampler.cpp +++ b/opencl/source/sampler/sampler.cpp @@ -10,8 +10,8 @@ #include "shared/source/helpers/get_info.h" #include "shared/source/helpers/hw_info.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/helpers/get_info_status_mapper.h" #include "patch_list.h" diff --git a/opencl/source/scheduler/scheduler_kernel.cpp b/opencl/source/scheduler/scheduler_kernel.cpp index db015e50c2..ea0b63921a 100644 --- a/opencl/source/scheduler/scheduler_kernel.cpp +++ b/opencl/source/scheduler/scheduler_kernel.cpp @@ -10,7 +10,7 @@ #include "shared/source/device/device.h" #include "shared/source/helpers/hw_helper.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include diff --git a/opencl/source/sharings/d3d/d3d_surface.cpp b/opencl/source/sharings/d3d/d3d_surface.cpp index bbf9de7307..55697ec130 100644 --- a/opencl/source/sharings/d3d/d3d_surface.cpp +++ b/opencl/source/sharings/d3d/d3d_surface.cpp @@ -11,8 +11,8 @@ #include "shared/source/helpers/get_info.h" #include "shared/source/memory_manager/memory_manager.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/helpers/gmm_types_converter.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/source/sharings/d3d/d3d_texture.cpp b/opencl/source/sharings/d3d/d3d_texture.cpp index 50321092a0..10cca4035d 100644 --- a/opencl/source/sharings/d3d/d3d_texture.cpp +++ b/opencl/source/sharings/d3d/d3d_texture.cpp @@ -14,8 +14,8 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/memory_manager/memory_manager.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/helpers/gmm_types_converter.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/source/sharings/gl/windows/cl_gl_api.cpp b/opencl/source/sharings/gl/windows/cl_gl_api.cpp index cb6287db7e..da531f1004 100644 --- a/opencl/source/sharings/gl/windows/cl_gl_api.cpp +++ b/opencl/source/sharings/gl/windows/cl_gl_api.cpp @@ -9,9 +9,9 @@ #include "shared/source/utilities/api_intercept.h" #include "opencl/source/api/api.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/event/async_events_handler.h" #include "opencl/source/helpers/base_object.h" #include "opencl/source/helpers/validators.h" diff --git a/opencl/source/sharings/gl/windows/gl_buffer_windows.cpp b/opencl/source/sharings/gl/windows/gl_buffer_windows.cpp index 989e14b549..10923b5273 100644 --- a/opencl/source/sharings/gl/windows/gl_buffer_windows.cpp +++ b/opencl/source/sharings/gl/windows/gl_buffer_windows.cpp @@ -10,8 +10,8 @@ #include "shared/source/memory_manager/memory_manager.h" #include "opencl/extensions/public/cl_gl_private_intel.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/sharings/gl/gl_buffer.h" #include "opencl/source/sharings/gl/windows/gl_sharing_windows.h" diff --git a/opencl/source/sharings/gl/windows/gl_texture_windows.cpp b/opencl/source/sharings/gl/windows/gl_texture_windows.cpp index 479b5ee0a2..a9f7fb66f2 100644 --- a/opencl/source/sharings/gl/windows/gl_texture_windows.cpp +++ b/opencl/source/sharings/gl/windows/gl_texture_windows.cpp @@ -15,8 +15,8 @@ #include "shared/source/memory_manager/memory_manager.h" #include "opencl/extensions/public/cl_gl_private_intel.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/helpers/gmm_types_converter.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/sharings/gl/gl_texture.h" diff --git a/opencl/source/sharings/unified/unified_image.cpp b/opencl/source/sharings/unified/unified_image.cpp index f4b8ffc79c..1bf6cd30cd 100644 --- a/opencl/source/sharings/unified/unified_image.cpp +++ b/opencl/source/sharings/unified/unified_image.cpp @@ -15,8 +15,8 @@ #include "shared/source/memory_manager/graphics_allocation.h" #include "shared/source/memory_manager/memory_manager.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/mem_obj/image.h" namespace NEO { diff --git a/opencl/source/sharings/va/cl_va_api.cpp b/opencl/source/sharings/va/cl_va_api.cpp index 70dc20a1f3..8910c4137f 100644 --- a/opencl/source/sharings/va/cl_va_api.cpp +++ b/opencl/source/sharings/va/cl_va_api.cpp @@ -9,9 +9,9 @@ #include "shared/source/utilities/api_intercept.h" #include "opencl/source/api/api.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/platform/platform.h" #include "opencl/source/sharings/va/va_sharing.h" #include "opencl/source/sharings/va/va_surface.h" diff --git a/opencl/source/sharings/va/va_surface.cpp b/opencl/source/sharings/va/va_surface.cpp index a3634557f2..cd76723841 100644 --- a/opencl/source/sharings/va/va_surface.cpp +++ b/opencl/source/sharings/va/va_surface.cpp @@ -11,8 +11,8 @@ #include "shared/source/helpers/get_info.h" #include "shared/source/memory_manager/memory_manager.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/mem_obj/image.h" namespace NEO { diff --git a/opencl/test/unit_test/api/cl_add_comment_to_aub_tests.inl b/opencl/test/unit_test/api/cl_add_comment_to_aub_tests.inl index 48c667ca47..c19c003858 100644 --- a/opencl/test/unit_test/api/cl_add_comment_to_aub_tests.inl +++ b/opencl/test/unit_test/api/cl_add_comment_to_aub_tests.inl @@ -8,8 +8,8 @@ #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/root_device_environment.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/api/cl_api_tests.h" #include "opencl/test/unit_test/mocks/mock_aub_center.h" diff --git a/opencl/test/unit_test/api/cl_create_program_with_built_in_kernels_tests.cpp b/opencl/test/unit_test/api/cl_create_program_with_built_in_kernels_tests.cpp index dec2877ce7..f58b4926d6 100644 --- a/opencl/test/unit_test/api/cl_create_program_with_built_in_kernels_tests.cpp +++ b/opencl/test/unit_test/api/cl_create_program_with_built_in_kernels_tests.cpp @@ -11,8 +11,8 @@ #include "opencl/source/built_ins/built_in_ops_vme.h" #include "opencl/source/built_ins/vme_builtin.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/helpers/base_object.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/program/program.h" diff --git a/opencl/test/unit_test/api/cl_enqueue_read_buffer_tests.inl b/opencl/test/unit_test/api/cl_enqueue_read_buffer_tests.inl index 997fe14777..df51841c90 100644 --- a/opencl/test/unit_test/api/cl_enqueue_read_buffer_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_read_buffer_tests.inl @@ -7,9 +7,9 @@ #include "shared/source/device/device.h" +#include "opencl/source/cl_device/cl_device_info.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" -#include "opencl/source/device/cl_device_info.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/gl/cl_get_gl_context_info_khr_tests.cpp b/opencl/test/unit_test/api/gl/cl_get_gl_context_info_khr_tests.cpp index ca7bfe01bf..5170ba6e73 100644 --- a/opencl/test/unit_test/api/gl/cl_get_gl_context_info_khr_tests.cpp +++ b/opencl/test/unit_test/api/gl/cl_get_gl_context_info_khr_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/device_factory.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/test/unit_test/api/cl_api_tests.h" #include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_platform.h" diff --git a/opencl/test/unit_test/device/get_device_info_size_tests.cpp b/opencl/test/unit_test/device/get_device_info_size_tests.cpp index 106e2fef92..4f0b2e7117 100644 --- a/opencl/test/unit_test/device/get_device_info_size_tests.cpp +++ b/opencl/test/unit_test/device/get_device_info_size_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "opencl/source/device/cl_device_info_map.h" +#include "opencl/source/cl_device/cl_device_info_map.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/mocks/mock_platform.h" diff --git a/opencl/test/unit_test/device/get_device_info_tests.cpp b/opencl/test/unit_test/device/get_device_info_tests.cpp index 40fe969b6f..e29c8d035e 100644 --- a/opencl/test/unit_test/device/get_device_info_tests.cpp +++ b/opencl/test/unit_test/device/get_device_info_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "opencl/source/device/cl_device_info_map.h" +#include "opencl/source/cl_device/cl_device_info_map.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/fixtures/device_info_fixture.h" #include "test.h" diff --git a/opencl/test/unit_test/device/sub_device_tests.cpp b/opencl/test/unit_test/device/sub_device_tests.cpp index 3ef2186d4a..2caebc8977 100644 --- a/opencl/test/unit_test/device/sub_device_tests.cpp +++ b/opencl/test/unit_test/device/sub_device_tests.cpp @@ -10,7 +10,7 @@ #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/helpers/ult_hw_config.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/test/unit_test/helpers/variable_backup.h" #include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" diff --git a/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp b/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp index cabcd11a69..2ad4e89db6 100644 --- a/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp +++ b/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp @@ -19,7 +19,7 @@ #include "shared/test/unit_test/utilities/destructor_counted.h" #include "opencl/source/aub/aub_center.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/mocks/mock_device.h" diff --git a/opencl/test/unit_test/fixtures/device_host_queue_fixture.h b/opencl/test/unit_test/fixtures/device_host_queue_fixture.h index 403ee76880..8a8be31487 100644 --- a/opencl/test/unit_test/fixtures/device_host_queue_fixture.h +++ b/opencl/test/unit_test/fixtures/device_host_queue_fixture.h @@ -6,8 +6,8 @@ */ #pragma once +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/command_queue/command_queue.h" -#include "opencl/source/device/cl_device.h" #include "opencl/source/device_queue/device_queue.h" #include "opencl/source/device_queue/device_queue_hw.h" #include "opencl/test/unit_test/api/cl_api_tests.h" diff --git a/opencl/test/unit_test/fixtures/device_instrumentation_fixture.cpp b/opencl/test/unit_test/fixtures/device_instrumentation_fixture.cpp index e002891e32..01b5d36ff6 100644 --- a/opencl/test/unit_test/fixtures/device_instrumentation_fixture.cpp +++ b/opencl/test/unit_test/fixtures/device_instrumentation_fixture.cpp @@ -7,7 +7,7 @@ #include "opencl/test/unit_test/fixtures/device_instrumentation_fixture.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/test/unit_test/helpers/execution_environment_helper.h" #include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_platform.h" diff --git a/opencl/test/unit_test/fixtures/kernel_data_fixture.h b/opencl/test/unit_test/fixtures/kernel_data_fixture.h index 9749bbde40..de9c1abf5a 100644 --- a/opencl/test/unit_test/fixtures/kernel_data_fixture.h +++ b/opencl/test/unit_test/fixtures/kernel_data_fixture.h @@ -9,7 +9,7 @@ #include "shared/source/memory_manager/memory_manager.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/program/kernel_info.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_program.h" diff --git a/opencl/test/unit_test/fixtures/platform_fixture.cpp b/opencl/test/unit_test/fixtures/platform_fixture.cpp index 89ed23ad4a..9fa1038c87 100644 --- a/opencl/test/unit_test/fixtures/platform_fixture.cpp +++ b/opencl/test/unit_test/fixtures/platform_fixture.cpp @@ -7,7 +7,7 @@ #include "opencl/test/unit_test/fixtures/platform_fixture.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp b/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp index 772adc309f..e3ef95957d 100644 --- a/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp +++ b/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" #include "test.h" diff --git a/opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp b/opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp index f33b411755..2c678acf1b 100644 --- a/opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/hw_helper.h" -#include "opencl/source/device/cl_device_info_map.h" +#include "opencl/source/cl_device/cl_device_info_map.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/test/unit_test/mem_obj/image_validate_tests.cpp b/opencl/test/unit_test/mem_obj/image_validate_tests.cpp index cd0005ebd2..3abaca3e8a 100644 --- a/opencl/test/unit_test/mem_obj/image_validate_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_validate_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/helpers/aligned_memory.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/helpers/convert_color.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp b/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp index 900c8cb778..ba3985bc63 100644 --- a/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp +++ b/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp @@ -9,7 +9,7 @@ #include "shared/source/helpers/aligned_memory.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" -#include "opencl/source/device/cl_device_get_cap.inl" +#include "opencl/source/cl_device/cl_device_get_cap.inl" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/test/unit_test/mocks/mock_cl_device.h b/opencl/test/unit_test/mocks/mock_cl_device.h index c4b4676247..e9607c3bf4 100644 --- a/opencl/test/unit_test/mocks/mock_cl_device.h +++ b/opencl/test/unit_test/mocks/mock_cl_device.h @@ -7,7 +7,7 @@ #pragma once -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/test/unit_test/mocks/mock_device.h" namespace NEO { diff --git a/opencl/test/unit_test/mocks/mock_kernel.h b/opencl/test/unit_test/mocks/mock_kernel.h index d9efbe6576..f093a2dccb 100644 --- a/opencl/test/unit_test/mocks/mock_kernel.h +++ b/opencl/test/unit_test/mocks/mock_kernel.h @@ -11,7 +11,7 @@ #include "shared/source/helpers/string.h" #include "shared/source/kernel/grf_config.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/platform/platform.h" #include "opencl/source/program/block_kernel_manager.h" diff --git a/opencl/test/unit_test/mocks/mock_program.h b/opencl/test/unit_test/mocks/mock_program.h index 7213ab6677..cade1945ff 100644 --- a/opencl/test/unit_test/mocks/mock_program.h +++ b/opencl/test/unit_test/mocks/mock_program.h @@ -10,7 +10,7 @@ #include "shared/source/helpers/hash.h" #include "shared/source/helpers/string.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/program/kernel_info.h" #include "opencl/source/program/program.h" diff --git a/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp b/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp index 4d8a0c1735..07eb738359 100644 --- a/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp +++ b/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp @@ -9,7 +9,7 @@ #include "shared/source/helpers/hw_helper.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" using namespace NEO; using namespace std; diff --git a/opencl/test/unit_test/os_interface/windows/wddm_residency_handler_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_residency_handler_tests.cpp index 8dd68bb04e..28010219dd 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_residency_handler_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_residency_handler_tests.cpp @@ -10,7 +10,7 @@ #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/helpers/ult_hw_config.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/test/unit_test/helpers/variable_backup.h" #include "opencl/test/unit_test/mocks/mock_allocation_properties.h" #include "opencl/test/unit_test/mocks/mock_context.h" diff --git a/opencl/test/unit_test/platform/platform_tests.cpp b/opencl/test/unit_test/platform/platform_tests.cpp index 432b658c6f..c3dead2784 100644 --- a/opencl/test/unit_test/platform/platform_tests.cpp +++ b/opencl/test/unit_test/platform/platform_tests.cpp @@ -11,7 +11,7 @@ #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/helpers/ult_hw_config.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/platform/extensions.h" #include "opencl/source/sharings/sharing_factory.h" #include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h" diff --git a/opencl/test/unit_test/program/program_with_block_kernels_tests.cpp b/opencl/test/unit_test/program/program_with_block_kernels_tests.cpp index aab1272dfd..7ba57e69b4 100644 --- a/opencl/test/unit_test/program/program_with_block_kernels_tests.cpp +++ b/opencl/test/unit_test/program/program_with_block_kernels_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/compiler_interface/compiler_interface.h" #include "shared/source/device/device.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/program/block_kernel_manager.h" #include "opencl/test/unit_test/fixtures/context_fixture.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp index cd9a95598c..b603c2de10 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/helpers/get_info.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/helpers/gmm_types_converter.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/sharings/gl/gl_texture.h" diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp index d05569265f..65b23a8a0c 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/gmm_helper/gmm.h" #include "shared/source/gmm_helper/resource_info.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/sharings/gl/gl_buffer.h" #include "opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h" diff --git a/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp b/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp index bb01e843a2..49a8565327 100644 --- a/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp +++ b/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp @@ -11,7 +11,7 @@ #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/api/api.h" -#include "opencl/source/device/cl_device.h" +#include "opencl/source/cl_device/cl_device.h" #include "opencl/source/platform/platform.h" #include "opencl/source/sharings/va/cl_va_api.h" #include "opencl/source/sharings/va/va_sharing.h"