From bb308c04ed6cd0cf60fdc2cc0b25ce198f896c2e Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Wed, 23 Nov 2022 09:14:27 +0000 Subject: [PATCH] Refactor aubstream include interface set include path to third_party/aub_stream rename third_party/aub_stream/headers -> third_party/aub_stream/aubstream Signed-off-by: Mateusz Jablonski --- CMakeLists.txt | 10 ++++------ opencl/source/cl_device/cl_device.h | 2 +- opencl/source/command_queue/copy_engine_state.h | 4 ++-- .../command_queue/sync_buffer_handler_tests.cpp | 2 +- .../test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl | 2 +- shared/source/aub/aub_center.cpp | 6 +++--- shared/source/aub/aub_center.h | 4 ++-- shared/source/aub/aub_helper.cpp | 4 ++-- shared/source/aub/aub_helper_add_mmio.cpp | 2 +- shared/source/aub/aub_helper_extra.cpp | 4 ++-- shared/source/aub_mem_dump/aub_alloc_dump.inl | 2 +- shared/source/aub_mem_dump/aub_stream_stubs.cpp | 2 +- .../aub_command_stream_receiver_hw_base.inl | 2 +- .../command_stream_receiver_simulated_common_hw.h | 2 +- ...ommand_stream_receiver_simulated_common_hw_base.inl | 2 +- .../command_stream_receiver_simulated_hw.h | 2 +- .../direct_submission/direct_submission_properties.h | 4 ++-- shared/source/gen11/aub_mapper.h | 2 +- shared/source/gen11/hw_info_ehl.cpp | 2 +- shared/source/gen11/hw_info_icllp.cpp | 2 +- shared/source/gen11/hw_info_lkf.cpp | 2 +- .../gen11/icllp/os_agnostic_hw_info_config_icllp.inl | 2 +- .../gen12lp/adln/os_agnostic_hw_info_config_adln.inl | 2 +- .../gen12lp/adlp/os_agnostic_hw_info_config_adlp.inl | 2 +- .../gen12lp/adls/os_agnostic_hw_info_config_adls.inl | 2 +- shared/source/gen12lp/aub_mapper.h | 2 +- .../gen12lp/dg1/os_agnostic_hw_info_config_dg1.inl | 2 +- shared/source/gen12lp/hw_helper_gen12lp.cpp | 2 +- shared/source/gen12lp/hw_info_adln.cpp | 2 +- shared/source/gen12lp/hw_info_adlp.cpp | 2 +- shared/source/gen12lp/hw_info_adls.cpp | 2 +- shared/source/gen12lp/hw_info_dg1.cpp | 2 +- shared/source/gen12lp/hw_info_rkl.cpp | 2 +- shared/source/gen12lp/hw_info_tgllp.cpp | 2 +- .../gen12lp/tgllp/os_agnostic_hw_info_config_tgllp.inl | 2 +- shared/source/gen8/aub_mapper.h | 2 +- .../source/gen8/bdw/os_agnostic_hw_info_config_bdw.inl | 2 +- shared/source/gen8/hw_info_bdw.cpp | 2 +- shared/source/gen9/aub_mapper.h | 2 +- .../source/gen9/bxt/os_agnostic_hw_info_config_bxt.inl | 2 +- .../source/gen9/cfl/os_agnostic_hw_info_config_cfl.inl | 2 +- .../source/gen9/glk/os_agnostic_hw_info_config_glk.inl | 2 +- shared/source/gen9/hw_info_bxt.cpp | 2 +- shared/source/gen9/hw_info_cfl.cpp | 2 +- shared/source/gen9/hw_info_glk.cpp | 2 +- shared/source/gen9/hw_info_kbl.cpp | 2 +- shared/source/gen9/hw_info_skl.cpp | 2 +- .../source/gen9/kbl/os_agnostic_hw_info_config_kbl.inl | 2 +- .../source/gen9/skl/os_agnostic_hw_info_config_skl.inl | 2 +- shared/source/helpers/engine_control.h | 2 -- shared/source/helpers/engine_node_helper.h | 2 +- shared/source/helpers/hardware_context_controller.cpp | 4 ++-- shared/source/helpers/hardware_context_controller.h | 4 ++-- shared/source/helpers/hw_helper.h | 2 +- shared/source/helpers/hw_helper_xehp_and_later.inl | 2 +- shared/source/helpers/hw_info.h | 1 - .../os_interface/aub_memory_operations_handler.cpp | 2 +- .../os_interface/aub_memory_operations_handler.h | 2 +- shared/source/os_interface/linux/drm_engine_mapper.h | 2 +- shared/source/os_interface/linux/drm_neo.h | 2 +- shared/source/os_interface/linux/engine_info.h | 2 +- shared/source/os_interface/os_context.h | 2 +- shared/source/os_interface/performance_counters.h | 2 +- .../source/os_interface/windows/wddm_engine_mapper.h | 4 ++-- shared/source/xe_hp_core/aub_mapper.h | 2 +- shared/source/xe_hp_core/hw_info_xe_hp_sdv.cpp | 2 +- .../os_agnostic_hw_info_config_xe_hp_core.inl | 2 +- shared/source/xe_hpc_core/aub_mapper.h | 2 +- shared/source/xe_hpc_core/hw_info_pvc.cpp | 2 +- .../xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl | 2 +- shared/source/xe_hpg_core/aub_mapper.h | 2 +- .../xe_hpg_core/dg2/os_agnostic_hw_info_config_dg2.inl | 2 +- shared/source/xe_hpg_core/hw_info_dg2.cpp | 2 +- shared/test/common/base_ult_config_listener.cpp | 2 +- shared/test/common/mocks/mock_aub_manager.h | 8 ++++---- .../os_interface/linux/device_command_stream_fixture.h | 2 +- shared/test/unit_test/aub/aub_center_tests.cpp | 2 +- .../aub/aub_center_using_aubstream_stubs_tests.cpp | 2 +- .../aub_command_stream_receiver_2_tests.cpp | 2 +- .../gen11/icllp/test_hw_info_config_icllp.cpp | 2 +- .../gen12lp/adln/test_hw_info_config_adln.cpp | 2 +- .../gen12lp/adlp/test_hw_info_config_adlp.cpp | 2 +- .../gen12lp/adls/test_hw_info_config_adls.cpp | 2 +- .../unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp | 2 +- .../gen12lp/tgllp/hw_info_config_tests_tgllp.cpp | 2 +- .../unit_test/gen8/bdw/test_hw_info_config_bdw.cpp | 2 +- .../unit_test/gen9/bxt/test_hw_info_config_bxt.cpp | 2 +- .../unit_test/gen9/cfl/test_hw_info_config_cfl.cpp | 2 +- .../unit_test/gen9/glk/test_hw_info_config_glk.cpp | 2 +- .../unit_test/gen9/kbl/test_hw_info_config_kbl.cpp | 2 +- .../unit_test/gen9/skl/test_hw_info_config_skl.cpp | 2 +- .../unit_test/os_interface/linux/drm_mapper_tests.cpp | 2 +- .../xe_hp_sdv/hw_info_config_tests_xe_hp_sdv.cpp | 2 +- .../xe_hpc_core/pvc/test_hw_info_config_pvc.cpp | 2 +- .../xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp | 2 +- .../{headers => aubstream}/allocation_params.h | 0 .../aub_stream/{headers => aubstream}/aub_manager.h | 0 .../aub_stream/{headers => aubstream}/aubstream.h | 0 .../aub_stream/{headers => aubstream}/engine_node.h | 0 .../{headers => aubstream}/hardware_context.h | 0 .../aub_stream/{headers => aubstream}/page_info.h | 0 .../{headers => aubstream}/physical_allocation_info.h | 0 .../aub_stream/{headers => aubstream}/product_family.h | 0 .../{headers => aubstream}/shared_mem_info.h | 0 104 files changed, 109 insertions(+), 114 deletions(-) rename third_party/aub_stream/{headers => aubstream}/allocation_params.h (100%) rename third_party/aub_stream/{headers => aubstream}/aub_manager.h (100%) rename third_party/aub_stream/{headers => aubstream}/aubstream.h (100%) rename third_party/aub_stream/{headers => aubstream}/engine_node.h (100%) rename third_party/aub_stream/{headers => aubstream}/hardware_context.h (100%) rename third_party/aub_stream/{headers => aubstream}/page_info.h (100%) rename third_party/aub_stream/{headers => aubstream}/physical_allocation_info.h (100%) rename third_party/aub_stream/{headers => aubstream}/product_family.h (100%) rename third_party/aub_stream/{headers => aubstream}/shared_mem_info.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b635c9cb2..d1aac598ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -321,7 +321,7 @@ if(NOT DEFINED SOURCE_LEVEL_DEBUGGER_HEADERS_DIR) message(STATUS "Source Level Debugger headers dir: ${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR}") endif() -get_filename_component(AUB_STREAM_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}aub_stream/headers" ABSOLUTE) +get_filename_component(AUB_STREAM_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}aub_stream" ABSOLUTE) if(IS_DIRECTORY ${AUB_STREAM_HEADERS_DIR}) message(STATUS "Aub Stream Headers dir: ${AUB_STREAM_HEADERS_DIR}") else() @@ -454,11 +454,9 @@ if(DEFINED AUB_STREAM_DIR) set(AUB_STREAM_PROJECT_NAME "aub_stream") add_subdirectory_unique(${AUB_STREAM_DIR} ${CMAKE_BINARY_DIR}/aub_stream EXCLUDE_FROM_ALL) - if(EXISTS ${AUB_STREAM_DIR}${BRANCH_DIR_SUFFIX}headers/engine_node.h) - set(ENGINE_NODE_DIR ${AUB_STREAM_DIR}${BRANCH_DIR_SUFFIX}headers) - else() - get_target_property(interface_dir ${AUB_STREAM_PROJECT_NAME} INTERFACE_INCLUDE_DIRECTORIES) - set(ENGINE_NODE_DIR ${interface_dir}/aubstream/headers) + get_target_property(ENGINE_NODE_DIR ${AUB_STREAM_PROJECT_NAME} INTERFACE_INCLUDE_DIRECTORIES) + if(NOT EXISTS ${ENGINE_NODE_DIR}/aubstream/engine_node.h) + set(ENGINE_NODE_DIR ${AUB_STREAM_HEADERS_DIR}) endif() else() set(ENGINE_NODE_DIR ${AUB_STREAM_HEADERS_DIR}) diff --git a/opencl/source/cl_device/cl_device.h b/opencl/source/cl_device/cl_device.h index 8386fa230f..cf7ecbfb90 100644 --- a/opencl/source/cl_device/cl_device.h +++ b/opencl/source/cl_device/cl_device.h @@ -15,7 +15,7 @@ #include "opencl/source/cl_device/cl_device_info.h" #include "opencl/source/helpers/base_object.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" #include "igfxfmid.h" #include diff --git a/opencl/source/command_queue/copy_engine_state.h b/opencl/source/command_queue/copy_engine_state.h index abe05d0628..ee9dafd16b 100644 --- a/opencl/source/command_queue/copy_engine_state.h +++ b/opencl/source/command_queue/copy_engine_state.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #pragma once -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { struct CopyEngineState { diff --git a/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp b/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp index c365262969..ea16ebcc46 100644 --- a/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp +++ b/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp @@ -16,7 +16,7 @@ #include "opencl/test/unit_test/mocks/mock_mdi.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl index f71cef7983..aaf81c2b33 100644 --- a/opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl @@ -17,7 +17,7 @@ #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" using ClHwHelperTestsGen12Lp = Test; diff --git a/shared/source/aub/aub_center.cpp b/shared/source/aub/aub_center.cpp index 2f91f563b7..28da6e9d11 100644 --- a/shared/source/aub/aub_center.cpp +++ b/shared/source/aub/aub_center.cpp @@ -13,9 +13,9 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/hw_info_config.h" -#include "third_party/aub_stream/headers/aub_manager.h" -#include "third_party/aub_stream/headers/aubstream.h" -#include "third_party/aub_stream/headers/product_family.h" +#include "aubstream/aub_manager.h" +#include "aubstream/aubstream.h" +#include "aubstream/product_family.h" namespace NEO { extern aub_stream::AubManager *createAubManager(const aub_stream::AubManagerOptions &options); diff --git a/shared/source/aub/aub_center.h b/shared/source/aub/aub_center.h index c04d1cb87e..d2418c82d8 100644 --- a/shared/source/aub/aub_center.h +++ b/shared/source/aub/aub_center.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ #include "shared/source/memory_manager/address_mapper.h" #include "shared/source/memory_manager/physical_address_allocator.h" -#include "third_party/aub_stream/headers/aub_manager.h" +#include "aubstream/aub_manager.h" namespace NEO { struct HardwareInfo; diff --git a/shared/source/aub/aub_helper.cpp b/shared/source/aub/aub_helper.cpp index b11c1cbfdb..16563a8366 100644 --- a/shared/source/aub/aub_helper.cpp +++ b/shared/source/aub/aub_helper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -15,7 +15,7 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/tbx/tbx_proto.h" -#include "third_party/aub_stream/headers/aubstream.h" +#include "aubstream/aubstream.h" namespace NEO { diff --git a/shared/source/aub/aub_helper_add_mmio.cpp b/shared/source/aub/aub_helper_add_mmio.cpp index 21c94ab4e1..38d5c96047 100644 --- a/shared/source/aub/aub_helper_add_mmio.cpp +++ b/shared/source/aub/aub_helper_add_mmio.cpp @@ -8,7 +8,7 @@ #include "shared/source/aub/aub_helper.h" #include "shared/source/debug_settings/debug_settings_manager.h" -#include "third_party/aub_stream/headers/aubstream.h" +#include "aubstream/aubstream.h" #include diff --git a/shared/source/aub/aub_helper_extra.cpp b/shared/source/aub/aub_helper_extra.cpp index 362dba0765..4d00a17ca9 100644 --- a/shared/source/aub/aub_helper_extra.cpp +++ b/shared/source/aub/aub_helper_extra.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "shared/source/debug_settings/debug_settings_manager.h" -#include "third_party/aub_stream/headers/aubstream.h" +#include "aubstream/aubstream.h" namespace NEO { diff --git a/shared/source/aub_mem_dump/aub_alloc_dump.inl b/shared/source/aub_mem_dump/aub_alloc_dump.inl index 0a5721042b..87b77ac5dd 100644 --- a/shared/source/aub_mem_dump/aub_alloc_dump.inl +++ b/shared/source/aub_mem_dump/aub_alloc_dump.inl @@ -9,7 +9,7 @@ #include "shared/source/gmm_helper/gmm.h" #include "shared/source/gmm_helper/gmm_helper.h" -#include "third_party/aub_stream/headers/aubstream.h" +#include "aubstream/aubstream.h" using namespace NEO; using namespace aub_stream; diff --git a/shared/source/aub_mem_dump/aub_stream_stubs.cpp b/shared/source/aub_mem_dump/aub_stream_stubs.cpp index e61ca5187c..189d88ae76 100644 --- a/shared/source/aub_mem_dump/aub_stream_stubs.cpp +++ b/shared/source/aub_mem_dump/aub_stream_stubs.cpp @@ -5,7 +5,7 @@ * */ -#include "third_party/aub_stream/headers/aubstream.h" +#include "aubstream/aubstream.h" namespace aub_stream_stubs { uint16_t tbxServerPort = 4321; diff --git a/shared/source/command_stream/aub_command_stream_receiver_hw_base.inl b/shared/source/command_stream/aub_command_stream_receiver_hw_base.inl index dede9989ff..771cdbab2d 100644 --- a/shared/source/command_stream/aub_command_stream_receiver_hw_base.inl +++ b/shared/source/command_stream/aub_command_stream_receiver_hw_base.inl @@ -33,7 +33,7 @@ #include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/source/os_interface/hw_info_config.h" -#include "third_party/aub_stream/headers/aubstream.h" +#include "aubstream/aubstream.h" #include diff --git a/shared/source/command_stream/command_stream_receiver_simulated_common_hw.h b/shared/source/command_stream/command_stream_receiver_simulated_common_hw.h index 6dd78bcf60..7b89964618 100644 --- a/shared/source/command_stream/command_stream_receiver_simulated_common_hw.h +++ b/shared/source/command_stream/command_stream_receiver_simulated_common_hw.h @@ -10,7 +10,7 @@ #include "shared/source/memory_manager/memory_banks.h" #include "aub_mapper.h" -#include "third_party/aub_stream/headers/hardware_context.h" +#include "aubstream/hardware_context.h" namespace aub_stream { class AubManager; diff --git a/shared/source/command_stream/command_stream_receiver_simulated_common_hw_base.inl b/shared/source/command_stream/command_stream_receiver_simulated_common_hw_base.inl index 25ab86ab14..98ac4625d6 100644 --- a/shared/source/command_stream/command_stream_receiver_simulated_common_hw_base.inl +++ b/shared/source/command_stream/command_stream_receiver_simulated_common_hw_base.inl @@ -17,7 +17,7 @@ #include "shared/source/memory_manager/memory_manager.h" #include "shared/source/os_interface/os_context.h" -#include "third_party/aub_stream/headers/aub_manager.h" +#include "aubstream/aub_manager.h" namespace NEO { diff --git a/shared/source/command_stream/command_stream_receiver_simulated_hw.h b/shared/source/command_stream/command_stream_receiver_simulated_hw.h index 42881cd5e2..12b6d01e39 100644 --- a/shared/source/command_stream/command_stream_receiver_simulated_hw.h +++ b/shared/source/command_stream/command_stream_receiver_simulated_hw.h @@ -13,7 +13,7 @@ #include "shared/source/memory_manager/physical_address_allocator.h" #include "shared/source/os_interface/os_context.h" -#include "third_party/aub_stream/headers/allocation_params.h" +#include "aubstream/allocation_params.h" namespace NEO { class GraphicsAllocation; diff --git a/shared/source/direct_submission/direct_submission_properties.h b/shared/source/direct_submission/direct_submission_properties.h index ba484f0d75..33108c2dcf 100644 --- a/shared/source/direct_submission/direct_submission_properties.h +++ b/shared/source/direct_submission/direct_submission_properties.h @@ -1,12 +1,12 @@ /* - * Copyright (C) 2020 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #pragma once -#include "engine_node.h" +#include "aubstream/engine_node.h" #include diff --git a/shared/source/gen11/aub_mapper.h b/shared/source/gen11/aub_mapper.h index 8c3413f621..3a05efa3f8 100644 --- a/shared/source/gen11/aub_mapper.h +++ b/shared/source/gen11/aub_mapper.h @@ -10,7 +10,7 @@ #include "shared/source/gen11/hw_cmds.h" #include "shared/source/helpers/constants.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { struct Gen11Family; diff --git a/shared/source/gen11/hw_info_ehl.cpp b/shared/source/gen11/hw_info_ehl.cpp index e169cffec3..361d9fa2d4 100644 --- a/shared/source/gen11/hw_info_ehl.cpp +++ b/shared/source/gen11/hw_info_ehl.cpp @@ -9,7 +9,7 @@ #include "shared/source/gen11/hw_cmds_ehl.h" #include "shared/source/helpers/constants.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { diff --git a/shared/source/gen11/hw_info_icllp.cpp b/shared/source/gen11/hw_info_icllp.cpp index 7d1f689353..c2f0b971a3 100644 --- a/shared/source/gen11/hw_info_icllp.cpp +++ b/shared/source/gen11/hw_info_icllp.cpp @@ -9,7 +9,7 @@ #include "shared/source/gen11/hw_cmds_icllp.h" #include "shared/source/helpers/constants.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { diff --git a/shared/source/gen11/hw_info_lkf.cpp b/shared/source/gen11/hw_info_lkf.cpp index 646c6f8dd6..40f94a5c13 100644 --- a/shared/source/gen11/hw_info_lkf.cpp +++ b/shared/source/gen11/hw_info_lkf.cpp @@ -9,7 +9,7 @@ #include "shared/source/gen11/hw_cmds_lkf.h" #include "shared/source/helpers/constants.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { diff --git a/shared/source/gen11/icllp/os_agnostic_hw_info_config_icllp.inl b/shared/source/gen11/icllp/os_agnostic_hw_info_config_icllp.inl index 0e8cf77e80..865014e997 100644 --- a/shared/source/gen11/icllp/os_agnostic_hw_info_config_icllp.inl +++ b/shared/source/gen11/icllp/os_agnostic_hw_info_config_icllp.inl @@ -5,7 +5,7 @@ * */ -#include "product_family.h" +#include "aubstream/product_family.h" namespace NEO { template <> diff --git a/shared/source/gen12lp/adln/os_agnostic_hw_info_config_adln.inl b/shared/source/gen12lp/adln/os_agnostic_hw_info_config_adln.inl index 4994298842..60404f6df1 100644 --- a/shared/source/gen12lp/adln/os_agnostic_hw_info_config_adln.inl +++ b/shared/source/gen12lp/adln/os_agnostic_hw_info_config_adln.inl @@ -5,7 +5,7 @@ * */ -#include "product_family.h" +#include "aubstream/product_family.h" namespace NEO { template <> diff --git a/shared/source/gen12lp/adlp/os_agnostic_hw_info_config_adlp.inl b/shared/source/gen12lp/adlp/os_agnostic_hw_info_config_adlp.inl index 0601b4adb6..d71be569de 100644 --- a/shared/source/gen12lp/adlp/os_agnostic_hw_info_config_adlp.inl +++ b/shared/source/gen12lp/adlp/os_agnostic_hw_info_config_adlp.inl @@ -5,7 +5,7 @@ * */ -#include "product_family.h" +#include "aubstream/product_family.h" namespace NEO { template <> diff --git a/shared/source/gen12lp/adls/os_agnostic_hw_info_config_adls.inl b/shared/source/gen12lp/adls/os_agnostic_hw_info_config_adls.inl index beb3af3b2a..72a6671530 100644 --- a/shared/source/gen12lp/adls/os_agnostic_hw_info_config_adls.inl +++ b/shared/source/gen12lp/adls/os_agnostic_hw_info_config_adls.inl @@ -5,7 +5,7 @@ * */ -#include "product_family.h" +#include "aubstream/product_family.h" namespace NEO { template <> diff --git a/shared/source/gen12lp/aub_mapper.h b/shared/source/gen12lp/aub_mapper.h index d2304117ef..58ddda70c5 100644 --- a/shared/source/gen12lp/aub_mapper.h +++ b/shared/source/gen12lp/aub_mapper.h @@ -10,7 +10,7 @@ #include "shared/source/gen12lp/hw_cmds.h" #include "shared/source/helpers/constants.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { struct Gen12LpFamily; diff --git a/shared/source/gen12lp/dg1/os_agnostic_hw_info_config_dg1.inl b/shared/source/gen12lp/dg1/os_agnostic_hw_info_config_dg1.inl index 0cfa048d7a..50761ad452 100644 --- a/shared/source/gen12lp/dg1/os_agnostic_hw_info_config_dg1.inl +++ b/shared/source/gen12lp/dg1/os_agnostic_hw_info_config_dg1.inl @@ -5,7 +5,7 @@ * */ -#include "product_family.h" +#include "aubstream/product_family.h" namespace NEO { template <> diff --git a/shared/source/gen12lp/hw_helper_gen12lp.cpp b/shared/source/gen12lp/hw_helper_gen12lp.cpp index 4b42f408ce..2efb7fc938 100644 --- a/shared/source/gen12lp/hw_helper_gen12lp.cpp +++ b/shared/source/gen12lp/hw_helper_gen12lp.cpp @@ -17,7 +17,7 @@ using Family = NEO::Gen12LpFamily; #include "shared/source/helpers/logical_state_helper.inl" #include "shared/source/os_interface/hw_info_config.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { diff --git a/shared/source/gen12lp/hw_info_adln.cpp b/shared/source/gen12lp/hw_info_adln.cpp index e5aacdd4b4..ad8e9db100 100644 --- a/shared/source/gen12lp/hw_info_adln.cpp +++ b/shared/source/gen12lp/hw_info_adln.cpp @@ -9,7 +9,7 @@ #include "shared/source/gen12lp/hw_cmds_adln.h" #include "shared/source/helpers/constants.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { diff --git a/shared/source/gen12lp/hw_info_adlp.cpp b/shared/source/gen12lp/hw_info_adlp.cpp index 9d84d63fa1..18ad327670 100644 --- a/shared/source/gen12lp/hw_info_adlp.cpp +++ b/shared/source/gen12lp/hw_info_adlp.cpp @@ -9,7 +9,7 @@ #include "shared/source/gen12lp/hw_cmds_adlp.h" #include "shared/source/helpers/constants.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { diff --git a/shared/source/gen12lp/hw_info_adls.cpp b/shared/source/gen12lp/hw_info_adls.cpp index ce4bdfacab..f324e48600 100644 --- a/shared/source/gen12lp/hw_info_adls.cpp +++ b/shared/source/gen12lp/hw_info_adls.cpp @@ -9,7 +9,7 @@ #include "shared/source/gen12lp/hw_cmds_adls.h" #include "shared/source/helpers/constants.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { diff --git a/shared/source/gen12lp/hw_info_dg1.cpp b/shared/source/gen12lp/hw_info_dg1.cpp index 10e88f6a78..393ce6c4c6 100644 --- a/shared/source/gen12lp/hw_info_dg1.cpp +++ b/shared/source/gen12lp/hw_info_dg1.cpp @@ -10,7 +10,7 @@ #include "shared/source/gen12lp/hw_cmds_dg1.h" #include "shared/source/helpers/constants.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { diff --git a/shared/source/gen12lp/hw_info_rkl.cpp b/shared/source/gen12lp/hw_info_rkl.cpp index 9509696147..376be1fef8 100644 --- a/shared/source/gen12lp/hw_info_rkl.cpp +++ b/shared/source/gen12lp/hw_info_rkl.cpp @@ -9,7 +9,7 @@ #include "shared/source/gen12lp/hw_cmds_rkl.h" #include "shared/source/helpers/constants.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { diff --git a/shared/source/gen12lp/hw_info_tgllp.cpp b/shared/source/gen12lp/hw_info_tgllp.cpp index ae7f8ad098..b62c68cc60 100644 --- a/shared/source/gen12lp/hw_info_tgllp.cpp +++ b/shared/source/gen12lp/hw_info_tgllp.cpp @@ -9,7 +9,7 @@ #include "shared/source/gen12lp/hw_cmds_tgllp.h" #include "shared/source/helpers/constants.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { diff --git a/shared/source/gen12lp/tgllp/os_agnostic_hw_info_config_tgllp.inl b/shared/source/gen12lp/tgllp/os_agnostic_hw_info_config_tgllp.inl index 26c9ad7435..4af6dcfd1c 100644 --- a/shared/source/gen12lp/tgllp/os_agnostic_hw_info_config_tgllp.inl +++ b/shared/source/gen12lp/tgllp/os_agnostic_hw_info_config_tgllp.inl @@ -5,7 +5,7 @@ * */ -#include "product_family.h" +#include "aubstream/product_family.h" namespace NEO { template <> diff --git a/shared/source/gen8/aub_mapper.h b/shared/source/gen8/aub_mapper.h index fc9ec6aa78..f1d1727298 100644 --- a/shared/source/gen8/aub_mapper.h +++ b/shared/source/gen8/aub_mapper.h @@ -10,7 +10,7 @@ #include "shared/source/gen8/hw_cmds.h" #include "shared/source/helpers/constants.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { struct Gen8Family; diff --git a/shared/source/gen8/bdw/os_agnostic_hw_info_config_bdw.inl b/shared/source/gen8/bdw/os_agnostic_hw_info_config_bdw.inl index 9d9f0fa315..7a1e2f4e3f 100644 --- a/shared/source/gen8/bdw/os_agnostic_hw_info_config_bdw.inl +++ b/shared/source/gen8/bdw/os_agnostic_hw_info_config_bdw.inl @@ -5,7 +5,7 @@ * */ -#include "product_family.h" +#include "aubstream/product_family.h" namespace NEO { template <> diff --git a/shared/source/gen8/hw_info_bdw.cpp b/shared/source/gen8/hw_info_bdw.cpp index e84d713a86..6a62112e31 100644 --- a/shared/source/gen8/hw_info_bdw.cpp +++ b/shared/source/gen8/hw_info_bdw.cpp @@ -9,7 +9,7 @@ #include "shared/source/gen8/hw_cmds_bdw.h" #include "shared/source/helpers/constants.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { diff --git a/shared/source/gen9/aub_mapper.h b/shared/source/gen9/aub_mapper.h index f7f44a8885..498688f7d6 100644 --- a/shared/source/gen9/aub_mapper.h +++ b/shared/source/gen9/aub_mapper.h @@ -10,7 +10,7 @@ #include "shared/source/gen9/hw_cmds.h" #include "shared/source/helpers/constants.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { struct Gen9Family; diff --git a/shared/source/gen9/bxt/os_agnostic_hw_info_config_bxt.inl b/shared/source/gen9/bxt/os_agnostic_hw_info_config_bxt.inl index 45848818f4..30b8f8b468 100644 --- a/shared/source/gen9/bxt/os_agnostic_hw_info_config_bxt.inl +++ b/shared/source/gen9/bxt/os_agnostic_hw_info_config_bxt.inl @@ -5,7 +5,7 @@ * */ -#include "product_family.h" +#include "aubstream/product_family.h" namespace NEO { template <> diff --git a/shared/source/gen9/cfl/os_agnostic_hw_info_config_cfl.inl b/shared/source/gen9/cfl/os_agnostic_hw_info_config_cfl.inl index a4146f11bf..36455e185f 100644 --- a/shared/source/gen9/cfl/os_agnostic_hw_info_config_cfl.inl +++ b/shared/source/gen9/cfl/os_agnostic_hw_info_config_cfl.inl @@ -7,8 +7,8 @@ #include "shared/source/gen9/cfl/device_ids_configs_cfl.h" +#include "aubstream/product_family.h" #include "platforms.h" -#include "product_family.h" #include diff --git a/shared/source/gen9/glk/os_agnostic_hw_info_config_glk.inl b/shared/source/gen9/glk/os_agnostic_hw_info_config_glk.inl index 0745c63c47..0e7fb4db10 100644 --- a/shared/source/gen9/glk/os_agnostic_hw_info_config_glk.inl +++ b/shared/source/gen9/glk/os_agnostic_hw_info_config_glk.inl @@ -5,7 +5,7 @@ * */ -#include "product_family.h" +#include "aubstream/product_family.h" namespace NEO { template <> diff --git a/shared/source/gen9/hw_info_bxt.cpp b/shared/source/gen9/hw_info_bxt.cpp index 22eb6a4ea0..96923aada6 100644 --- a/shared/source/gen9/hw_info_bxt.cpp +++ b/shared/source/gen9/hw_info_bxt.cpp @@ -9,7 +9,7 @@ #include "shared/source/gen9/hw_cmds_bxt.h" #include "shared/source/helpers/constants.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { diff --git a/shared/source/gen9/hw_info_cfl.cpp b/shared/source/gen9/hw_info_cfl.cpp index f1724d941b..105d2fb226 100644 --- a/shared/source/gen9/hw_info_cfl.cpp +++ b/shared/source/gen9/hw_info_cfl.cpp @@ -9,7 +9,7 @@ #include "shared/source/gen9/hw_cmds_cfl.h" #include "shared/source/helpers/constants.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { diff --git a/shared/source/gen9/hw_info_glk.cpp b/shared/source/gen9/hw_info_glk.cpp index ba0ec672fd..ae14cc94ef 100644 --- a/shared/source/gen9/hw_info_glk.cpp +++ b/shared/source/gen9/hw_info_glk.cpp @@ -9,7 +9,7 @@ #include "shared/source/gen9/hw_cmds_glk.h" #include "shared/source/helpers/constants.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { diff --git a/shared/source/gen9/hw_info_kbl.cpp b/shared/source/gen9/hw_info_kbl.cpp index 48ad5eddda..dcacb99886 100644 --- a/shared/source/gen9/hw_info_kbl.cpp +++ b/shared/source/gen9/hw_info_kbl.cpp @@ -9,7 +9,7 @@ #include "shared/source/gen9/hw_cmds_kbl.h" #include "shared/source/helpers/constants.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { diff --git a/shared/source/gen9/hw_info_skl.cpp b/shared/source/gen9/hw_info_skl.cpp index 3668c13f23..84e15672f2 100644 --- a/shared/source/gen9/hw_info_skl.cpp +++ b/shared/source/gen9/hw_info_skl.cpp @@ -9,7 +9,7 @@ #include "shared/source/gen9/hw_cmds_skl.h" #include "shared/source/helpers/constants.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { diff --git a/shared/source/gen9/kbl/os_agnostic_hw_info_config_kbl.inl b/shared/source/gen9/kbl/os_agnostic_hw_info_config_kbl.inl index 06576bd71c..639dc83216 100644 --- a/shared/source/gen9/kbl/os_agnostic_hw_info_config_kbl.inl +++ b/shared/source/gen9/kbl/os_agnostic_hw_info_config_kbl.inl @@ -7,8 +7,8 @@ #include "shared/source/gen9/kbl/device_ids_configs_kbl.h" +#include "aubstream/product_family.h" #include "platforms.h" -#include "product_family.h" #include diff --git a/shared/source/gen9/skl/os_agnostic_hw_info_config_skl.inl b/shared/source/gen9/skl/os_agnostic_hw_info_config_skl.inl index c955dc9746..a72f0042e5 100644 --- a/shared/source/gen9/skl/os_agnostic_hw_info_config_skl.inl +++ b/shared/source/gen9/skl/os_agnostic_hw_info_config_skl.inl @@ -5,7 +5,7 @@ * */ -#include "product_family.h" +#include "aubstream/product_family.h" namespace NEO { template <> diff --git a/shared/source/helpers/engine_control.h b/shared/source/helpers/engine_control.h index 36f4ac522d..9647ccb8c6 100644 --- a/shared/source/helpers/engine_control.h +++ b/shared/source/helpers/engine_control.h @@ -8,8 +8,6 @@ #pragma once #include "shared/source/os_interface/os_context.h" -#include "engine_node.h" - namespace NEO { class CommandStreamReceiver; diff --git a/shared/source/helpers/engine_node_helper.h b/shared/source/helpers/engine_node_helper.h index 6406c1cfd6..d19c6cda7a 100644 --- a/shared/source/helpers/engine_node_helper.h +++ b/shared/source/helpers/engine_node_helper.h @@ -11,7 +11,7 @@ #include "shared/source/helpers/common_types.h" #include "shared/source/utilities/stackvec.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" #include #include diff --git a/shared/source/helpers/hardware_context_controller.cpp b/shared/source/helpers/hardware_context_controller.cpp index ef89b67d32..1e09b06c5c 100644 --- a/shared/source/helpers/hardware_context_controller.cpp +++ b/shared/source/helpers/hardware_context_controller.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #include "shared/source/helpers/constants.h" #include "shared/source/os_interface/os_context.h" -#include "third_party/aub_stream/headers/allocation_params.h" +#include "aubstream/allocation_params.h" using namespace NEO; HardwareContextController::HardwareContextController(aub_stream::AubManager &aubManager, OsContext &osContext, uint32_t flags) { diff --git a/shared/source/helpers/hardware_context_controller.h b/shared/source/helpers/hardware_context_controller.h index 9eb33a7c1a..9f5abb27ae 100644 --- a/shared/source/helpers/hardware_context_controller.h +++ b/shared/source/helpers/hardware_context_controller.h @@ -6,8 +6,8 @@ */ #pragma once -#include "third_party/aub_stream/headers/aub_manager.h" -#include "third_party/aub_stream/headers/hardware_context.h" +#include "aubstream/aub_manager.h" +#include "aubstream/hardware_context.h" #include #include diff --git a/shared/source/helpers/hw_helper.h b/shared/source/helpers/hw_helper.h index ee862b3983..6484b2b4fc 100644 --- a/shared/source/helpers/hw_helper.h +++ b/shared/source/helpers/hw_helper.h @@ -14,9 +14,9 @@ #include "shared/source/helpers/engine_node_helper.h" #include "shared/source/helpers/options.h" +#include "aubstream/aubstream.h" #include "igfxfmid.h" #include "sku_info.h" -#include "third_party/aub_stream/headers/aubstream.h" #include #include diff --git a/shared/source/helpers/hw_helper_xehp_and_later.inl b/shared/source/helpers/hw_helper_xehp_and_later.inl index aeafdff002..c255df77b8 100644 --- a/shared/source/helpers/hw_helper_xehp_and_later.inl +++ b/shared/source/helpers/hw_helper_xehp_and_later.inl @@ -14,7 +14,7 @@ #include "shared/source/kernel/grf_config.h" #include "shared/source/memory_manager/memory_manager.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { diff --git a/shared/source/helpers/hw_info.h b/shared/source/helpers/hw_info.h index 71c97f11cd..62f8457337 100644 --- a/shared/source/helpers/hw_info.h +++ b/shared/source/helpers/hw_info.h @@ -10,7 +10,6 @@ #include "shared/source/direct_submission/direct_submission_properties.h" #include "shared/source/helpers/kmd_notify_properties.h" -#include "engine_node.h" #include "gtsysinfo.h" #include "igfxfmid.h" #include "sku_info.h" diff --git a/shared/source/os_interface/aub_memory_operations_handler.cpp b/shared/source/os_interface/aub_memory_operations_handler.cpp index 582d105c70..50b6dfc957 100644 --- a/shared/source/os_interface/aub_memory_operations_handler.cpp +++ b/shared/source/os_interface/aub_memory_operations_handler.cpp @@ -12,7 +12,7 @@ #include "shared/source/gmm_helper/gmm.h" #include "shared/source/memory_manager/graphics_allocation.h" -#include "third_party/aub_stream/headers/allocation_params.h" +#include "aubstream/allocation_params.h" #include diff --git a/shared/source/os_interface/aub_memory_operations_handler.h b/shared/source/os_interface/aub_memory_operations_handler.h index 69b053bbbf..643405cae4 100644 --- a/shared/source/os_interface/aub_memory_operations_handler.h +++ b/shared/source/os_interface/aub_memory_operations_handler.h @@ -9,7 +9,7 @@ #include "shared/source/memory_manager/memory_operations_handler.h" #include "shared/source/utilities/spinlock.h" -#include "third_party/aub_stream/headers/aub_manager.h" +#include "aubstream/aub_manager.h" #include #include diff --git a/shared/source/os_interface/linux/drm_engine_mapper.h b/shared/source/os_interface/linux/drm_engine_mapper.h index e1c9a2ba8d..37ecf48454 100644 --- a/shared/source/os_interface/linux/drm_engine_mapper.h +++ b/shared/source/os_interface/linux/drm_engine_mapper.h @@ -7,7 +7,7 @@ #pragma once -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { diff --git a/shared/source/os_interface/linux/drm_neo.h b/shared/source/os_interface/linux/drm_neo.h index 5b3e784e70..52658086b2 100644 --- a/shared/source/os_interface/linux/drm_neo.h +++ b/shared/source/os_interface/linux/drm_neo.h @@ -17,7 +17,7 @@ #include "shared/source/os_interface/linux/memory_info.h" #include "shared/source/os_interface/os_interface.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" #include "igfxfmid.h" #include diff --git a/shared/source/os_interface/linux/engine_info.h b/shared/source/os_interface/linux/engine_info.h index a4a86b9e75..8d610b5c91 100644 --- a/shared/source/os_interface/linux/engine_info.h +++ b/shared/source/os_interface/linux/engine_info.h @@ -9,7 +9,7 @@ #include "shared/source/os_interface/linux/engine_info.h" #include "shared/source/os_interface/linux/ioctl_helper.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" #include "sku_info.h" #include diff --git a/shared/source/os_interface/os_context.h b/shared/source/os_interface/os_context.h index f058b56aa2..d4d5d48eb5 100644 --- a/shared/source/os_interface/os_context.h +++ b/shared/source/os_interface/os_context.h @@ -11,7 +11,7 @@ #include "shared/source/helpers/engine_node_helper.h" #include "shared/source/utilities/reference_tracked_object.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" #include diff --git a/shared/source/os_interface/performance_counters.h b/shared/source/os_interface/performance_counters.h index f489546a6b..819b2dfa36 100644 --- a/shared/source/os_interface/performance_counters.h +++ b/shared/source/os_interface/performance_counters.h @@ -8,7 +8,7 @@ #pragma once #include "shared/source/utilities/metrics_library.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" #include diff --git a/shared/source/os_interface/windows/wddm_engine_mapper.h b/shared/source/os_interface/windows/wddm_engine_mapper.h index a724759925..e7c46d1f22 100644 --- a/shared/source/os_interface/windows/wddm_engine_mapper.h +++ b/shared/source/os_interface/windows/wddm_engine_mapper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "shared/source/gmm_helper/gmm_lib.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { diff --git a/shared/source/xe_hp_core/aub_mapper.h b/shared/source/xe_hp_core/aub_mapper.h index a3cef19a53..fd1bd0ca7c 100644 --- a/shared/source/xe_hp_core/aub_mapper.h +++ b/shared/source/xe_hp_core/aub_mapper.h @@ -10,7 +10,7 @@ #include "shared/source/helpers/constants.h" #include "shared/source/xe_hp_core/hw_cmds.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { struct XeHpFamily; diff --git a/shared/source/xe_hp_core/hw_info_xe_hp_sdv.cpp b/shared/source/xe_hp_core/hw_info_xe_hp_sdv.cpp index 6daaa6d56a..55f890612e 100644 --- a/shared/source/xe_hp_core/hw_info_xe_hp_sdv.cpp +++ b/shared/source/xe_hp_core/hw_info_xe_hp_sdv.cpp @@ -10,7 +10,7 @@ #include "shared/source/helpers/constants.h" #include "shared/source/xe_hp_core/hw_cmds.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { diff --git a/shared/source/xe_hp_core/os_agnostic_hw_info_config_xe_hp_core.inl b/shared/source/xe_hp_core/os_agnostic_hw_info_config_xe_hp_core.inl index 6cb83d9a12..77202318f5 100644 --- a/shared/source/xe_hp_core/os_agnostic_hw_info_config_xe_hp_core.inl +++ b/shared/source/xe_hp_core/os_agnostic_hw_info_config_xe_hp_core.inl @@ -5,7 +5,7 @@ * */ -#include "product_family.h" +#include "aubstream/product_family.h" namespace NEO { template <> diff --git a/shared/source/xe_hpc_core/aub_mapper.h b/shared/source/xe_hpc_core/aub_mapper.h index 682b220ec0..15f21089cd 100644 --- a/shared/source/xe_hpc_core/aub_mapper.h +++ b/shared/source/xe_hpc_core/aub_mapper.h @@ -10,7 +10,7 @@ #include "shared/source/helpers/constants.h" #include "shared/source/xe_hpc_core/hw_cmds.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { struct XeHpcCoreFamily; diff --git a/shared/source/xe_hpc_core/hw_info_pvc.cpp b/shared/source/xe_hpc_core/hw_info_pvc.cpp index 3c6c33e5e5..e160d6ca2f 100644 --- a/shared/source/xe_hpc_core/hw_info_pvc.cpp +++ b/shared/source/xe_hpc_core/hw_info_pvc.cpp @@ -11,7 +11,7 @@ #include "shared/source/unified_memory/usm_memory_support.h" #include "shared/source/xe_hpc_core/hw_cmds_pvc.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { diff --git a/shared/source/xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl b/shared/source/xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl index bff9d3a078..8d5fab9cb3 100644 --- a/shared/source/xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl +++ b/shared/source/xe_hpc_core/pvc/os_agnostic_hw_info_config_pvc.inl @@ -5,7 +5,7 @@ * */ -#include "product_family.h" +#include "aubstream/product_family.h" namespace NEO { template <> diff --git a/shared/source/xe_hpg_core/aub_mapper.h b/shared/source/xe_hpg_core/aub_mapper.h index 100fc195a4..13b160aa82 100644 --- a/shared/source/xe_hpg_core/aub_mapper.h +++ b/shared/source/xe_hpg_core/aub_mapper.h @@ -10,7 +10,7 @@ #include "shared/source/helpers/constants.h" #include "shared/source/xe_hpg_core/hw_cmds.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { struct XeHpgCoreFamily; diff --git a/shared/source/xe_hpg_core/dg2/os_agnostic_hw_info_config_dg2.inl b/shared/source/xe_hpg_core/dg2/os_agnostic_hw_info_config_dg2.inl index 992b51db73..e403a04e91 100644 --- a/shared/source/xe_hpg_core/dg2/os_agnostic_hw_info_config_dg2.inl +++ b/shared/source/xe_hpg_core/dg2/os_agnostic_hw_info_config_dg2.inl @@ -7,7 +7,7 @@ #include "shared/source/memory_manager/memory_manager.h" -#include "product_family.h" +#include "aubstream/product_family.h" namespace NEO { template <> diff --git a/shared/source/xe_hpg_core/hw_info_dg2.cpp b/shared/source/xe_hpg_core/hw_info_dg2.cpp index 38bb763c6b..ceba894a1c 100644 --- a/shared/source/xe_hpg_core/hw_info_dg2.cpp +++ b/shared/source/xe_hpg_core/hw_info_dg2.cpp @@ -10,7 +10,7 @@ #include "shared/source/helpers/constants.h" #include "shared/source/xe_hpg_core/hw_cmds_dg2.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" namespace NEO { diff --git a/shared/test/common/base_ult_config_listener.cpp b/shared/test/common/base_ult_config_listener.cpp index 1bce974bb1..f478540f0c 100644 --- a/shared/test/common/base_ult_config_listener.cpp +++ b/shared/test/common/base_ult_config_listener.cpp @@ -10,7 +10,7 @@ #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/helpers/ult_hw_config.h" -#include "third_party/aub_stream/headers/aubstream.h" +#include "aubstream/aubstream.h" void NEO::BaseUltConfigListener::OnTestStart(const ::testing::TestInfo &) { debugVarSnapshot = DebugManager.flags; diff --git a/shared/test/common/mocks/mock_aub_manager.h b/shared/test/common/mocks/mock_aub_manager.h index 0aed5c59f8..1a75b960dc 100644 --- a/shared/test/common/mocks/mock_aub_manager.h +++ b/shared/test/common/mocks/mock_aub_manager.h @@ -9,10 +9,10 @@ #include "shared/source/helpers/debug_helpers.h" -#include "third_party/aub_stream/headers/allocation_params.h" -#include "third_party/aub_stream/headers/aub_manager.h" -#include "third_party/aub_stream/headers/aubstream.h" -#include "third_party/aub_stream/headers/hardware_context.h" +#include "aubstream/allocation_params.h" +#include "aubstream/aub_manager.h" +#include "aubstream/aubstream.h" +#include "aubstream/hardware_context.h" struct MockHardwareContext : public aub_stream::HardwareContext { using SurfaceInfo = aub_stream::SurfaceInfo; diff --git a/shared/test/common/os_interface/linux/device_command_stream_fixture.h b/shared/test/common/os_interface/linux/device_command_stream_fixture.h index a0dc4ef610..d3761bcd0a 100644 --- a/shared/test/common/os_interface/linux/device_command_stream_fixture.h +++ b/shared/test/common/os_interface/linux/device_command_stream_fixture.h @@ -13,7 +13,7 @@ #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/common/mocks/linux/mock_drm_wrappers.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" #include #include diff --git a/shared/test/unit_test/aub/aub_center_tests.cpp b/shared/test/unit_test/aub/aub_center_tests.cpp index 3fec720500..43a6f5a709 100644 --- a/shared/test/unit_test/aub/aub_center_tests.cpp +++ b/shared/test/unit_test/aub/aub_center_tests.cpp @@ -19,8 +19,8 @@ #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/test_macros/hw_test.h" +#include "aubstream/aubstream.h" #include "gtest/gtest.h" -#include "third_party/aub_stream/headers/aubstream.h" using namespace NEO; diff --git a/shared/test/unit_test/aub/aub_center_using_aubstream_stubs_tests.cpp b/shared/test/unit_test/aub/aub_center_using_aubstream_stubs_tests.cpp index 198cc91ef2..19b992646e 100644 --- a/shared/test/unit_test/aub/aub_center_using_aubstream_stubs_tests.cpp +++ b/shared/test/unit_test/aub/aub_center_using_aubstream_stubs_tests.cpp @@ -14,8 +14,8 @@ #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_aub_center.h" +#include "aubstream/aubstream.h" #include "gtest/gtest.h" -#include "third_party/aub_stream/headers/aubstream.h" using namespace NEO; diff --git a/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp b/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp index 87732e577c..b4477a14bf 100644 --- a/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp +++ b/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp @@ -29,8 +29,8 @@ #include "shared/test/common/mocks/ult_device_factory.h" #include "shared/test/common/test_macros/hw_test.h" +#include "aubstream/aubstream.h" #include "gtest/gtest.h" -#include "third_party/aub_stream/headers/aubstream.h" using namespace NEO; diff --git a/shared/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp b/shared/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp index 9d75cb4a2e..0ed4e0b49d 100644 --- a/shared/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp +++ b/shared/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp @@ -12,8 +12,8 @@ #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/os_interface/hw_info_config_tests.h" +#include "aubstream/product_family.h" #include "platforms.h" -#include "product_family.h" using namespace NEO; diff --git a/shared/test/unit_test/gen12lp/adln/test_hw_info_config_adln.cpp b/shared/test/unit_test/gen12lp/adln/test_hw_info_config_adln.cpp index 58e2c3c7ee..8fef0f5ba1 100644 --- a/shared/test/unit_test/gen12lp/adln/test_hw_info_config_adln.cpp +++ b/shared/test/unit_test/gen12lp/adln/test_hw_info_config_adln.cpp @@ -13,8 +13,8 @@ #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/os_interface/hw_info_config_tests.h" +#include "aubstream/product_family.h" #include "platforms.h" -#include "product_family.h" using namespace NEO; diff --git a/shared/test/unit_test/gen12lp/adlp/test_hw_info_config_adlp.cpp b/shared/test/unit_test/gen12lp/adlp/test_hw_info_config_adlp.cpp index 07d5efdd1b..427d20931d 100644 --- a/shared/test/unit_test/gen12lp/adlp/test_hw_info_config_adlp.cpp +++ b/shared/test/unit_test/gen12lp/adlp/test_hw_info_config_adlp.cpp @@ -13,8 +13,8 @@ #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/os_interface/hw_info_config_tests.h" +#include "aubstream/product_family.h" #include "platforms.h" -#include "product_family.h" using namespace NEO; diff --git a/shared/test/unit_test/gen12lp/adls/test_hw_info_config_adls.cpp b/shared/test/unit_test/gen12lp/adls/test_hw_info_config_adls.cpp index 624b244b52..671f16245f 100644 --- a/shared/test/unit_test/gen12lp/adls/test_hw_info_config_adls.cpp +++ b/shared/test/unit_test/gen12lp/adls/test_hw_info_config_adls.cpp @@ -13,8 +13,8 @@ #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/os_interface/hw_info_config_tests.h" +#include "aubstream/product_family.h" #include "platforms.h" -#include "product_family.h" using namespace NEO; diff --git a/shared/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp b/shared/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp index 1cef87d45b..3364e28958 100644 --- a/shared/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp +++ b/shared/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp @@ -14,8 +14,8 @@ #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/os_interface/hw_info_config_tests.h" +#include "aubstream/product_family.h" #include "platforms.h" -#include "product_family.h" using namespace NEO; diff --git a/shared/test/unit_test/gen12lp/tgllp/hw_info_config_tests_tgllp.cpp b/shared/test/unit_test/gen12lp/tgllp/hw_info_config_tests_tgllp.cpp index 8c200c0a82..8a4fcee789 100644 --- a/shared/test/unit_test/gen12lp/tgllp/hw_info_config_tests_tgllp.cpp +++ b/shared/test/unit_test/gen12lp/tgllp/hw_info_config_tests_tgllp.cpp @@ -18,8 +18,8 @@ #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/os_interface/hw_info_config_tests.h" +#include "aubstream/product_family.h" #include "platforms.h" -#include "product_family.h" using namespace NEO; diff --git a/shared/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp b/shared/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp index bd6d3f1e2e..3bdb0a53f3 100644 --- a/shared/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp +++ b/shared/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp @@ -13,8 +13,8 @@ #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/os_interface/hw_info_config_tests.h" +#include "aubstream/product_family.h" #include "platforms.h" -#include "product_family.h" using namespace NEO; using BdwHwInfo = HwInfoConfigTest; diff --git a/shared/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp b/shared/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp index 9321dd2135..ea130a07a9 100644 --- a/shared/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp +++ b/shared/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp @@ -12,8 +12,8 @@ #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/os_interface/hw_info_config_tests.h" +#include "aubstream/product_family.h" #include "platforms.h" -#include "product_family.h" using namespace NEO; diff --git a/shared/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp b/shared/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp index a0f06966a2..e23306707a 100644 --- a/shared/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp +++ b/shared/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp @@ -13,8 +13,8 @@ #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/os_interface/hw_info_config_tests.h" +#include "aubstream/product_family.h" #include "platforms.h" -#include "product_family.h" using namespace NEO; diff --git a/shared/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp b/shared/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp index 0e9e8f1995..c0e55dab27 100644 --- a/shared/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp +++ b/shared/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp @@ -12,8 +12,8 @@ #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/os_interface/hw_info_config_tests.h" +#include "aubstream/product_family.h" #include "platforms.h" -#include "product_family.h" using namespace NEO; diff --git a/shared/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp b/shared/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp index 1d592b734a..3db16d073f 100644 --- a/shared/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp +++ b/shared/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp @@ -11,8 +11,8 @@ #include "shared/test/common/test_macros/hw_test.h" #include "shared/test/unit_test/os_interface/hw_info_config_tests.h" +#include "aubstream/product_family.h" #include "platforms.h" -#include "product_family.h" using namespace NEO; diff --git a/shared/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp b/shared/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp index 34f8307531..2a5c7789cf 100644 --- a/shared/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp +++ b/shared/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp @@ -12,8 +12,8 @@ #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/os_interface/hw_info_config_tests.h" +#include "aubstream/product_family.h" #include "platforms.h" -#include "product_family.h" using namespace NEO; diff --git a/shared/test/unit_test/os_interface/linux/drm_mapper_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_mapper_tests.cpp index ae31a64b70..7bd29e3b0d 100644 --- a/shared/test/unit_test/os_interface/linux/drm_mapper_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_mapper_tests.cpp @@ -9,7 +9,7 @@ #include "shared/source/os_interface/linux/drm_wrappers.h" #include "shared/test/common/test_macros/test.h" -#include "engine_node.h" +#include "aubstream/engine_node.h" #include diff --git a/shared/test/unit_test/xe_hp_core/xe_hp_sdv/hw_info_config_tests_xe_hp_sdv.cpp b/shared/test/unit_test/xe_hp_core/xe_hp_sdv/hw_info_config_tests_xe_hp_sdv.cpp index 63680365ba..51dcfc57f0 100644 --- a/shared/test/unit_test/xe_hp_core/xe_hp_sdv/hw_info_config_tests_xe_hp_sdv.cpp +++ b/shared/test/unit_test/xe_hp_core/xe_hp_sdv/hw_info_config_tests_xe_hp_sdv.cpp @@ -12,7 +12,7 @@ #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/os_interface/hw_info_config_tests.h" -#include "product_family.h" +#include "aubstream/product_family.h" using namespace NEO; diff --git a/shared/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp index 8ac85ce6be..20ec41e708 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp +++ b/shared/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp @@ -18,7 +18,7 @@ #include "shared/test/common/xe_hpc_core/pvc/product_configs_pvc.h" #include "shared/test/unit_test/os_interface/hw_info_config_tests.h" -#include "product_family.h" +#include "aubstream/product_family.h" using namespace NEO; diff --git a/shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp index 6e212b6fb5..6dddeede74 100644 --- a/shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp +++ b/shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp @@ -17,7 +17,7 @@ #include "shared/test/unit_test/fixtures/product_config_fixture.h" #include "shared/test/unit_test/os_interface/hw_info_config_tests.h" -#include "product_family.h" +#include "aubstream/product_family.h" using namespace NEO; diff --git a/third_party/aub_stream/headers/allocation_params.h b/third_party/aub_stream/aubstream/allocation_params.h similarity index 100% rename from third_party/aub_stream/headers/allocation_params.h rename to third_party/aub_stream/aubstream/allocation_params.h diff --git a/third_party/aub_stream/headers/aub_manager.h b/third_party/aub_stream/aubstream/aub_manager.h similarity index 100% rename from third_party/aub_stream/headers/aub_manager.h rename to third_party/aub_stream/aubstream/aub_manager.h diff --git a/third_party/aub_stream/headers/aubstream.h b/third_party/aub_stream/aubstream/aubstream.h similarity index 100% rename from third_party/aub_stream/headers/aubstream.h rename to third_party/aub_stream/aubstream/aubstream.h diff --git a/third_party/aub_stream/headers/engine_node.h b/third_party/aub_stream/aubstream/engine_node.h similarity index 100% rename from third_party/aub_stream/headers/engine_node.h rename to third_party/aub_stream/aubstream/engine_node.h diff --git a/third_party/aub_stream/headers/hardware_context.h b/third_party/aub_stream/aubstream/hardware_context.h similarity index 100% rename from third_party/aub_stream/headers/hardware_context.h rename to third_party/aub_stream/aubstream/hardware_context.h diff --git a/third_party/aub_stream/headers/page_info.h b/third_party/aub_stream/aubstream/page_info.h similarity index 100% rename from third_party/aub_stream/headers/page_info.h rename to third_party/aub_stream/aubstream/page_info.h diff --git a/third_party/aub_stream/headers/physical_allocation_info.h b/third_party/aub_stream/aubstream/physical_allocation_info.h similarity index 100% rename from third_party/aub_stream/headers/physical_allocation_info.h rename to third_party/aub_stream/aubstream/physical_allocation_info.h diff --git a/third_party/aub_stream/headers/product_family.h b/third_party/aub_stream/aubstream/product_family.h similarity index 100% rename from third_party/aub_stream/headers/product_family.h rename to third_party/aub_stream/aubstream/product_family.h diff --git a/third_party/aub_stream/headers/shared_mem_info.h b/third_party/aub_stream/aubstream/shared_mem_info.h similarity index 100% rename from third_party/aub_stream/headers/shared_mem_info.h rename to third_party/aub_stream/aubstream/shared_mem_info.h