From ca5f34133b701112ed5e9c7c8dac377ee54e0ed9 Mon Sep 17 00:00:00 2001 From: Filip Hazubski Date: Fri, 16 Oct 2020 12:10:52 +0200 Subject: [PATCH] Move aub and tbx code to shared Related-To: NEO-3964 Change-Id: Ice978e582721498d7496f989767ce7d6f5f4caf4 Signed-off-by: Filip Hazubski --- level_zero/CMakeLists.txt | 2 +- level_zero/cmake/l0_tests.cmake | 2 +- manifests/manifest.yml | 2 +- opencl/source/CMakeLists.txt | 2 +- opencl/source/api/api.cpp | 2 +- .../command_stream/aub_command_stream_receiver.h | 2 +- .../command_stream/aub_command_stream_receiver_hw.h | 2 +- .../aub_command_stream_receiver_hw_base.inl | 12 ++++++------ ...mand_stream_receiver_simulated_common_hw_base.inl | 4 ++-- .../command_stream_receiver_with_aub_dump.inl | 2 +- .../command_stream/tbx_command_stream_receiver.h | 2 +- .../tbx_command_stream_receiver_hw.inl | 10 +++++----- opencl/source/command_stream/tbx_stream.cpp | 4 ++-- opencl/source/dll/create_tbx_sockets.cpp | 2 +- opencl/source/gen11/aub_mem_dump_gen11.cpp | 7 +++---- opencl/source/gen11/hw_info_ehl.inl | 3 +-- opencl/source/gen11/hw_info_icllp.inl | 3 +-- opencl/source/gen11/hw_info_lkf.inl | 3 +-- .../gen12lp/aub_command_stream_receiver_gen12lp.cpp | 2 +- opencl/source/gen12lp/aub_mem_dump_gen12lp.cpp | 7 +++---- opencl/source/gen12lp/hw_info_dg1.inl | 3 +-- opencl/source/gen12lp/hw_info_rkl.inl | 3 +-- opencl/source/gen12lp/hw_info_tgllp.inl | 3 +-- .../gen12lp/tbx_command_stream_receiver_gen12lp.cpp | 2 +- opencl/source/gen8/aub_mem_dump_gen8.cpp | 7 +++---- opencl/source/gen8/hw_info_bdw.inl | 3 +-- opencl/source/gen9/aub_mem_dump_gen9.cpp | 7 +++---- opencl/source/gen9/hw_info_bxt.inl | 3 +-- opencl/source/gen9/hw_info_cfl.inl | 3 +-- opencl/source/gen9/hw_info_glk.inl | 3 +-- opencl/source/gen9/hw_info_kbl.inl | 3 +-- opencl/source/gen9/hw_info_skl.inl | 3 +-- .../source/helpers/hardware_context_controller.cpp | 3 +-- .../memory_manager/os_agnostic_memory_manager.cpp | 2 +- opencl/source/memory_manager/page_table.cpp | 3 ++- opencl/test/unit_test/CMakeLists.txt | 2 +- .../test/unit_test/api/cl_enqueue_verify_memory.inl | 3 ++- opencl/test/unit_test/aub/aub_helper_tests.inl | 6 +++--- .../unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp | 2 +- .../unit_test/aub_mem_dump/lrca_helper_tests.cpp | 3 ++- opencl/test/unit_test/aub_tests/CMakeLists.txt | 2 +- .../command_stream/aub_command_stream_fixture.h | 4 ++-- .../aub_tests/command_stream/aub_mem_dump_tests.cpp | 2 +- .../aub_tests/command_stream/aub_mem_dump_tests.h | 2 +- .../test/unit_test/aub_tests/fixtures/aub_fixture.h | 4 ++-- .../batch_buffer/aub_batch_buffer_tests_gen11.h | 3 ++- .../batch_buffer/aub_batch_buffer_tests_gen12lp.h | 3 ++- .../gen9/batch_buffer/aub_batch_buffer_tests.h | 3 ++- .../command_queue/enqueue_handler_tests.cpp | 2 +- .../aub_command_stream_receiver_1_tests.cpp | 4 ++-- .../aub_command_stream_receiver_2_tests.cpp | 4 ++-- .../command_stream/aub_file_stream_tests.cpp | 2 +- .../command_stream/aub_subcapture_tests.cpp | 2 +- .../command_stream/tbx_command_stream_tests.cpp | 2 +- .../execution_environment_tests.cpp | 2 +- .../aub_command_stream_receiver_tests_gen12lp.inl | 2 +- .../tbx_command_stream_receiver_tests_gen12lp.inl | 3 ++- opencl/test/unit_test/libult/create_tbx_sockets.cpp | 2 +- .../unit_test/memory_manager/page_table_tests.cpp | 2 +- opencl/test/unit_test/mocks/mock_aub_center.h | 5 +++-- opencl/test/unit_test/mocks/mock_aub_stream.h | 4 ++-- .../unit_test/mocks/mock_aub_subcapture_manager.h | 3 ++- opencl/test/unit_test/mocks/mock_lrca_helper.h | 2 +- opencl/test/unit_test/mocks/mock_tbx_csr.h | 2 +- opencl/test/unit_test/mocks/mock_tbx_sockets.h | 2 +- opencl/test/unit_test/mt_tests/CMakeLists.txt | 4 ++-- opencl/test/unit_test/windows/CMakeLists.txt | 4 ++-- shared/source/CMakeLists.txt | 9 ++++++--- {opencl => shared}/source/aub/CMakeLists.txt | 5 ++--- {opencl => shared}/source/aub/aub_center.cpp | 5 ++--- {opencl => shared}/source/aub/aub_center.h | 5 ++--- {opencl => shared}/source/aub/aub_helper.cpp | 5 ++--- {opencl => shared}/source/aub/aub_helper.h | 3 +-- .../source/aub/aub_helper_add_mmio.cpp | 3 +-- {opencl => shared}/source/aub/aub_helper_base.inl | 4 ++-- .../source/aub/aub_helper_bdw_plus.inl | 2 +- {opencl => shared}/source/aub/aub_mapper_base.h | 3 +-- .../source/aub/aub_stream_interface.cpp | 2 +- {opencl => shared}/source/aub/aub_stream_provider.h | 2 +- {opencl => shared}/source/aub/aub_subcapture.cpp | 2 +- {opencl => shared}/source/aub/aub_subcapture.h | 0 .../source/aub_mem_dump/CMakeLists.txt | 7 +++---- .../source/aub_mem_dump/aub_alloc_dump.h | 3 +-- .../source/aub_mem_dump/aub_alloc_dump.inl | 3 +-- {opencl => shared}/source/aub_mem_dump/aub_data.h | 0 {opencl => shared}/source/aub_mem_dump/aub_header.h | 0 .../source/aub_mem_dump/aub_mem_dump.cpp | 3 +-- .../source/aub_mem_dump/aub_mem_dump.h | 2 +- .../source/aub_mem_dump/aub_mem_dump.inl | 3 +-- .../source/aub_mem_dump/aub_services.h | 0 .../source/aub_mem_dump/aub_stream_stubs.cpp | 0 .../source/aub_mem_dump/context_flags.cpp | 2 +- .../source/aub_mem_dump/page_table_entry_bits.h | 0 .../root_device_environment.cpp | 3 +-- shared/source/gen11/aub_mapper.h | 3 +-- shared/source/gen12lp/aub_mapper.h | 3 +-- shared/source/gen12lp/helpers_gen12lp_dg1.cpp | 2 +- shared/source/gen8/aub_mapper.h | 3 +-- shared/source/gen9/aub_mapper.h | 3 +-- shared/source/helpers/hw_helper.h | 2 +- shared/source/helpers/hw_helper_base.inl | 2 +- .../os_interface/aub_memory_operations_handler.cpp | 3 +-- shared/source/os_interface/device_factory.cpp | 3 +-- {opencl => shared}/source/tbx/CMakeLists.txt | 5 ++--- {opencl => shared}/source/tbx/tbx_proto.h | 0 {opencl => shared}/source/tbx/tbx_sockets.h | 0 {opencl => shared}/source/tbx/tbx_sockets_imp.cpp | 2 +- {opencl => shared}/source/tbx/tbx_sockets_imp.h | 2 +- .../aub_memory_operations_handler_tests.cpp | 3 ++- 109 files changed, 153 insertions(+), 177 deletions(-) rename {opencl => shared}/source/aub/CMakeLists.txt (82%) rename {opencl => shared}/source/aub/aub_center.cpp (97%) rename {opencl => shared}/source/aub/aub_center.h (94%) rename {opencl => shared}/source/aub/aub_helper.cpp (91%) rename {opencl => shared}/source/aub/aub_helper.h (98%) rename {opencl => shared}/source/aub/aub_helper_add_mmio.cpp (97%) rename {opencl => shared}/source/aub/aub_helper_base.inl (92%) rename {opencl => shared}/source/aub/aub_helper_bdw_plus.inl (93%) rename {opencl => shared}/source/aub/aub_mapper_base.h (86%) rename {opencl => shared}/source/aub/aub_stream_interface.cpp (91%) rename {opencl => shared}/source/aub/aub_stream_provider.h (90%) rename {opencl => shared}/source/aub/aub_subcapture.cpp (99%) rename {opencl => shared}/source/aub/aub_subcapture.h (100%) rename {opencl => shared}/source/aub_mem_dump/CMakeLists.txt (76%) rename {opencl => shared}/source/aub_mem_dump/aub_alloc_dump.h (98%) rename {opencl => shared}/source/aub_mem_dump/aub_alloc_dump.inl (99%) rename {opencl => shared}/source/aub_mem_dump/aub_data.h (100%) rename {opencl => shared}/source/aub_mem_dump/aub_header.h (100%) rename {opencl => shared}/source/aub_mem_dump/aub_mem_dump.cpp (99%) rename {opencl => shared}/source/aub_mem_dump/aub_mem_dump.h (99%) rename {opencl => shared}/source/aub_mem_dump/aub_mem_dump.inl (99%) rename {opencl => shared}/source/aub_mem_dump/aub_services.h (100%) rename {opencl => shared}/source/aub_mem_dump/aub_stream_stubs.cpp (100%) rename {opencl => shared}/source/aub_mem_dump/context_flags.cpp (80%) rename {opencl => shared}/source/aub_mem_dump/page_table_entry_bits.h (100%) rename {opencl => shared}/source/tbx/CMakeLists.txt (67%) rename {opencl => shared}/source/tbx/tbx_proto.h (100%) rename {opencl => shared}/source/tbx/tbx_sockets.h (100%) rename {opencl => shared}/source/tbx/tbx_sockets_imp.cpp (99%) rename {opencl => shared}/source/tbx/tbx_sockets_imp.h (96%) diff --git a/level_zero/CMakeLists.txt b/level_zero/CMakeLists.txt index 87fea0a25b..7ab8f23382 100644 --- a/level_zero/CMakeLists.txt +++ b/level_zero/CMakeLists.txt @@ -201,13 +201,13 @@ if(BUILD_WITH_L0) target_sources(${TARGET_NAME_L0} PRIVATE - ${COMPUTE_RUNTIME_DIR}/opencl/source/aub/aub_stream_interface.cpp ${COMPUTE_RUNTIME_DIR}/opencl/source/dll/create_command_stream.cpp ${COMPUTE_RUNTIME_DIR}/opencl/source/dll/create_deferred_deleter.cpp ${COMPUTE_RUNTIME_DIR}/opencl/source/dll/create_tbx_sockets.cpp ${COMPUTE_RUNTIME_DIR}/opencl/source/dll/get_devices.cpp ${COMPUTE_RUNTIME_DIR}/opencl/source/dll/source_level_debugger_dll.cpp ${COMPUTE_RUNTIME_DIR}/opencl/source/helpers/built_ins_helper.cpp + ${COMPUTE_RUNTIME_DIR}/shared/source/aub/aub_stream_interface.cpp ) if(WIN32) diff --git a/level_zero/cmake/l0_tests.cmake b/level_zero/cmake/l0_tests.cmake index e997a37cfa..bfbb601d08 100644 --- a/level_zero/cmake/l0_tests.cmake +++ b/level_zero/cmake/l0_tests.cmake @@ -129,8 +129,8 @@ if(UNIX) target_sources(compute_runtime_mockable_extra PRIVATE ${NEO_SOURCE_DIR}/opencl/source/dll/linux/allocator_helper.cpp - ${NEO_SOURCE_DIR}/opencl/source/tbx/tbx_sockets_imp.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_mock.cpp + ${NEO_SOURCE_DIR}/shared/source/tbx/tbx_sockets_imp.cpp ) target_link_libraries(compute_runtime_mockable_extra dl diff --git a/manifests/manifest.yml b/manifests/manifest.yml index 06573c3aab..657519afec 100644 --- a/manifests/manifest.yml +++ b/manifests/manifest.yml @@ -14,7 +14,7 @@ components: infra: branch: infra dest_dir: infra - revision: 4f8d0d6e8855e128b66cabbb99d3a51fc5f32880 + revision: 8581f6059f2265306ed99961ccebe79540b3d669 type: git internal: branch: master diff --git a/opencl/source/CMakeLists.txt b/opencl/source/CMakeLists.txt index dfb66e43e5..8eec22c47e 100644 --- a/opencl/source/CMakeLists.txt +++ b/opencl/source/CMakeLists.txt @@ -127,7 +127,7 @@ if(${GENERATE_EXECUTABLE}) add_library(${NEO_DYNAMIC_LIB_NAME} SHARED ${NEO_DYNAMIC_LIB__TARGET_OBJECTS} - ${NEO_SOURCE_DIR}/opencl/source/aub/aub_stream_interface.cpp + ${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp ) if(UNIX) diff --git a/opencl/source/api/api.cpp b/opencl/source/api/api.cpp index 252530efff..858b4fa740 100644 --- a/opencl/source/api/api.cpp +++ b/opencl/source/api/api.cpp @@ -7,6 +7,7 @@ #include "api.h" +#include "shared/source/aub/aub_center.h" #include "shared/source/built_ins/built_ins.h" #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/debug_settings/debug_settings_manager.h" @@ -23,7 +24,6 @@ #include "opencl/source/accelerators/intel_motion_estimation.h" #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" diff --git a/opencl/source/command_stream/aub_command_stream_receiver.h b/opencl/source/command_stream/aub_command_stream_receiver.h index 6da8c28215..e59ee4ce19 100644 --- a/opencl/source/command_stream/aub_command_stream_receiver.h +++ b/opencl/source/command_stream/aub_command_stream_receiver.h @@ -6,7 +6,7 @@ */ #pragma once -#include "opencl/source/aub_mem_dump/aub_mem_dump.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include diff --git a/opencl/source/command_stream/aub_command_stream_receiver_hw.h b/opencl/source/command_stream/aub_command_stream_receiver_hw.h index 3774271a0c..04f0e237c6 100644 --- a/opencl/source/command_stream/aub_command_stream_receiver_hw.h +++ b/opencl/source/command_stream/aub_command_stream_receiver_hw.h @@ -6,11 +6,11 @@ */ #pragma once +#include "shared/source/aub/aub_center.h" #include "shared/source/helpers/array_count.h" #include "shared/source/memory_manager/physical_address_allocator.h" #include "shared/source/utilities/spinlock.h" -#include "opencl/source/aub/aub_center.h" #include "opencl/source/command_stream/aub_command_stream_receiver.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/memory_manager/page_table.h" diff --git a/opencl/source/command_stream/aub_command_stream_receiver_hw_base.inl b/opencl/source/command_stream/aub_command_stream_receiver_hw_base.inl index 3ae58fbc8d..94e90eb80c 100644 --- a/opencl/source/command_stream/aub_command_stream_receiver_hw_base.inl +++ b/opencl/source/command_stream/aub_command_stream_receiver_hw_base.inl @@ -5,6 +5,12 @@ * */ +#include "shared/source/aub/aub_helper.h" +#include "shared/source/aub/aub_stream_provider.h" +#include "shared/source/aub/aub_subcapture.h" +#include "shared/source/aub_mem_dump/aub_alloc_dump.h" +#include "shared/source/aub_mem_dump/aub_alloc_dump.inl" +#include "shared/source/aub_mem_dump/page_table_entry_bits.h" #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/execution_environment/execution_environment.h" @@ -20,12 +26,6 @@ #include "shared/source/memory_manager/memory_banks.h" #include "shared/source/os_interface/os_context.h" -#include "opencl/source/aub/aub_helper.h" -#include "opencl/source/aub/aub_stream_provider.h" -#include "opencl/source/aub/aub_subcapture.h" -#include "opencl/source/aub_mem_dump/aub_alloc_dump.h" -#include "opencl/source/aub_mem_dump/aub_alloc_dump.inl" -#include "opencl/source/aub_mem_dump/page_table_entry_bits.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/helpers/hardware_context_controller.h" diff --git a/opencl/source/command_stream/command_stream_receiver_simulated_common_hw_base.inl b/opencl/source/command_stream/command_stream_receiver_simulated_common_hw_base.inl index 5a032e0323..96747db682 100644 --- a/opencl/source/command_stream/command_stream_receiver_simulated_common_hw_base.inl +++ b/opencl/source/command_stream/command_stream_receiver_simulated_common_hw_base.inl @@ -5,6 +5,8 @@ * */ +#include "shared/source/aub/aub_helper.h" +#include "shared/source/aub_mem_dump/page_table_entry_bits.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/gmm_helper/gmm.h" #include "shared/source/gmm_helper/gmm_helper.h" @@ -13,8 +15,6 @@ #include "shared/source/memory_manager/memory_manager.h" #include "shared/source/os_interface/os_context.h" -#include "opencl/source/aub/aub_helper.h" -#include "opencl/source/aub_mem_dump/page_table_entry_bits.h" #include "opencl/source/command_stream/command_stream_receiver_simulated_common_hw.h" #include "opencl/source/helpers/hardware_context_controller.h" diff --git a/opencl/source/command_stream/command_stream_receiver_with_aub_dump.inl b/opencl/source/command_stream/command_stream_receiver_with_aub_dump.inl index e327d3f1bd..3d0f391420 100644 --- a/opencl/source/command_stream/command_stream_receiver_with_aub_dump.inl +++ b/opencl/source/command_stream/command_stream_receiver_with_aub_dump.inl @@ -5,10 +5,10 @@ * */ +#include "shared/source/aub/aub_center.h" #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/root_device_environment.h" -#include "opencl/source/aub/aub_center.h" #include "opencl/source/command_stream/aub_command_stream_receiver.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" diff --git a/opencl/source/command_stream/tbx_command_stream_receiver.h b/opencl/source/command_stream/tbx_command_stream_receiver.h index 44c4cfb687..9aa8e2ab3e 100644 --- a/opencl/source/command_stream/tbx_command_stream_receiver.h +++ b/opencl/source/command_stream/tbx_command_stream_receiver.h @@ -6,7 +6,7 @@ */ #pragma once -#include "opencl/source/aub_mem_dump/aub_mem_dump.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" namespace NEO { class CommandStreamReceiver; diff --git a/opencl/source/command_stream/tbx_command_stream_receiver_hw.inl b/opencl/source/command_stream/tbx_command_stream_receiver_hw.inl index fd390e502d..940d4a6081 100644 --- a/opencl/source/command_stream/tbx_command_stream_receiver_hw.inl +++ b/opencl/source/command_stream/tbx_command_stream_receiver_hw.inl @@ -5,6 +5,11 @@ * */ +#include "shared/source/aub/aub_center.h" +#include "shared/source/aub/aub_helper.h" +#include "shared/source/aub_mem_dump/aub_alloc_dump.h" +#include "shared/source/aub_mem_dump/aub_alloc_dump.inl" +#include "shared/source/aub_mem_dump/page_table_entry_bits.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/root_device_environment.h" @@ -20,11 +25,6 @@ #include "shared/source/memory_manager/physical_address_allocator.h" #include "shared/source/os_interface/os_context.h" -#include "opencl/source/aub/aub_center.h" -#include "opencl/source/aub/aub_helper.h" -#include "opencl/source/aub_mem_dump/aub_alloc_dump.h" -#include "opencl/source/aub_mem_dump/aub_alloc_dump.inl" -#include "opencl/source/aub_mem_dump/page_table_entry_bits.h" #include "opencl/source/command_stream/aub_command_stream_receiver.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" #include "opencl/source/helpers/dispatch_info.h" diff --git a/opencl/source/command_stream/tbx_stream.cpp b/opencl/source/command_stream/tbx_stream.cpp index 2b7dd2ccb1..a47b10b707 100644 --- a/opencl/source/command_stream/tbx_stream.cpp +++ b/opencl/source/command_stream/tbx_stream.cpp @@ -5,12 +5,12 @@ * */ +#include "shared/source/aub/aub_helper.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/debug_helpers.h" +#include "shared/source/tbx/tbx_sockets.h" -#include "opencl/source/aub/aub_helper.h" #include "opencl/source/command_stream/tbx_command_stream_receiver.h" -#include "opencl/source/tbx/tbx_sockets.h" namespace NEO { diff --git a/opencl/source/dll/create_tbx_sockets.cpp b/opencl/source/dll/create_tbx_sockets.cpp index b2506dc407..c7275a8c71 100644 --- a/opencl/source/dll/create_tbx_sockets.cpp +++ b/opencl/source/dll/create_tbx_sockets.cpp @@ -5,7 +5,7 @@ * */ -#include "opencl/source/tbx/tbx_sockets_imp.h" +#include "shared/source/tbx/tbx_sockets_imp.h" using namespace NEO; diff --git a/opencl/source/gen11/aub_mem_dump_gen11.cpp b/opencl/source/gen11/aub_mem_dump_gen11.cpp index 404f6b19bc..de2ba83896 100644 --- a/opencl/source/gen11/aub_mem_dump_gen11.cpp +++ b/opencl/source/gen11/aub_mem_dump_gen11.cpp @@ -5,14 +5,13 @@ * */ +#include "shared/source/aub/aub_helper_bdw_plus.inl" +#include "shared/source/aub_mem_dump/aub_alloc_dump.inl" +#include "shared/source/aub_mem_dump/aub_mem_dump.inl" #include "shared/source/gen11/aub_mapper.h" #include "shared/source/helpers/completion_stamp.h" #include "shared/source/helpers/hw_helper.h" -#include "opencl/source/aub/aub_helper_bdw_plus.inl" -#include "opencl/source/aub_mem_dump/aub_alloc_dump.inl" -#include "opencl/source/aub_mem_dump/aub_mem_dump.inl" - #include "config.h" namespace AubMemDump { diff --git a/opencl/source/gen11/hw_info_ehl.inl b/opencl/source/gen11/hw_info_ehl.inl index 71f2d68cea..323c801409 100644 --- a/opencl/source/gen11/hw_info_ehl.inl +++ b/opencl/source/gen11/hw_info_ehl.inl @@ -5,11 +5,10 @@ * */ +#include "shared/source/aub_mem_dump/aub_services.h" #include "shared/source/gen11/hw_cmds.h" #include "shared/source/helpers/constants.h" -#include "opencl/source/aub_mem_dump/aub_services.h" - #include "engine_node.h" namespace NEO { diff --git a/opencl/source/gen11/hw_info_icllp.inl b/opencl/source/gen11/hw_info_icllp.inl index 76fdf5047f..a50d7c0c75 100644 --- a/opencl/source/gen11/hw_info_icllp.inl +++ b/opencl/source/gen11/hw_info_icllp.inl @@ -5,11 +5,10 @@ * */ +#include "shared/source/aub_mem_dump/aub_services.h" #include "shared/source/gen11/hw_cmds.h" #include "shared/source/helpers/constants.h" -#include "opencl/source/aub_mem_dump/aub_services.h" - #include "engine_node.h" namespace NEO { diff --git a/opencl/source/gen11/hw_info_lkf.inl b/opencl/source/gen11/hw_info_lkf.inl index 57c5fab77f..a80f483a64 100644 --- a/opencl/source/gen11/hw_info_lkf.inl +++ b/opencl/source/gen11/hw_info_lkf.inl @@ -5,11 +5,10 @@ * */ +#include "shared/source/aub_mem_dump/aub_services.h" #include "shared/source/gen11/hw_cmds_lkf.h" #include "shared/source/helpers/constants.h" -#include "opencl/source/aub_mem_dump/aub_services.h" - #include "engine_node.h" namespace NEO { diff --git a/opencl/source/gen12lp/aub_command_stream_receiver_gen12lp.cpp b/opencl/source/gen12lp/aub_command_stream_receiver_gen12lp.cpp index f0aa0045dc..1124d110d9 100644 --- a/opencl/source/gen12lp/aub_command_stream_receiver_gen12lp.cpp +++ b/opencl/source/gen12lp/aub_command_stream_receiver_gen12lp.cpp @@ -5,11 +5,11 @@ * */ +#include "shared/source/aub_mem_dump/aub_alloc_dump.h" #include "shared/source/helpers/array_count.h" #include "shared/source/helpers/populate_factory.h" #include "shared/source/memory_manager/memory_pool.h" -#include "opencl/source/aub_mem_dump/aub_alloc_dump.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw_bdw_plus.inl" diff --git a/opencl/source/gen12lp/aub_mem_dump_gen12lp.cpp b/opencl/source/gen12lp/aub_mem_dump_gen12lp.cpp index ee5a126e31..f1d118d61f 100644 --- a/opencl/source/gen12lp/aub_mem_dump_gen12lp.cpp +++ b/opencl/source/gen12lp/aub_mem_dump_gen12lp.cpp @@ -5,14 +5,13 @@ * */ +#include "shared/source/aub/aub_helper_bdw_plus.inl" +#include "shared/source/aub_mem_dump/aub_alloc_dump.inl" +#include "shared/source/aub_mem_dump/aub_mem_dump.inl" #include "shared/source/gen12lp/aub_mapper.h" #include "shared/source/helpers/completion_stamp.h" #include "shared/source/helpers/hw_helper.h" -#include "opencl/source/aub/aub_helper_bdw_plus.inl" -#include "opencl/source/aub_mem_dump/aub_alloc_dump.inl" -#include "opencl/source/aub_mem_dump/aub_mem_dump.inl" - #include "config.h" #include "reg_configs_common.h" diff --git a/opencl/source/gen12lp/hw_info_dg1.inl b/opencl/source/gen12lp/hw_info_dg1.inl index 0a414d12de..e975338918 100644 --- a/opencl/source/gen12lp/hw_info_dg1.inl +++ b/opencl/source/gen12lp/hw_info_dg1.inl @@ -5,12 +5,11 @@ * */ +#include "shared/source/aub_mem_dump/aub_services.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/gen12lp/hw_cmds_dg1.h" #include "shared/source/helpers/constants.h" -#include "opencl/source/aub_mem_dump/aub_services.h" - #include "engine_node.h" namespace NEO { diff --git a/opencl/source/gen12lp/hw_info_rkl.inl b/opencl/source/gen12lp/hw_info_rkl.inl index b97b00dc26..fb7091b0fb 100644 --- a/opencl/source/gen12lp/hw_info_rkl.inl +++ b/opencl/source/gen12lp/hw_info_rkl.inl @@ -5,11 +5,10 @@ * */ +#include "shared/source/aub_mem_dump/aub_services.h" #include "shared/source/gen12lp/hw_cmds_rkl.h" #include "shared/source/helpers/constants.h" -#include "opencl/source/aub_mem_dump/aub_services.h" - #include "engine_node.h" namespace NEO { diff --git a/opencl/source/gen12lp/hw_info_tgllp.inl b/opencl/source/gen12lp/hw_info_tgllp.inl index df17548d34..bbec45c7c2 100644 --- a/opencl/source/gen12lp/hw_info_tgllp.inl +++ b/opencl/source/gen12lp/hw_info_tgllp.inl @@ -5,11 +5,10 @@ * */ +#include "shared/source/aub_mem_dump/aub_services.h" #include "shared/source/gen12lp/hw_cmds.h" #include "shared/source/helpers/constants.h" -#include "opencl/source/aub_mem_dump/aub_services.h" - #include "engine_node.h" namespace NEO { diff --git a/opencl/source/gen12lp/tbx_command_stream_receiver_gen12lp.cpp b/opencl/source/gen12lp/tbx_command_stream_receiver_gen12lp.cpp index 1299adab6f..ef94ac233b 100644 --- a/opencl/source/gen12lp/tbx_command_stream_receiver_gen12lp.cpp +++ b/opencl/source/gen12lp/tbx_command_stream_receiver_gen12lp.cpp @@ -5,12 +5,12 @@ * */ +#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "shared/source/gen12lp/hw_cmds.h" #include "shared/source/helpers/array_count.h" #include "shared/source/helpers/populate_factory.h" #include "shared/source/memory_manager/memory_pool.h" -#include "opencl/source/aub_mem_dump/aub_mem_dump.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.inl" #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.inl" diff --git a/opencl/source/gen8/aub_mem_dump_gen8.cpp b/opencl/source/gen8/aub_mem_dump_gen8.cpp index 2851fa3eab..2a2d1a83f2 100644 --- a/opencl/source/gen8/aub_mem_dump_gen8.cpp +++ b/opencl/source/gen8/aub_mem_dump_gen8.cpp @@ -5,13 +5,12 @@ * */ +#include "shared/source/aub/aub_helper_bdw_plus.inl" +#include "shared/source/aub_mem_dump/aub_alloc_dump.inl" +#include "shared/source/aub_mem_dump/aub_mem_dump.inl" #include "shared/source/gen8/aub_mapper.h" #include "shared/source/helpers/hw_helper.h" -#include "opencl/source/aub/aub_helper_bdw_plus.inl" -#include "opencl/source/aub_mem_dump/aub_alloc_dump.inl" -#include "opencl/source/aub_mem_dump/aub_mem_dump.inl" - namespace AubMemDump { enum { diff --git a/opencl/source/gen8/hw_info_bdw.inl b/opencl/source/gen8/hw_info_bdw.inl index 24088dbcc1..362b3c453b 100644 --- a/opencl/source/gen8/hw_info_bdw.inl +++ b/opencl/source/gen8/hw_info_bdw.inl @@ -5,11 +5,10 @@ * */ +#include "shared/source/aub_mem_dump/aub_services.h" #include "shared/source/gen8/hw_cmds.h" #include "shared/source/helpers/constants.h" -#include "opencl/source/aub_mem_dump/aub_services.h" - #include "engine_node.h" namespace NEO { diff --git a/opencl/source/gen9/aub_mem_dump_gen9.cpp b/opencl/source/gen9/aub_mem_dump_gen9.cpp index 3f1571f18c..e9b6d10af5 100644 --- a/opencl/source/gen9/aub_mem_dump_gen9.cpp +++ b/opencl/source/gen9/aub_mem_dump_gen9.cpp @@ -5,13 +5,12 @@ * */ +#include "shared/source/aub/aub_helper_bdw_plus.inl" +#include "shared/source/aub_mem_dump/aub_alloc_dump.inl" +#include "shared/source/aub_mem_dump/aub_mem_dump.inl" #include "shared/source/gen9/aub_mapper.h" #include "shared/source/helpers/hw_helper.h" -#include "opencl/source/aub/aub_helper_bdw_plus.inl" -#include "opencl/source/aub_mem_dump/aub_alloc_dump.inl" -#include "opencl/source/aub_mem_dump/aub_mem_dump.inl" - namespace AubMemDump { enum { diff --git a/opencl/source/gen9/hw_info_bxt.inl b/opencl/source/gen9/hw_info_bxt.inl index 0357950215..8fbebd8832 100644 --- a/opencl/source/gen9/hw_info_bxt.inl +++ b/opencl/source/gen9/hw_info_bxt.inl @@ -5,11 +5,10 @@ * */ +#include "shared/source/aub_mem_dump/aub_services.h" #include "shared/source/gen9/hw_cmds.h" #include "shared/source/helpers/constants.h" -#include "opencl/source/aub_mem_dump/aub_services.h" - #include "engine_node.h" namespace NEO { diff --git a/opencl/source/gen9/hw_info_cfl.inl b/opencl/source/gen9/hw_info_cfl.inl index 05d5988c42..2973e9dcc5 100644 --- a/opencl/source/gen9/hw_info_cfl.inl +++ b/opencl/source/gen9/hw_info_cfl.inl @@ -5,11 +5,10 @@ * */ +#include "shared/source/aub_mem_dump/aub_services.h" #include "shared/source/gen9/hw_cmds.h" #include "shared/source/helpers/constants.h" -#include "opencl/source/aub_mem_dump/aub_services.h" - #include "engine_node.h" namespace NEO { diff --git a/opencl/source/gen9/hw_info_glk.inl b/opencl/source/gen9/hw_info_glk.inl index 1daa113098..883ccf7e93 100644 --- a/opencl/source/gen9/hw_info_glk.inl +++ b/opencl/source/gen9/hw_info_glk.inl @@ -5,11 +5,10 @@ * */ +#include "shared/source/aub_mem_dump/aub_services.h" #include "shared/source/gen9/hw_cmds.h" #include "shared/source/helpers/constants.h" -#include "opencl/source/aub_mem_dump/aub_services.h" - #include "engine_node.h" namespace NEO { diff --git a/opencl/source/gen9/hw_info_kbl.inl b/opencl/source/gen9/hw_info_kbl.inl index de77f94076..a4aec95ff7 100644 --- a/opencl/source/gen9/hw_info_kbl.inl +++ b/opencl/source/gen9/hw_info_kbl.inl @@ -5,11 +5,10 @@ * */ +#include "shared/source/aub_mem_dump/aub_services.h" #include "shared/source/gen9/hw_cmds.h" #include "shared/source/helpers/constants.h" -#include "opencl/source/aub_mem_dump/aub_services.h" - #include "engine_node.h" namespace NEO { diff --git a/opencl/source/gen9/hw_info_skl.inl b/opencl/source/gen9/hw_info_skl.inl index 2cc529f5d5..8f38e5faa7 100644 --- a/opencl/source/gen9/hw_info_skl.inl +++ b/opencl/source/gen9/hw_info_skl.inl @@ -5,11 +5,10 @@ * */ +#include "shared/source/aub_mem_dump/aub_services.h" #include "shared/source/gen9/hw_cmds.h" #include "shared/source/helpers/constants.h" -#include "opencl/source/aub_mem_dump/aub_services.h" - #include "engine_node.h" namespace NEO { diff --git a/opencl/source/helpers/hardware_context_controller.cpp b/opencl/source/helpers/hardware_context_controller.cpp index 7ca8eb07aa..fd3cfe341d 100644 --- a/opencl/source/helpers/hardware_context_controller.cpp +++ b/opencl/source/helpers/hardware_context_controller.cpp @@ -7,11 +7,10 @@ #include "opencl/source/helpers/hardware_context_controller.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "shared/source/helpers/constants.h" #include "shared/source/os_interface/os_context.h" -#include "opencl/source/aub_mem_dump/aub_mem_dump.h" - using namespace NEO; HardwareContextController::HardwareContextController(aub_stream::AubManager &aubManager, OsContext &osContext, uint32_t flags) { diff --git a/opencl/source/memory_manager/os_agnostic_memory_manager.cpp b/opencl/source/memory_manager/os_agnostic_memory_manager.cpp index 6954878d48..52e549e561 100644 --- a/opencl/source/memory_manager/os_agnostic_memory_manager.cpp +++ b/opencl/source/memory_manager/os_agnostic_memory_manager.cpp @@ -7,6 +7,7 @@ #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" +#include "shared/source/aub/aub_center.h" #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/gmm_helper/gmm.h" @@ -22,7 +23,6 @@ #include "shared/source/memory_manager/residency.h" #include "shared/source/os_interface/os_memory.h" -#include "opencl/source/aub/aub_center.h" #include "opencl/source/helpers/surface_formats.h" #include diff --git a/opencl/source/memory_manager/page_table.cpp b/opencl/source/memory_manager/page_table.cpp index 9d621086e4..565c22d377 100644 --- a/opencl/source/memory_manager/page_table.cpp +++ b/opencl/source/memory_manager/page_table.cpp @@ -7,7 +7,8 @@ #include "opencl/source/memory_manager/page_table.h" -#include "opencl/source/aub_mem_dump/page_table_entry_bits.h" +#include "shared/source/aub_mem_dump/page_table_entry_bits.h" + #include "opencl/source/memory_manager/page_table.inl" namespace NEO { diff --git a/opencl/test/unit_test/CMakeLists.txt b/opencl/test/unit_test/CMakeLists.txt index 3884ea40b7..06c1b49a4a 100644 --- a/opencl/test/unit_test/CMakeLists.txt +++ b/opencl/test/unit_test/CMakeLists.txt @@ -102,7 +102,7 @@ if(DEFINED AUB_STREAM_PROJECT_NAME) $ ) else() - list(APPEND IGDRCL_SRCS_tests_local ${NEO_SOURCE_DIR}/opencl/source/aub/aub_stream_interface.cpp) + list(APPEND IGDRCL_SRCS_tests_local ${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp) endif() add_executable(igdrcl_tests diff --git a/opencl/test/unit_test/api/cl_enqueue_verify_memory.inl b/opencl/test/unit_test/api/cl_enqueue_verify_memory.inl index 9dd5c670f9..80c0142ad9 100644 --- a/opencl/test/unit_test/api/cl_enqueue_verify_memory.inl +++ b/opencl/test/unit_test/api/cl_enqueue_verify_memory.inl @@ -5,8 +5,9 @@ * */ +#include "shared/source/aub_mem_dump/aub_services.h" + #include "opencl/extensions/public/cl_ext_private.h" -#include "opencl/source/aub_mem_dump/aub_services.h" #include "opencl/test/unit_test/api/cl_api_tests.h" #include "opencl/test/unit_test/mocks/mock_csr.h" #include "test.h" diff --git a/opencl/test/unit_test/aub/aub_helper_tests.inl b/opencl/test/unit_test/aub/aub_helper_tests.inl index 9ef93e0de5..a6fa719ca9 100644 --- a/opencl/test/unit_test/aub/aub_helper_tests.inl +++ b/opencl/test/unit_test/aub/aub_helper_tests.inl @@ -5,13 +5,13 @@ * */ +#include "shared/source/aub/aub_helper.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" +#include "shared/source/aub_mem_dump/page_table_entry_bits.h" #include "shared/source/helpers/basic_math.h" #include "shared/source/helpers/hw_helper.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" -#include "opencl/source/aub/aub_helper.h" -#include "opencl/source/aub_mem_dump/aub_mem_dump.h" -#include "opencl/source/aub_mem_dump/page_table_entry_bits.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_lrca_helper.h" diff --git a/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp b/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp index 486efdf27b..4898686d8c 100644 --- a/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp +++ b/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp @@ -5,11 +5,11 @@ * */ +#include "shared/source/aub_mem_dump/aub_alloc_dump.h" #include "shared/source/gmm_helper/gmm.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" -#include "opencl/source/aub_mem_dump/aub_alloc_dump.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" diff --git a/opencl/test/unit_test/aub_mem_dump/lrca_helper_tests.cpp b/opencl/test/unit_test/aub_mem_dump/lrca_helper_tests.cpp index f34aaccc84..421b5367bf 100644 --- a/opencl/test/unit_test/aub_mem_dump/lrca_helper_tests.cpp +++ b/opencl/test/unit_test/aub_mem_dump/lrca_helper_tests.cpp @@ -5,7 +5,8 @@ * */ -#include "opencl/source/aub_mem_dump/aub_mem_dump.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" + #include "test.h" #include diff --git a/opencl/test/unit_test/aub_tests/CMakeLists.txt b/opencl/test/unit_test/aub_tests/CMakeLists.txt index 9dfc4af665..46bafa6649 100644 --- a/opencl/test/unit_test/aub_tests/CMakeLists.txt +++ b/opencl/test/unit_test/aub_tests/CMakeLists.txt @@ -10,9 +10,9 @@ set(OPENCL_AUB_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) list(APPEND IGDRCL_AUB_TESTS__TARGET_OBJECTS ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration.cpp - ${NEO_SOURCE_DIR}/opencl/source/aub/aub_stream_interface.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/os_interface.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/test_macros/test_checks_ocl.cpp + ${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp ${NEO_SOURCE_DIR}/shared/test/unit_test/test_macros/test_checks_shared.cpp $ $ diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h index 45cf32f3be..4cf0f42c38 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h @@ -6,13 +6,13 @@ */ #pragma once +#include "shared/source/aub_mem_dump/aub_mem_dump.h" +#include "shared/source/aub_mem_dump/page_table_entry_bits.h" #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/memory_manager/memory_banks.h" #include "shared/source/os_interface/os_context.h" #include "shared/test/unit_test/tests_configuration.h" -#include "opencl/source/aub_mem_dump/aub_mem_dump.h" -#include "opencl/source/aub_mem_dump/page_table_entry_bits.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.cpp index 30bfbb50d6..9a0407ea24 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.cpp @@ -7,10 +7,10 @@ #include "aub_mem_dump_tests.h" +#include "shared/source/aub/aub_helper.h" #include "shared/source/helpers/hw_helper.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" -#include "opencl/source/aub/aub_helper.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_aub_csr.h" diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h b/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h index 44ce4c08fd..cee3bd7324 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h @@ -6,11 +6,11 @@ */ #pragma once +#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "shared/source/device/device.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/ptr_math.h" -#include "opencl/source/aub_mem_dump/aub_mem_dump.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "test.h" diff --git a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h index d92c264e5b..6eaf5ac800 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h @@ -6,13 +6,13 @@ */ #pragma once +#include "shared/source/aub_mem_dump/aub_mem_dump.h" +#include "shared/source/aub_mem_dump/page_table_entry_bits.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/os_interface.h" #include "shared/test/unit_test/mocks/mock_device.h" #include "shared/test/unit_test/tests_configuration.h" -#include "opencl/source/aub_mem_dump/aub_mem_dump.h" -#include "opencl/source/aub_mem_dump/page_table_entry_bits.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" diff --git a/opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.h b/opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.h index 427aa2f57c..06f2881489 100644 --- a/opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.h +++ b/opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.h @@ -6,7 +6,8 @@ */ #pragma once -#include "opencl/source/aub/aub_helper.h" +#include "shared/source/aub/aub_helper.h" + #include "opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h" template diff --git a/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.h b/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.h index 9b13650c29..203f88a747 100644 --- a/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.h +++ b/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.h @@ -6,7 +6,8 @@ */ #pragma once -#include "opencl/source/aub/aub_helper.h" +#include "shared/source/aub/aub_helper.h" + #include "opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h" template diff --git a/opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.h b/opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.h index 0f919217ab..0b399d3a85 100644 --- a/opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.h +++ b/opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.h @@ -6,7 +6,8 @@ */ #pragma once -#include "opencl/source/aub/aub_helper.h" +#include "shared/source/aub/aub_helper.h" + #include "opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h" template diff --git a/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp index 7f948bba97..70523d7eaf 100644 --- a/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp @@ -5,12 +5,12 @@ * */ +#include "shared/source/aub/aub_subcapture.h" #include "shared/source/program/sync_buffer_handler.h" #include "shared/test/unit_test/cmd_parse/hw_parse.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/utilities/base_object_utils.h" -#include "opencl/source/aub/aub_subcapture.h" #include "opencl/source/event/user_event.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/command_stream/thread_arbitration_policy_helper.h" diff --git a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp index b8a95502b8..2394f7067f 100644 --- a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp +++ b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp @@ -5,12 +5,12 @@ * */ +#include "shared/source/aub_mem_dump/aub_alloc_dump.h" +#include "shared/source/aub_mem_dump/page_table_entry_bits.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/os_context.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" -#include "opencl/source/aub_mem_dump/aub_alloc_dump.h" -#include "opencl/source/aub_mem_dump/page_table_entry_bits.h" #include "opencl/source/helpers/hardware_context_controller.h" #include "opencl/test/unit_test/fixtures/aub_command_stream_receiver_fixture.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" diff --git a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp index eae7e6a975..1db14494ad 100644 --- a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp +++ b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp @@ -5,13 +5,13 @@ * */ +#include "shared/source/aub_mem_dump/aub_alloc_dump.h" +#include "shared/source/aub_mem_dump/page_table_entry_bits.h" #include "shared/source/helpers/engine_node_helper.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/os_context.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" -#include "opencl/source/aub_mem_dump/aub_alloc_dump.h" -#include "opencl/source/aub_mem_dump/page_table_entry_bits.h" #include "opencl/source/helpers/hardware_context_controller.h" #include "opencl/source/mem_obj/mem_obj_helper.h" #include "opencl/source/platform/platform.h" diff --git a/opencl/test/unit_test/command_stream/aub_file_stream_tests.cpp b/opencl/test/unit_test/command_stream/aub_file_stream_tests.cpp index 468e92a2f1..c616647480 100644 --- a/opencl/test/unit_test/command_stream/aub_file_stream_tests.cpp +++ b/opencl/test/unit_test/command_stream/aub_file_stream_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "shared/source/aub_mem_dump/page_table_entry_bits.h" #include "shared/source/os_interface/os_context.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" -#include "opencl/source/aub_mem_dump/page_table_entry_bits.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/helpers/hardware_context_controller.h" #include "opencl/source/helpers/neo_driver_version.h" diff --git a/opencl/test/unit_test/command_stream/aub_subcapture_tests.cpp b/opencl/test/unit_test/command_stream/aub_subcapture_tests.cpp index 163b75efda..c2d6949227 100644 --- a/opencl/test/unit_test/command_stream/aub_subcapture_tests.cpp +++ b/opencl/test/unit_test/command_stream/aub_subcapture_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "shared/source/aub/aub_subcapture.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" -#include "opencl/source/aub/aub_subcapture.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h" diff --git a/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp b/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp index 3181b9d1d9..e1ed594683 100644 --- a/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp +++ b/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/aub_mem_dump/aub_alloc_dump.h" #include "shared/source/command_stream/command_stream_receiver_hw.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/engine_node_helper.h" @@ -16,7 +17,6 @@ #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/helpers/variable_backup.h" -#include "opencl/source/aub_mem_dump/aub_alloc_dump.h" #include "opencl/source/command_stream/aub_command_stream_receiver.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.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 ea91829267..8abde72347 100644 --- a/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp +++ b/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/aub/aub_center.h" #include "shared/source/built_ins/built_ins.h" #include "shared/source/command_stream/preemption.h" #include "shared/source/compiler_interface/compiler_interface.h" @@ -19,7 +20,6 @@ #include "shared/test/unit_test/mocks/mock_device.h" #include "shared/test/unit_test/utilities/destructor_counted.h" -#include "opencl/source/aub/aub_center.h" #include "opencl/source/cl_device/cl_device.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_async_event_handler.h" diff --git a/opencl/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl index 3612af3528..217568401e 100644 --- a/opencl/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl @@ -5,10 +5,10 @@ * */ +#include "shared/source/aub_mem_dump/page_table_entry_bits.h" #include "shared/source/os_interface/os_context.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" -#include "opencl/source/aub_mem_dump/page_table_entry_bits.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/helpers/hw_helper_tests.h" diff --git a/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl index 7f75cc2103..343772687e 100644 --- a/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl @@ -5,7 +5,8 @@ * */ -#include "opencl/source/aub_mem_dump/page_table_entry_bits.h" +#include "shared/source/aub_mem_dump/page_table_entry_bits.h" + #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" diff --git a/opencl/test/unit_test/libult/create_tbx_sockets.cpp b/opencl/test/unit_test/libult/create_tbx_sockets.cpp index 7393bbfc85..cc2b881470 100644 --- a/opencl/test/unit_test/libult/create_tbx_sockets.cpp +++ b/opencl/test/unit_test/libult/create_tbx_sockets.cpp @@ -5,9 +5,9 @@ * */ +#include "shared/source/tbx/tbx_sockets_imp.h" #include "shared/test/unit_test/tests_configuration.h" -#include "opencl/source/tbx/tbx_sockets_imp.h" #include "opencl/test/unit_test/mocks/mock_tbx_sockets.h" namespace NEO { diff --git a/opencl/test/unit_test/memory_manager/page_table_tests.cpp b/opencl/test/unit_test/memory_manager/page_table_tests.cpp index 8807fed936..8ef497c237 100644 --- a/opencl/test/unit_test/memory_manager/page_table_tests.cpp +++ b/opencl/test/unit_test/memory_manager/page_table_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "shared/source/aub_mem_dump/page_table_entry_bits.h" #include "shared/source/helpers/ptr_math.h" #include "shared/source/memory_manager/memory_banks.h" -#include "opencl/source/aub_mem_dump/page_table_entry_bits.h" #include "opencl/source/memory_manager/page_table.h" #include "opencl/source/memory_manager/page_table.inl" #include "opencl/test/unit_test/mocks/mock_physical_address_allocator.h" diff --git a/opencl/test/unit_test/mocks/mock_aub_center.h b/opencl/test/unit_test/mocks/mock_aub_center.h index 84c4c0f870..ac608f2286 100644 --- a/opencl/test/unit_test/mocks/mock_aub_center.h +++ b/opencl/test/unit_test/mocks/mock_aub_center.h @@ -7,8 +7,9 @@ #pragma once -#include "opencl/source/aub/aub_center.h" -#include "opencl/source/aub/aub_stream_provider.h" +#include "shared/source/aub/aub_center.h" +#include "shared/source/aub/aub_stream_provider.h" + #include "opencl/test/unit_test/mocks/mock_aub_file_stream.h" namespace NEO { diff --git a/opencl/test/unit_test/mocks/mock_aub_stream.h b/opencl/test/unit_test/mocks/mock_aub_stream.h index f0e69e809b..351c538984 100644 --- a/opencl/test/unit_test/mocks/mock_aub_stream.h +++ b/opencl/test/unit_test/mocks/mock_aub_stream.h @@ -7,8 +7,8 @@ #pragma once -#include "opencl/source/aub/aub_mapper_base.h" -#include "opencl/source/aub_mem_dump/aub_mem_dump.h" +#include "shared/source/aub/aub_mapper_base.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" namespace NEO { diff --git a/opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h b/opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h index 2433a08732..651794c442 100644 --- a/opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h +++ b/opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h @@ -6,7 +6,8 @@ */ #pragma once -#include "opencl/source/aub/aub_subcapture.h" +#include "shared/source/aub/aub_subcapture.h" + #include "opencl/source/os_interface/ocl_reg_path.h" using namespace NEO; diff --git a/opencl/test/unit_test/mocks/mock_lrca_helper.h b/opencl/test/unit_test/mocks/mock_lrca_helper.h index 3850f8306a..14f807a6dc 100644 --- a/opencl/test/unit_test/mocks/mock_lrca_helper.h +++ b/opencl/test/unit_test/mocks/mock_lrca_helper.h @@ -7,7 +7,7 @@ #pragma once -#include "opencl/source/aub_mem_dump/aub_mem_dump.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" struct MockLrcaHelper : AubMemDump::LrcaHelper { mutable uint32_t setContextSaveRestoreFlagsCalled = 0; diff --git a/opencl/test/unit_test/mocks/mock_tbx_csr.h b/opencl/test/unit_test/mocks/mock_tbx_csr.h index b153e40e18..fb708cd49a 100644 --- a/opencl/test/unit_test/mocks/mock_tbx_csr.h +++ b/opencl/test/unit_test/mocks/mock_tbx_csr.h @@ -7,11 +7,11 @@ #pragma once +#include "shared/source/aub/aub_center.h" #include "shared/source/command_stream/preemption.h" #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/helpers/hw_info.h" -#include "opencl/source/aub/aub_center.h" #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" #include "gmock/gmock.h" diff --git a/opencl/test/unit_test/mocks/mock_tbx_sockets.h b/opencl/test/unit_test/mocks/mock_tbx_sockets.h index ac123cf975..ab07914243 100644 --- a/opencl/test/unit_test/mocks/mock_tbx_sockets.h +++ b/opencl/test/unit_test/mocks/mock_tbx_sockets.h @@ -6,7 +6,7 @@ */ #pragma once -#include "opencl/source/tbx/tbx_sockets.h" +#include "shared/source/tbx/tbx_sockets.h" namespace NEO { diff --git a/opencl/test/unit_test/mt_tests/CMakeLists.txt b/opencl/test/unit_test/mt_tests/CMakeLists.txt index 6eaaf5ca4e..786b496c97 100644 --- a/opencl/test/unit_test/mt_tests/CMakeLists.txt +++ b/opencl/test/unit_test/mt_tests/CMakeLists.txt @@ -17,12 +17,12 @@ endif() add_custom_target(run_mt_unit_tests) add_executable(igdrcl_mt_tests EXCLUDE_FROM_ALL ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${NEO_SOURCE_DIR}/shared/test/unit_test/test_macros/test_checks_shared.cpp ${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/os_interface.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/test_macros/test_checks_ocl.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/ult_configuration.cpp - ${NEO_SOURCE_DIR}/opencl/source/aub/aub_stream_interface.cpp + ${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp + ${NEO_SOURCE_DIR}/shared/test/unit_test/test_macros/test_checks_shared.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h $ $ diff --git a/opencl/test/unit_test/windows/CMakeLists.txt b/opencl/test/unit_test/windows/CMakeLists.txt index 3d01cf0078..570bf055e3 100644 --- a/opencl/test/unit_test/windows/CMakeLists.txt +++ b/opencl/test/unit_test/windows/CMakeLists.txt @@ -15,13 +15,13 @@ if(WIN32) add_executable(igdrcl_windows_dll_tests ${NEO_IGDRCL_WINDOWS_DLL_TESTS_TARGET_OBJECTS} - ${NEO_SOURCE_DIR}/opencl/source/aub/aub_stream_interface.cpp + ${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp ${NEO_SOURCE_DIR}/opencl/source/dll/create_command_stream.cpp ${NEO_SOURCE_DIR}/opencl/source/dll${BRANCH_DIR_SUFFIX}/get_devices.cpp ${NEO_SOURCE_DIR}/opencl/source/dll/windows/os_interface.cpp ${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp - ${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/ult_configuration.cpp + ${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_devices_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/wddm_create_tests.cpp diff --git a/shared/source/CMakeLists.txt b/shared/source/CMakeLists.txt index 7ddf1b4450..fee236fe32 100644 --- a/shared/source/CMakeLists.txt +++ b/shared/source/CMakeLists.txt @@ -83,13 +83,15 @@ endmacro() apply_macro_for_each_gen("SUPPORTED") append_sources_from_properties(CORE_SOURCES + NEO_CORE_AUB + NEO_CORE_AUB_MEM_DUMP NEO_CORE_BUILT_INS - NEO_CORE_COMMAND_STREAM NEO_CORE_COMMANDS NEO_CORE_COMMAND_CONTAINER NEO_CORE_COMMAND_ENCODERS - NEO_CORE_DEBUG_SETTINGS + NEO_CORE_COMMAND_STREAM NEO_CORE_DEBUGGER + NEO_CORE_DEBUG_SETTINGS NEO_CORE_DEVICE NEO_CORE_DIRECT_SUBMISSION NEO_CORE_DIRECT_SUBMISSION_DISPATCHERS @@ -107,9 +109,10 @@ append_sources_from_properties(CORE_SOURCES NEO_CORE_PROGRAM NEO_CORE_SKU_INFO_BASE NEO_CORE_SRCS_BUILT_INS - NEO_CORE_SRCS_BUILT_IN_KERNELS NEO_CORE_SRCS_BUILT_INS_OPS + NEO_CORE_SRCS_BUILT_IN_KERNELS NEO_CORE_SRCS_SOURCE_LEVEL_DEBUGGER + NEO_CORE_TBX NEO_CORE_UTILITIES NEO_UNIFIED_MEMORY ) diff --git a/opencl/source/aub/CMakeLists.txt b/shared/source/aub/CMakeLists.txt similarity index 82% rename from opencl/source/aub/CMakeLists.txt rename to shared/source/aub/CMakeLists.txt index b161ff02e7..d6c3bc8839 100644 --- a/opencl/source/aub/CMakeLists.txt +++ b/shared/source/aub/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # -set(RUNTIME_SRCS_AUB +set(NEO_CORE_AUB ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/aub_center.cpp ${CMAKE_CURRENT_SOURCE_DIR}/aub_center.h @@ -18,6 +18,5 @@ set(RUNTIME_SRCS_AUB ${CMAKE_CURRENT_SOURCE_DIR}/aub_subcapture.cpp ${CMAKE_CURRENT_SOURCE_DIR}/aub_subcapture.h ) -target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_AUB}) -set_property(GLOBAL PROPERTY RUNTIME_SRCS_AUB ${RUNTIME_SRCS_AUB}) +set_property(GLOBAL PROPERTY NEO_CORE_AUB ${NEO_CORE_AUB}) add_subdirectories() diff --git a/opencl/source/aub/aub_center.cpp b/shared/source/aub/aub_center.cpp similarity index 97% rename from opencl/source/aub/aub_center.cpp rename to shared/source/aub/aub_center.cpp index daa7816140..592046fd86 100644 --- a/opencl/source/aub/aub_center.cpp +++ b/shared/source/aub/aub_center.cpp @@ -5,14 +5,13 @@ * */ -#include "opencl/source/aub/aub_center.h" +#include "shared/source/aub/aub_center.h" +#include "shared/source/aub/aub_helper.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/helpers/hw_info.h" -#include "opencl/source/aub/aub_helper.h" - #include "third_party/aub_stream/headers/aub_manager.h" #include "third_party/aub_stream/headers/aubstream.h" diff --git a/opencl/source/aub/aub_center.h b/shared/source/aub/aub_center.h similarity index 94% rename from opencl/source/aub/aub_center.h rename to shared/source/aub/aub_center.h index c74c7c60c7..c4797f2dfc 100644 --- a/opencl/source/aub/aub_center.h +++ b/shared/source/aub/aub_center.h @@ -6,13 +6,12 @@ */ #pragma once +#include "shared/source/aub/aub_stream_provider.h" +#include "shared/source/aub/aub_subcapture.h" #include "shared/source/helpers/options.h" #include "shared/source/memory_manager/address_mapper.h" #include "shared/source/memory_manager/physical_address_allocator.h" -#include "opencl/source/aub/aub_stream_provider.h" -#include "opencl/source/aub/aub_subcapture.h" - #include "third_party/aub_stream/headers/aub_manager.h" namespace NEO { diff --git a/opencl/source/aub/aub_helper.cpp b/shared/source/aub/aub_helper.cpp similarity index 91% rename from opencl/source/aub/aub_helper.cpp rename to shared/source/aub/aub_helper.cpp index f628d14d94..cd05a90fd8 100644 --- a/opencl/source/aub/aub_helper.cpp +++ b/shared/source/aub/aub_helper.cpp @@ -5,13 +5,12 @@ * */ -#include "opencl/source/aub/aub_helper.h" +#include "shared/source/aub/aub_helper.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/basic_math.h" -#include "opencl/source/aub_mem_dump/aub_mem_dump.h" - #include "third_party/aub_stream/headers/aubstream.h" namespace NEO { diff --git a/opencl/source/aub/aub_helper.h b/shared/source/aub/aub_helper.h similarity index 98% rename from opencl/source/aub/aub_helper.h rename to shared/source/aub/aub_helper.h index e332328cf2..d7ac9064b9 100644 --- a/opencl/source/aub/aub_helper.h +++ b/shared/source/aub/aub_helper.h @@ -6,12 +6,11 @@ */ #pragma once +#include "shared/source/aub/aub_mapper_base.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/non_copyable_or_moveable.h" #include "shared/source/memory_manager/graphics_allocation.h" -#include "opencl/source/aub/aub_mapper_base.h" - namespace NEO { class AubHelper : public NonCopyableOrMovableClass { diff --git a/opencl/source/aub/aub_helper_add_mmio.cpp b/shared/source/aub/aub_helper_add_mmio.cpp similarity index 97% rename from opencl/source/aub/aub_helper_add_mmio.cpp rename to shared/source/aub/aub_helper_add_mmio.cpp index df022af68d..76fd7e28f9 100644 --- a/opencl/source/aub/aub_helper_add_mmio.cpp +++ b/shared/source/aub/aub_helper_add_mmio.cpp @@ -5,10 +5,9 @@ * */ +#include "shared/source/aub/aub_helper.h" #include "shared/source/debug_settings/debug_settings_manager.h" -#include "opencl/source/aub/aub_helper.h" - #include "third_party/aub_stream/headers/aubstream.h" namespace NEO { diff --git a/opencl/source/aub/aub_helper_base.inl b/shared/source/aub/aub_helper_base.inl similarity index 92% rename from opencl/source/aub/aub_helper_base.inl rename to shared/source/aub/aub_helper_base.inl index 2dd2e309ac..4636154af4 100644 --- a/opencl/source/aub/aub_helper_base.inl +++ b/shared/source/aub/aub_helper_base.inl @@ -5,8 +5,8 @@ * */ -#include "opencl/source/aub/aub_helper.h" -#include "opencl/source/aub_mem_dump/aub_mem_dump.h" +#include "shared/source/aub/aub_helper.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" namespace NEO { diff --git a/opencl/source/aub/aub_helper_bdw_plus.inl b/shared/source/aub/aub_helper_bdw_plus.inl similarity index 93% rename from opencl/source/aub/aub_helper_bdw_plus.inl rename to shared/source/aub/aub_helper_bdw_plus.inl index 8719c28ecd..497ad26a17 100644 --- a/opencl/source/aub/aub_helper_bdw_plus.inl +++ b/shared/source/aub/aub_helper_bdw_plus.inl @@ -5,7 +5,7 @@ * */ -#include "opencl/source/aub/aub_helper_base.inl" +#include "shared/source/aub/aub_helper_base.inl" namespace NEO { diff --git a/opencl/source/aub/aub_mapper_base.h b/shared/source/aub/aub_mapper_base.h similarity index 86% rename from opencl/source/aub/aub_mapper_base.h rename to shared/source/aub/aub_mapper_base.h index 17eee3d30a..02d56562cf 100644 --- a/opencl/source/aub/aub_mapper_base.h +++ b/shared/source/aub/aub_mapper_base.h @@ -6,10 +6,9 @@ */ #pragma once +#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "shared/source/helpers/completion_stamp.h" -#include "opencl/source/aub_mem_dump/aub_mem_dump.h" - #include namespace NEO { diff --git a/opencl/source/aub/aub_stream_interface.cpp b/shared/source/aub/aub_stream_interface.cpp similarity index 91% rename from opencl/source/aub/aub_stream_interface.cpp rename to shared/source/aub/aub_stream_interface.cpp index ed8c7258cf..80fbb971cf 100644 --- a/opencl/source/aub/aub_stream_interface.cpp +++ b/shared/source/aub/aub_stream_interface.cpp @@ -5,7 +5,7 @@ * */ -#include "opencl/source/aub/aub_center.h" +#include "shared/source/aub/aub_center.h" using namespace aub_stream; namespace NEO { AubManager *createAubManager(uint32_t gfxFamily, uint32_t devicesCount, uint64_t memoryBankSize, uint32_t stepping, bool localMemorySupported, uint32_t streamMode, uint64_t gpuAddressSpace) { diff --git a/opencl/source/aub/aub_stream_provider.h b/shared/source/aub/aub_stream_provider.h similarity index 90% rename from opencl/source/aub/aub_stream_provider.h rename to shared/source/aub/aub_stream_provider.h index 17647a2880..356e9f0f2d 100644 --- a/opencl/source/aub/aub_stream_provider.h +++ b/shared/source/aub/aub_stream_provider.h @@ -6,7 +6,7 @@ */ #pragma once -#include "opencl/source/aub_mem_dump/aub_mem_dump.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include diff --git a/opencl/source/aub/aub_subcapture.cpp b/shared/source/aub/aub_subcapture.cpp similarity index 99% rename from opencl/source/aub/aub_subcapture.cpp rename to shared/source/aub/aub_subcapture.cpp index 1b4cb9c041..9a9cdbe679 100644 --- a/opencl/source/aub/aub_subcapture.cpp +++ b/shared/source/aub/aub_subcapture.cpp @@ -5,7 +5,7 @@ * */ -#include "opencl/source/aub/aub_subcapture.h" +#include "shared/source/aub/aub_subcapture.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/debug_helpers.h" diff --git a/opencl/source/aub/aub_subcapture.h b/shared/source/aub/aub_subcapture.h similarity index 100% rename from opencl/source/aub/aub_subcapture.h rename to shared/source/aub/aub_subcapture.h diff --git a/opencl/source/aub_mem_dump/CMakeLists.txt b/shared/source/aub_mem_dump/CMakeLists.txt similarity index 76% rename from opencl/source/aub_mem_dump/CMakeLists.txt rename to shared/source/aub_mem_dump/CMakeLists.txt index 752c833875..854dc0cedb 100644 --- a/opencl/source/aub_mem_dump/CMakeLists.txt +++ b/shared/source/aub_mem_dump/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # -set(RUNTIME_SRCS_AUB_MEM_DUMP +set(NEO_CORE_AUB_MEM_DUMP ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/aub_alloc_dump.h ${CMAKE_CURRENT_SOURCE_DIR}/aub_alloc_dump.inl @@ -19,11 +19,10 @@ set(RUNTIME_SRCS_AUB_MEM_DUMP ) if(NOT DEFINED AUB_STREAM_PROJECT_NAME) - list(APPEND RUNTIME_SRCS_AUB_MEM_DUMP + list(APPEND NEO_CORE_AUB_MEM_DUMP ${CMAKE_CURRENT_SOURCE_DIR}/aub_stream_stubs.cpp ) endif() -target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_AUB_MEM_DUMP}) -set_property(GLOBAL PROPERTY RUNTIME_SRCS_AUB_MEM_DUMP ${RUNTIME_SRCS_AUB_MEM_DUMP}) +set_property(GLOBAL PROPERTY NEO_CORE_AUB_MEM_DUMP ${NEO_CORE_AUB_MEM_DUMP}) add_subdirectories() diff --git a/opencl/source/aub_mem_dump/aub_alloc_dump.h b/shared/source/aub_mem_dump/aub_alloc_dump.h similarity index 98% rename from opencl/source/aub_mem_dump/aub_alloc_dump.h rename to shared/source/aub_mem_dump/aub_alloc_dump.h index f51e5fbdbc..6d749a4e3b 100644 --- a/opencl/source/aub_mem_dump/aub_alloc_dump.h +++ b/shared/source/aub_mem_dump/aub_alloc_dump.h @@ -7,12 +7,11 @@ #pragma once +#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/gmm_helper/resource_info.h" #include "shared/source/memory_manager/graphics_allocation.h" -#include "opencl/source/aub_mem_dump/aub_mem_dump.h" - using namespace NEO; namespace aub_stream { diff --git a/opencl/source/aub_mem_dump/aub_alloc_dump.inl b/shared/source/aub_mem_dump/aub_alloc_dump.inl similarity index 99% rename from opencl/source/aub_mem_dump/aub_alloc_dump.inl rename to shared/source/aub_mem_dump/aub_alloc_dump.inl index 4ce654cea5..ab5708844f 100644 --- a/opencl/source/aub_mem_dump/aub_alloc_dump.inl +++ b/shared/source/aub_mem_dump/aub_alloc_dump.inl @@ -5,11 +5,10 @@ * */ +#include "shared/source/aub_mem_dump/aub_alloc_dump.h" #include "shared/source/gmm_helper/gmm.h" #include "shared/source/gmm_helper/gmm_helper.h" -#include "opencl/source/aub_mem_dump/aub_alloc_dump.h" - #include "third_party/aub_stream/headers/aubstream.h" using namespace NEO; diff --git a/opencl/source/aub_mem_dump/aub_data.h b/shared/source/aub_mem_dump/aub_data.h similarity index 100% rename from opencl/source/aub_mem_dump/aub_data.h rename to shared/source/aub_mem_dump/aub_data.h diff --git a/opencl/source/aub_mem_dump/aub_header.h b/shared/source/aub_mem_dump/aub_header.h similarity index 100% rename from opencl/source/aub_mem_dump/aub_header.h rename to shared/source/aub_mem_dump/aub_header.h diff --git a/opencl/source/aub_mem_dump/aub_mem_dump.cpp b/shared/source/aub_mem_dump/aub_mem_dump.cpp similarity index 99% rename from opencl/source/aub_mem_dump/aub_mem_dump.cpp rename to shared/source/aub_mem_dump/aub_mem_dump.cpp index 293953f797..801e700576 100644 --- a/opencl/source/aub_mem_dump/aub_mem_dump.cpp +++ b/shared/source/aub_mem_dump/aub_mem_dump.cpp @@ -7,12 +7,11 @@ #include "aub_mem_dump.h" +#include "shared/source/aub/aub_helper.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/debug_helpers.h" #include "shared/source/helpers/ptr_math.h" -#include "opencl/source/aub/aub_helper.h" - namespace AubMemDump { const uint64_t g_pageMask = ~(4096ull - 1); diff --git a/opencl/source/aub_mem_dump/aub_mem_dump.h b/shared/source/aub_mem_dump/aub_mem_dump.h similarity index 99% rename from opencl/source/aub_mem_dump/aub_mem_dump.h rename to shared/source/aub_mem_dump/aub_mem_dump.h index 1385be6fee..b8cc7c42f5 100644 --- a/opencl/source/aub_mem_dump/aub_mem_dump.h +++ b/shared/source/aub_mem_dump/aub_mem_dump.h @@ -16,7 +16,7 @@ #define BIT(x) (((uint64_t)1) << (x)) #endif -#include "opencl/source/aub_mem_dump/aub_data.h" +#include "shared/source/aub_mem_dump/aub_data.h" namespace NEO { class AubHelper; diff --git a/opencl/source/aub_mem_dump/aub_mem_dump.inl b/shared/source/aub_mem_dump/aub_mem_dump.inl similarity index 99% rename from opencl/source/aub_mem_dump/aub_mem_dump.inl rename to shared/source/aub_mem_dump/aub_mem_dump.inl index ad98208df6..f76917aa87 100644 --- a/opencl/source/aub_mem_dump/aub_mem_dump.inl +++ b/shared/source/aub_mem_dump/aub_mem_dump.inl @@ -5,12 +5,11 @@ * */ +#include "shared/source/aub/aub_helper.h" #include "shared/source/helpers/constants.h" #include "shared/source/helpers/debug_helpers.h" #include "shared/source/helpers/ptr_math.h" -#include "opencl/source/aub/aub_helper.h" - #include "aub_mem_dump.h" #include diff --git a/opencl/source/aub_mem_dump/aub_services.h b/shared/source/aub_mem_dump/aub_services.h similarity index 100% rename from opencl/source/aub_mem_dump/aub_services.h rename to shared/source/aub_mem_dump/aub_services.h diff --git a/opencl/source/aub_mem_dump/aub_stream_stubs.cpp b/shared/source/aub_mem_dump/aub_stream_stubs.cpp similarity index 100% rename from opencl/source/aub_mem_dump/aub_stream_stubs.cpp rename to shared/source/aub_mem_dump/aub_stream_stubs.cpp diff --git a/opencl/source/aub_mem_dump/context_flags.cpp b/shared/source/aub_mem_dump/context_flags.cpp similarity index 80% rename from opencl/source/aub_mem_dump/context_flags.cpp rename to shared/source/aub_mem_dump/context_flags.cpp index cbdf7057e2..97a6ed335c 100644 --- a/opencl/source/aub_mem_dump/context_flags.cpp +++ b/shared/source/aub_mem_dump/context_flags.cpp @@ -5,7 +5,7 @@ * */ -#include "opencl/source/aub_mem_dump/aub_mem_dump.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" namespace AubMemDump { void LrcaHelper::setContextSaveRestoreFlags(uint32_t &ctxSrCtlValue) const { diff --git a/opencl/source/aub_mem_dump/page_table_entry_bits.h b/shared/source/aub_mem_dump/page_table_entry_bits.h similarity index 100% rename from opencl/source/aub_mem_dump/page_table_entry_bits.h rename to shared/source/aub_mem_dump/page_table_entry_bits.h diff --git a/shared/source/execution_environment/root_device_environment.cpp b/shared/source/execution_environment/root_device_environment.cpp index 13fb4db993..4f18a882e5 100644 --- a/shared/source/execution_environment/root_device_environment.cpp +++ b/shared/source/execution_environment/root_device_environment.cpp @@ -7,6 +7,7 @@ #include "shared/source/execution_environment/root_device_environment.h" +#include "shared/source/aub/aub_center.h" #include "shared/source/built_ins/built_ins.h" #include "shared/source/compiler_interface/compiler_interface.h" #include "shared/source/compiler_interface/default_cache_config.h" @@ -18,8 +19,6 @@ #include "shared/source/memory_manager/memory_operations_handler.h" #include "shared/source/os_interface/os_interface.h" -#include "opencl/source/aub/aub_center.h" - namespace NEO { RootDeviceEnvironment::RootDeviceEnvironment(ExecutionEnvironment &executionEnvironment) : executionEnvironment(executionEnvironment) { diff --git a/shared/source/gen11/aub_mapper.h b/shared/source/gen11/aub_mapper.h index 94fe22de23..8ae01c0211 100644 --- a/shared/source/gen11/aub_mapper.h +++ b/shared/source/gen11/aub_mapper.h @@ -6,10 +6,9 @@ */ #pragma once +#include "shared/source/aub/aub_mapper_base.h" #include "shared/source/helpers/constants.h" -#include "opencl/source/aub/aub_mapper_base.h" - #include "engine_node.h" namespace NEO { diff --git a/shared/source/gen12lp/aub_mapper.h b/shared/source/gen12lp/aub_mapper.h index a4190a8f70..459d27c8c7 100644 --- a/shared/source/gen12lp/aub_mapper.h +++ b/shared/source/gen12lp/aub_mapper.h @@ -6,10 +6,9 @@ */ #pragma once +#include "shared/source/aub/aub_mapper_base.h" #include "shared/source/helpers/constants.h" -#include "opencl/source/aub/aub_mapper_base.h" - #include "engine_node.h" namespace NEO { diff --git a/shared/source/gen12lp/helpers_gen12lp_dg1.cpp b/shared/source/gen12lp/helpers_gen12lp_dg1.cpp index 0ef7eb76c0..6aafc3f68e 100644 --- a/shared/source/gen12lp/helpers_gen12lp_dg1.cpp +++ b/shared/source/gen12lp/helpers_gen12lp_dg1.cpp @@ -5,11 +5,11 @@ * */ +#include "shared/source/aub_mem_dump/page_table_entry_bits.h" #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/gen12lp/helpers_gen12lp.h" #include "shared/source/helpers/hw_helper.h" -#include "opencl/source/aub_mem_dump/page_table_entry_bits.h" #include "opencl/source/command_stream/command_stream_receiver_simulated_common_hw.h" namespace NEO { diff --git a/shared/source/gen8/aub_mapper.h b/shared/source/gen8/aub_mapper.h index 779e5581c8..cb70af5ab7 100644 --- a/shared/source/gen8/aub_mapper.h +++ b/shared/source/gen8/aub_mapper.h @@ -6,10 +6,9 @@ */ #pragma once +#include "shared/source/aub/aub_mapper_base.h" #include "shared/source/helpers/constants.h" -#include "opencl/source/aub/aub_mapper_base.h" - #include "engine_node.h" namespace NEO { diff --git a/shared/source/gen9/aub_mapper.h b/shared/source/gen9/aub_mapper.h index 7a570f16c9..58c11d912b 100644 --- a/shared/source/gen9/aub_mapper.h +++ b/shared/source/gen9/aub_mapper.h @@ -6,10 +6,9 @@ */ #pragma once +#include "shared/source/aub/aub_mapper_base.h" #include "shared/source/helpers/constants.h" -#include "opencl/source/aub/aub_mapper_base.h" - #include "engine_node.h" namespace NEO { diff --git a/shared/source/helpers/hw_helper.h b/shared/source/helpers/hw_helper.h index 5ba522f741..8ce3e63451 100644 --- a/shared/source/helpers/hw_helper.h +++ b/shared/source/helpers/hw_helper.h @@ -6,13 +6,13 @@ */ #pragma once +#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "shared/source/built_ins/sip.h" #include "shared/source/command_stream/linear_stream.h" #include "shared/source/commands/bxml_generator_glue.h" #include "shared/source/helpers/aux_translation.h" #include "shared/source/helpers/engine_node_helper.h" -#include "opencl/source/aub_mem_dump/aub_mem_dump.h" #include "opencl/source/mem_obj/buffer.h" #include "hw_cmds.h" diff --git a/shared/source/helpers/hw_helper_base.inl b/shared/source/helpers/hw_helper_base.inl index bbf33bca60..d3374d356e 100644 --- a/shared/source/helpers/hw_helper_base.inl +++ b/shared/source/helpers/hw_helper_base.inl @@ -5,6 +5,7 @@ * */ +#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/gmm_helper/gmm.h" #include "shared/source/gmm_helper/gmm_helper.h" @@ -18,7 +19,6 @@ #include "shared/source/memory_manager/graphics_allocation.h" #include "shared/source/os_interface/os_interface.h" -#include "opencl/source/aub_mem_dump/aub_mem_dump.h" #include "opencl/source/helpers/dispatch_info.h" #include "pipe_control_args.h" diff --git a/shared/source/os_interface/aub_memory_operations_handler.cpp b/shared/source/os_interface/aub_memory_operations_handler.cpp index 788b16564e..fcf272dea7 100644 --- a/shared/source/os_interface/aub_memory_operations_handler.cpp +++ b/shared/source/os_interface/aub_memory_operations_handler.cpp @@ -7,10 +7,9 @@ #include "shared/source/os_interface/aub_memory_operations_handler.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "shared/source/memory_manager/graphics_allocation.h" -#include "opencl/source/aub_mem_dump/aub_mem_dump.h" - #include namespace NEO { diff --git a/shared/source/os_interface/device_factory.cpp b/shared/source/os_interface/device_factory.cpp index 69379d3831..13977674bd 100644 --- a/shared/source/os_interface/device_factory.cpp +++ b/shared/source/os_interface/device_factory.cpp @@ -7,6 +7,7 @@ #include "shared/source/os_interface/device_factory.h" +#include "shared/source/aub/aub_center.h" #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/device/device.h" #include "shared/source/device/root_device.h" @@ -16,8 +17,6 @@ #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/os_interface.h" -#include "opencl/source/aub/aub_center.h" - #include "hw_device_id.h" namespace NEO { diff --git a/opencl/source/tbx/CMakeLists.txt b/shared/source/tbx/CMakeLists.txt similarity index 67% rename from opencl/source/tbx/CMakeLists.txt rename to shared/source/tbx/CMakeLists.txt index fdedbc7970..d3b98315b9 100644 --- a/opencl/source/tbx/CMakeLists.txt +++ b/shared/source/tbx/CMakeLists.txt @@ -4,12 +4,11 @@ # SPDX-License-Identifier: MIT # -set(RUNTIME_SRCS_TBX +set(NEO_CORE_TBX ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/tbx_proto.h ${CMAKE_CURRENT_SOURCE_DIR}/tbx_sockets.h ${CMAKE_CURRENT_SOURCE_DIR}/tbx_sockets_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tbx_sockets_imp.h ) -target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_TBX}) -set_property(GLOBAL PROPERTY RUNTIME_SRCS_TBX ${RUNTIME_SRCS_TBX}) +set_property(GLOBAL PROPERTY NEO_CORE_TBX ${NEO_CORE_TBX}) diff --git a/opencl/source/tbx/tbx_proto.h b/shared/source/tbx/tbx_proto.h similarity index 100% rename from opencl/source/tbx/tbx_proto.h rename to shared/source/tbx/tbx_proto.h diff --git a/opencl/source/tbx/tbx_sockets.h b/shared/source/tbx/tbx_sockets.h similarity index 100% rename from opencl/source/tbx/tbx_sockets.h rename to shared/source/tbx/tbx_sockets.h diff --git a/opencl/source/tbx/tbx_sockets_imp.cpp b/shared/source/tbx/tbx_sockets_imp.cpp similarity index 99% rename from opencl/source/tbx/tbx_sockets_imp.cpp rename to shared/source/tbx/tbx_sockets_imp.cpp index cf8c60e298..b48bcdf318 100644 --- a/opencl/source/tbx/tbx_sockets_imp.cpp +++ b/shared/source/tbx/tbx_sockets_imp.cpp @@ -5,7 +5,7 @@ * */ -#include "opencl/source/tbx/tbx_sockets_imp.h" +#include "shared/source/tbx/tbx_sockets_imp.h" #include "shared/source/helpers/debug_helpers.h" #include "shared/source/helpers/string.h" diff --git a/opencl/source/tbx/tbx_sockets_imp.h b/shared/source/tbx/tbx_sockets_imp.h similarity index 96% rename from opencl/source/tbx/tbx_sockets_imp.h rename to shared/source/tbx/tbx_sockets_imp.h index 3b51e15051..738f26175b 100644 --- a/opencl/source/tbx/tbx_sockets_imp.h +++ b/shared/source/tbx/tbx_sockets_imp.h @@ -6,7 +6,7 @@ */ #pragma once -#include "opencl/source/tbx/tbx_sockets.h" +#include "shared/source/tbx/tbx_sockets.h" #include "os_socket.h" diff --git a/shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.cpp b/shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.cpp index b5a27f5e47..c9440dde0e 100644 --- a/shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.cpp +++ b/shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.cpp @@ -7,7 +7,8 @@ #include "shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.h" -#include "opencl/source/aub_mem_dump/aub_mem_dump.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" + #include "opencl/test/unit_test/mocks/mock_aub_manager.h" TEST_F(AubMemoryOperationsHandlerTests, givenNullPtrAsAubManagerWhenMakeResidentCalledThenFalseReturned) {