Move core device objects to core

Change-Id: Iab6f00ea5cf2595cebc34c18286a6900b90aef92
Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>

unit_tests/api/cl_build_program_tests.inl

@@ -6,9 +6,9 @@
  */
 
 #include "core/compiler_interface/compiler_interface.h"
+#include "core/device/device.h"
 #include "core/helpers/file_io.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
 #include "runtime/program/kernel_info.h"
 #include "runtime/program/program.h"
 #include "unit_tests/helpers/kernel_binary_helper.h"

unit_tests/api/cl_create_command_queue_tests.inl

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/device/device.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
 #include "test.h"
 #include "unit_tests/libult/ult_command_stream_receiver.h"
 #include "unit_tests/mocks/mock_device.h"

unit_tests/api/cl_create_pipe_tests.inl

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/device/device.h"
 #include "core/unit_tests/utilities/base_object_utils.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
 #include "runtime/helpers/base_object.h"
 
 #include "cl_api_tests.h"

unit_tests/api/cl_create_program_with_built_in_kernels_tests.cpp

@@ -6,10 +6,10 @@
  */
 
 #include "core/compiler_interface/compiler_interface.h"
+#include "core/device/device.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/context/context.h"
 #include "runtime/device/cl_device.h"
-#include "runtime/device/device.h"
 #include "runtime/helpers/base_object.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/program/program.h"

unit_tests/api/cl_enqueue_read_buffer_tests.inl

@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "core/device/device.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
 #include "runtime/device/device_info.h"
 
 #include "cl_api_tests.h"

unit_tests/api/cl_enqueue_svm_free_tests.inl

@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "core/device/device.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
 #include "runtime/event/user_event.h"
 
 #include "cl_api_tests.h"

unit_tests/api/cl_enqueue_svm_map_tests.inl

@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "core/device/device.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
 
 #include "cl_api_tests.h"
 

unit_tests/api/cl_enqueue_svm_mem_fill_tests.inl

@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "core/device/device.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
 
 #include "cl_api_tests.h"
 

unit_tests/api/cl_enqueue_svm_memcpy_tests.inl

@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "core/device/device.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
 
 #include "cl_api_tests.h"
 

unit_tests/api/cl_enqueue_svm_migrate_mem_tests.cpp

@@ -1,14 +1,14 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "core/device/device.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "core/memory_manager/unified_memory_manager.h"
 #include "runtime/command_queue/command_queue.h"
-#include "runtime/device/device.h"
 #include "runtime/event/user_event.h"
 #include "unit_tests/mocks/mock_context.h"
 

unit_tests/api/cl_enqueue_svm_unmap_tests.inl

@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "core/device/device.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
 
 #include "cl_api_tests.h"
 

unit_tests/api/cl_get_context_info_tests.inl

@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "core/device/device.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
 
 #include "cl_api_tests.h"
 

unit_tests/api/cl_get_device_info_tests.inl

@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/device/device.h"
 #include "core/helpers/hw_info.h"
-#include "runtime/device/device.h"
 
 #include "cl_api_tests.h"
 

unit_tests/api/cl_get_kernel_arg_info_tests.inl

@@ -6,9 +6,9 @@
  */
 
 #include "core/compiler_interface/compiler_interface.h"
+#include "core/device/device.h"
 #include "core/helpers/file_io.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
 #include "unit_tests/helpers/kernel_binary_helper.h"
 #include "unit_tests/helpers/test_files.h"
 

unit_tests/api/cl_get_kernel_info_tests.inl

@@ -6,9 +6,9 @@
  */
 
 #include "core/compiler_interface/compiler_interface.h"
+#include "core/device/device.h"
 #include "core/helpers/file_io.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
 #include "unit_tests/helpers/kernel_binary_helper.h"
 #include "unit_tests/helpers/test_files.h"
 

unit_tests/api/cl_get_kernel_work_group_info_tests.inl

@@ -6,8 +6,8 @@
  */
 
 #include "core/compiler_interface/compiler_interface.h"
+#include "core/device/device.h"
 #include "core/helpers/file_io.h"
-#include "runtime/device/device.h"
 #include "unit_tests/helpers/kernel_binary_helper.h"
 #include "unit_tests/helpers/test_files.h"
 #include "unit_tests/mocks/mock_kernel.h"

unit_tests/api/cl_get_mem_object_info_tests.inl

@@ -6,9 +6,9 @@
  */
 
 #include "core/compiler_interface/compiler_interface.h"
+#include "core/device/device.h"
 #include "core/helpers/file_io.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
 #include "unit_tests/helpers/test_files.h"
 
 #include "cl_api_tests.h"

unit_tests/api/cl_get_platform_info_tests.inl

@@ -6,7 +6,7 @@
  */
 
 #include "core/debug_settings/debug_settings_manager.h"
-#include "runtime/device/device.h"
+#include "core/device/device.h"
 #include "runtime/platform/platform.h"
 #include "test.h"
 

unit_tests/api/cl_get_program_build_info_tests.inl

@@ -6,9 +6,9 @@
  */
 
 #include "core/compiler_interface/compiler_interface.h"
+#include "core/device/device.h"
 #include "core/helpers/file_io.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
 #include "unit_tests/elflib/elf_binary_simulator.h"
 #include "unit_tests/helpers/kernel_binary_helper.h"
 #include "unit_tests/helpers/test_files.h"

unit_tests/api/cl_get_program_info_tests.inl

@@ -6,9 +6,9 @@
  */
 
 #include "core/compiler_interface/compiler_interface.h"
+#include "core/device/device.h"
 #include "core/helpers/file_io.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
 #include "unit_tests/helpers/kernel_binary_helper.h"
 #include "unit_tests/helpers/test_files.h"
 

unit_tests/api/cl_get_supported_image_formats_tests.inl

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/device/device.h"
 #include "core/unit_tests/utilities/base_object_utils.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
 #include "unit_tests/mocks/mock_device.h"
 
 #include "cl_api_tests.h"

unit_tests/api/cl_icd_get_platform_ids_khr_tests.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,7 +9,7 @@
 #include "core/os_interface/windows/windows_wrapper.h"
 #endif
 
-#include "runtime/device/device.h"
+#include "core/device/device.h"
 #include "runtime/platform/platform.h"
 #include "unit_tests/api/cl_api_tests.h"
 

unit_tests/api/cl_mem_locally_uncached_resource_tests.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/device/device.h"
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/hw_cmds.h"
 #include "core/helpers/state_base_address.h"
@@ -13,7 +14,6 @@
 #include "runtime/api/api.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/device/device.h"
 #include "runtime/kernel/kernel.h"
 #include "test.h"
 #include "unit_tests/fixtures/hello_world_fixture.h"

unit_tests/api/cl_set_default_device_command_queue_tests.inl

@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/device/device.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
 #include "runtime/device_queue/device_queue.h"
 #include "test.h"
 

unit_tests/api/cl_svm_alloc_tests.inl

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/device/device.h"
 #include "core/unit_tests/utilities/base_object_utils.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
 
 #include "cl_api_tests.h"
 

unit_tests/api/gl/cl_get_gl_device_info_tests.cpp

@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/device/device.h"
 #include "core/helpers/hw_info.h"
-#include "runtime/device/device.h"
 #include "unit_tests/api/cl_api_tests.h"
 
 #include <cstring>

unit_tests/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp

@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/device/device.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/device/device.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "test.h"

unit_tests/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/device/device.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/device/device.h"
 #include "runtime/mem_obj/buffer.h"
 #include "test.h"
 #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h"

unit_tests/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp

@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/device/device.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/device/device.h"
 #include "runtime/mem_obj/buffer.h"
 #include "test.h"
 #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h"

unit_tests/aub_tests/command_stream/aub_command_stream_fixture.cpp

@@ -7,13 +7,13 @@
 
 #include "unit_tests/aub_tests/command_stream/aub_command_stream_fixture.h"
 
+#include "core/device/device.h"
 #include "core/helpers/hw_helper.h"
 #include "core/os_interface/os_context.h"
 #include "core/unit_tests/helpers/memory_management.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/command_stream/tbx_command_stream_receiver.h"
-#include "runtime/device/device.h"
 #include "unit_tests/gen_common/gen_cmd_parse.h"
 #include "unit_tests/mocks/mock_device.h"
 #include "unit_tests/tests_configuration.h"

unit_tests/aub_tests/command_stream/aub_mem_dump_tests.h

@@ -6,11 +6,11 @@
  */
 
 #pragma once
+#include "core/device/device.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/aub_mem_dump/aub_mem_dump.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw.h"
-#include "runtime/device/device.h"
 #include "runtime/gen_common/aub_mapper.h"
 #include "test.h"
 

unit_tests/command_queue/command_queue_fixture.cpp

@@ -7,9 +7,9 @@
 
 #include "unit_tests/command_queue/command_queue_fixture.h"
 
+#include "core/device/device.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
 #include "unit_tests/mocks/mock_device.h"
 
 #include "gtest/gtest.h"

unit_tests/command_stream/tbx_command_stream_fixture.cpp

@@ -7,9 +7,9 @@
 
 #include "unit_tests/command_stream/tbx_command_stream_fixture.h"
 
+#include "core/device/device.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/device/device.h"
 #include "unit_tests/gen_common/gen_cmd_parse.h"
 #include "unit_tests/mocks/mock_device.h"
 

unit_tests/context/context_tests.cpp

@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/device/device.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/context/context.inl"
-#include "runtime/device/device.h"
 #include "runtime/device_queue/device_queue.h"
 #include "runtime/sharings/sharing.h"
 #include "unit_tests/fixtures/platform_fixture.h"

unit_tests/device/device_tests.cpp

@@ -5,12 +5,12 @@
  *
  */
 
+#include "core/device/device.h"
 #include "core/helpers/hw_helper.h"
 #include "core/indirect_heap/indirect_heap.h"
 #include "core/os_interface/os_context.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/helpers/ult_hw_config.h"
-#include "runtime/device/device.h"
 #include "runtime/platform/platform.h"
 #include "test.h"
 #include "unit_tests/fixtures/device_fixture.h"

unit_tests/device/sub_device_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/device/sub_device.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/helpers/ult_hw_config.h"
-#include "runtime/device/sub_device.h"
 #include "unit_tests/helpers/variable_backup.h"
 #include "unit_tests/mocks/mock_device.h"
 #include "unit_tests/mocks/mock_memory_manager.h"

unit_tests/execution_environment/execution_environment_tests.cpp

@@ -7,6 +7,7 @@
 
 #include "core/command_stream/preemption.h"
 #include "core/compiler_interface/compiler_interface.h"
+#include "core/device/device.h"
 #include "core/execution_environment/execution_environment.h"
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/hw_helper.h"
@@ -15,7 +16,6 @@
 #include "core/unit_tests/utilities/destructor_counted.h"
 #include "runtime/aub/aub_center.h"
 #include "runtime/built_ins/built_ins.h"
-#include "runtime/device/device.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/platform/platform.h"
 #include "runtime/source_level_debugger/source_level_debugger.h"

unit_tests/fixtures/built_in_fixture.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,8 +7,8 @@
 
 #include "unit_tests/fixtures/built_in_fixture.h"
 
+#include "core/device/device.h"
 #include "runtime/built_ins/built_ins.h"
-#include "runtime/device/device.h"
 #include "unit_tests/global_environment.h"
 #include "unit_tests/helpers/kernel_binary_helper.h"
 #include "unit_tests/helpers/test_files.h"

unit_tests/fixtures/hello_world_kernel_fixture.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
+#include "core/device/device.h"
 #include "core/helpers/file_io.h"
-#include "runtime/device/device.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/platform/platform.h"
 #include "runtime/program/program.h"

unit_tests/fixtures/simple_arg_kernel_fixture.h

@@ -6,10 +6,10 @@
  */
 
 #pragma once
+#include "core/device/device.h"
 #include "core/helpers/array_count.h"
 #include "core/helpers/file_io.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "runtime/device/device.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/program/program.h"
 #include "unit_tests/fixtures/device_fixture.h"

unit_tests/gen9/test_platform_caps_gen9.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/device/device.h"
+#include "core/device/device.h"
 #include "test.h"
 #include "unit_tests/fixtures/platform_fixture.h"
 

unit_tests/gtpin/gtpin_tests.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/device/device.h"
 #include "core/device_binary_format/patchtokens_decoder.h"
 #include "core/helpers/basic_math.h"
 #include "core/helpers/file_io.h"
@@ -14,7 +15,6 @@
 #include "core/unit_tests/device_binary_format/patchtokens_tests.h"
 #include "runtime/api/api.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
 #include "runtime/gtpin/gtpin_defs.h"
 #include "runtime/gtpin/gtpin_helpers.h"
 #include "runtime/gtpin/gtpin_hw_helper.h"

unit_tests/helpers/built_ins_helper.cpp

@@ -7,8 +7,8 @@
 
 #include "runtime/helpers/built_ins_helper.h"
 
+#include "core/device/device.h"
 #include "runtime/compiler_interface/default_cl_cache_config.h"
-#include "runtime/device/device.h"
 #include "unit_tests/mocks/mock_builtins.h"
 #include "unit_tests/mocks/mock_compilers.h"
 #include "unit_tests/mocks/mock_program.h"

unit_tests/helpers/hw_helper_tests.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,8 +7,8 @@
 
 #pragma once
 
+#include "core/device/device.h"
 #include "core/helpers/hw_helper.h"
-#include "runtime/device/device.h"
 #include "test.h"
 #include "unit_tests/fixtures/device_fixture.h"
 

unit_tests/libult/ult_command_stream_receiver.h

@@ -6,10 +6,10 @@
  */
 
 #pragma once
+#include "core/device/device.h"
 #include "core/execution_environment/execution_environment.h"
 #include "core/os_interface/os_context.h"
 #include "runtime/command_stream/command_stream_receiver_hw.h"
-#include "runtime/device/device.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "unit_tests/helpers/dispatch_flags_helper.h"
 #include "unit_tests/mocks/mock_experimental_command_buffer.h"

unit_tests/mem_obj/mem_obj_tests.cpp

@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/device/device.h"
 #include "core/gmm_helper/gmm.h"
 #include "core/memory_manager/allocations_list.h"
 #include "core/os_interface/os_context.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/device/device.h"
 #include "runtime/helpers/memory_properties_flags_helpers.h"
 #include "runtime/helpers/properties_helper.h"
 #include "runtime/mem_obj/mem_obj.h"

unit_tests/memory_manager/deferrable_allocation_deletion_tests.cpp

@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/device/device.h"
 #include "core/memory_manager/deferrable_allocation_deletion.h"
 #include "core/memory_manager/deferred_deleter.h"
 #include "core/os_interface/os_context.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/device/device.h"
 #include "runtime/platform/platform.h"
 #include "test.h"
 #include "unit_tests/libult/ult_command_stream_receiver.h"

unit_tests/mocks/mock_device.h

@@ -6,11 +6,11 @@
  */
 
 #pragma once
+#include "core/device/root_device.h"
+#include "core/device/sub_device.h"
 #include "core/helpers/hw_helper.h"
 #include "core/unit_tests/helpers/default_hw_info.h"
 #include "runtime/device/cl_device.h"
-#include "runtime/device/root_device.h"
-#include "runtime/device/sub_device.h"
 #include "unit_tests/fixtures/mock_aub_center_fixture.h"
 #include "unit_tests/helpers/variable_backup.h"
 #include "unit_tests/libult/ult_command_stream_receiver.h"

unit_tests/mocks/mock_kernel.h

@@ -7,10 +7,10 @@
 
 #pragma once
 
+#include "core/device/device.h"
 #include "core/helpers/string.h"
 #include "core/kernel/grf_config.h"
 #include "runtime/device/cl_device.h"
-#include "runtime/device/device.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/platform/platform.h"
 #include "runtime/program/block_kernel_manager.h"

unit_tests/os_interface/hw_info_config_tests.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "runtime/device/device.h"
+#include "core/device/device.h"
 #include "test.h"
 #include "unit_tests/fixtures/platform_fixture.h"
 

unit_tests/os_interface/linux/device_factory_tests.h

@@ -7,9 +7,9 @@
 
 #pragma once
 
+#include "core/device/device.h"
 #include "core/execution_environment/execution_environment.h"
 #include "core/os_interface/device_factory.h"
-#include "runtime/device/device.h"
 #include "test.h"
 #include "unit_tests/mocks/mock_device_factory.h"
 #include "unit_tests/mocks/mock_execution_environment.h"

unit_tests/os_interface/linux/device_os_tests.cpp

@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/device/device.h"
 #include "core/helpers/get_info.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/api/api.h"
-#include "runtime/device/device.h"
 #include "runtime/platform/platform.h"
 #include "unit_tests/mocks/mock_buffer.h"
 #include "unit_tests/mocks/mock_command_queue.h"

unit_tests/os_interface/mock_performance_counters.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/device/device.h"
+#include "core/device/device.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "unit_tests/mocks/mock_command_queue.h"
 #include "unit_tests/mocks/mock_context.h"

unit_tests/os_interface/windows/device_os_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/device/device.h"
 #include "core/helpers/get_info.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "runtime/device/device.h"
 #include "unit_tests/mocks/mock_device.h"
 
 #include "gmock/gmock.h"

unit_tests/perf_tests/fixtures/command_queue_fixture.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,9 +7,9 @@
 
 #include "unit_tests/perf_tests/fixtures/command_queue_fixture.h"
 
+#include "core/device/device.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
 
 #include "gtest/gtest.h"
 

unit_tests/perf_tests/fixtures/device_fixture.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/device/device.h"
+#include "core/device/device.h"
 
 #include <cassert>
 

unit_tests/perf_tests/fixtures/platform_fixture.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #include "unit_tests/fixtures/platform_fixture.h"
 
-#include "runtime/device/device.h"
+#include "core/device/device.h"
 
 #include "gtest/gtest.h"
 

unit_tests/platform/platform_tests.cpp

@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/device/device.h"
 #include "core/helpers/hw_info.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/helpers/ult_hw_config.h"
-#include "runtime/device/device.h"
 #include "runtime/platform/extensions.h"
 #include "runtime/sharings/sharing_factory.h"
 #include "unit_tests/fixtures/mock_aub_center_fixture.h"

unit_tests/program/process_elf_binary_tests.cpp

@@ -1,14 +1,14 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "core/device/device.h"
 #include "core/elf/reader.h"
 #include "core/helpers/file_io.h"
 #include "core/helpers/string.h"
-#include "runtime/device/device.h"
 #include "unit_tests/helpers/test_files.h"
 #include "unit_tests/mocks/mock_program.h"
 

unit_tests/program/process_spir_binary_tests.cpp

@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "core/device/device.h"
 #include "core/helpers/string.h"
-#include "runtime/device/device.h"
 #include "unit_tests/mocks/mock_program.h"
 
 #include "gtest/gtest.h"

unit_tests/program/program_with_block_kernels_tests.cpp

@@ -6,8 +6,8 @@
  */
 
 #include "core/compiler_interface/compiler_interface.h"
+#include "core/device/device.h"
 #include "runtime/device/cl_device.h"
-#include "runtime/device/device.h"
 #include "runtime/program/block_kernel_manager.h"
 #include "unit_tests/fixtures/context_fixture.h"
 #include "unit_tests/fixtures/platform_fixture.h"

unit_tests/sharings/gl/windows/gl_sharing_tests.cpp

@@ -5,12 +5,12 @@
  *
  */
 
+#include "core/device/device.h"
 #include "core/gmm_helper/gmm.h"
 #include "core/helpers/array_count.h"
 #include "core/os_interface/os_interface.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/command_queue/command_queue.h"
-#include "runtime/device/device.h"
 #include "runtime/event/user_event.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/mem_obj/image.h"

unit_tests/sharings/sharing_factory_tests.cpp

@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/device/device.h"
 #include "core/helpers/string.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/context/context.h"
-#include "runtime/device/device.h"
 #include "runtime/platform/extensions.h"
 #include "runtime/platform/platform.h"
 #include "runtime/sharings/sharing.h"

unit_tests/source_level_debugger/source_level_debugger_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/device/device.h"
 #include "core/os_interface/os_interface.h"
 #include "core/unit_tests/helpers/ult_hw_config.h"
-#include "runtime/device/device.h"
 #include "runtime/platform/platform.h"
 #include "runtime/program/kernel_info.h"
 #include "runtime/source_level_debugger/source_level_debugger.h"