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 <mateusz.jablonski@intel.com>

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)
+  get_target_property(ENGINE_NODE_DIR ${AUB_STREAM_PROJECT_NAME} INTERFACE_INCLUDE_DIRECTORIES)
-    set(ENGINE_NODE_DIR ${AUB_STREAM_DIR}${BRANCH_DIR_SUFFIX}headers)
+  if(NOT EXISTS ${ENGINE_NODE_DIR}/aubstream/engine_node.h)
-  else()
+    set(ENGINE_NODE_DIR ${AUB_STREAM_HEADERS_DIR})
-    get_target_property(interface_dir ${AUB_STREAM_PROJECT_NAME} INTERFACE_INCLUDE_DIRECTORIES)
-    set(ENGINE_NODE_DIR ${interface_dir}/aubstream/headers)
   endif()
 else()
   set(ENGINE_NODE_DIR ${AUB_STREAM_HEADERS_DIR})

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 <vector>

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 {

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;
 

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<ClDeviceFixture>;
 

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 "aubstream/aub_manager.h"
-#include "third_party/aub_stream/headers/aubstream.h"
+#include "aubstream/aubstream.h"
-#include "third_party/aub_stream/headers/product_family.h"
+#include "aubstream/product_family.h"
 
 namespace NEO {
 extern aub_stream::AubManager *createAubManager(const aub_stream::AubManagerOptions &options);

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;

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 {
 

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 <sstream>
 

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 {
 

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;

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;

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 <cstring>
 

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;

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 {
 

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;

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 <vector>
 

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;

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 {
 

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 {
 

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 {
 

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 <>

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 <>

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 <>

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 <>

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;

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 <>

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 <>

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;

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 <>

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 {
 

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;

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 <>

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 <algorithm>
 

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 <>

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 <algorithm>
 

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 <>

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;
 

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 <atomic>
 #include <string>

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) {

shared/source/helpers/hardware_context_controller.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "third_party/aub_stream/headers/aub_manager.h"
+#include "aubstream/aub_manager.h"
-#include "third_party/aub_stream/headers/hardware_context.h"
+#include "aubstream/hardware_context.h"
 
 #include <memory>
 #include <vector>

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 <cstdint>
 #include <memory>

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 {
 

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"

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 <algorithm>
 

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 <mutex>
 #include <vector>

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 {
 

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 <array>

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 <cstdint>

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 <mutex>
 

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 <mutex>
 

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 {
 

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;

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 {
 

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 <>

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;

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 {
 

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 <>

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;

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 <>

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 {
 

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;

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 "aubstream/allocation_params.h"
-#include "third_party/aub_stream/headers/aub_manager.h"
+#include "aubstream/aub_manager.h"
-#include "third_party/aub_stream/headers/aubstream.h"
+#include "aubstream/aubstream.h"
-#include "third_party/aub_stream/headers/hardware_context.h"
+#include "aubstream/hardware_context.h"
 
 struct MockHardwareContext : public aub_stream::HardwareContext {
     using SurfaceInfo = aub_stream::SurfaceInfo;

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 <atomic>
 #include <cstdint>

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;

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;
 

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;
 

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;
 

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;
 

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;
 

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 <array>
 

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;
 

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;
 

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;