From 2b1aa8b331cc4d7aaf5fff7f34cda75778f39655 Mon Sep 17 00:00:00 2001 From: Bartosz Dunajski Date: Tue, 7 Dec 2021 11:22:25 +0000 Subject: [PATCH] Compilation fix: Add missing LrcaHelper types Signed-off-by: Bartosz Dunajski --- .../helpers/hardware_context_controller.cpp | 2 +- .../test/unit_test/aub/aub_helper_tests.cpp | 3 +- .../aub_command_stream_fixture.h | 2 +- .../command_stream/aub_mem_dump_tests.h | 2 +- .../aub_tests/fixtures/aub_fixture.h | 2 +- ...ommand_stream_receiver_simulated_tests.cpp | 3 +- .../aub_helper_hw_tests_xehp_and_later.cpp | 3 +- opencl/test/unit_test/mocks/mock_aub_stream.h | 3 +- .../test/unit_test/mocks/mock_lrca_helper.h | 2 +- shared/source/aub/aub_helper.cpp | 2 +- shared/source/aub/aub_helper_base.inl | 3 +- shared/source/aub/aub_helper_extra.cpp | 2 +- shared/source/aub/aub_mapper_base.h | 3 +- shared/source/aub/aub_stream_provider.h | 2 +- shared/source/aub_mem_dump/CMakeLists.txt | 1 + shared/source/aub_mem_dump/aub_alloc_dump.h | 3 +- shared/source/aub_mem_dump/aub_mem_dump.cpp | 2 +- .../{aub_mem_dump_base.inl => aub_mem_dump.h} | 30 +++++++++++++++++++ shared/source/aub_mem_dump/aub_mem_dump.inl | 3 +- shared/source/aub_mem_dump/context_flags.cpp | 2 +- .../aub_mem_dump/definitions/CMakeLists.txt | 1 - .../aub_mem_dump/definitions/aub_mem_dump.h | 27 ----------------- .../aub_command_stream_receiver.h | 3 +- .../command_stream_receiver_simulated_hw.h | 2 +- .../tbx_command_stream_receiver.h | 3 +- .../tbx_command_stream_receiver_gen12lp.cpp | 3 +- .../helpers/hardware_context_controller.cpp | 2 +- shared/source/helpers/hw_helper.h | 2 +- shared/source/helpers/hw_helper_base.inl | 2 +- .../aub_memory_operations_handler.cpp | 2 +- .../xe_hp_core/aub_mem_dump_xe_hp_core.cpp | 3 +- .../xe_hpc_core/aub_mem_dump_xe_hpc_core.cpp | 3 +- .../xe_hpg_core/aub_mem_dump_xe_hpg_core.cpp | 3 +- .../test/common/mocks/mock_hw_info_config.cpp | 2 +- .../aub_mem_dump/lrca_helper_tests.cpp | 4 +-- .../aub_memory_operations_handler_tests.cpp | 3 +- 36 files changed, 64 insertions(+), 76 deletions(-) rename shared/source/aub_mem_dump/{aub_mem_dump_base.inl => aub_mem_dump.h} (96%) delete mode 100644 shared/source/aub_mem_dump/definitions/aub_mem_dump.h diff --git a/opencl/source/helpers/hardware_context_controller.cpp b/opencl/source/helpers/hardware_context_controller.cpp index 9630eb08ea..ef89b67d32 100644 --- a/opencl/source/helpers/hardware_context_controller.cpp +++ b/opencl/source/helpers/hardware_context_controller.cpp @@ -7,10 +7,10 @@ #include "shared/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 "aub_mem_dump.h" #include "third_party/aub_stream/headers/allocation_params.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub/aub_helper_tests.cpp b/opencl/test/unit_test/aub/aub_helper_tests.cpp index eb2189fe0b..02028245b0 100644 --- a/opencl/test/unit_test/aub/aub_helper_tests.cpp +++ b/opencl/test/unit_test/aub/aub_helper_tests.cpp @@ -6,6 +6,7 @@ */ #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/command_stream/aub_command_stream_receiver_hw.h" #include "shared/source/helpers/basic_math.h" @@ -17,8 +18,6 @@ #include "opencl/test/unit_test/mocks/mock_lrca_helper.h" #include "test.h" -#include "aub_mem_dump.h" - using namespace NEO; TEST(AubHelper, GivenZeroPdEntryBitsWhenGetMemTraceIsCalledThenTraceNonLocalIsReturned) { 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 47f777919f..258619a448 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,6 +6,7 @@ */ #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/command_stream/aub_command_stream_receiver_hw.h" #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.h" @@ -18,7 +19,6 @@ #include "opencl/test/unit_test/command_stream/command_stream_fixture.h" -#include "aub_mem_dump.h" #include "gtest/gtest.h" #include 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 387ef076e5..db3c09e60f 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,6 +6,7 @@ */ #pragma once +#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "shared/source/command_stream/aub_command_stream_receiver_hw.h" #include "shared/source/device/device.h" #include "shared/source/helpers/aligned_memory.h" @@ -16,7 +17,6 @@ #include "test.h" #include "aub_mapper.h" -#include "aub_mem_dump.h" namespace Os { extern const char *fileSeparator; 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 74c7aa2381..8f59d0c711 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h @@ -6,6 +6,7 @@ */ #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/command_stream/aub_command_stream_receiver_hw.h" #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.h" @@ -22,7 +23,6 @@ #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "aub_mem_dump.h" #include "gtest/gtest.h" #include diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_simulated_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_simulated_tests.cpp index 7449e94dfa..6dff54b645 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_simulated_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_simulated_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "shared/source/command_stream/command_stream_receiver_simulated_hw.h" #include "shared/source/helpers/array_count.h" #include "shared/source/helpers/hardware_context_controller.h" @@ -22,8 +23,6 @@ #include "opencl/test/unit_test/mocks/mock_os_context.h" #include "test.h" -#include "aub_mem_dump.h" - #include #include using namespace NEO; diff --git a/opencl/test/unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp b/opencl/test/unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp index 4b2ace4d64..6df90ecc65 100644 --- a/opencl/test/unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp @@ -6,12 +6,11 @@ */ #include "shared/source/aub/aub_helper.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "test.h" -#include "aub_mem_dump.h" - using namespace NEO; using AubHelperHwTestXeHPAndLater = Test; diff --git a/opencl/test/unit_test/mocks/mock_aub_stream.h b/opencl/test/unit_test/mocks/mock_aub_stream.h index c28bdb46db..feb3745cd5 100644 --- a/opencl/test/unit_test/mocks/mock_aub_stream.h +++ b/opencl/test/unit_test/mocks/mock_aub_stream.h @@ -8,8 +8,7 @@ #pragma once #include "shared/source/aub/aub_mapper_base.h" - -#include "aub_mem_dump.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" 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 8a174671a2..e6f53a1aea 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 "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/shared/source/aub/aub_helper.cpp b/shared/source/aub/aub_helper.cpp index 7b19ac31d6..b11c1cbfdb 100644 --- a/shared/source/aub/aub_helper.cpp +++ b/shared/source/aub/aub_helper.cpp @@ -7,6 +7,7 @@ #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/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/basic_math.h" @@ -14,7 +15,6 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/tbx/tbx_proto.h" -#include "aub_mem_dump.h" #include "third_party/aub_stream/headers/aubstream.h" namespace NEO { diff --git a/shared/source/aub/aub_helper_base.inl b/shared/source/aub/aub_helper_base.inl index e1cd8ff545..4229d55901 100644 --- a/shared/source/aub/aub_helper_base.inl +++ b/shared/source/aub/aub_helper_base.inl @@ -6,8 +6,7 @@ */ #include "shared/source/aub/aub_helper.h" - -#include "aub_mem_dump.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" namespace NEO { diff --git a/shared/source/aub/aub_helper_extra.cpp b/shared/source/aub/aub_helper_extra.cpp index c72ae1476c..362dba0765 100644 --- a/shared/source/aub/aub_helper_extra.cpp +++ b/shared/source/aub/aub_helper_extra.cpp @@ -6,9 +6,9 @@ */ #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 "aub_mem_dump.h" #include "third_party/aub_stream/headers/aubstream.h" namespace NEO { diff --git a/shared/source/aub/aub_mapper_base.h b/shared/source/aub/aub_mapper_base.h index 508d052dcd..c3060ac423 100644 --- a/shared/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 "aub_mem_dump.h" - #include namespace NEO { diff --git a/shared/source/aub/aub_stream_provider.h b/shared/source/aub/aub_stream_provider.h index c86e7d4aba..526c3c2a7b 100644 --- a/shared/source/aub/aub_stream_provider.h +++ b/shared/source/aub/aub_stream_provider.h @@ -6,7 +6,7 @@ */ #pragma once -#include "aub_mem_dump.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" namespace NEO { diff --git a/shared/source/aub_mem_dump/CMakeLists.txt b/shared/source/aub_mem_dump/CMakeLists.txt index 972fcb53c7..89bb56e01d 100644 --- a/shared/source/aub_mem_dump/CMakeLists.txt +++ b/shared/source/aub_mem_dump/CMakeLists.txt @@ -10,6 +10,7 @@ set(NEO_CORE_AUB_MEM_DUMP ${CMAKE_CURRENT_SOURCE_DIR}/aub_alloc_dump.inl ${CMAKE_CURRENT_SOURCE_DIR}/aub_data.h ${CMAKE_CURRENT_SOURCE_DIR}/aub_header.h + ${CMAKE_CURRENT_SOURCE_DIR}/aub_mem_dump.h ${CMAKE_CURRENT_SOURCE_DIR}/aub_mem_dump.cpp ${CMAKE_CURRENT_SOURCE_DIR}/aub_mem_dump.inl ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}context_flags.cpp diff --git a/shared/source/aub_mem_dump/aub_alloc_dump.h b/shared/source/aub_mem_dump/aub_alloc_dump.h index a1b244102a..0190a5383b 100644 --- a/shared/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 "aub_mem_dump.h" - using namespace NEO; namespace aub_stream { diff --git a/shared/source/aub_mem_dump/aub_mem_dump.cpp b/shared/source/aub_mem_dump/aub_mem_dump.cpp index be961a8f0b..bfa451a4cb 100644 --- a/shared/source/aub_mem_dump/aub_mem_dump.cpp +++ b/shared/source/aub_mem_dump/aub_mem_dump.cpp @@ -5,7 +5,7 @@ * */ -#include "aub_mem_dump.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "shared/source/aub/aub_helper.h" #include "shared/source/debug_settings/debug_settings_manager.h" diff --git a/shared/source/aub_mem_dump/aub_mem_dump_base.inl b/shared/source/aub_mem_dump/aub_mem_dump.h similarity index 96% rename from shared/source/aub_mem_dump/aub_mem_dump_base.inl rename to shared/source/aub_mem_dump/aub_mem_dump.h index 53cdd328aa..6cc13c9d9a 100644 --- a/shared/source/aub_mem_dump/aub_mem_dump_base.inl +++ b/shared/source/aub_mem_dump/aub_mem_dump.h @@ -5,10 +5,26 @@ * */ +#pragma once +#include "shared/source/aub_mem_dump/aub_data.h" + +#include +#include +#include + +namespace NEO { +class AubHelper; +} + +namespace AubMemDump { #include "aub_services.h" constexpr uint32_t rcsRegisterBase = 0x2000; +#ifndef BIT +#define BIT(x) (((uint64_t)1) << (x)) +#endif + inline uint32_t computeRegisterOffset(uint32_t mmioBase, uint32_t rcsRegisterOffset) { return mmioBase + rcsRegisterOffset - rcsRegisterBase; } @@ -382,5 +398,19 @@ struct LrcaHelperCcs : public LrcaHelper { } }; +struct LrcaHelperLinkBcs : public LrcaHelperBcs { + LrcaHelperLinkBcs(uint32_t base, uint32_t engineId) : LrcaHelperBcs(base) { + std::string nameStr("BCS" + std::to_string(engineId)); + name = nameStr.c_str(); + } +}; + +struct LrcaHelperCccs : public LrcaHelper { + LrcaHelperCccs(uint32_t base) : LrcaHelper(base) { + name = "CCCS"; + } +}; + extern const uint64_t g_pageMask; extern const size_t g_dwordCountMax; +} // namespace AubMemDump \ No newline at end of file diff --git a/shared/source/aub_mem_dump/aub_mem_dump.inl b/shared/source/aub_mem_dump/aub_mem_dump.inl index 7074a2beee..c33cb3e45e 100644 --- a/shared/source/aub_mem_dump/aub_mem_dump.inl +++ b/shared/source/aub_mem_dump/aub_mem_dump.inl @@ -6,12 +6,11 @@ */ #include "shared/source/aub/aub_helper.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "shared/source/helpers/constants.h" #include "shared/source/helpers/debug_helpers.h" #include "shared/source/helpers/ptr_math.h" -#include "aub_mem_dump.h" - #include #include diff --git a/shared/source/aub_mem_dump/context_flags.cpp b/shared/source/aub_mem_dump/context_flags.cpp index 5554773cab..b0e997955b 100644 --- a/shared/source/aub_mem_dump/context_flags.cpp +++ b/shared/source/aub_mem_dump/context_flags.cpp @@ -5,7 +5,7 @@ * */ -#include "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/shared/source/aub_mem_dump/definitions/CMakeLists.txt b/shared/source/aub_mem_dump/definitions/CMakeLists.txt index 60a46b6e39..21f882fc3b 100644 --- a/shared/source/aub_mem_dump/definitions/CMakeLists.txt +++ b/shared/source/aub_mem_dump/definitions/CMakeLists.txt @@ -8,7 +8,6 @@ get_property(NEO_CORE_AUB_MEM_DUMP GLOBAL PROPERTY NEO_CORE_AUB_MEM_DUMP) list(APPEND NEO_CORE_AUB_MEM_DUMP ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/aub_mem_dump.h ${CMAKE_CURRENT_SOURCE_DIR}/aub_services.h ) diff --git a/shared/source/aub_mem_dump/definitions/aub_mem_dump.h b/shared/source/aub_mem_dump/definitions/aub_mem_dump.h deleted file mode 100644 index f89d9d0ada..0000000000 --- a/shared/source/aub_mem_dump/definitions/aub_mem_dump.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2021 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#pragma once -#include -#include -#include -#include -#include - -#ifndef BIT -#define BIT(x) (((uint64_t)1) << (x)) -#endif - -#include "shared/source/aub_mem_dump/aub_data.h" - -namespace NEO { -class AubHelper; -} - -namespace AubMemDump { -#include "shared/source/aub_mem_dump/aub_mem_dump_base.inl" -} // namespace AubMemDump diff --git a/shared/source/command_stream/aub_command_stream_receiver.h b/shared/source/command_stream/aub_command_stream_receiver.h index 828faea9f8..f23c7a0aad 100644 --- a/shared/source/command_stream/aub_command_stream_receiver.h +++ b/shared/source/command_stream/aub_command_stream_receiver.h @@ -6,10 +6,9 @@ */ #pragma once +#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "shared/source/helpers/common_types.h" -#include "aub_mem_dump.h" - #include 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 0d7343aa13..a60e0e9b62 100644 --- a/shared/source/command_stream/command_stream_receiver_simulated_hw.h +++ b/shared/source/command_stream/command_stream_receiver_simulated_hw.h @@ -7,6 +7,7 @@ #pragma once #include "shared/source/aub/aub_helper.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "shared/source/command_stream/command_stream_receiver_simulated_common_hw.h" #include "shared/source/helpers/debug_helpers.h" #include "shared/source/helpers/hardware_context_controller.h" @@ -17,7 +18,6 @@ #include "shared/source/memory_manager/physical_address_allocator.h" #include "shared/source/os_interface/os_context.h" -#include "aub_mem_dump.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/hardware_context.h" diff --git a/shared/source/command_stream/tbx_command_stream_receiver.h b/shared/source/command_stream/tbx_command_stream_receiver.h index a44716f992..00ebfec489 100644 --- a/shared/source/command_stream/tbx_command_stream_receiver.h +++ b/shared/source/command_stream/tbx_command_stream_receiver.h @@ -6,10 +6,9 @@ */ #pragma once +#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "shared/source/helpers/common_types.h" -#include "aub_mem_dump.h" - namespace NEO { class CommandStreamReceiver; class TbxSockets; diff --git a/shared/source/gen12lp/tbx_command_stream_receiver_gen12lp.cpp b/shared/source/gen12lp/tbx_command_stream_receiver_gen12lp.cpp index 5436a7a281..83014d7bec 100644 --- a/shared/source/gen12lp/tbx_command_stream_receiver_gen12lp.cpp +++ b/shared/source/gen12lp/tbx_command_stream_receiver_gen12lp.cpp @@ -5,6 +5,7 @@ * */ +#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.inl" #include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" #include "shared/source/command_stream/tbx_command_stream_receiver_hw.inl" @@ -13,8 +14,6 @@ #include "shared/source/helpers/populate_factory.h" #include "shared/source/memory_manager/memory_pool.h" -#include "aub_mem_dump.h" - namespace NEO { typedef TGLLPFamily Family; static auto gfxCore = IGFX_GEN12LP_CORE; diff --git a/shared/source/helpers/hardware_context_controller.cpp b/shared/source/helpers/hardware_context_controller.cpp index 9630eb08ea..ef89b67d32 100644 --- a/shared/source/helpers/hardware_context_controller.cpp +++ b/shared/source/helpers/hardware_context_controller.cpp @@ -7,10 +7,10 @@ #include "shared/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 "aub_mem_dump.h" #include "third_party/aub_stream/headers/allocation_params.h" using namespace NEO; diff --git a/shared/source/helpers/hw_helper.h b/shared/source/helpers/hw_helper.h index 4499169e4a..666623247b 100644 --- a/shared/source/helpers/hw_helper.h +++ b/shared/source/helpers/hw_helper.h @@ -6,6 +6,7 @@ */ #pragma once +#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "shared/source/built_ins/sip.h" #include "shared/source/command_container/command_encoder.h" #include "shared/source/command_stream/linear_stream.h" @@ -15,7 +16,6 @@ #include "shared/source/helpers/options.h" #include "shared/source/utilities/stackvec.h" -#include "aub_mem_dump.h" #include "engine_group_types.h" #include "hw_cmds.h" #include "third_party/aub_stream/headers/aubstream.h" diff --git a/shared/source/helpers/hw_helper_base.inl b/shared/source/helpers/hw_helper_base.inl index d2e17248c8..18ccd60bbd 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/command_container/command_encoder.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/gmm_helper/gmm.h" @@ -22,7 +23,6 @@ #include "shared/source/os_interface/os_interface.h" #include "shared/source/utilities/tag_allocator.h" -#include "aub_mem_dump.h" #include "pipe_control_args.h" namespace NEO { diff --git a/shared/source/os_interface/aub_memory_operations_handler.cpp b/shared/source/os_interface/aub_memory_operations_handler.cpp index 6b07e1ef21..ec69109d63 100644 --- a/shared/source/os_interface/aub_memory_operations_handler.cpp +++ b/shared/source/os_interface/aub_memory_operations_handler.cpp @@ -7,10 +7,10 @@ #include "shared/source/os_interface/aub_memory_operations_handler.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "shared/source/gmm_helper/gmm.h" #include "shared/source/memory_manager/graphics_allocation.h" -#include "aub_mem_dump.h" #include "third_party/aub_stream/headers/allocation_params.h" #include diff --git a/shared/source/xe_hp_core/aub_mem_dump_xe_hp_core.cpp b/shared/source/xe_hp_core/aub_mem_dump_xe_hp_core.cpp index da7e766885..4f931602f6 100644 --- a/shared/source/xe_hp_core/aub_mem_dump_xe_hp_core.cpp +++ b/shared/source/xe_hp_core/aub_mem_dump_xe_hp_core.cpp @@ -6,8 +6,7 @@ */ #include "shared/source/aub/aub_helper_xehp_and_later.inl" - -#include "aub_mem_dump.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" namespace NEO { struct XeHpFamily; diff --git a/shared/source/xe_hpc_core/aub_mem_dump_xe_hpc_core.cpp b/shared/source/xe_hpc_core/aub_mem_dump_xe_hpc_core.cpp index 195721ac1d..4872611dee 100644 --- a/shared/source/xe_hpc_core/aub_mem_dump_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/aub_mem_dump_xe_hpc_core.cpp @@ -6,8 +6,7 @@ */ #include "shared/source/aub/aub_helper_xehp_and_later.inl" - -#include "aub_mem_dump.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" namespace NEO { struct XE_HPC_COREFamily; diff --git a/shared/source/xe_hpg_core/aub_mem_dump_xe_hpg_core.cpp b/shared/source/xe_hpg_core/aub_mem_dump_xe_hpg_core.cpp index 6c03ce9567..cb654b0b8a 100644 --- a/shared/source/xe_hpg_core/aub_mem_dump_xe_hpg_core.cpp +++ b/shared/source/xe_hpg_core/aub_mem_dump_xe_hpg_core.cpp @@ -6,8 +6,7 @@ */ #include "shared/source/aub/aub_helper_xehp_and_later.inl" - -#include "aub_mem_dump.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" namespace NEO { struct XE_HPG_COREFamily; diff --git a/shared/test/common/mocks/mock_hw_info_config.cpp b/shared/test/common/mocks/mock_hw_info_config.cpp index 3c8f49a84f..576579ac0e 100644 --- a/shared/test/common/mocks/mock_hw_info_config.cpp +++ b/shared/test/common/mocks/mock_hw_info_config.cpp @@ -5,7 +5,7 @@ * */ -#include "shared/source/aub_mem_dump/definitions/aub_mem_dump.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "shared/source/helpers/constants.h" #include "shared/source/os_interface/hw_info_config.h" diff --git a/shared/test/unit_test/aub_mem_dump/lrca_helper_tests.cpp b/shared/test/unit_test/aub_mem_dump/lrca_helper_tests.cpp index eb0e8de421..58e84c5ede 100644 --- a/shared/test/unit_test/aub_mem_dump/lrca_helper_tests.cpp +++ b/shared/test/unit_test/aub_mem_dump/lrca_helper_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "test.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" -#include "aub_mem_dump.h" +#include "test.h" #include 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 a65827f8b1..b582ad963a 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,11 +7,10 @@ #include "shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.h" +#include "shared/source/aub_mem_dump/aub_mem_dump.h" #include "shared/test/common/mocks/mock_aub_manager.h" #include "shared/test/common/mocks/mock_gmm.h" -#include "aub_mem_dump.h" - TEST_F(AubMemoryOperationsHandlerTests, givenNullPtrAsAubManagerWhenMakeResidentCalledThenFalseReturned) { getMemoryOperationsHandler()->setAubManager(nullptr); auto memoryOperationsInterface = getMemoryOperationsHandler();