diff --git a/core/command_stream/preemption.h b/core/command_stream/preemption.h index c1b4fe8f7e..65ff3e338a 100644 --- a/core/command_stream/preemption.h +++ b/core/command_stream/preemption.h @@ -8,7 +8,7 @@ #pragma once #include "core/command_stream/linear_stream.h" #include "core/command_stream/preemption_mode.h" -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include "sku_info.h" diff --git a/runtime/commands/CMakeLists.txt b/core/commands/CMakeLists.txt similarity index 50% rename from runtime/commands/CMakeLists.txt rename to core/commands/CMakeLists.txt index 4793e253d2..c4ea086f6c 100644 --- a/runtime/commands/CMakeLists.txt +++ b/core/commands/CMakeLists.txt @@ -1,12 +1,12 @@ # -# Copyright (C) 2018 Intel Corporation +# Copyright (C) 2018-2019 Intel Corporation # # SPDX-License-Identifier: MIT # -set(RUNTIME_SRCS_COMMANDS +set(NEO_CORE_COMMANDS ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/bxml_generator_glue.h ) -target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_COMMANDS}) +set_property(GLOBAL PROPERTY NEO_CORE_COMMANDS ${NEO_CORE_COMMANDS}) diff --git a/core/commands/bxml_generator_glue.h b/core/commands/bxml_generator_glue.h new file mode 100644 index 0000000000..5939526504 --- /dev/null +++ b/core/commands/bxml_generator_glue.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2017-2019 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#pragma once +#include +#include + +// Macro helpers +#ifndef STATIC_ASSERT +#define STATIC_ASSERT(e) static_assert(e, #e) +#endif + +#ifndef SIZE32 +#define SIZE32(x) (sizeof(x) / sizeof(uint32_t)) +#endif // SIZE32 + +/*****************************************************************************\ +MACRO: BITFIELD_RANGE +PURPOSE: Calculates the number of bits between the startbit and the endbit (0 based) +\*****************************************************************************/ +#ifndef BITFIELD_RANGE +#define BITFIELD_RANGE(startbit, endbit) ((endbit) - (startbit) + 1) +#endif + +/*****************************************************************************\ +MACRO: BITFIELD_BIT +PURPOSE: Definition declared for clarity when creating structs +\*****************************************************************************/ +#ifndef BITFIELD_BIT +#define BITFIELD_BIT(bit) 1 +#endif diff --git a/core/compiler_interface/compiler_cache.cpp b/core/compiler_interface/compiler_cache.cpp index 59382d9581..0b4ec10db2 100644 --- a/core/compiler_interface/compiler_cache.cpp +++ b/core/compiler_interface/compiler_cache.cpp @@ -10,8 +10,8 @@ #include "core/helpers/aligned_memory.h" #include "core/helpers/file_io.h" #include "core/helpers/hash.h" +#include "core/helpers/hw_info.h" #include "core/utilities/debug_settings_reader.h" -#include "runtime/helpers/hw_info.h" #include "config.h" #include "os_inc.h" diff --git a/core/compiler_interface/compiler_interface.cpp b/core/compiler_interface/compiler_interface.cpp index 959e0db3d9..abca1c7da5 100644 --- a/core/compiler_interface/compiler_interface.cpp +++ b/core/compiler_interface/compiler_interface.cpp @@ -9,8 +9,8 @@ #include "core/compiler_interface/compiler_cache.h" #include "core/compiler_interface/compiler_interface.inl" +#include "core/helpers/hw_info.h" #include "runtime/device/device.h" -#include "runtime/helpers/hw_info.h" #include "runtime/os_interface/debug_settings_manager.h" #include "runtime/os_interface/os_inc_base.h" diff --git a/runtime/gen11/hw_cmds.h b/core/gen11/hw_cmds.h similarity index 100% rename from runtime/gen11/hw_cmds.h rename to core/gen11/hw_cmds.h diff --git a/runtime/gen11/hw_cmds_base.h b/core/gen11/hw_cmds_base.h similarity index 97% rename from runtime/gen11/hw_cmds_base.h rename to core/gen11/hw_cmds_base.h index f5b85753fd..df4933bcd1 100644 --- a/runtime/gen11/hw_cmds_base.h +++ b/core/gen11/hw_cmds_base.h @@ -6,10 +6,10 @@ */ #pragma once +#include "core/commands/bxml_generator_glue.h" +#include "core/gen11/hw_info.h" #include "core/helpers/debug_helpers.h" -#include "runtime/commands/bxml_generator_glue.h" -#include "hw_info.h" #include "igfxfmid.h" #include diff --git a/runtime/gen11/hw_cmds_ehl.h b/core/gen11/hw_cmds_ehl.h similarity index 97% rename from runtime/gen11/hw_cmds_ehl.h rename to core/gen11/hw_cmds_ehl.h index 3618e08ae5..fa1ef00efc 100644 --- a/runtime/gen11/hw_cmds_ehl.h +++ b/core/gen11/hw_cmds_ehl.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/gen11/hw_cmds_base.h" +#include "core/gen11/hw_cmds_base.h" namespace NEO { diff --git a/runtime/gen11/hw_cmds_icllp.h b/core/gen11/hw_cmds_icllp.h similarity index 97% rename from runtime/gen11/hw_cmds_icllp.h rename to core/gen11/hw_cmds_icllp.h index 891568fc72..f5f9db6bb9 100644 --- a/runtime/gen11/hw_cmds_icllp.h +++ b/core/gen11/hw_cmds_icllp.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/gen11/hw_cmds_base.h" +#include "core/gen11/hw_cmds_base.h" namespace NEO { diff --git a/runtime/gen11/hw_cmds_lkf.h b/core/gen11/hw_cmds_lkf.h similarity index 96% rename from runtime/gen11/hw_cmds_lkf.h rename to core/gen11/hw_cmds_lkf.h index 9d51c64c0c..68463e42d2 100644 --- a/runtime/gen11/hw_cmds_lkf.h +++ b/core/gen11/hw_cmds_lkf.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/gen11/hw_cmds_base.h" +#include "core/gen11/hw_cmds_base.h" namespace NEO { diff --git a/runtime/gen11/hw_info.h b/core/gen11/hw_info.h similarity index 100% rename from runtime/gen11/hw_info.h rename to core/gen11/hw_info.h diff --git a/runtime/gen11/hw_info_ehl.h b/core/gen11/hw_info_ehl.h similarity index 91% rename from runtime/gen11/hw_info_ehl.h rename to core/gen11/hw_info_ehl.h index c75913e4d9..b6f2b35f8e 100644 --- a/runtime/gen11/hw_info_ehl.h +++ b/core/gen11/hw_info_ehl.h @@ -6,7 +6,7 @@ */ #pragma once -#include "hw_info_gen11.h" +#include "core/gen11/hw_info_gen11.h" namespace NEO { diff --git a/runtime/gen11/hw_info_gen11.h b/core/gen11/hw_info_gen11.h similarity index 88% rename from runtime/gen11/hw_info_gen11.h rename to core/gen11/hw_info_gen11.h index fdb78bee0d..48396c8b88 100644 --- a/runtime/gen11/hw_info_gen11.h +++ b/core/gen11/hw_info_gen11.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" namespace NEO { diff --git a/runtime/gen11/hw_info_icllp.h b/core/gen11/hw_info_icllp.h similarity index 100% rename from runtime/gen11/hw_info_icllp.h rename to core/gen11/hw_info_icllp.h diff --git a/runtime/gen11/hw_info_lkf.h b/core/gen11/hw_info_lkf.h similarity index 91% rename from runtime/gen11/hw_info_lkf.h rename to core/gen11/hw_info_lkf.h index e30f84eb98..adf181a002 100644 --- a/runtime/gen11/hw_info_lkf.h +++ b/core/gen11/hw_info_lkf.h @@ -6,7 +6,7 @@ */ #pragma once -#include "hw_info_gen11.h" +#include "core/gen11/hw_info_gen11.h" namespace NEO { diff --git a/runtime/gen12lp/hw_cmds.h b/core/gen12lp/hw_cmds.h similarity index 100% rename from runtime/gen12lp/hw_cmds.h rename to core/gen12lp/hw_cmds.h diff --git a/runtime/gen12lp/hw_cmds_base.h b/core/gen12lp/hw_cmds_base.h similarity index 96% rename from runtime/gen12lp/hw_cmds_base.h rename to core/gen12lp/hw_cmds_base.h index fb30a8e6ab..418c233409 100644 --- a/runtime/gen12lp/hw_cmds_base.h +++ b/core/gen12lp/hw_cmds_base.h @@ -6,9 +6,9 @@ */ #pragma once +#include "core/commands/bxml_generator_glue.h" +#include "core/gen12lp/hw_info.h" #include "core/helpers/debug_helpers.h" -#include "runtime/commands/bxml_generator_glue.h" -#include "runtime/gen12lp/hw_info.h" #include "igfxfmid.h" diff --git a/runtime/gen12lp/hw_cmds_tgllp.h b/core/gen12lp/hw_cmds_tgllp.h similarity index 97% rename from runtime/gen12lp/hw_cmds_tgllp.h rename to core/gen12lp/hw_cmds_tgllp.h index b5737fdf4b..9f11a6f905 100644 --- a/runtime/gen12lp/hw_cmds_tgllp.h +++ b/core/gen12lp/hw_cmds_tgllp.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/gen12lp/hw_cmds_base.h" +#include "core/gen12lp/hw_cmds_base.h" namespace NEO { struct TGLLP : public TGLLPFamily { diff --git a/runtime/gen12lp/hw_info.h b/core/gen12lp/hw_info.h similarity index 100% rename from runtime/gen12lp/hw_info.h rename to core/gen12lp/hw_info.h diff --git a/runtime/gen12lp/hw_info_gen12lp.h b/core/gen12lp/hw_info_gen12lp.h similarity index 88% rename from runtime/gen12lp/hw_info_gen12lp.h rename to core/gen12lp/hw_info_gen12lp.h index dcebd1662b..3220d95fea 100644 --- a/runtime/gen12lp/hw_info_gen12lp.h +++ b/core/gen12lp/hw_info_gen12lp.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" namespace NEO { diff --git a/runtime/gen12lp/hw_info_tgllp.h b/core/gen12lp/hw_info_tgllp.h similarity index 100% rename from runtime/gen12lp/hw_info_tgllp.h rename to core/gen12lp/hw_info_tgllp.h diff --git a/runtime/gen8/hw_cmds.h b/core/gen8/hw_cmds.h similarity index 70% rename from runtime/gen8/hw_cmds.h rename to core/gen8/hw_cmds.h index d9baa6a8fe..e92a61105e 100644 --- a/runtime/gen8/hw_cmds.h +++ b/core/gen8/hw_cmds.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/runtime/gen8/hw_cmds_base.h b/core/gen8/hw_cmds_base.h similarity index 97% rename from runtime/gen8/hw_cmds_base.h rename to core/gen8/hw_cmds_base.h index 1c8835d204..4a3d30921f 100644 --- a/runtime/gen8/hw_cmds_base.h +++ b/core/gen8/hw_cmds_base.h @@ -6,10 +6,10 @@ */ #pragma once +#include "core/commands/bxml_generator_glue.h" +#include "core/gen8/hw_info.h" #include "core/helpers/debug_helpers.h" -#include "runtime/commands/bxml_generator_glue.h" -#include "hw_info.h" #include "igfxfmid.h" #include diff --git a/runtime/gen8/hw_cmds_bdw.h b/core/gen8/hw_cmds_bdw.h similarity index 97% rename from runtime/gen8/hw_cmds_bdw.h rename to core/gen8/hw_cmds_bdw.h index 354efe16e6..4bff49c165 100644 --- a/runtime/gen8/hw_cmds_bdw.h +++ b/core/gen8/hw_cmds_bdw.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/gen8/hw_cmds_base.h" +#include "core/gen8/hw_cmds_base.h" #include diff --git a/runtime/gen8/hw_info.h b/core/gen8/hw_info.h similarity index 70% rename from runtime/gen8/hw_info.h rename to core/gen8/hw_info.h index 82f9b5428b..7a5af9b9d6 100644 --- a/runtime/gen8/hw_info.h +++ b/core/gen8/hw_info.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/runtime/gen8/hw_info_bdw.h b/core/gen8/hw_info_bdw.h similarity index 100% rename from runtime/gen8/hw_info_bdw.h rename to core/gen8/hw_info_bdw.h diff --git a/runtime/gen8/hw_info_gen8.h b/core/gen8/hw_info_gen8.h similarity index 88% rename from runtime/gen8/hw_info_gen8.h rename to core/gen8/hw_info_gen8.h index 0145be6a13..850ae65f87 100644 --- a/runtime/gen8/hw_info_gen8.h +++ b/core/gen8/hw_info_gen8.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" namespace NEO { diff --git a/runtime/gen9/hw_cmds.h b/core/gen9/hw_cmds.h similarity index 87% rename from runtime/gen9/hw_cmds.h rename to core/gen9/hw_cmds.h index fb225b0c66..14c75e726e 100644 --- a/runtime/gen9/hw_cmds.h +++ b/core/gen9/hw_cmds.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/runtime/gen9/hw_cmds_base.h b/core/gen9/hw_cmds_base.h similarity index 96% rename from runtime/gen9/hw_cmds_base.h rename to core/gen9/hw_cmds_base.h index c8b8e52321..a24fe1edde 100644 --- a/runtime/gen9/hw_cmds_base.h +++ b/core/gen9/hw_cmds_base.h @@ -6,10 +6,10 @@ */ #pragma once +#include "core/commands/bxml_generator_glue.h" +#include "core/gen9/hw_info.h" #include "core/helpers/debug_helpers.h" -#include "runtime/commands/bxml_generator_glue.h" -#include "hw_info.h" #include "igfxfmid.h" #include diff --git a/runtime/gen9/hw_cmds_bxt.h b/core/gen9/hw_cmds_bxt.h similarity index 97% rename from runtime/gen9/hw_cmds_bxt.h rename to core/gen9/hw_cmds_bxt.h index 7ed0e101b1..9cb37ab3de 100644 --- a/runtime/gen9/hw_cmds_bxt.h +++ b/core/gen9/hw_cmds_bxt.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/gen9/hw_cmds_base.h" +#include "core/gen9/hw_cmds_base.h" namespace NEO { diff --git a/runtime/gen9/hw_cmds_cfl.h b/core/gen9/hw_cmds_cfl.h similarity index 98% rename from runtime/gen9/hw_cmds_cfl.h rename to core/gen9/hw_cmds_cfl.h index 7c6933bd30..c5bb8c2762 100644 --- a/runtime/gen9/hw_cmds_cfl.h +++ b/core/gen9/hw_cmds_cfl.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/gen9/hw_cmds_base.h" +#include "core/gen9/hw_cmds_base.h" namespace NEO { diff --git a/runtime/gen9/hw_cmds_glk.h b/core/gen9/hw_cmds_glk.h similarity index 97% rename from runtime/gen9/hw_cmds_glk.h rename to core/gen9/hw_cmds_glk.h index fe4c9a84fd..7ca0986693 100644 --- a/runtime/gen9/hw_cmds_glk.h +++ b/core/gen9/hw_cmds_glk.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/gen9/hw_cmds_base.h" +#include "core/gen9/hw_cmds_base.h" namespace NEO { diff --git a/runtime/gen9/hw_cmds_kbl.h b/core/gen9/hw_cmds_kbl.h similarity index 98% rename from runtime/gen9/hw_cmds_kbl.h rename to core/gen9/hw_cmds_kbl.h index 9796468352..af708a99a1 100644 --- a/runtime/gen9/hw_cmds_kbl.h +++ b/core/gen9/hw_cmds_kbl.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/gen9/hw_cmds_base.h" +#include "core/gen9/hw_cmds_base.h" namespace NEO { diff --git a/runtime/gen9/hw_cmds_skl.h b/core/gen9/hw_cmds_skl.h similarity index 98% rename from runtime/gen9/hw_cmds_skl.h rename to core/gen9/hw_cmds_skl.h index ddc2abf79e..ee8da3b857 100644 --- a/runtime/gen9/hw_cmds_skl.h +++ b/core/gen9/hw_cmds_skl.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/gen9/hw_cmds_base.h" +#include "core/gen9/hw_cmds_base.h" namespace NEO { diff --git a/runtime/gen9/hw_info.h b/core/gen9/hw_info.h similarity index 87% rename from runtime/gen9/hw_info.h rename to core/gen9/hw_info.h index 6370ba31d5..8f12369619 100644 --- a/runtime/gen9/hw_info.h +++ b/core/gen9/hw_info.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/runtime/gen9/hw_info_bxt.h b/core/gen9/hw_info_bxt.h similarity index 100% rename from runtime/gen9/hw_info_bxt.h rename to core/gen9/hw_info_bxt.h diff --git a/runtime/gen9/hw_info_cfl.h b/core/gen9/hw_info_cfl.h similarity index 100% rename from runtime/gen9/hw_info_cfl.h rename to core/gen9/hw_info_cfl.h diff --git a/runtime/gen9/hw_info_gen9.h b/core/gen9/hw_info_gen9.h similarity index 88% rename from runtime/gen9/hw_info_gen9.h rename to core/gen9/hw_info_gen9.h index daf9b97780..e2567c909e 100644 --- a/runtime/gen9/hw_info_gen9.h +++ b/core/gen9/hw_info_gen9.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" namespace NEO { diff --git a/runtime/gen9/hw_info_glk.h b/core/gen9/hw_info_glk.h similarity index 100% rename from runtime/gen9/hw_info_glk.h rename to core/gen9/hw_info_glk.h diff --git a/runtime/gen9/hw_info_kbl.h b/core/gen9/hw_info_kbl.h similarity index 100% rename from runtime/gen9/hw_info_kbl.h rename to core/gen9/hw_info_kbl.h diff --git a/runtime/gen9/hw_info_skl.h b/core/gen9/hw_info_skl.h similarity index 100% rename from runtime/gen9/hw_info_skl.h rename to core/gen9/hw_info_skl.h diff --git a/core/helpers/CMakeLists.txt b/core/helpers/CMakeLists.txt index 83e4c68547..1392592dd8 100644 --- a/core/helpers/CMakeLists.txt +++ b/core/helpers/CMakeLists.txt @@ -10,6 +10,7 @@ set(NEO_CORE_HELPERS ${CMAKE_CURRENT_SOURCE_DIR}/aligned_memory.h ${CMAKE_CURRENT_SOURCE_DIR}/basic_math.h ${CMAKE_CURRENT_SOURCE_DIR}/common_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/completion_stamp.h ${CMAKE_CURRENT_SOURCE_DIR}/debug_helpers.h ${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter_helper.h ${CMAKE_CURRENT_SOURCE_DIR}/extendable_enum.h @@ -18,13 +19,18 @@ set(NEO_CORE_HELPERS ${CMAKE_CURRENT_SOURCE_DIR}/hash.h ${CMAKE_CURRENT_SOURCE_DIR}/heap_helper.cpp ${CMAKE_CURRENT_SOURCE_DIR}/heap_helper.h + ${CMAKE_CURRENT_SOURCE_DIR}/hw_cmds.h ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper.h ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_base.inl ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_bdw_plus.inl + ${CMAKE_CURRENT_SOURCE_DIR}/hw_info.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/hw_info.h ${CMAKE_CURRENT_SOURCE_DIR}/interlocked_max.h ${CMAKE_CURRENT_SOURCE_DIR}/kernel_helpers.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kernel_helpers.h + ${CMAKE_CURRENT_SOURCE_DIR}/kmd_notify_properties.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/kmd_notify_properties.h ${CMAKE_CURRENT_SOURCE_DIR}/non_copyable_or_moveable.h ${CMAKE_CURRENT_SOURCE_DIR}/pipeline_select_args.h ${CMAKE_CURRENT_SOURCE_DIR}/preamble.h diff --git a/runtime/helpers/completion_stamp.h b/core/helpers/completion_stamp.h similarity index 100% rename from runtime/helpers/completion_stamp.h rename to core/helpers/completion_stamp.h diff --git a/runtime/gen_common/hw_cmds.h b/core/helpers/hw_cmds.h similarity index 60% rename from runtime/gen_common/hw_cmds.h rename to core/helpers/hw_cmds.h index a4812eb862..737f494ba7 100644 --- a/runtime/gen_common/hw_cmds.h +++ b/core/helpers/hw_cmds.h @@ -7,14 +7,14 @@ #pragma once #ifdef SUPPORT_GEN8 -#include "runtime/gen8/hw_cmds.h" +#include "core/gen8/hw_cmds.h" #endif #ifdef SUPPORT_GEN9 -#include "runtime/gen9/hw_cmds.h" +#include "core/gen9/hw_cmds.h" #endif #ifdef SUPPORT_GEN11 -#include "runtime/gen11/hw_cmds.h" +#include "core/gen11/hw_cmds.h" #endif #ifdef SUPPORT_GEN12LP -#include "runtime/gen12lp/hw_cmds.h" +#include "core/gen12lp/hw_cmds.h" #endif diff --git a/core/helpers/hw_helper.h b/core/helpers/hw_helper.h index e307ddf037..10fbfe035c 100644 --- a/core/helpers/hw_helper.h +++ b/core/helpers/hw_helper.h @@ -7,9 +7,9 @@ #pragma once #include "core/command_stream/linear_stream.h" +#include "core/helpers/hw_cmds.h" #include "runtime/built_ins/sip.h" #include "runtime/gen_common/aub_mapper.h" -#include "runtime/gen_common/hw_cmds.h" #include "runtime/mem_obj/buffer.h" #include diff --git a/core/helpers/hw_helper_base.inl b/core/helpers/hw_helper_base.inl index 22f8ae2357..53390890be 100644 --- a/core/helpers/hw_helper_base.inl +++ b/core/helpers/hw_helper_base.inl @@ -7,6 +7,7 @@ #include "core/helpers/aligned_memory.h" #include "core/helpers/hw_helper.h" +#include "core/helpers/hw_info.h" #include "core/helpers/preamble.h" #include "core/memory_manager/graphics_allocation.h" #include "core/memory_manager/memory_constants.h" @@ -16,7 +17,6 @@ #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/helpers/dispatch_info.h" #include "runtime/helpers/hardware_commands_helper.h" -#include "runtime/helpers/hw_info.h" #include "runtime/os_interface/os_interface.h" namespace NEO { diff --git a/runtime/helpers/hw_info.cpp b/core/helpers/hw_info.cpp similarity index 97% rename from runtime/helpers/hw_info.cpp rename to core/helpers/hw_info.cpp index cef1863570..33b08e792b 100644 --- a/runtime/helpers/hw_info.cpp +++ b/core/helpers/hw_info.cpp @@ -5,9 +5,9 @@ * */ -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" -#include "runtime/gen_common/hw_cmds.h" +#include "core/helpers/hw_cmds.h" #include "runtime/os_interface/debug_settings_manager.h" #include diff --git a/runtime/helpers/hw_info.h b/core/helpers/hw_info.h similarity index 98% rename from runtime/helpers/hw_info.h rename to core/helpers/hw_info.h index feb9755f3d..abbf33ae48 100644 --- a/runtime/helpers/hw_info.h +++ b/core/helpers/hw_info.h @@ -7,7 +7,7 @@ #pragma once #include "core/command_stream/preemption_mode.h" -#include "runtime/helpers/kmd_notify_properties.h" +#include "core/helpers/kmd_notify_properties.h" #include "engine_node.h" #include "gtsysinfo.h" diff --git a/runtime/helpers/kmd_notify_properties.cpp b/core/helpers/kmd_notify_properties.cpp similarity index 98% rename from runtime/helpers/kmd_notify_properties.cpp rename to core/helpers/kmd_notify_properties.cpp index 0cfc78d09c..847b5cc427 100644 --- a/runtime/helpers/kmd_notify_properties.cpp +++ b/core/helpers/kmd_notify_properties.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/kmd_notify_properties.h" +#include "core/helpers/kmd_notify_properties.h" #include "runtime/os_interface/debug_settings_manager.h" diff --git a/runtime/helpers/kmd_notify_properties.h b/core/helpers/kmd_notify_properties.h similarity index 97% rename from runtime/helpers/kmd_notify_properties.h rename to core/helpers/kmd_notify_properties.h index e0daab5e74..107a2356b8 100644 --- a/runtime/helpers/kmd_notify_properties.h +++ b/core/helpers/kmd_notify_properties.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/helpers/completion_stamp.h" +#include "core/helpers/completion_stamp.h" #include #include diff --git a/core/helpers/preamble_base.inl b/core/helpers/preamble_base.inl index 6796dcb4e2..f25bc9c5bd 100644 --- a/core/helpers/preamble_base.inl +++ b/core/helpers/preamble_base.inl @@ -8,9 +8,9 @@ #include "core/command_stream/linear_stream.h" #include "core/command_stream/preemption.h" #include "core/helpers/aligned_memory.h" +#include "core/helpers/hw_cmds.h" #include "core/helpers/preamble.h" #include "runtime/device/device.h" -#include "runtime/gen_common/hw_cmds.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/kernel/kernel.h" diff --git a/core/unit_tests/compiler_interface/compiler_cache_tests.cpp b/core/unit_tests/compiler_interface/compiler_cache_tests.cpp index 182cd1fb62..7e2314b9f5 100644 --- a/core/unit_tests/compiler_interface/compiler_cache_tests.cpp +++ b/core/unit_tests/compiler_interface/compiler_cache_tests.cpp @@ -9,9 +9,9 @@ #include "core/compiler_interface/compiler_interface.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/hash.h" +#include "core/helpers/hw_info.h" #include "core/helpers/string.h" #include "runtime/compiler_interface/default_cl_cache_config.h" -#include "runtime/helpers/hw_info.h" #include "test.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/global_environment.h" diff --git a/core/unit_tests/compiler_interface/compiler_interface_tests.cpp b/core/unit_tests/compiler_interface/compiler_interface_tests.cpp index 54ad8ac3bd..68541ea3d2 100644 --- a/core/unit_tests/compiler_interface/compiler_interface_tests.cpp +++ b/core/unit_tests/compiler_interface/compiler_interface_tests.cpp @@ -8,8 +8,8 @@ #include "core/compiler_interface/compiler_interface.h" #include "core/compiler_interface/compiler_interface.inl" #include "core/helpers/file_io.h" +#include "core/helpers/hw_info.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/helpers/hw_info.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/global_environment.h" #include "unit_tests/helpers/test_files.h" diff --git a/core/unit_tests/fixtures/preemption_fixture.cpp b/core/unit_tests/fixtures/preemption_fixture.cpp index 5131648059..6fc73972e6 100644 --- a/core/unit_tests/fixtures/preemption_fixture.cpp +++ b/core/unit_tests/fixtures/preemption_fixture.cpp @@ -8,11 +8,11 @@ #include "core/unit_tests/fixtures/preemption_fixture.h" #include "core/command_stream/preemption.h" +#include "core/helpers/hw_info.h" #include "runtime/command_queue/enqueue_common.h" #include "runtime/command_queue/enqueue_kernel.h" #include "runtime/command_queue/enqueue_marker.h" #include "runtime/helpers/dispatch_info.h" -#include "runtime/helpers/hw_info.h" #include "runtime/scheduler/scheduler_kernel.h" #include "test.h" #include "unit_tests/fixtures/hello_world_fixture.h" diff --git a/core/unit_tests/os_interface/aub_memory_operations_handler_tests.h b/core/unit_tests/os_interface/aub_memory_operations_handler_tests.h index 881803cd20..244c78e225 100644 --- a/core/unit_tests/os_interface/aub_memory_operations_handler_tests.h +++ b/core/unit_tests/os_interface/aub_memory_operations_handler_tests.h @@ -7,9 +7,9 @@ #pragma once +#include "core/helpers/hw_info.h" #include "core/os_interface/aub_memory_operations_handler.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/os_interface/device_factory.h" #include "unit_tests/mocks/mock_graphics_allocation.h" diff --git a/core/unit_tests/test_macros/test.h b/core/unit_tests/test_macros/test.h index ace85e35da..7ab185ef5e 100644 --- a/core/unit_tests/test_macros/test.h +++ b/core/unit_tests/test_macros/test.h @@ -6,8 +6,8 @@ */ #pragma once -#include "runtime/gen_common/hw_cmds.h" -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_cmds.h" +#include "core/helpers/hw_info.h" #include "gtest/gtest.h" #include "igfxfmid.h" diff --git a/offline_compiler/CMakeLists.txt b/offline_compiler/CMakeLists.txt index fa149f1faf..38ad7eef7b 100644 --- a/offline_compiler/CMakeLists.txt +++ b/offline_compiler/CMakeLists.txt @@ -27,7 +27,7 @@ set(CLOC_SRCS_LIB ${NEO_SOURCE_DIR}/offline_compiler/options.cpp ${NEO_SOURCE_DIR}/offline_compiler/${BRANCH_DIR_SUFFIX}/extra_settings.cpp ${NEO_SOURCE_DIR}/core/compiler_interface/create_main.cpp - ${NEO_SOURCE_DIR}/runtime/helpers/hw_info.cpp + ${NEO_SOURCE_DIR}/core/helpers/hw_info.cpp ${NEO_SOURCE_DIR}/runtime/platform/extensions.cpp ${NEO_SOURCE_DIR}/runtime/platform/extensions.h ) diff --git a/offline_compiler/decoder/helper.cpp b/offline_compiler/decoder/helper.cpp index 5652cb33fe..a91bf896be 100644 --- a/offline_compiler/decoder/helper.cpp +++ b/offline_compiler/decoder/helper.cpp @@ -7,8 +7,8 @@ #include "helper.h" +#include "core/helpers/hw_info.h" #include "core/os_interface/os_library.h" -#include "runtime/helpers/hw_info.h" #include "runtime/os_interface/os_inc_base.h" #include "igfxfmid.h" diff --git a/offline_compiler/decoder/iga_wrapper.cpp b/offline_compiler/decoder/iga_wrapper.cpp index a48b1a9a7f..82ea3673b4 100644 --- a/offline_compiler/decoder/iga_wrapper.cpp +++ b/offline_compiler/decoder/iga_wrapper.cpp @@ -7,8 +7,8 @@ #include "iga_wrapper.h" +#include "core/helpers/hw_info.h" #include "core/os_interface/os_library.h" -#include "runtime/helpers/hw_info.h" #include "runtime/os_interface/os_inc_base.h" #include "helper.h" diff --git a/offline_compiler/helper.cpp b/offline_compiler/helper.cpp index d5e331f240..56d60b125f 100644 --- a/offline_compiler/helper.cpp +++ b/offline_compiler/helper.cpp @@ -5,8 +5,8 @@ * */ +#include "core/helpers/hw_info.h" #include "core/utilities/debug_settings_reader_creator.h" -#include "runtime/helpers/hw_info.h" #include "runtime/os_interface/debug_settings_manager.h" namespace NEO { diff --git a/offline_compiler/offline_compiler.cpp b/offline_compiler/offline_compiler.cpp index 64113e59e2..860c0a176f 100644 --- a/offline_compiler/offline_compiler.cpp +++ b/offline_compiler/offline_compiler.cpp @@ -10,9 +10,9 @@ #include "core/elf/writer.h" #include "core/helpers/debug_helpers.h" #include "core/helpers/file_io.h" +#include "core/helpers/hw_info.h" #include "core/helpers/string.h" #include "core/os_interface/os_library.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/validators.h" #include "runtime/os_interface/debug_settings_manager.h" #include "runtime/os_interface/os_inc_base.h" diff --git a/offline_compiler/options.cpp b/offline_compiler/options.cpp index 3040f2433a..1c654f56c4 100644 --- a/offline_compiler/options.cpp +++ b/offline_compiler/options.cpp @@ -7,7 +7,7 @@ #include "runtime/helpers/options.h" -#include "runtime/gen_common/hw_cmds.h" +#include "core/helpers/hw_cmds.h" #include "runtime/helpers/array_count.h" #include diff --git a/runtime/api/api.cpp b/runtime/api/api.cpp index 3a09ac5b1a..1673d6c5f4 100644 --- a/runtime/api/api.cpp +++ b/runtime/api/api.cpp @@ -9,6 +9,7 @@ #include "core/execution_environment/root_device_environment.h" #include "core/helpers/aligned_memory.h" +#include "core/helpers/hw_info.h" #include "core/helpers/kernel_helpers.h" #include "core/memory_manager/unified_memory_manager.h" #include "core/utilities/stackvec.h" @@ -25,7 +26,6 @@ #include "runtime/event/user_event.h" #include "runtime/gtpin/gtpin_notify.h" #include "runtime/helpers/get_info.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/mem_properties_parser_helper.h" #include "runtime/helpers/memory_properties_flags_helpers.h" #include "runtime/helpers/options.h" diff --git a/runtime/aub/aub_center.cpp b/runtime/aub/aub_center.cpp index 616ade25de..cd7ecb29c9 100644 --- a/runtime/aub/aub_center.cpp +++ b/runtime/aub/aub_center.cpp @@ -7,9 +7,9 @@ #include "runtime/aub/aub_center.h" +#include "core/helpers/hw_info.h" #include "runtime/aub/aub_helper.h" #include "runtime/helpers/device_helpers.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/os_interface/debug_settings_manager.h" diff --git a/runtime/aub/aub_helper.h b/runtime/aub/aub_helper.h index a7e7e41a02..6426db6a15 100644 --- a/runtime/aub/aub_helper.h +++ b/runtime/aub/aub_helper.h @@ -6,10 +6,10 @@ */ #pragma once +#include "core/helpers/hw_info.h" #include "core/helpers/non_copyable_or_moveable.h" #include "core/memory_manager/graphics_allocation.h" #include "runtime/gen_common/aub_mapper_base.h" -#include "runtime/helpers/hw_info.h" namespace NEO { diff --git a/runtime/built_ins/sip.h b/runtime/built_ins/sip.h index 0660b62c01..66cf5710e0 100644 --- a/runtime/built_ins/sip.h +++ b/runtime/built_ins/sip.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include #include diff --git a/runtime/builtin_kernels_simulation/gen11/scheduler_simulation.cpp b/runtime/builtin_kernels_simulation/gen11/scheduler_simulation.cpp index 3a9b8277ee..52ceb8febc 100644 --- a/runtime/builtin_kernels_simulation/gen11/scheduler_simulation.cpp +++ b/runtime/builtin_kernels_simulation/gen11/scheduler_simulation.cpp @@ -7,11 +7,11 @@ #include "runtime/builtin_kernels_simulation/scheduler_simulation.h" +#include "core/gen11/hw_cmds.h" #include "core/memory_manager/graphics_allocation.h" #include "runtime/builtin_kernels_simulation/opencl_c.h" #include "runtime/builtin_kernels_simulation/scheduler_simulation.inl" #include "runtime/execution_model/device_enqueue.h" -#include "runtime/gen11/hw_cmds.h" #include "CL/cl.h" diff --git a/runtime/builtin_kernels_simulation/gen12lp/scheduler_simulation.cpp b/runtime/builtin_kernels_simulation/gen12lp/scheduler_simulation.cpp index bf62702339..540651819f 100644 --- a/runtime/builtin_kernels_simulation/gen12lp/scheduler_simulation.cpp +++ b/runtime/builtin_kernels_simulation/gen12lp/scheduler_simulation.cpp @@ -7,11 +7,11 @@ #include "runtime/builtin_kernels_simulation/scheduler_simulation.h" +#include "core/gen12lp/hw_cmds.h" #include "core/memory_manager/graphics_allocation.h" #include "runtime/builtin_kernels_simulation/opencl_c.h" #include "runtime/builtin_kernels_simulation/scheduler_simulation.inl" #include "runtime/execution_model/device_enqueue.h" -#include "runtime/gen12lp/hw_cmds.h" #include "CL/cl.h" diff --git a/runtime/builtin_kernels_simulation/gen8/scheduler_simulation.cpp b/runtime/builtin_kernels_simulation/gen8/scheduler_simulation.cpp index 2328f370da..70ceaaf434 100644 --- a/runtime/builtin_kernels_simulation/gen8/scheduler_simulation.cpp +++ b/runtime/builtin_kernels_simulation/gen8/scheduler_simulation.cpp @@ -7,11 +7,11 @@ #include "runtime/builtin_kernels_simulation/scheduler_simulation.h" +#include "core/gen8/hw_cmds.h" #include "core/memory_manager/graphics_allocation.h" #include "runtime/builtin_kernels_simulation/opencl_c.h" #include "runtime/builtin_kernels_simulation/scheduler_simulation.inl" #include "runtime/execution_model/device_enqueue.h" -#include "runtime/gen8/hw_cmds.h" #include "CL/cl.h" diff --git a/runtime/builtin_kernels_simulation/gen9/scheduler_simulation.cpp b/runtime/builtin_kernels_simulation/gen9/scheduler_simulation.cpp index c4cf47e822..cd458c0060 100644 --- a/runtime/builtin_kernels_simulation/gen9/scheduler_simulation.cpp +++ b/runtime/builtin_kernels_simulation/gen9/scheduler_simulation.cpp @@ -7,11 +7,11 @@ #include "runtime/builtin_kernels_simulation/scheduler_simulation.h" +#include "core/gen9/hw_cmds.h" #include "core/memory_manager/graphics_allocation.h" #include "runtime/builtin_kernels_simulation/opencl_c.h" #include "runtime/builtin_kernels_simulation/scheduler_simulation.inl" #include "runtime/execution_model/device_enqueue.h" -#include "runtime/gen9/hw_cmds.h" #include "CL/cl.h" diff --git a/runtime/command_stream/aub_command_stream_receiver.cpp b/runtime/command_stream/aub_command_stream_receiver.cpp index f8442fdc25..73faf8d443 100644 --- a/runtime/command_stream/aub_command_stream_receiver.cpp +++ b/runtime/command_stream/aub_command_stream_receiver.cpp @@ -8,8 +8,8 @@ #include "runtime/command_stream/aub_command_stream_receiver.h" #include "core/helpers/debug_helpers.h" +#include "core/helpers/hw_info.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" #include "runtime/os_interface/os_inc_base.h" diff --git a/runtime/command_stream/command_stream_receiver.h b/runtime/command_stream/command_stream_receiver.h index 4657f5811d..35a1b1483b 100644 --- a/runtime/command_stream/command_stream_receiver.h +++ b/runtime/command_stream/command_stream_receiver.h @@ -8,13 +8,13 @@ #pragma once #include "core/command_stream/linear_stream.h" #include "core/helpers/aligned_memory.h" +#include "core/helpers/completion_stamp.h" #include "runtime/command_stream/aub_subcapture.h" #include "runtime/command_stream/csr_definitions.h" #include "runtime/command_stream/submissions_aggregator.h" #include "runtime/command_stream/thread_arbitration_policy.h" #include "runtime/helpers/address_patch.h" #include "runtime/helpers/blit_commands_helper.h" -#include "runtime/helpers/completion_stamp.h" #include "runtime/helpers/flat_batch_buffer_helper.h" #include "runtime/helpers/options.h" #include "runtime/indirect_heap/indirect_heap.h" diff --git a/runtime/command_stream/command_stream_receiver_hw.h b/runtime/command_stream/command_stream_receiver_hw.h index d73d35b638..d9518df5ee 100644 --- a/runtime/command_stream/command_stream_receiver_hw.h +++ b/runtime/command_stream/command_stream_receiver_hw.h @@ -6,12 +6,12 @@ */ #pragma once +#include "core/helpers/hw_cmds.h" +#include "core/helpers/hw_info.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/gen_common/hw_cmds.h" #include "runtime/helpers/csr_deps.h" #include "runtime/helpers/dirty_state_helpers.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" namespace NEO { diff --git a/runtime/command_stream/csr_definitions.h b/runtime/command_stream/csr_definitions.h index b4abddd648..3d53fa2697 100644 --- a/runtime/command_stream/csr_definitions.h +++ b/runtime/command_stream/csr_definitions.h @@ -6,10 +6,10 @@ */ #pragma once +#include "core/helpers/hw_info.h" #include "core/helpers/pipeline_select_args.h" #include "core/memory_manager/memory_constants.h" #include "runtime/helpers/csr_deps.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/properties_helper.h" #include "runtime/kernel/grf_config.h" diff --git a/runtime/command_stream/tbx_command_stream_receiver.cpp b/runtime/command_stream/tbx_command_stream_receiver.cpp index 71d61b9fad..19f4e31b45 100644 --- a/runtime/command_stream/tbx_command_stream_receiver.cpp +++ b/runtime/command_stream/tbx_command_stream_receiver.cpp @@ -7,8 +7,8 @@ #include "runtime/command_stream/tbx_command_stream_receiver.h" +#include "core/helpers/hw_info.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include diff --git a/runtime/commands/bxml_generator_glue.h b/runtime/commands/bxml_generator_glue.h deleted file mode 100644 index 49d4742d60..0000000000 --- a/runtime/commands/bxml_generator_glue.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2017, Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -#pragma once -#include -#include - -// Macro helpers -#ifndef STATIC_ASSERT -#define STATIC_ASSERT(e) static_assert(e, #e) -#endif - -#ifndef SIZE32 -#define SIZE32(x) (sizeof(x) / sizeof(uint32_t)) -#endif // SIZE32 - -/*****************************************************************************\ -MACRO: BITFIELD_RANGE -PURPOSE: Calculates the number of bits between the startbit and the endbit (0 based) -\*****************************************************************************/ -#ifndef BITFIELD_RANGE -#define BITFIELD_RANGE(startbit, endbit) ((endbit) - (startbit) + 1) -#endif - -/*****************************************************************************\ -MACRO: BITFIELD_BIT -PURPOSE: Definition declared for clarity when creating structs -\*****************************************************************************/ -#ifndef BITFIELD_BIT -#define BITFIELD_BIT(bit) 1 -#endif diff --git a/runtime/compiler_interface/patchtokens_validator.inl b/runtime/compiler_interface/patchtokens_validator.inl index 01c48dc0eb..72ddd41a55 100644 --- a/runtime/compiler_interface/patchtokens_validator.inl +++ b/runtime/compiler_interface/patchtokens_validator.inl @@ -7,8 +7,8 @@ #pragma once +#include "core/helpers/hw_info.h" #include "runtime/compiler_interface/patchtokens_decoder.h" -#include "runtime/helpers/hw_info.h" #include "igfxfmid.h" diff --git a/runtime/core_files.cmake b/runtime/core_files.cmake index 6212419999..0c0f6e48bb 100644 --- a/runtime/core_files.cmake +++ b/runtime/core_files.cmake @@ -9,6 +9,7 @@ target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${NEO_SOURCE_DIR}/runtime/core_fil append_sources_from_properties(NEO_CORE_SOURCES NEO_CORE_COMMAND_CONTAINER NEO_CORE_COMMAND_STREAM + NEO_CORE_COMMANDS NEO_CORE_EXECUTION_ENVIRONMENT NEO_CORE_GMM_HELPER NEO_CORE_HELPERS diff --git a/runtime/device/device.h b/runtime/device/device.h index d77be33d43..cb7ffc1e1a 100644 --- a/runtime/device/device.h +++ b/runtime/device/device.h @@ -7,12 +7,12 @@ #pragma once #include "core/helpers/common_types.h" +#include "core/helpers/hw_info.h" #include "runtime/api/cl_types.h" #include "runtime/device/device_info_map.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/helpers/base_object.h" #include "runtime/helpers/engine_control.h" -#include "runtime/helpers/hw_info.h" #include "runtime/os_interface/performance_counters.h" #include "engine_node.h" diff --git a/runtime/device_queue/device_queue.h b/runtime/device_queue/device_queue.h index 54a4a9f3ce..833fe37374 100644 --- a/runtime/device_queue/device_queue.h +++ b/runtime/device_queue/device_queue.h @@ -6,11 +6,11 @@ */ #pragma once +#include "core/helpers/hw_info.h" #include "core/memory_manager/graphics_allocation.h" #include "runtime/api/cl_types.h" #include "runtime/execution_model/device_enqueue.h" #include "runtime/helpers/base_object.h" -#include "runtime/helpers/hw_info.h" #include "runtime/indirect_heap/indirect_heap.h" namespace NEO { diff --git a/runtime/device_queue/device_queue_hw.h b/runtime/device_queue/device_queue_hw.h index 8d78e33724..d7b77b0f5b 100644 --- a/runtime/device_queue/device_queue_hw.h +++ b/runtime/device_queue/device_queue_hw.h @@ -7,9 +7,9 @@ #pragma once #include "core/command_stream/linear_stream.h" +#include "core/helpers/hw_cmds.h" #include "core/helpers/ptr_math.h" #include "runtime/device_queue/device_queue.h" -#include "runtime/gen_common/hw_cmds.h" #include "runtime/indirect_heap/indirect_heap.h" #include "runtime/kernel/kernel.h" #include "runtime/program/program.h" diff --git a/runtime/dll/create_command_stream.cpp b/runtime/dll/create_command_stream.cpp index c1cbf747b8..43db070a16 100644 --- a/runtime/dll/create_command_stream.cpp +++ b/runtime/dll/create_command_stream.cpp @@ -5,12 +5,12 @@ * */ +#include "core/helpers/hw_info.h" #include "runtime/command_stream/aub_command_stream_receiver.h" #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h" #include "runtime/command_stream/create_command_stream_impl.h" #include "runtime/command_stream/device_command_stream.h" #include "runtime/command_stream/tbx_command_stream_receiver.h" -#include "runtime/helpers/hw_info.h" namespace NEO { diff --git a/runtime/dll/linux/drm_neo_create.cpp b/runtime/dll/linux/drm_neo_create.cpp index a6f1a01b8d..dbc2b03691 100644 --- a/runtime/dll/linux/drm_neo_create.cpp +++ b/runtime/dll/linux/drm_neo_create.cpp @@ -5,10 +5,10 @@ * */ +#include "core/helpers/hw_cmds.h" #include "core/helpers/hw_helper.h" -#include "runtime/gen_common/hw_cmds.h" +#include "core/helpers/hw_info.h" #include "runtime/gmm_helper/gmm_helper.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/os_interface/debug_settings_manager.h" #include "runtime/os_interface/linux/drm_neo.h" diff --git a/runtime/dll/options.cpp b/runtime/dll/options.cpp index 623b333db2..fc20e3dac7 100644 --- a/runtime/dll/options.cpp +++ b/runtime/dll/options.cpp @@ -7,7 +7,7 @@ #include "runtime/helpers/options.h" -#include "runtime/gen_common/hw_cmds.h" +#include "core/helpers/hw_cmds.h" #include "runtime/helpers/array_count.h" namespace NEO { diff --git a/runtime/enable_gens.cmake b/runtime/enable_gens.cmake index 4079458c55..add8f3727f 100644 --- a/runtime/enable_gens.cmake +++ b/runtime/enable_gens.cmake @@ -15,6 +15,9 @@ set(RUNTIME_SRCS_GENX_CPP_LINUX set(RUNTIME_SRCS_GENX_H_BASE aub_mapper.h +) + +set(CORE_SRCS_GENX_H_BASE hw_cmds.h hw_info.h ) @@ -45,7 +48,13 @@ set(CORE_RUNTIME_SRCS_GENX_CPP_BASE macro(macro_for_each_platform) string(TOLOWER ${PLATFORM_IT} PLATFORM_IT_LOWER) - foreach(PLATFORM_FILE "hw_cmds_${PLATFORM_IT_LOWER}.h" "hw_info_${PLATFORM_IT_LOWER}.h" "reg_configs.h") + foreach(PLATFORM_FILE "hw_cmds_${PLATFORM_IT_LOWER}.h" "hw_info_${PLATFORM_IT_LOWER}.h") + if(EXISTS ${CORE_GENX_PREFIX}/${PLATFORM_FILE}) + list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE ${CORE_GENX_PREFIX}/${PLATFORM_FILE}) + endif() + endforeach() + + foreach(PLATFORM_FILE "reg_configs.h") if(EXISTS ${GENX_PREFIX}/${PLATFORM_FILE}) list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE ${GENX_PREFIX}/${PLATFORM_FILE}) endif() @@ -65,6 +74,9 @@ macro(macro_for_each_gen) foreach(SRC_IT ${RUNTIME_SRCS_GENX_H_BASE}) list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE ${GENX_PREFIX}/${SRC_IT}) endforeach() + foreach(SRC_IT ${CORE_SRCS_GENX_H_BASE}) + list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE ${CORE_GENX_PREFIX}/${SRC_IT}) + endforeach() foreach(SRC_IT "state_compute_mode_helper_${GEN_TYPE_LOWER}.cpp") if(EXISTS ${GENX_PREFIX}/${SRC_IT}) list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE ${GENX_PREFIX}/${SRC_IT}) diff --git a/runtime/gen11/aub_mem_dump_gen11.cpp b/runtime/gen11/aub_mem_dump_gen11.cpp index 8e8be4fb82..29e4bb35f0 100644 --- a/runtime/gen11/aub_mem_dump_gen11.cpp +++ b/runtime/gen11/aub_mem_dump_gen11.cpp @@ -5,10 +5,10 @@ * */ +#include "core/helpers/completion_stamp.h" #include "core/helpers/hw_helper.h" #include "runtime/aub_mem_dump/aub_alloc_dump.inl" #include "runtime/aub_mem_dump/aub_mem_dump.inl" -#include "runtime/helpers/completion_stamp.h" #include "aub_mapper.h" #include "config.h" diff --git a/runtime/gen11/buffer_gen11.cpp b/runtime/gen11/buffer_gen11.cpp index b8fd434b8c..befa6e571f 100644 --- a/runtime/gen11/buffer_gen11.cpp +++ b/runtime/gen11/buffer_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen11/hw_cmds.h" +#include "core/gen11/hw_cmds.h" #include "runtime/mem_obj/buffer_bdw_plus.inl" namespace NEO { diff --git a/runtime/gen11/device_queue_gen11.cpp b/runtime/gen11/device_queue_gen11.cpp index 874e5b7f4e..60e52f94f7 100644 --- a/runtime/gen11/device_queue_gen11.cpp +++ b/runtime/gen11/device_queue_gen11.cpp @@ -5,11 +5,11 @@ * */ +#include "core/gen11/hw_cmds.h" #include "runtime/device_queue/device_queue_hw.h" #include "runtime/device_queue/device_queue_hw_bdw_plus.inl" #include "runtime/device_queue/device_queue_hw_profiling.inl" #include "runtime/gen11/device_enqueue.h" -#include "runtime/gen11/hw_cmds.h" namespace NEO { typedef ICLFamily Family; diff --git a/runtime/gen11/enable_family_full_gen11.cpp b/runtime/gen11/enable_family_full_gen11.cpp index ab726c78de..95dd7116ee 100644 --- a/runtime/gen11/enable_family_full_gen11.cpp +++ b/runtime/gen11/enable_family_full_gen11.cpp @@ -5,12 +5,12 @@ * */ +#include "core/gen11/hw_cmds.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_stream/aub_command_stream_receiver_hw.h" #include "runtime/command_stream/command_stream_receiver_hw.h" #include "runtime/command_stream/tbx_command_stream_receiver_hw.h" #include "runtime/device_queue/device_queue_hw.h" -#include "runtime/gen11/hw_cmds.h" #ifdef HAVE_INSTRUMENTATION #include "runtime/event/perf_counter.h" diff --git a/runtime/gen11/enable_gen11.cpp b/runtime/gen11/enable_gen11.cpp index 364bf4181f..7fc5218894 100644 --- a/runtime/gen11/enable_gen11.cpp +++ b/runtime/gen11/enable_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen11/hw_cmds.h" +#include "core/gen11/hw_cmds.h" #include "runtime/helpers/enable_product.inl" #include "runtime/os_interface/hw_info_config.h" diff --git a/runtime/gen11/enable_hw_info_config_gen11.cpp b/runtime/gen11/enable_hw_info_config_gen11.cpp index 20d4f4cb4a..5c1de96677 100644 --- a/runtime/gen11/enable_hw_info_config_gen11.cpp +++ b/runtime/gen11/enable_hw_info_config_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen11/hw_cmds.h" +#include "core/gen11/hw_cmds.h" #include "runtime/os_interface/hw_info_config.h" namespace NEO { diff --git a/runtime/gen11/gpgpu_walker_gen11.cpp b/runtime/gen11/gpgpu_walker_gen11.cpp index b1fabc1d61..6024344be9 100644 --- a/runtime/gen11/gpgpu_walker_gen11.cpp +++ b/runtime/gen11/gpgpu_walker_gen11.cpp @@ -5,9 +5,9 @@ * */ +#include "core/gen11/hw_info.h" #include "runtime/command_queue/gpgpu_walker_bdw_plus.inl" #include "runtime/command_queue/hardware_interface_bdw_plus.inl" -#include "runtime/gen11/hw_info.h" namespace NEO { diff --git a/runtime/gen11/hardware_commands_helper_gen11.cpp b/runtime/gen11/hardware_commands_helper_gen11.cpp index 8b7002f2ba..9b30b57112 100644 --- a/runtime/gen11/hardware_commands_helper_gen11.cpp +++ b/runtime/gen11/hardware_commands_helper_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen11/hw_cmds.h" +#include "core/gen11/hw_cmds.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/helpers/hardware_commands_helper.inl" #include "runtime/helpers/hardware_commands_helper_base.inl" diff --git a/runtime/gen11/hw_info_ehl.inl b/runtime/gen11/hw_info_ehl.inl index 7f33cdb529..d428eaab16 100644 --- a/runtime/gen11/hw_info_ehl.inl +++ b/runtime/gen11/hw_info_ehl.inl @@ -9,8 +9,6 @@ #include "runtime/aub_mem_dump/aub_services.h" #include "engine_node.h" -#include "hw_cmds_ehl.h" -#include "hw_info_ehl.h" namespace NEO { diff --git a/runtime/gen11/hw_info_icllp.inl b/runtime/gen11/hw_info_icllp.inl index ecb7d32559..2f984ff5a9 100644 --- a/runtime/gen11/hw_info_icllp.inl +++ b/runtime/gen11/hw_info_icllp.inl @@ -5,12 +5,11 @@ * */ +#include "core/gen11/hw_cmds.h" #include "core/memory_manager/memory_constants.h" #include "runtime/aub_mem_dump/aub_services.h" -#include "runtime/gen11/hw_cmds.h" #include "engine_node.h" -#include "hw_info_icllp.h" namespace NEO { diff --git a/runtime/gen11/hw_info_lkf.inl b/runtime/gen11/hw_info_lkf.inl index fcc08d0ae1..24b0c2e231 100644 --- a/runtime/gen11/hw_info_lkf.inl +++ b/runtime/gen11/hw_info_lkf.inl @@ -5,12 +5,11 @@ * */ +#include "core/gen11/hw_cmds_lkf.h" #include "core/memory_manager/memory_constants.h" #include "runtime/aub_mem_dump/aub_services.h" #include "engine_node.h" -#include "hw_cmds_lkf.h" -#include "hw_info_lkf.h" namespace NEO { diff --git a/runtime/gen11/image_gen11.cpp b/runtime/gen11/image_gen11.cpp index 4e7b9bf6d0..653f7d9270 100644 --- a/runtime/gen11/image_gen11.cpp +++ b/runtime/gen11/image_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen11/hw_cmds_base.h" +#include "core/gen11/hw_cmds_base.h" #include "runtime/mem_obj/image.h" #include "runtime/mem_obj/image.inl" diff --git a/runtime/gen11/linux/hw_info_config_ehl.inl b/runtime/gen11/linux/hw_info_config_ehl.inl index d6d120901b..770bc16350 100644 --- a/runtime/gen11/linux/hw_info_config_ehl.inl +++ b/runtime/gen11/linux/hw_info_config_ehl.inl @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include "runtime/os_interface/hw_info_config.h" namespace NEO { diff --git a/runtime/gen11/linux/hw_info_config_icllp.inl b/runtime/gen11/linux/hw_info_config_icllp.inl index 3aa964a964..c1e6486746 100644 --- a/runtime/gen11/linux/hw_info_config_icllp.inl +++ b/runtime/gen11/linux/hw_info_config_icllp.inl @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include "runtime/os_interface/hw_info_config.h" namespace NEO { diff --git a/runtime/gen11/linux/hw_info_config_lkf.inl b/runtime/gen11/linux/hw_info_config_lkf.inl index dc6a79e23f..5aa0431578 100644 --- a/runtime/gen11/linux/hw_info_config_lkf.inl +++ b/runtime/gen11/linux/hw_info_config_lkf.inl @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include "runtime/os_interface/hw_info_config.h" namespace NEO { diff --git a/runtime/gen11/sampler_gen11.cpp b/runtime/gen11/sampler_gen11.cpp index f530860f33..884dd6378f 100644 --- a/runtime/gen11/sampler_gen11.cpp +++ b/runtime/gen11/sampler_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen11/hw_cmds.h" +#include "core/gen11/hw_cmds.h" #include "runtime/sampler/sampler.h" #include "runtime/sampler/sampler.inl" diff --git a/runtime/gen11/tbx_command_stream_receiver_gen11.cpp b/runtime/gen11/tbx_command_stream_receiver_gen11.cpp index 0ad3963ab7..da5d3d4609 100644 --- a/runtime/gen11/tbx_command_stream_receiver_gen11.cpp +++ b/runtime/gen11/tbx_command_stream_receiver_gen11.cpp @@ -5,10 +5,10 @@ * */ +#include "core/gen11/hw_cmds.h" #include "runtime/command_stream/command_stream_receiver_with_aub_dump.inl" #include "runtime/command_stream/tbx_command_stream_receiver_hw.h" #include "runtime/command_stream/tbx_command_stream_receiver_hw.inl" -#include "runtime/gen11/hw_cmds.h" #include "runtime/helpers/array_count.h" #include "runtime/helpers/base_object.h" diff --git a/runtime/gen11/windows/gmm_callbacks_gen11.cpp b/runtime/gen11/windows/gmm_callbacks_gen11.cpp index 3ac7920ef5..87dc50a123 100644 --- a/runtime/gen11/windows/gmm_callbacks_gen11.cpp +++ b/runtime/gen11/windows/gmm_callbacks_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen11/hw_cmds.h" +#include "core/gen11/hw_cmds.h" #include "runtime/helpers/gmm_callbacks.h" #include "runtime/helpers/gmm_callbacks.inl" diff --git a/runtime/gen11/windows/hw_info_config_gen11.cpp b/runtime/gen11/windows/hw_info_config_gen11.cpp index 5544afb984..a18966d72a 100644 --- a/runtime/gen11/windows/hw_info_config_gen11.cpp +++ b/runtime/gen11/windows/hw_info_config_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include "runtime/os_interface/hw_info_config.h" #include "runtime/os_interface/hw_info_config.inl" #include "runtime/os_interface/hw_info_config_bdw_plus.inl" diff --git a/runtime/gen12lp/aub_mem_dump_gen12lp.cpp b/runtime/gen12lp/aub_mem_dump_gen12lp.cpp index 099645bc28..3ca43f11bc 100644 --- a/runtime/gen12lp/aub_mem_dump_gen12lp.cpp +++ b/runtime/gen12lp/aub_mem_dump_gen12lp.cpp @@ -5,10 +5,10 @@ * */ +#include "core/helpers/completion_stamp.h" #include "core/helpers/hw_helper.h" #include "runtime/aub_mem_dump/aub_alloc_dump.inl" #include "runtime/aub_mem_dump/aub_mem_dump.inl" -#include "runtime/helpers/completion_stamp.h" #include "aub_mapper.h" #include "config.h" diff --git a/runtime/gen12lp/buffer_gen12lp.cpp b/runtime/gen12lp/buffer_gen12lp.cpp index 26b786467a..ed89bf9e28 100644 --- a/runtime/gen12lp/buffer_gen12lp.cpp +++ b/runtime/gen12lp/buffer_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen12lp/hw_cmds.h" +#include "core/gen12lp/hw_cmds.h" #include "runtime/mem_obj/buffer_bdw_plus.inl" namespace NEO { diff --git a/runtime/gen12lp/command_stream_receiver_hw_gen12lp.cpp b/runtime/gen12lp/command_stream_receiver_hw_gen12lp.cpp index 99eb4c0761..03d6d31567 100644 --- a/runtime/gen12lp/command_stream_receiver_hw_gen12lp.cpp +++ b/runtime/gen12lp/command_stream_receiver_hw_gen12lp.cpp @@ -5,15 +5,13 @@ * */ +#include "core/gen12lp/hw_cmds.h" #include "runtime/command_stream/command_stream_receiver_hw_bdw_plus.inl" #include "runtime/command_stream/command_stream_receiver_hw_tgllp_plus.inl" #include "runtime/command_stream/device_command_stream.h" #include "runtime/gen12lp/helpers_gen12lp.h" -#include "runtime/gen12lp/hw_cmds.h" #include "runtime/helpers/blit_commands_helper_bdw_plus.inl" -#include "hw_info.h" - namespace NEO { typedef TGLLPFamily Family; static auto gfxCore = IGFX_GEN12LP_CORE; diff --git a/runtime/gen12lp/device_queue_gen12lp.cpp b/runtime/gen12lp/device_queue_gen12lp.cpp index 7b0921d900..84e6dd577e 100644 --- a/runtime/gen12lp/device_queue_gen12lp.cpp +++ b/runtime/gen12lp/device_queue_gen12lp.cpp @@ -5,10 +5,10 @@ * */ +#include "core/gen12lp/hw_cmds.h" #include "runtime/device_queue/device_queue_hw.h" #include "runtime/device_queue/device_queue_hw_bdw_plus.inl" #include "runtime/device_queue/device_queue_hw_profiling.inl" -#include "runtime/gen12lp/hw_cmds.h" namespace NEO { typedef TGLLPFamily Family; diff --git a/runtime/gen12lp/enable_family_full_gen12lp.cpp b/runtime/gen12lp/enable_family_full_gen12lp.cpp index 6798678982..2b7956d738 100644 --- a/runtime/gen12lp/enable_family_full_gen12lp.cpp +++ b/runtime/gen12lp/enable_family_full_gen12lp.cpp @@ -5,13 +5,13 @@ * */ +#include "core/gen12lp/hw_cmds.h" #include "core/helpers/hw_helper.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_stream/aub_command_stream_receiver_hw.h" #include "runtime/command_stream/command_stream_receiver_hw.h" #include "runtime/command_stream/tbx_command_stream_receiver_hw.h" #include "runtime/device_queue/device_queue_hw.h" -#include "runtime/gen12lp/hw_cmds.h" #include "runtime/mem_obj/buffer.h" #include "runtime/mem_obj/image.h" #include "runtime/sampler/sampler.h" diff --git a/runtime/gen12lp/enable_gen12lp.cpp b/runtime/gen12lp/enable_gen12lp.cpp index b6af2d1e18..c02bf30770 100644 --- a/runtime/gen12lp/enable_gen12lp.cpp +++ b/runtime/gen12lp/enable_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen12lp/hw_cmds.h" +#include "core/gen12lp/hw_cmds.h" #include "runtime/helpers/enable_product.inl" #include "runtime/os_interface/hw_info_config.h" diff --git a/runtime/gen12lp/enable_hw_info_config_gen12lp.cpp b/runtime/gen12lp/enable_hw_info_config_gen12lp.cpp index 00205e6616..9263ee1cf4 100644 --- a/runtime/gen12lp/enable_hw_info_config_gen12lp.cpp +++ b/runtime/gen12lp/enable_hw_info_config_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen12lp/hw_cmds.h" +#include "core/gen12lp/hw_cmds.h" #include "runtime/os_interface/hw_info_config.h" namespace NEO { diff --git a/runtime/gen12lp/gpgpu_walker_gen12lp.cpp b/runtime/gen12lp/gpgpu_walker_gen12lp.cpp index 11f6dd3567..61269ca5c3 100644 --- a/runtime/gen12lp/gpgpu_walker_gen12lp.cpp +++ b/runtime/gen12lp/gpgpu_walker_gen12lp.cpp @@ -5,9 +5,9 @@ * */ +#include "core/gen12lp/hw_info.h" #include "runtime/command_queue/gpgpu_walker_bdw_plus.inl" #include "runtime/command_queue/hardware_interface_bdw_plus.inl" -#include "runtime/gen12lp/hw_info.h" namespace NEO { diff --git a/runtime/gen12lp/hardware_commands_helper_gen12lp.cpp b/runtime/gen12lp/hardware_commands_helper_gen12lp.cpp index c8e783cf48..e7bc0c3125 100644 --- a/runtime/gen12lp/hardware_commands_helper_gen12lp.cpp +++ b/runtime/gen12lp/hardware_commands_helper_gen12lp.cpp @@ -7,9 +7,9 @@ #include "hardware_commands_helper_gen12lp.inl" +#include "core/gen12lp/hw_cmds.h" #include "runtime/command_queue/command_queue.h" #include "runtime/gen12lp/helpers_gen12lp.h" -#include "runtime/gen12lp/hw_cmds.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/helpers/hardware_commands_helper.inl" #include "runtime/helpers/hardware_commands_helper_base.inl" diff --git a/runtime/gen12lp/helpers_gen12lp.h b/runtime/gen12lp/helpers_gen12lp.h index ea55e8e466..e4ce1a5f9b 100644 --- a/runtime/gen12lp/helpers_gen12lp.h +++ b/runtime/gen12lp/helpers_gen12lp.h @@ -7,9 +7,7 @@ #pragma once -#include "runtime/gen12lp/hw_cmds_base.h" - -#include "hw_info.h" +#include "core/gen12lp/hw_cmds_base.h" namespace AubMemDump { struct AubStream; diff --git a/runtime/gen12lp/hw_info_tgllp.inl b/runtime/gen12lp/hw_info_tgllp.inl index 30860a62ed..a01211fe59 100644 --- a/runtime/gen12lp/hw_info_tgllp.inl +++ b/runtime/gen12lp/hw_info_tgllp.inl @@ -5,12 +5,11 @@ * */ +#include "core/gen12lp/hw_cmds.h" #include "core/memory_manager/memory_constants.h" #include "runtime/aub_mem_dump/aub_services.h" -#include "runtime/gen12lp/hw_cmds.h" #include "engine_node.h" -#include "hw_info_tgllp.h" namespace NEO { diff --git a/runtime/gen12lp/image_gen12lp.cpp b/runtime/gen12lp/image_gen12lp.cpp index 2ba05cf1f6..f45c326e74 100644 --- a/runtime/gen12lp/image_gen12lp.cpp +++ b/runtime/gen12lp/image_gen12lp.cpp @@ -5,8 +5,8 @@ * */ +#include "core/gen12lp/hw_cmds.h" #include "runtime/gen12lp/helpers_gen12lp.h" -#include "runtime/gen12lp/hw_cmds.h" #include "runtime/mem_obj/image.h" #include "runtime/mem_obj/image.inl" diff --git a/runtime/gen12lp/linux/hw_info_config_tgllp.inl b/runtime/gen12lp/linux/hw_info_config_tgllp.inl index c0599c2b13..4637cd5162 100644 --- a/runtime/gen12lp/linux/hw_info_config_tgllp.inl +++ b/runtime/gen12lp/linux/hw_info_config_tgllp.inl @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include "runtime/os_interface/hw_info_config.h" namespace NEO { diff --git a/runtime/gen12lp/sampler_gen12lp.cpp b/runtime/gen12lp/sampler_gen12lp.cpp index 847db5e00c..bb4d1ec3c4 100644 --- a/runtime/gen12lp/sampler_gen12lp.cpp +++ b/runtime/gen12lp/sampler_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen12lp/hw_cmds_base.h" +#include "core/gen12lp/hw_cmds_base.h" using Family = NEO::TGLLPFamily; constexpr static auto gfxCore = IGFX_GEN12LP_CORE; #include "runtime/sampler/sampler_tgllp_plus.inl" diff --git a/runtime/gen12lp/tbx_command_stream_receiver_gen12lp.cpp b/runtime/gen12lp/tbx_command_stream_receiver_gen12lp.cpp index 6423489b3f..7632927fa8 100644 --- a/runtime/gen12lp/tbx_command_stream_receiver_gen12lp.cpp +++ b/runtime/gen12lp/tbx_command_stream_receiver_gen12lp.cpp @@ -5,12 +5,12 @@ * */ +#include "core/gen12lp/hw_cmds.h" #include "core/memory_manager/memory_pool.h" #include "runtime/aub_mem_dump/aub_mem_dump.h" #include "runtime/command_stream/command_stream_receiver_with_aub_dump.inl" #include "runtime/command_stream/tbx_command_stream_receiver_hw.h" #include "runtime/command_stream/tbx_command_stream_receiver_hw.inl" -#include "runtime/gen12lp/hw_cmds.h" #include "runtime/helpers/array_count.h" #include "runtime/helpers/base_object.h" diff --git a/runtime/gen12lp/windows/gmm_callbacks_gen12lp.cpp b/runtime/gen12lp/windows/gmm_callbacks_gen12lp.cpp index 16dd49f0e5..f3d2d6d3c7 100644 --- a/runtime/gen12lp/windows/gmm_callbacks_gen12lp.cpp +++ b/runtime/gen12lp/windows/gmm_callbacks_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen12lp/hw_cmds.h" +#include "core/gen12lp/hw_cmds.h" #include "runtime/helpers/gmm_callbacks_tgllp_plus.inl" using namespace NEO; diff --git a/runtime/gen12lp/windows/hw_info_config_gen12lp.cpp b/runtime/gen12lp/windows/hw_info_config_gen12lp.cpp index bc3c25daed..ddb780fc26 100644 --- a/runtime/gen12lp/windows/hw_info_config_gen12lp.cpp +++ b/runtime/gen12lp/windows/hw_info_config_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include "runtime/os_interface/debug_settings_manager.h" #include "runtime/os_interface/hw_info_config.h" #include "runtime/os_interface/hw_info_config.inl" diff --git a/runtime/gen8/buffer_gen8.cpp b/runtime/gen8/buffer_gen8.cpp index dd88f637f7..78ef1efe77 100644 --- a/runtime/gen8/buffer_gen8.cpp +++ b/runtime/gen8/buffer_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen8/hw_cmds.h" +#include "core/gen8/hw_cmds.h" #include "runtime/mem_obj/buffer_bdw_plus.inl" namespace NEO { diff --git a/runtime/gen8/command_stream_receiver_hw_gen8.cpp b/runtime/gen8/command_stream_receiver_hw_gen8.cpp index 0a982a4871..d69040e033 100644 --- a/runtime/gen8/command_stream_receiver_hw_gen8.cpp +++ b/runtime/gen8/command_stream_receiver_hw_gen8.cpp @@ -5,13 +5,11 @@ * */ +#include "core/gen8/hw_cmds.h" #include "runtime/command_stream/command_stream_receiver_hw_bdw_plus.inl" #include "runtime/command_stream/device_command_stream.h" -#include "runtime/gen8/hw_cmds.h" #include "runtime/helpers/blit_commands_helper_bdw_plus.inl" -#include "hw_info.h" - namespace NEO { typedef BDWFamily Family; static auto gfxCore = IGFX_GEN8_CORE; diff --git a/runtime/gen8/device_queue_gen8.cpp b/runtime/gen8/device_queue_gen8.cpp index 5392411156..3909ee9981 100644 --- a/runtime/gen8/device_queue_gen8.cpp +++ b/runtime/gen8/device_queue_gen8.cpp @@ -5,9 +5,9 @@ * */ +#include "core/gen8/hw_cmds.h" #include "runtime/device_queue/device_queue_hw.h" #include "runtime/device_queue/device_queue_hw_bdw_plus.inl" -#include "runtime/gen8/hw_cmds.h" namespace NEO { typedef BDWFamily Family; diff --git a/runtime/gen8/enable_family_full_gen8.cpp b/runtime/gen8/enable_family_full_gen8.cpp index 588d8a00fd..a850be93d0 100644 --- a/runtime/gen8/enable_family_full_gen8.cpp +++ b/runtime/gen8/enable_family_full_gen8.cpp @@ -5,6 +5,7 @@ * */ +#include "core/gen8/hw_cmds.h" #include "core/helpers/hw_helper.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_stream/aub_command_stream_receiver_hw.h" @@ -12,7 +13,6 @@ #include "runtime/command_stream/tbx_command_stream_receiver_hw.h" #include "runtime/device_queue/device_queue_hw.h" #include "runtime/event/perf_counter.h" -#include "runtime/gen8/hw_cmds.h" #include "runtime/mem_obj/buffer.h" #include "runtime/mem_obj/image.h" #include "runtime/sampler/sampler.h" diff --git a/runtime/gen8/enable_gen8.cpp b/runtime/gen8/enable_gen8.cpp index f481ffa6d3..8bea7ebc73 100644 --- a/runtime/gen8/enable_gen8.cpp +++ b/runtime/gen8/enable_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen8/hw_cmds.h" +#include "core/gen8/hw_cmds.h" #include "runtime/helpers/enable_product.inl" #include "runtime/os_interface/hw_info_config.h" diff --git a/runtime/gen8/enable_hw_info_config_gen8.cpp b/runtime/gen8/enable_hw_info_config_gen8.cpp index 71be1abcf8..a196b07ce0 100644 --- a/runtime/gen8/enable_hw_info_config_gen8.cpp +++ b/runtime/gen8/enable_hw_info_config_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen8/hw_cmds.h" +#include "core/gen8/hw_cmds.h" #include "runtime/os_interface/hw_info_config.h" namespace NEO { diff --git a/runtime/gen8/gpgpu_walker_gen8.cpp b/runtime/gen8/gpgpu_walker_gen8.cpp index 96a0d7a285..f6a937fcaf 100644 --- a/runtime/gen8/gpgpu_walker_gen8.cpp +++ b/runtime/gen8/gpgpu_walker_gen8.cpp @@ -5,9 +5,9 @@ * */ +#include "core/gen8/hw_info.h" #include "runtime/command_queue/gpgpu_walker_bdw_plus.inl" #include "runtime/command_queue/hardware_interface_bdw_plus.inl" -#include "runtime/gen8/hw_info.h" namespace NEO { diff --git a/runtime/gen8/hardware_commands_helper_gen8.cpp b/runtime/gen8/hardware_commands_helper_gen8.cpp index 5e36fcd7af..ee1f326154 100644 --- a/runtime/gen8/hardware_commands_helper_gen8.cpp +++ b/runtime/gen8/hardware_commands_helper_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen8/hw_cmds.h" +#include "core/gen8/hw_cmds.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/helpers/hardware_commands_helper.inl" #include "runtime/helpers/hardware_commands_helper_base.inl" diff --git a/runtime/gen8/hw_info_bdw.inl b/runtime/gen8/hw_info_bdw.inl index ac9222a4da..af62236e6b 100644 --- a/runtime/gen8/hw_info_bdw.inl +++ b/runtime/gen8/hw_info_bdw.inl @@ -5,12 +5,11 @@ * */ +#include "core/gen8/hw_cmds.h" #include "core/memory_manager/memory_constants.h" #include "runtime/aub_mem_dump/aub_services.h" -#include "runtime/gen8/hw_cmds.h" #include "engine_node.h" -#include "hw_info.h" namespace NEO { diff --git a/runtime/gen8/image_gen8.cpp b/runtime/gen8/image_gen8.cpp index 03f5b5f800..c3bf7710ea 100644 --- a/runtime/gen8/image_gen8.cpp +++ b/runtime/gen8/image_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen8/hw_cmds.h" +#include "core/gen8/hw_cmds.h" #include "runtime/mem_obj/image.h" #include "runtime/mem_obj/image.inl" diff --git a/runtime/gen8/linux/hw_info_config_bdw.inl b/runtime/gen8/linux/hw_info_config_bdw.inl index e2f74a8c5a..a7dda4399e 100644 --- a/runtime/gen8/linux/hw_info_config_bdw.inl +++ b/runtime/gen8/linux/hw_info_config_bdw.inl @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include "runtime/os_interface/hw_info_config.h" namespace NEO { diff --git a/runtime/gen8/sampler_gen8.cpp b/runtime/gen8/sampler_gen8.cpp index 297ecaf929..6bd0ace6b1 100644 --- a/runtime/gen8/sampler_gen8.cpp +++ b/runtime/gen8/sampler_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen8/hw_cmds.h" +#include "core/gen8/hw_cmds.h" #include "runtime/sampler/sampler.h" #include "runtime/sampler/sampler.inl" diff --git a/runtime/gen8/tbx_command_stream_receiver_gen8.cpp b/runtime/gen8/tbx_command_stream_receiver_gen8.cpp index 08bc53eaae..999db0d490 100644 --- a/runtime/gen8/tbx_command_stream_receiver_gen8.cpp +++ b/runtime/gen8/tbx_command_stream_receiver_gen8.cpp @@ -5,10 +5,10 @@ * */ +#include "core/gen8/hw_cmds.h" #include "runtime/command_stream/command_stream_receiver_with_aub_dump.inl" #include "runtime/command_stream/tbx_command_stream_receiver_hw.h" #include "runtime/command_stream/tbx_command_stream_receiver_hw.inl" -#include "runtime/gen8/hw_cmds.h" #include "runtime/helpers/array_count.h" #include "runtime/helpers/base_object.h" diff --git a/runtime/gen8/windows/gmm_callbacks_gen8.cpp b/runtime/gen8/windows/gmm_callbacks_gen8.cpp index ad19491f18..c6f4631530 100644 --- a/runtime/gen8/windows/gmm_callbacks_gen8.cpp +++ b/runtime/gen8/windows/gmm_callbacks_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen8/hw_cmds.h" +#include "core/gen8/hw_cmds.h" #include "runtime/helpers/gmm_callbacks.h" #include "runtime/helpers/gmm_callbacks.inl" diff --git a/runtime/gen8/windows/hw_info_config_gen8.cpp b/runtime/gen8/windows/hw_info_config_gen8.cpp index 317d1c737d..d379fbc7c4 100644 --- a/runtime/gen8/windows/hw_info_config_gen8.cpp +++ b/runtime/gen8/windows/hw_info_config_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include "runtime/os_interface/hw_info_config.h" #include "runtime/os_interface/hw_info_config.inl" #include "runtime/os_interface/hw_info_config_bdw_plus.inl" diff --git a/runtime/gen9/buffer_gen9.cpp b/runtime/gen9/buffer_gen9.cpp index 4ffdaa2c27..63ecf5db67 100644 --- a/runtime/gen9/buffer_gen9.cpp +++ b/runtime/gen9/buffer_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen9/hw_cmds.h" +#include "core/gen9/hw_cmds.h" #include "runtime/mem_obj/buffer_bdw_plus.inl" namespace NEO { diff --git a/runtime/gen9/command_stream_receiver_hw_gen9.cpp b/runtime/gen9/command_stream_receiver_hw_gen9.cpp index e88f5c3f95..c29d3eda0a 100644 --- a/runtime/gen9/command_stream_receiver_hw_gen9.cpp +++ b/runtime/gen9/command_stream_receiver_hw_gen9.cpp @@ -5,13 +5,11 @@ * */ +#include "core/gen9/hw_cmds.h" #include "runtime/command_stream/command_stream_receiver_hw_bdw_plus.inl" #include "runtime/command_stream/device_command_stream.h" -#include "runtime/gen9/hw_cmds.h" #include "runtime/helpers/blit_commands_helper_bdw_plus.inl" -#include "hw_info.h" - namespace NEO { typedef SKLFamily Family; static auto gfxCore = IGFX_GEN9_CORE; diff --git a/runtime/gen9/device_queue_gen9.cpp b/runtime/gen9/device_queue_gen9.cpp index b50ae885b4..02feed562c 100644 --- a/runtime/gen9/device_queue_gen9.cpp +++ b/runtime/gen9/device_queue_gen9.cpp @@ -5,10 +5,10 @@ * */ +#include "core/gen9/hw_cmds.h" #include "runtime/device_queue/device_queue_hw.h" #include "runtime/device_queue/device_queue_hw_bdw_plus.inl" #include "runtime/device_queue/device_queue_hw_profiling.inl" -#include "runtime/gen9/hw_cmds.h" namespace NEO { typedef SKLFamily Family; diff --git a/runtime/gen9/enable_family_full_gen9.cpp b/runtime/gen9/enable_family_full_gen9.cpp index 9acb3737c5..8054c7f213 100644 --- a/runtime/gen9/enable_family_full_gen9.cpp +++ b/runtime/gen9/enable_family_full_gen9.cpp @@ -5,6 +5,7 @@ * */ +#include "core/gen8/hw_cmds.h" #include "core/helpers/hw_helper.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_stream/aub_command_stream_receiver_hw.h" @@ -12,7 +13,6 @@ #include "runtime/command_stream/tbx_command_stream_receiver_hw.h" #include "runtime/device_queue/device_queue_hw.h" #include "runtime/event/perf_counter.h" -#include "runtime/gen8/hw_cmds.h" #include "runtime/mem_obj/buffer.h" #include "runtime/mem_obj/image.h" #include "runtime/sampler/sampler.h" diff --git a/runtime/gen9/enable_gen9.cpp b/runtime/gen9/enable_gen9.cpp index 9aca7f9c34..a871f64fa5 100644 --- a/runtime/gen9/enable_gen9.cpp +++ b/runtime/gen9/enable_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen9/hw_cmds.h" +#include "core/gen9/hw_cmds.h" #include "runtime/helpers/enable_product.inl" #include "runtime/os_interface/hw_info_config.h" diff --git a/runtime/gen9/enable_hw_info_config_gen9.cpp b/runtime/gen9/enable_hw_info_config_gen9.cpp index 233005a786..e27bf7c97a 100644 --- a/runtime/gen9/enable_hw_info_config_gen9.cpp +++ b/runtime/gen9/enable_hw_info_config_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen9/hw_cmds.h" +#include "core/gen9/hw_cmds.h" #include "runtime/os_interface/hw_info_config.h" namespace NEO { diff --git a/runtime/gen9/gpgpu_walker_gen9.cpp b/runtime/gen9/gpgpu_walker_gen9.cpp index bad1dd1111..863470c64a 100644 --- a/runtime/gen9/gpgpu_walker_gen9.cpp +++ b/runtime/gen9/gpgpu_walker_gen9.cpp @@ -5,9 +5,9 @@ * */ +#include "core/gen9/hw_cmds_base.h" #include "runtime/command_queue/gpgpu_walker_bdw_plus.inl" #include "runtime/command_queue/hardware_interface_bdw_plus.inl" -#include "runtime/gen9/hw_cmds_base.h" namespace NEO { diff --git a/runtime/gen9/hardware_commands_helper_gen9.cpp b/runtime/gen9/hardware_commands_helper_gen9.cpp index ce540379b8..9086809939 100644 --- a/runtime/gen9/hardware_commands_helper_gen9.cpp +++ b/runtime/gen9/hardware_commands_helper_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen9/hw_cmds.h" +#include "core/gen9/hw_cmds.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/helpers/hardware_commands_helper.inl" #include "runtime/helpers/hardware_commands_helper_base.inl" diff --git a/runtime/gen9/hw_info_bxt.inl b/runtime/gen9/hw_info_bxt.inl index 5ad9c24a86..c1e0af4ab4 100644 --- a/runtime/gen9/hw_info_bxt.inl +++ b/runtime/gen9/hw_info_bxt.inl @@ -5,12 +5,11 @@ * */ +#include "core/gen9/hw_cmds.h" #include "core/memory_manager/memory_constants.h" #include "runtime/aub_mem_dump/aub_services.h" -#include "runtime/gen9/hw_cmds.h" #include "engine_node.h" -#include "hw_info_bxt.h" namespace NEO { diff --git a/runtime/gen9/hw_info_cfl.inl b/runtime/gen9/hw_info_cfl.inl index f6de6825c4..503063b4b6 100644 --- a/runtime/gen9/hw_info_cfl.inl +++ b/runtime/gen9/hw_info_cfl.inl @@ -5,12 +5,11 @@ * */ +#include "core/gen9/hw_cmds.h" #include "core/memory_manager/memory_constants.h" #include "runtime/aub_mem_dump/aub_services.h" -#include "runtime/gen9/hw_cmds.h" #include "engine_node.h" -#include "hw_info_cfl.h" namespace NEO { diff --git a/runtime/gen9/hw_info_glk.inl b/runtime/gen9/hw_info_glk.inl index 2a6a0be183..eecc1627a9 100644 --- a/runtime/gen9/hw_info_glk.inl +++ b/runtime/gen9/hw_info_glk.inl @@ -5,12 +5,11 @@ * */ +#include "core/gen9/hw_cmds.h" #include "core/memory_manager/memory_constants.h" #include "runtime/aub_mem_dump/aub_services.h" -#include "runtime/gen9/hw_cmds.h" #include "engine_node.h" -#include "hw_info_glk.h" namespace NEO { diff --git a/runtime/gen9/hw_info_kbl.inl b/runtime/gen9/hw_info_kbl.inl index 9e2ebc1fee..1a0acfe453 100644 --- a/runtime/gen9/hw_info_kbl.inl +++ b/runtime/gen9/hw_info_kbl.inl @@ -5,12 +5,11 @@ * */ +#include "core/gen9/hw_cmds.h" #include "core/memory_manager/memory_constants.h" #include "runtime/aub_mem_dump/aub_services.h" -#include "runtime/gen9/hw_cmds.h" #include "engine_node.h" -#include "hw_info_kbl.h" namespace NEO { diff --git a/runtime/gen9/hw_info_skl.inl b/runtime/gen9/hw_info_skl.inl index ef7bb5fed4..b10ac67c5f 100644 --- a/runtime/gen9/hw_info_skl.inl +++ b/runtime/gen9/hw_info_skl.inl @@ -5,12 +5,11 @@ * */ +#include "core/gen9/hw_cmds.h" #include "core/memory_manager/memory_constants.h" #include "runtime/aub_mem_dump/aub_services.h" -#include "runtime/gen9/hw_cmds.h" #include "engine_node.h" -#include "hw_info_skl.h" namespace NEO { diff --git a/runtime/gen9/image_gen9.cpp b/runtime/gen9/image_gen9.cpp index a6f7a4a922..f0c68a1e41 100644 --- a/runtime/gen9/image_gen9.cpp +++ b/runtime/gen9/image_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen9/hw_cmds.h" +#include "core/gen9/hw_cmds.h" #include "runtime/mem_obj/image.h" #include "runtime/mem_obj/image.inl" diff --git a/runtime/gen9/linux/hw_info_config_bxt.inl b/runtime/gen9/linux/hw_info_config_bxt.inl index c05a190cab..ca8958493e 100644 --- a/runtime/gen9/linux/hw_info_config_bxt.inl +++ b/runtime/gen9/linux/hw_info_config_bxt.inl @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include "runtime/os_interface/hw_info_config.h" #include "runtime/os_interface/linux/drm_neo.h" #include "runtime/os_interface/linux/os_interface.h" diff --git a/runtime/gen9/linux/hw_info_config_cfl.inl b/runtime/gen9/linux/hw_info_config_cfl.inl index ab6a347352..2b0d87fe60 100644 --- a/runtime/gen9/linux/hw_info_config_cfl.inl +++ b/runtime/gen9/linux/hw_info_config_cfl.inl @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include "runtime/os_interface/hw_info_config.h" namespace NEO { diff --git a/runtime/gen9/linux/hw_info_config_glk.inl b/runtime/gen9/linux/hw_info_config_glk.inl index 0df48a7529..ab7e557195 100644 --- a/runtime/gen9/linux/hw_info_config_glk.inl +++ b/runtime/gen9/linux/hw_info_config_glk.inl @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include "runtime/os_interface/hw_info_config.h" #include "runtime/os_interface/linux/drm_neo.h" #include "runtime/os_interface/linux/os_interface.h" diff --git a/runtime/gen9/linux/hw_info_config_kbl.inl b/runtime/gen9/linux/hw_info_config_kbl.inl index 9d12a33904..2b87dfcf63 100644 --- a/runtime/gen9/linux/hw_info_config_kbl.inl +++ b/runtime/gen9/linux/hw_info_config_kbl.inl @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include "runtime/os_interface/hw_info_config.h" namespace NEO { diff --git a/runtime/gen9/linux/hw_info_config_skl.inl b/runtime/gen9/linux/hw_info_config_skl.inl index 613b305a34..64f5f46c36 100644 --- a/runtime/gen9/linux/hw_info_config_skl.inl +++ b/runtime/gen9/linux/hw_info_config_skl.inl @@ -5,8 +5,8 @@ * */ -#include "runtime/gen_common/hw_cmds.h" -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_cmds.h" +#include "core/helpers/hw_info.h" #include "runtime/os_interface/hw_info_config.h" namespace NEO { diff --git a/runtime/gen9/sampler_gen9.cpp b/runtime/gen9/sampler_gen9.cpp index ba38fb4758..e4f224e681 100644 --- a/runtime/gen9/sampler_gen9.cpp +++ b/runtime/gen9/sampler_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen9/hw_cmds.h" +#include "core/gen9/hw_cmds.h" #include "runtime/sampler/sampler.h" #include "runtime/sampler/sampler.inl" diff --git a/runtime/gen9/tbx_command_stream_receiver_gen9.cpp b/runtime/gen9/tbx_command_stream_receiver_gen9.cpp index a37456f2a9..f12f44a37b 100644 --- a/runtime/gen9/tbx_command_stream_receiver_gen9.cpp +++ b/runtime/gen9/tbx_command_stream_receiver_gen9.cpp @@ -5,10 +5,10 @@ * */ +#include "core/gen9/hw_cmds.h" #include "runtime/command_stream/command_stream_receiver_with_aub_dump.inl" #include "runtime/command_stream/tbx_command_stream_receiver_hw.h" #include "runtime/command_stream/tbx_command_stream_receiver_hw.inl" -#include "runtime/gen9/hw_cmds.h" #include "runtime/helpers/array_count.h" #include "runtime/helpers/base_object.h" diff --git a/runtime/gen9/windows/gmm_callbacks_gen9.cpp b/runtime/gen9/windows/gmm_callbacks_gen9.cpp index f237e7e2d0..ac801db00f 100644 --- a/runtime/gen9/windows/gmm_callbacks_gen9.cpp +++ b/runtime/gen9/windows/gmm_callbacks_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen9/hw_cmds.h" +#include "core/gen9/hw_cmds.h" #include "runtime/helpers/gmm_callbacks.h" #include "runtime/helpers/gmm_callbacks.inl" diff --git a/runtime/gen9/windows/hw_info_config_gen9.cpp b/runtime/gen9/windows/hw_info_config_gen9.cpp index fb28a350b4..65c6550791 100644 --- a/runtime/gen9/windows/hw_info_config_gen9.cpp +++ b/runtime/gen9/windows/hw_info_config_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include "runtime/os_interface/hw_info_config.h" #include "runtime/os_interface/hw_info_config.inl" #include "runtime/os_interface/hw_info_config_bdw_plus.inl" diff --git a/runtime/gen_common/CMakeLists.txt b/runtime/gen_common/CMakeLists.txt index f4e78cad17..731dcfe795 100644 --- a/runtime/gen_common/CMakeLists.txt +++ b/runtime/gen_common/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2018 Intel Corporation +# Copyright (C) 2018-2019 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -8,7 +8,6 @@ set(RUNTIME_SRCS_GEN_COMMON ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/aub_mapper.h ${CMAKE_CURRENT_SOURCE_DIR}/aub_mapper_base.h - ${CMAKE_CURRENT_SOURCE_DIR}/hw_cmds.h ${CMAKE_CURRENT_SOURCE_DIR}/reg_configs${BRANCH_DIR_SUFFIX}/reg_configs_common.h ) diff --git a/runtime/gen_common/aub_mapper_base.h b/runtime/gen_common/aub_mapper_base.h index a10e8c47f0..848a966e2d 100644 --- a/runtime/gen_common/aub_mapper_base.h +++ b/runtime/gen_common/aub_mapper_base.h @@ -6,8 +6,8 @@ */ #pragma once +#include "core/helpers/completion_stamp.h" #include "runtime/aub_mem_dump/aub_mem_dump.h" -#include "runtime/helpers/completion_stamp.h" #include diff --git a/runtime/gmm_helper/client_context/gmm_client_context_base.cpp b/runtime/gmm_helper/client_context/gmm_client_context_base.cpp index 871a35941e..5fd4875722 100644 --- a/runtime/gmm_helper/client_context/gmm_client_context_base.cpp +++ b/runtime/gmm_helper/client_context/gmm_client_context_base.cpp @@ -8,9 +8,9 @@ #include "runtime/gmm_helper/client_context/gmm_client_context_base.h" #include "core/helpers/debug_helpers.h" +#include "core/helpers/hw_info.h" #include "core/sku_info/operations/sku_info_transfer.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/helpers/hw_info.h" #include "runtime/os_interface/os_interface.h" #include "runtime/platform/platform.h" diff --git a/runtime/gmm_helper/gmm.cpp b/runtime/gmm_helper/gmm.cpp index d42156959b..a343774623 100644 --- a/runtime/gmm_helper/gmm.cpp +++ b/runtime/gmm_helper/gmm.cpp @@ -10,10 +10,10 @@ #include "core/helpers/aligned_memory.h" #include "core/helpers/debug_helpers.h" #include "core/helpers/hw_helper.h" +#include "core/helpers/hw_info.h" #include "core/helpers/ptr_math.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/gmm_helper/resource_info.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/surface_formats.h" namespace NEO { diff --git a/runtime/gmm_helper/gmm_helper.cpp b/runtime/gmm_helper/gmm_helper.cpp index c6861f8cbc..7a5487c994 100644 --- a/runtime/gmm_helper/gmm_helper.cpp +++ b/runtime/gmm_helper/gmm_helper.cpp @@ -8,12 +8,12 @@ #include "runtime/gmm_helper/gmm_helper.h" #include "core/helpers/debug_helpers.h" +#include "core/helpers/hw_info.h" #include "core/memory_manager/graphics_allocation.h" #include "core/os_interface/os_library.h" #include "core/sku_info/operations/sku_info_transfer.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/helpers/get_info.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/surface_formats.h" #include "runtime/platform/platform.h" diff --git a/runtime/gmm_helper/gmm_utils.cpp b/runtime/gmm_helper/gmm_utils.cpp index 1b94d8a300..5843326ece 100644 --- a/runtime/gmm_helper/gmm_utils.cpp +++ b/runtime/gmm_helper/gmm_utils.cpp @@ -5,10 +5,10 @@ * */ +#include "core/helpers/hw_info.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/gmm_helper/resource_info.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/surface_formats.h" #include "GL/gl.h" diff --git a/runtime/gtpin/gtpin_hw_helper.h b/runtime/gtpin/gtpin_hw_helper.h index c86b9e73be..b20e6c1283 100644 --- a/runtime/gtpin/gtpin_hw_helper.h +++ b/runtime/gtpin/gtpin_hw_helper.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/gen_common/hw_cmds.h" +#include "core/helpers/hw_cmds.h" namespace NEO { class Kernel; diff --git a/runtime/gtpin/gtpin_hw_helper.inl b/runtime/gtpin/gtpin_hw_helper.inl index a847a58b50..43359169d6 100644 --- a/runtime/gtpin/gtpin_hw_helper.inl +++ b/runtime/gtpin/gtpin_hw_helper.inl @@ -5,8 +5,8 @@ * */ +#include "core/helpers/hw_cmds.h" #include "core/helpers/string.h" -#include "runtime/gen_common/hw_cmds.h" #include "runtime/gtpin/gtpin_hw_helper.h" #include "runtime/kernel/kernel.h" diff --git a/runtime/helpers/CMakeLists.txt b/runtime/helpers/CMakeLists.txt index 40a9fb8131..61dab1a2d7 100644 --- a/runtime/helpers/CMakeLists.txt +++ b/runtime/helpers/CMakeLists.txt @@ -18,7 +18,6 @@ set(RUNTIME_SRCS_HELPERS_BASE ${CMAKE_CURRENT_SOURCE_DIR}/cache_policy.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cache_policy.h ${CMAKE_CURRENT_SOURCE_DIR}/cl_helper.h - ${CMAKE_CURRENT_SOURCE_DIR}/completion_stamp.h ${CMAKE_CURRENT_SOURCE_DIR}/convert_color.h ${CMAKE_CURRENT_SOURCE_DIR}/csr_deps.cpp ${CMAKE_CURRENT_SOURCE_DIR}/csr_deps.h @@ -46,10 +45,6 @@ set(RUNTIME_SRCS_HELPERS_BASE ${CMAKE_CURRENT_SOURCE_DIR}/hardware_commands_helper_base.inl ${CMAKE_CURRENT_SOURCE_DIR}/hardware_context_controller.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hardware_context_controller.h - ${CMAKE_CURRENT_SOURCE_DIR}/hw_info.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/hw_info.h - ${CMAKE_CURRENT_SOURCE_DIR}/kmd_notify_properties.h - ${CMAKE_CURRENT_SOURCE_DIR}/kmd_notify_properties.cpp ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mem_properties_parser_helper.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mem_properties_parser_helper.h ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/memory_properties_flags_helpers.cpp diff --git a/runtime/helpers/device_helpers.cpp b/runtime/helpers/device_helpers.cpp index 14144162fa..f6250f35dc 100644 --- a/runtime/helpers/device_helpers.cpp +++ b/runtime/helpers/device_helpers.cpp @@ -7,7 +7,7 @@ #include "runtime/helpers/device_helpers.h" -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include "runtime/os_interface/debug_settings_manager.h" namespace NEO { diff --git a/runtime/helpers/enable_product.inl b/runtime/helpers/enable_product.inl index 99f64b137a..e49b63ea34 100644 --- a/runtime/helpers/enable_product.inl +++ b/runtime/helpers/enable_product.inl @@ -5,7 +5,7 @@ * */ -#include "hw_info.h" +#include "core/helpers/hw_info.h" namespace NEO { template diff --git a/runtime/helpers/flush_stamp.h b/runtime/helpers/flush_stamp.h index 0b353d2629..e19ccd9e65 100644 --- a/runtime/helpers/flush_stamp.h +++ b/runtime/helpers/flush_stamp.h @@ -7,9 +7,9 @@ #pragma once +#include "core/helpers/completion_stamp.h" #include "core/utilities/reference_tracked_object.h" #include "core/utilities/stackvec.h" -#include "runtime/helpers/completion_stamp.h" namespace NEO { struct FlushStampTrackingObj : public ReferenceTrackedObject { diff --git a/runtime/helpers/linux/kmd_notify_properties_linux.cpp b/runtime/helpers/linux/kmd_notify_properties_linux.cpp index 6efe063ed2..5ca10418aa 100644 --- a/runtime/helpers/linux/kmd_notify_properties_linux.cpp +++ b/runtime/helpers/linux/kmd_notify_properties_linux.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/kmd_notify_properties.h" +#include "core/helpers/kmd_notify_properties.h" using namespace NEO; diff --git a/runtime/helpers/options.cpp b/runtime/helpers/options.cpp index 86a6282108..269a11c390 100644 --- a/runtime/helpers/options.cpp +++ b/runtime/helpers/options.cpp @@ -7,7 +7,7 @@ #include "runtime/helpers/options.h" -#include "runtime/gen_common/hw_cmds.h" +#include "core/helpers/hw_cmds.h" #include "runtime/helpers/array_count.h" #include diff --git a/runtime/helpers/state_base_address_base.inl b/runtime/helpers/state_base_address_base.inl index fa1e72944e..a941214d4c 100644 --- a/runtime/helpers/state_base_address_base.inl +++ b/runtime/helpers/state_base_address_base.inl @@ -5,8 +5,8 @@ * */ +#include "core/helpers/hw_cmds.h" #include "core/memory_manager/memory_constants.h" -#include "runtime/gen_common/hw_cmds.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/helpers/cache_policy.h" #include "runtime/helpers/state_base_address.h" diff --git a/runtime/helpers/state_compute_mode_helper.h b/runtime/helpers/state_compute_mode_helper.h index 7069c6ccd7..0d6830c4ee 100644 --- a/runtime/helpers/state_compute_mode_helper.h +++ b/runtime/helpers/state_compute_mode_helper.h @@ -6,8 +6,8 @@ */ #pragma once +#include "core/helpers/hw_cmds.h" #include "runtime/command_stream/csr_definitions.h" -#include "runtime/gen_common/hw_cmds.h" namespace NEO { template diff --git a/runtime/helpers/task_information.h b/runtime/helpers/task_information.h index 5be0954c30..3d4f7fbf02 100644 --- a/runtime/helpers/task_information.h +++ b/runtime/helpers/task_information.h @@ -7,10 +7,10 @@ #pragma once #include "core/command_stream/linear_stream.h" +#include "core/helpers/completion_stamp.h" +#include "core/helpers/hw_info.h" #include "core/utilities/iflist.h" #include "runtime/helpers/blit_commands_helper.h" -#include "runtime/helpers/completion_stamp.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/properties_helper.h" #include "runtime/helpers/timestamp_packet.h" #include "runtime/indirect_heap/indirect_heap.h" diff --git a/runtime/helpers/windows/kmd_notify_properties_windows.cpp b/runtime/helpers/windows/kmd_notify_properties_windows.cpp index 802718c382..d3ad33b690 100644 --- a/runtime/helpers/windows/kmd_notify_properties_windows.cpp +++ b/runtime/helpers/windows/kmd_notify_properties_windows.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/kmd_notify_properties.h" +#include "core/helpers/kmd_notify_properties.h" #include "runtime/os_interface/windows/sys_calls.h" using namespace NEO; diff --git a/runtime/mem_obj/buffer.cpp b/runtime/mem_obj/buffer.cpp index 599c29402b..282ccefa4c 100644 --- a/runtime/mem_obj/buffer.cpp +++ b/runtime/mem_obj/buffer.cpp @@ -9,6 +9,7 @@ #include "core/helpers/aligned_memory.h" #include "core/helpers/hw_helper.h" +#include "core/helpers/hw_info.h" #include "core/helpers/ptr_math.h" #include "core/helpers/string.h" #include "core/memory_manager/host_ptr_manager.h" @@ -19,7 +20,6 @@ #include "runtime/device/device.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/memory_properties_flags_helpers.h" #include "runtime/helpers/timestamp_packet.h" #include "runtime/helpers/validators.h" diff --git a/runtime/mem_obj/buffer_base.inl b/runtime/mem_obj/buffer_base.inl index b4df5603ed..b76469089d 100644 --- a/runtime/mem_obj/buffer_base.inl +++ b/runtime/mem_obj/buffer_base.inl @@ -7,8 +7,8 @@ #include "common/helpers/bit_helpers.h" #include "core/helpers/aligned_memory.h" +#include "core/helpers/hw_cmds.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/gen_common/hw_cmds.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/gmm_helper/resource_info.h" diff --git a/runtime/mem_obj/image.cpp b/runtime/mem_obj/image.cpp index 1cfb436a9b..722b449711 100644 --- a/runtime/mem_obj/image.cpp +++ b/runtime/mem_obj/image.cpp @@ -11,6 +11,7 @@ #include "core/helpers/aligned_memory.h" #include "core/helpers/basic_math.h" #include "core/helpers/hw_helper.h" +#include "core/helpers/hw_info.h" #include "core/helpers/ptr_math.h" #include "core/helpers/string.h" #include "runtime/command_queue/command_queue.h" @@ -20,7 +21,6 @@ #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/gmm_helper/resource_info.h" #include "runtime/helpers/get_info.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/memory_properties_flags_helpers.h" #include "runtime/helpers/mipmap.h" #include "runtime/helpers/surface_formats.h" diff --git a/runtime/mem_obj/image.inl b/runtime/mem_obj/image.inl index 56ab250372..2b1c40f5ee 100644 --- a/runtime/mem_obj/image.inl +++ b/runtime/mem_obj/image.inl @@ -6,8 +6,8 @@ */ #include "core/helpers/aligned_memory.h" +#include "core/helpers/hw_cmds.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/gen_common/hw_cmds.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/gmm_helper/resource_info.h" diff --git a/runtime/memory_manager/memory_manager.cpp b/runtime/memory_manager/memory_manager.cpp index 09d42a064d..7a04163e77 100644 --- a/runtime/memory_manager/memory_manager.cpp +++ b/runtime/memory_manager/memory_manager.cpp @@ -10,6 +10,7 @@ #include "core/helpers/aligned_memory.h" #include "core/helpers/basic_math.h" #include "core/helpers/hw_helper.h" +#include "core/helpers/hw_info.h" #include "core/memory_manager/host_ptr_manager.h" #include "core/utilities/stackvec.h" #include "runtime/command_stream/command_stream_receiver.h" @@ -20,7 +21,6 @@ #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/gmm_helper/resource_info.h" #include "runtime/helpers/hardware_commands_helper.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/mem_obj/image.h" #include "runtime/memory_manager/deferrable_allocation_deletion.h" diff --git a/runtime/memory_manager/os_agnostic_memory_manager.cpp b/runtime/memory_manager/os_agnostic_memory_manager.cpp index f46bdd06ad..a02d077568 100644 --- a/runtime/memory_manager/os_agnostic_memory_manager.cpp +++ b/runtime/memory_manager/os_agnostic_memory_manager.cpp @@ -10,6 +10,7 @@ #include "core/execution_environment/root_device_environment.h" #include "core/helpers/aligned_memory.h" #include "core/helpers/basic_math.h" +#include "core/helpers/hw_info.h" #include "core/helpers/ptr_math.h" #include "core/memory_manager/host_ptr_manager.h" #include "core/os_interface/os_memory.h" @@ -18,7 +19,6 @@ #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/gmm_helper/resource_info.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/helpers/surface_formats.h" diff --git a/runtime/os_interface/hw_info_config.h b/runtime/os_interface/hw_info_config.h index 6353251117..c60547e432 100644 --- a/runtime/os_interface/hw_info_config.h +++ b/runtime/os_interface/hw_info_config.h @@ -7,8 +7,8 @@ #pragma once +#include "core/helpers/hw_info.h" #include "public/cl_ext_private.h" -#include "runtime/helpers/hw_info.h" #include "igfxfmid.h" diff --git a/runtime/os_interface/linux/device_factory_linux.cpp b/runtime/os_interface/linux/device_factory_linux.cpp index 4e6a442d53..cd753f9b8a 100644 --- a/runtime/os_interface/linux/device_factory_linux.cpp +++ b/runtime/os_interface/linux/device_factory_linux.cpp @@ -5,8 +5,8 @@ * */ +#include "core/helpers/hw_info.h" #include "runtime/device/device.h" -#include "runtime/helpers/hw_info.h" #include "runtime/os_interface/device_factory.h" #include "runtime/os_interface/hw_info_config.h" #include "runtime/os_interface/linux/drm_memory_operations_handler.h" diff --git a/runtime/os_interface/linux/drm_memory_manager.cpp b/runtime/os_interface/linux/drm_memory_manager.cpp index a953ef5b2c..4864e0c6db 100644 --- a/runtime/os_interface/linux/drm_memory_manager.cpp +++ b/runtime/os_interface/linux/drm_memory_manager.cpp @@ -7,6 +7,7 @@ #include "runtime/os_interface/linux/drm_memory_manager.h" +#include "core/helpers/hw_info.h" #include "core/helpers/ptr_math.h" #include "core/memory_manager/host_ptr_manager.h" #include "runtime/command_stream/command_stream_receiver.h" @@ -15,7 +16,6 @@ #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/gmm_helper/resource_info.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/helpers/surface_formats.h" #include "runtime/os_interface/linux/allocator_helper.h" diff --git a/runtime/os_interface/linux/drm_neo.cpp b/runtime/os_interface/linux/drm_neo.cpp index 75596228e2..adb382f5e1 100644 --- a/runtime/os_interface/linux/drm_neo.cpp +++ b/runtime/os_interface/linux/drm_neo.cpp @@ -7,9 +7,9 @@ #include "drm_neo.h" +#include "core/helpers/hw_info.h" #include "core/memory_manager/memory_constants.h" #include "core/utilities/directory.h" -#include "runtime/helpers/hw_info.h" #include "runtime/os_interface/os_inc_base.h" #include diff --git a/runtime/os_interface/linux/hw_info_config.cpp b/runtime/os_interface/linux/hw_info_config.cpp index f3cf07282e..a94cba9ec3 100644 --- a/runtime/os_interface/linux/hw_info_config.cpp +++ b/runtime/os_interface/linux/hw_info_config.cpp @@ -8,11 +8,11 @@ #include "runtime/os_interface/hw_info_config.h" #include "core/command_stream/preemption.h" +#include "core/helpers/hw_cmds.h" #include "core/helpers/hw_helper.h" +#include "core/helpers/hw_info.h" #include "core/memory_manager/memory_constants.h" #include "core/utilities/cpu_info.h" -#include "runtime/gen_common/hw_cmds.h" -#include "runtime/helpers/hw_info.h" #include "runtime/os_interface/debug_settings_manager.h" #include "runtime/os_interface/linux/drm_neo.h" #include "runtime/os_interface/linux/os_interface.h" diff --git a/runtime/os_interface/os_time.cpp b/runtime/os_interface/os_time.cpp index daab0028c5..09b2f2a820 100644 --- a/runtime/os_interface/os_time.cpp +++ b/runtime/os_interface/os_time.cpp @@ -7,7 +7,7 @@ #include "runtime/os_interface/os_time.h" -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" namespace NEO { diff --git a/runtime/os_interface/windows/device_command_stream.inl b/runtime/os_interface/windows/device_command_stream.inl index 93d8522d7d..6cd8c9ae0c 100644 --- a/runtime/os_interface/windows/device_command_stream.inl +++ b/runtime/os_interface/windows/device_command_stream.inl @@ -9,9 +9,9 @@ // Current order must be preserved due to two versions of igfxfmid.h #pragma warning(push) #pragma warning(disable : 4005) +#include "core/helpers/hw_cmds.h" #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h" #include "runtime/command_stream/device_command_stream.h" -#include "runtime/gen_common/hw_cmds.h" #include "runtime/os_interface/windows/wddm_device_command_stream.h" #pragma warning(pop) diff --git a/runtime/os_interface/windows/hw_info_config.cpp b/runtime/os_interface/windows/hw_info_config.cpp index 67bbddbe86..57a87176db 100644 --- a/runtime/os_interface/windows/hw_info_config.cpp +++ b/runtime/os_interface/windows/hw_info_config.cpp @@ -8,10 +8,10 @@ #include "runtime/os_interface/hw_info_config.h" #include "core/command_stream/preemption.h" +#include "core/helpers/hw_cmds.h" #include "core/helpers/hw_helper.h" +#include "core/helpers/hw_info.h" #include "core/memory_manager/memory_constants.h" -#include "runtime/gen_common/hw_cmds.h" -#include "runtime/helpers/hw_info.h" #include "runtime/os_interface/debug_settings_manager.h" #include "instrumentation.h" diff --git a/runtime/os_interface/windows/wddm/wddm_interface.h b/runtime/os_interface/windows/wddm/wddm_interface.h index 8a8348b943..ab74c1277d 100644 --- a/runtime/os_interface/windows/wddm/wddm_interface.h +++ b/runtime/os_interface/windows/wddm/wddm_interface.h @@ -6,8 +6,8 @@ */ #pragma once +#include "core/helpers/hw_info.h" #include "core/os_interface/windows/windows_wrapper.h" -#include "runtime/helpers/hw_info.h" #include "runtime/os_interface/os_context.h" #include diff --git a/runtime/os_interface/windows/wddm_device_command_stream.inl b/runtime/os_interface/windows/wddm_device_command_stream.inl index e8fef47a7a..9233806167 100644 --- a/runtime/os_interface/windows/wddm_device_command_stream.inl +++ b/runtime/os_interface/windows/wddm_device_command_stream.inl @@ -11,9 +11,9 @@ #pragma warning(disable : 4005) #include "core/command_stream/linear_stream.h" #include "core/command_stream/preemption.h" +#include "core/helpers/hw_cmds.h" #include "core/helpers/ptr_math.h" #include "runtime/device/device.h" -#include "runtime/gen_common/hw_cmds.h" #include "runtime/gmm_helper/page_table_mngr.h" #include "runtime/helpers/flush_stamp.h" #include "runtime/helpers/gmm_callbacks.h" diff --git a/runtime/os_interface/windows/wddm_engine_mapper.cpp b/runtime/os_interface/windows/wddm_engine_mapper.cpp index a5ff93b147..83e1159857 100644 --- a/runtime/os_interface/windows/wddm_engine_mapper.cpp +++ b/runtime/os_interface/windows/wddm_engine_mapper.cpp @@ -7,7 +7,7 @@ #include "runtime/os_interface/windows/wddm_engine_mapper.h" -#include "runtime/gen_common/hw_cmds.h" +#include "core/helpers/hw_cmds.h" namespace NEO { diff --git a/runtime/platform/extensions.cpp b/runtime/platform/extensions.cpp index cfcc74c38a..2786c636a9 100644 --- a/runtime/platform/extensions.cpp +++ b/runtime/platform/extensions.cpp @@ -7,7 +7,7 @@ #include "runtime/platform/extensions.h" -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include diff --git a/runtime/platform/extensions.h b/runtime/platform/extensions.h index 8279b7899e..955b14744a 100644 --- a/runtime/platform/extensions.h +++ b/runtime/platform/extensions.h @@ -7,7 +7,7 @@ #pragma once -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include diff --git a/runtime/program/kernel_info.cpp b/runtime/program/kernel_info.cpp index 882064bc4b..ac6c8fafe6 100644 --- a/runtime/program/kernel_info.cpp +++ b/runtime/program/kernel_info.cpp @@ -6,11 +6,11 @@ */ #include "core/helpers/aligned_memory.h" +#include "core/helpers/hw_cmds.h" #include "core/helpers/ptr_math.h" #include "core/helpers/string.h" #include "runtime/compiler_interface/patchtokens_decoder.h" #include "runtime/device/device.h" -#include "runtime/gen_common/hw_cmds.h" #include "runtime/helpers/dispatch_info.h" #include "runtime/kernel/kernel.h" #include "runtime/mem_obj/buffer.h" diff --git a/runtime/program/kernel_info.h b/runtime/program/kernel_info.h index d04a2568c0..cd11bdfb5a 100644 --- a/runtime/program/kernel_info.h +++ b/runtime/program/kernel_info.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include "CL/cl.h" #include "heap_info.h" diff --git a/runtime/sampler/sampler.cpp b/runtime/sampler/sampler.cpp index 11c2203ce1..9eab2bb292 100644 --- a/runtime/sampler/sampler.cpp +++ b/runtime/sampler/sampler.cpp @@ -7,10 +7,10 @@ #include "runtime/sampler/sampler.h" +#include "core/helpers/hw_info.h" #include "runtime/context/context.h" #include "runtime/device/device.h" #include "runtime/helpers/get_info.h" -#include "runtime/helpers/hw_info.h" #include "patch_list.h" diff --git a/runtime/sharings/gl/gl_texture.cpp b/runtime/sharings/gl/gl_texture.cpp index c8ef433cac..5905608890 100644 --- a/runtime/sharings/gl/gl_texture.cpp +++ b/runtime/sharings/gl/gl_texture.cpp @@ -8,6 +8,7 @@ #include "runtime/sharings/gl/gl_texture.h" #include "core/helpers/hw_helper.h" +#include "core/helpers/hw_info.h" #include "public/cl_gl_private_intel.h" #include "runtime/context/context.h" #include "runtime/device/device.h" @@ -15,7 +16,6 @@ #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/gmm_helper/resource_info.h" #include "runtime/helpers/get_info.h" -#include "runtime/helpers/hw_info.h" #include "runtime/mem_obj/image.h" #include "runtime/memory_manager/memory_manager.h" diff --git a/unit_tests/api/cl_create_image_tests.cpp b/unit_tests/api/cl_create_image_tests.cpp index 369bc8a848..b95815ca6a 100644 --- a/unit_tests/api/cl_create_image_tests.cpp +++ b/unit_tests/api/cl_create_image_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/helpers/hw_info.h" #include "runtime/context/context.h" -#include "runtime/helpers/hw_info.h" #include "unit_tests/helpers/unit_test_helper.h" #include "unit_tests/mocks/mock_device.h" diff --git a/unit_tests/api/cl_get_device_info_tests.inl b/unit_tests/api/cl_get_device_info_tests.inl index 9beb74df51..be958f860e 100644 --- a/unit_tests/api/cl_get_device_info_tests.inl +++ b/unit_tests/api/cl_get_device_info_tests.inl @@ -5,8 +5,8 @@ * */ +#include "core/helpers/hw_info.h" #include "runtime/device/device.h" -#include "runtime/helpers/hw_info.h" #include "cl_api_tests.h" diff --git a/unit_tests/api/cl_get_image_info_tests.inl b/unit_tests/api/cl_get_image_info_tests.inl index 70286e98ed..c22300598f 100644 --- a/unit_tests/api/cl_get_image_info_tests.inl +++ b/unit_tests/api/cl_get_image_info_tests.inl @@ -5,8 +5,8 @@ * */ +#include "core/helpers/hw_info.h" #include "runtime/context/context.h" -#include "runtime/helpers/hw_info.h" #include "runtime/mem_obj/image.h" #include "unit_tests/mocks/mock_device.h" diff --git a/unit_tests/api/cl_get_image_params_tests.inl b/unit_tests/api/cl_get_image_params_tests.inl index ab55da4bfb..6bda999a38 100644 --- a/unit_tests/api/cl_get_image_params_tests.inl +++ b/unit_tests/api/cl_get_image_params_tests.inl @@ -5,8 +5,8 @@ * */ +#include "core/helpers/hw_info.h" #include "runtime/context/context.h" -#include "runtime/helpers/hw_info.h" #include "unit_tests/mocks/mock_device.h" #include "cl_api_tests.h" diff --git a/unit_tests/api/cl_mem_locally_uncached_resource_tests.cpp b/unit_tests/api/cl_mem_locally_uncached_resource_tests.cpp index e66608bf7d..99569355e3 100644 --- a/unit_tests/api/cl_mem_locally_uncached_resource_tests.cpp +++ b/unit_tests/api/cl_mem_locally_uncached_resource_tests.cpp @@ -5,13 +5,13 @@ * */ +#include "core/helpers/hw_cmds.h" #include "core/unit_tests/utilities/base_object_utils.h" #include "public/cl_ext_private.h" #include "runtime/api/api.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/device/device.h" -#include "runtime/gen_common/hw_cmds.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/helpers/state_base_address.h" #include "runtime/kernel/kernel.h" diff --git a/unit_tests/api/gl/cl_get_gl_context_info_khr_tests.cpp b/unit_tests/api/gl/cl_get_gl_context_info_khr_tests.cpp index 2dc5af5dd7..cba833c2a1 100644 --- a/unit_tests/api/gl/cl_get_gl_context_info_khr_tests.cpp +++ b/unit_tests/api/gl/cl_get_gl_context_info_khr_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/helpers/hw_info.h" #include "runtime/device/device.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "unit_tests/api/cl_api_tests.h" #include "unit_tests/os_interface/windows/gl/gl_dll_helper.h" diff --git a/unit_tests/api/gl/cl_get_gl_device_info_tests.cpp b/unit_tests/api/gl/cl_get_gl_device_info_tests.cpp index e265be8ffe..98a719ec7b 100644 --- a/unit_tests/api/gl/cl_get_gl_device_info_tests.cpp +++ b/unit_tests/api/gl/cl_get_gl_device_info_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/helpers/hw_info.h" #include "runtime/device/device.h" -#include "runtime/helpers/hw_info.h" #include "unit_tests/api/cl_api_tests.h" #include diff --git a/unit_tests/aub/aub_center_tests.cpp b/unit_tests/aub/aub_center_tests.cpp index 5f51c95233..12d86cec52 100644 --- a/unit_tests/aub/aub_center_tests.cpp +++ b/unit_tests/aub/aub_center_tests.cpp @@ -6,8 +6,8 @@ */ #include "core/helpers/basic_math.h" +#include "core/helpers/hw_info.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/os_interface/debug_settings_manager.h" #include "unit_tests/mocks/mock_aub_center.h" diff --git a/unit_tests/aub/aub_center_using_aubstream_stubs_tests.cpp b/unit_tests/aub/aub_center_using_aubstream_stubs_tests.cpp index 408ace27cb..b90edbffd2 100644 --- a/unit_tests/aub/aub_center_using_aubstream_stubs_tests.cpp +++ b/unit_tests/aub/aub_center_using_aubstream_stubs_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/helpers/hw_info.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/os_interface/debug_settings_manager.h" #include "unit_tests/helpers/variable_backup.h" diff --git a/unit_tests/aub_tests/gen11/aub_tests_configuration_gen11.cpp b/unit_tests/aub_tests/gen11/aub_tests_configuration_gen11.cpp index 586b7df881..f4af47f726 100644 --- a/unit_tests/aub_tests/gen11/aub_tests_configuration_gen11.cpp +++ b/unit_tests/aub_tests/gen11/aub_tests_configuration_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen_common/hw_cmds.h" +#include "core/helpers/hw_cmds.h" #include "unit_tests/aub_tests/aub_tests_configuration.inl" using namespace NEO; diff --git a/unit_tests/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp b/unit_tests/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp index 041bdcee3d..23fa088705 100644 --- a/unit_tests/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp +++ b/unit_tests/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen_common/hw_cmds.h" +#include "core/helpers/hw_cmds.h" #include "unit_tests/aub_tests/aub_tests_configuration.h" using namespace NEO; diff --git a/unit_tests/aub_tests/gen8/aub_tests_configuration_gen8.cpp b/unit_tests/aub_tests/gen8/aub_tests_configuration_gen8.cpp index 8735553d36..e9a627f62b 100644 --- a/unit_tests/aub_tests/gen8/aub_tests_configuration_gen8.cpp +++ b/unit_tests/aub_tests/gen8/aub_tests_configuration_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen_common/hw_cmds.h" +#include "core/helpers/hw_cmds.h" #include "unit_tests/aub_tests/aub_tests_configuration.inl" using namespace NEO; diff --git a/unit_tests/aub_tests/gen9/aub_tests_configuration_gen9.cpp b/unit_tests/aub_tests/gen9/aub_tests_configuration_gen9.cpp index 6f4891db9f..9aa7546bc3 100644 --- a/unit_tests/aub_tests/gen9/aub_tests_configuration_gen9.cpp +++ b/unit_tests/aub_tests/gen9/aub_tests_configuration_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen_common/hw_cmds.h" +#include "core/helpers/hw_cmds.h" #include "unit_tests/aub_tests/aub_tests_configuration.inl" using namespace NEO; diff --git a/unit_tests/device/gl/device_caps_gl_tests.cpp b/unit_tests/device/gl/device_caps_gl_tests.cpp index 41186e9601..b59824969d 100644 --- a/unit_tests/device/gl/device_caps_gl_tests.cpp +++ b/unit_tests/device/gl/device_caps_gl_tests.cpp @@ -6,8 +6,8 @@ */ #include "core/helpers/basic_math.h" +#include "core/helpers/hw_info.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" #include "runtime/os_interface/debug_settings_manager.h" diff --git a/unit_tests/device_queue/device_queue_hw_tests.cpp b/unit_tests/device_queue/device_queue_hw_tests.cpp index 59718d7cf0..78d33a6021 100644 --- a/unit_tests/device_queue/device_queue_hw_tests.cpp +++ b/unit_tests/device_queue/device_queue_hw_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/helpers/hw_cmds.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_queue/gpgpu_walker.h" -#include "runtime/gen_common/hw_cmds.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/helpers/options.h" #include "runtime/utilities/tag_allocator.h" diff --git a/unit_tests/event/event_tests.cpp b/unit_tests/event/event_tests.cpp index f3a876441d..53e3571eed 100644 --- a/unit_tests/event/event_tests.cpp +++ b/unit_tests/event/event_tests.cpp @@ -5,11 +5,11 @@ * */ +#include "core/helpers/hw_info.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/event/perf_counter.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/task_information.h" #include "runtime/memory_manager/internal_allocation_storage.h" #include "runtime/memory_manager/surface.h" diff --git a/unit_tests/fixtures/buffer_enqueue_fixture.h b/unit_tests/fixtures/buffer_enqueue_fixture.h index 9dbeac9114..794f9f5d01 100644 --- a/unit_tests/fixtures/buffer_enqueue_fixture.h +++ b/unit_tests/fixtures/buffer_enqueue_fixture.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include "runtime/memory_manager/internal_allocation_storage.h" #include "test.h" #include "unit_tests/fixtures/buffer_fixture.h" diff --git a/unit_tests/fixtures/image_fixture.h b/unit_tests/fixtures/image_fixture.h index 651dd98107..8fe34f1eb1 100644 --- a/unit_tests/fixtures/image_fixture.h +++ b/unit_tests/fixtures/image_fixture.h @@ -6,9 +6,9 @@ */ #pragma once +#include "core/helpers/hw_info.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/gmm_helper/gmm_helper.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/memory_properties_flags_helpers.h" #include "runtime/helpers/options.h" #include "runtime/mem_obj/image.h" diff --git a/unit_tests/gen11/scheduler_source_tests_gen11.cpp b/unit_tests/gen11/scheduler_source_tests_gen11.cpp index 0c5ce925ae..a2426c265f 100644 --- a/unit_tests/gen11/scheduler_source_tests_gen11.cpp +++ b/unit_tests/gen11/scheduler_source_tests_gen11.cpp @@ -5,8 +5,8 @@ * */ +#include "core/gen11/hw_cmds.h" #include "runtime/device_queue/device_queue_hw.h" -#include "runtime/gen11/hw_cmds.h" // Keep the order of device_enqueue.h and scheduler_definitions.h as the latter uses defines from the first one #include "runtime/gen11/device_enqueue.h" diff --git a/unit_tests/gen11/unit_test_helper_gen11.cpp b/unit_tests/gen11/unit_test_helper_gen11.cpp index 470da22a6d..aae37d77f9 100644 --- a/unit_tests/gen11/unit_test_helper_gen11.cpp +++ b/unit_tests/gen11/unit_test_helper_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen11/hw_info.h" +#include "core/gen11/hw_info.h" #include "unit_tests/helpers/unit_test_helper.h" #include "unit_tests/helpers/unit_test_helper.inl" diff --git a/unit_tests/gen12lp/scheduler_source_tests_gen12lp.inl b/unit_tests/gen12lp/scheduler_source_tests_gen12lp.inl index c975fbbf09..9eebe66f29 100644 --- a/unit_tests/gen12lp/scheduler_source_tests_gen12lp.inl +++ b/unit_tests/gen12lp/scheduler_source_tests_gen12lp.inl @@ -5,8 +5,8 @@ * */ +#include "core/gen12lp/hw_cmds.h" #include "runtime/device_queue/device_queue_hw.h" -#include "runtime/gen12lp/hw_cmds.h" // Keep the order of device_enqueue.h and scheduler_definitions.h as the latter uses defines from the first one #include "runtime/gen12lp/device_enqueue.h" diff --git a/unit_tests/gen12lp/special_ult_helper_gen12lp.cpp b/unit_tests/gen12lp/special_ult_helper_gen12lp.cpp index cd62d392ff..e64593745e 100644 --- a/unit_tests/gen12lp/special_ult_helper_gen12lp.cpp +++ b/unit_tests/gen12lp/special_ult_helper_gen12lp.cpp @@ -7,7 +7,7 @@ #include "unit_tests/gen12lp/special_ult_helper_gen12lp.h" -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" namespace NEO { diff --git a/unit_tests/gen12lp/unit_test_helper_gen12lp.cpp b/unit_tests/gen12lp/unit_test_helper_gen12lp.cpp index 70baa8c5cb..3c8311b60a 100644 --- a/unit_tests/gen12lp/unit_test_helper_gen12lp.cpp +++ b/unit_tests/gen12lp/unit_test_helper_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen12lp/hw_info.h" +#include "core/gen12lp/hw_info.h" #include "unit_tests/gen12lp/special_ult_helper_gen12lp.h" #include "unit_tests/helpers/unit_test_helper.h" #include "unit_tests/helpers/unit_test_helper.inl" diff --git a/unit_tests/gen8/scheduler_source_tests_gen8.cpp b/unit_tests/gen8/scheduler_source_tests_gen8.cpp index 4bff3f3b42..35d1ce71e5 100644 --- a/unit_tests/gen8/scheduler_source_tests_gen8.cpp +++ b/unit_tests/gen8/scheduler_source_tests_gen8.cpp @@ -5,8 +5,8 @@ * */ +#include "core/gen8/hw_cmds.h" #include "runtime/device_queue/device_queue_hw.h" -#include "runtime/gen8/hw_cmds.h" // Keep the order of device_enqueue.h and scheduler_definitions.h as the latter uses defines from the first one #include "runtime/gen8/device_enqueue.h" diff --git a/unit_tests/gen8/unit_test_helper_gen8.cpp b/unit_tests/gen8/unit_test_helper_gen8.cpp index 3dc919703b..6a81077dc3 100644 --- a/unit_tests/gen8/unit_test_helper_gen8.cpp +++ b/unit_tests/gen8/unit_test_helper_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen8/hw_info.h" +#include "core/gen8/hw_info.h" #include "unit_tests/helpers/unit_test_helper.h" #include "unit_tests/helpers/unit_test_helper.inl" diff --git a/unit_tests/gen9/scheduler_source_tests_gen9.cpp b/unit_tests/gen9/scheduler_source_tests_gen9.cpp index 26605e5fad..a67fa652d4 100644 --- a/unit_tests/gen9/scheduler_source_tests_gen9.cpp +++ b/unit_tests/gen9/scheduler_source_tests_gen9.cpp @@ -5,8 +5,8 @@ * */ +#include "core/gen9/hw_cmds.h" #include "runtime/device_queue/device_queue_hw.h" -#include "runtime/gen9/hw_cmds.h" // Keep the order of device_enqueue.h and scheduler_definitions.h as the latter uses defines from the first one #include "runtime/gen9/device_enqueue.h" diff --git a/unit_tests/gen9/unit_test_helper_gen9.cpp b/unit_tests/gen9/unit_test_helper_gen9.cpp index f6dd09b961..9a519093f7 100644 --- a/unit_tests/gen9/unit_test_helper_gen9.cpp +++ b/unit_tests/gen9/unit_test_helper_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen9/hw_info.h" +#include "core/gen9/hw_info.h" #include "unit_tests/helpers/unit_test_helper.h" #include "unit_tests/helpers/unit_test_helper.inl" diff --git a/unit_tests/gen_common/exclude_tests/exclude_test_declare.cpp b/unit_tests/gen_common/exclude_tests/exclude_test_declare.cpp index f38855ae64..219c0db579 100644 --- a/unit_tests/gen_common/exclude_tests/exclude_test_declare.cpp +++ b/unit_tests/gen_common/exclude_tests/exclude_test_declare.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include "test.h" #include diff --git a/unit_tests/gen_common/gen_cmd_parse.h b/unit_tests/gen_common/gen_cmd_parse.h index e3f8c31e45..027683bdc1 100644 --- a/unit_tests/gen_common/gen_cmd_parse.h +++ b/unit_tests/gen_common/gen_cmd_parse.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/gen_common/hw_cmds.h" +#include "core/helpers/hw_cmds.h" #include #include diff --git a/unit_tests/gen_common/hw_cmds_tests.cpp b/unit_tests/gen_common/hw_cmds_tests.cpp index cdc90a0a50..323b01f35f 100644 --- a/unit_tests/gen_common/hw_cmds_tests.cpp +++ b/unit_tests/gen_common/hw_cmds_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen_common/hw_cmds.h" +#include "core/helpers/hw_cmds.h" #include "runtime/helpers/hardware_commands_helper.h" #include "test.h" #include "unit_tests/mocks/mock_device.h" diff --git a/unit_tests/global_environment.cpp b/unit_tests/global_environment.cpp index bb6c1ba552..23b31fdb18 100644 --- a/unit_tests/global_environment.cpp +++ b/unit_tests/global_environment.cpp @@ -7,7 +7,7 @@ #include "global_environment.h" -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include "runtime/os_interface/os_inc_base.h" TestEnvironment::TestEnvironment(void) diff --git a/unit_tests/global_environment.h b/unit_tests/global_environment.h index e0f32e607d..61059b0310 100644 --- a/unit_tests/global_environment.h +++ b/unit_tests/global_environment.h @@ -6,8 +6,8 @@ */ #pragma once +#include "core/helpers/hw_info.h" #include "core/os_interface/os_library.h" -#include "runtime/helpers/hw_info.h" #include "unit_tests/mocks/mock_compilers.h" #include "gtest/gtest.h" diff --git a/unit_tests/gmm_helper/gmm_helper_tests.cpp b/unit_tests/gmm_helper/gmm_helper_tests.cpp index 1c6386efdb..96adcb9445 100644 --- a/unit_tests/gmm_helper/gmm_helper_tests.cpp +++ b/unit_tests/gmm_helper/gmm_helper_tests.cpp @@ -5,11 +5,11 @@ * */ +#include "core/helpers/hw_info.h" #include "core/helpers/ptr_math.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" #include "runtime/platform/platform.h" diff --git a/unit_tests/gmm_helper/gmm_interface_tests.cpp b/unit_tests/gmm_helper/gmm_interface_tests.cpp index f9b1264989..672b4847f0 100644 --- a/unit_tests/gmm_helper/gmm_interface_tests.cpp +++ b/unit_tests/gmm_helper/gmm_interface_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "core/helpers/hw_info.h" #include "core/sku_info/operations/sku_info_transfer.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/gmm_helper/gmm_helper.h" -#include "runtime/helpers/hw_info.h" #include "runtime/os_interface/os_interface.h" #include "runtime/platform/platform.h" #include "unit_tests/helpers/variable_backup.h" diff --git a/unit_tests/helpers/hw_helper_default_tests.cpp b/unit_tests/helpers/hw_helper_default_tests.cpp index 39df2bf461..89788ce9c0 100644 --- a/unit_tests/helpers/hw_helper_default_tests.cpp +++ b/unit_tests/helpers/hw_helper_default_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include "unit_tests/helpers/hw_helper_tests.h" void testDefaultImplementationOfSetupHardwareCapabilities(HwHelper &hwHelper, const HardwareInfo &hwInfo) { diff --git a/unit_tests/helpers/linux/kmd_notify_linux_tests.cpp b/unit_tests/helpers/linux/kmd_notify_linux_tests.cpp index 6d84ed8ac9..9cf4ffa1b7 100644 --- a/unit_tests/helpers/linux/kmd_notify_linux_tests.cpp +++ b/unit_tests/helpers/linux/kmd_notify_linux_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/kmd_notify_properties.h" +#include "core/helpers/kmd_notify_properties.h" #include "runtime/helpers/options.h" #include "test.h" diff --git a/unit_tests/helpers/unit_test_helper.h b/unit_tests/helpers/unit_test_helper.h index d95f67ee2d..c2b5d741a9 100644 --- a/unit_tests/helpers/unit_test_helper.h +++ b/unit_tests/helpers/unit_test_helper.h @@ -7,7 +7,7 @@ #pragma once -#include "runtime/gen_common/hw_cmds.h" +#include "core/helpers/hw_cmds.h" #include "runtime/helpers/properties_helper.h" namespace NEO { diff --git a/unit_tests/helpers/windows/kmd_notify_windows_tests.cpp b/unit_tests/helpers/windows/kmd_notify_windows_tests.cpp index 50baf822da..84f98e724f 100644 --- a/unit_tests/helpers/windows/kmd_notify_windows_tests.cpp +++ b/unit_tests/helpers/windows/kmd_notify_windows_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/kmd_notify_properties.h" +#include "core/helpers/kmd_notify_properties.h" #include "runtime/helpers/options.h" #include "runtime/os_interface/windows/sys_calls.h" #include "test.h" diff --git a/unit_tests/igdrcl_tests_pch.h b/unit_tests/igdrcl_tests_pch.h index 9ceeffb3e2..f9082c55c5 100644 --- a/unit_tests/igdrcl_tests_pch.h +++ b/unit_tests/igdrcl_tests_pch.h @@ -7,14 +7,14 @@ #include "core/gmm_helper/gmm_lib.h" #include "core/helpers/abort.h" +#include "core/helpers/completion_stamp.h" #include "core/helpers/debug_helpers.h" +#include "core/helpers/hw_cmds.h" +#include "core/helpers/hw_info.h" +#include "core/helpers/kmd_notify_properties.h" #include "core/helpers/ptr_math.h" #include "core/memory_manager/memory_constants.h" #include "core/sku_info/sku_info_base.h" -#include "runtime/gen_common/hw_cmds.h" -#include "runtime/helpers/completion_stamp.h" -#include "runtime/helpers/hw_info.h" -#include "runtime/helpers/kmd_notify_properties.h" #include "test.h" #include "unit_tests/gen_common/gen_cmd_parse.h" diff --git a/unit_tests/mocks/mock_aub_csr.h b/unit_tests/mocks/mock_aub_csr.h index 15e9a68eee..0aba4d0517 100644 --- a/unit_tests/mocks/mock_aub_csr.h +++ b/unit_tests/mocks/mock_aub_csr.h @@ -9,9 +9,9 @@ #include "core/command_stream/preemption.h" #include "core/execution_environment/root_device_environment.h" +#include "core/helpers/hw_info.h" #include "runtime/command_stream/aub_command_stream_receiver_hw.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/helpers/hw_info.h" #include "runtime/platform/platform.h" #include "unit_tests/mocks/mock_allocation_properties.h" diff --git a/unit_tests/mocks/mock_compilers.cpp b/unit_tests/mocks/mock_compilers.cpp index f2bea1c6d5..24b96dfd22 100644 --- a/unit_tests/mocks/mock_compilers.cpp +++ b/unit_tests/mocks/mock_compilers.cpp @@ -8,7 +8,7 @@ #include "mock_compilers.h" #include "core/helpers/file_io.h" -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/os_interface/os_inc_base.h" #include "unit_tests/helpers/test_files.h" diff --git a/unit_tests/mocks/mock_csr.h b/unit_tests/mocks/mock_csr.h index 7325e1a86b..f4ea85187d 100644 --- a/unit_tests/mocks/mock_csr.h +++ b/unit_tests/mocks/mock_csr.h @@ -6,6 +6,7 @@ */ #pragma once +#include "core/helpers/hw_info.h" #include "core/helpers/string.h" #include "core/memory_manager/graphics_allocation.h" #include "runtime/command_stream/command_stream_receiver.h" @@ -13,7 +14,6 @@ #include "runtime/execution_environment/execution_environment.h" #include "runtime/helpers/flat_batch_buffer_helper_hw.h" #include "runtime/helpers/flush_stamp.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/os_interface/os_context.h" #include "unit_tests/libult/ult_command_stream_receiver.h" diff --git a/unit_tests/mocks/mock_sip.cpp b/unit_tests/mocks/mock_sip.cpp index 637ad21d1a..0cb9707528 100644 --- a/unit_tests/mocks/mock_sip.cpp +++ b/unit_tests/mocks/mock_sip.cpp @@ -8,7 +8,7 @@ #include "unit_tests/mocks/mock_sip.h" #include "core/helpers/file_io.h" -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/os_interface/os_inc_base.h" #include "unit_tests/helpers/test_files.h" diff --git a/unit_tests/mocks/mock_tbx_csr.h b/unit_tests/mocks/mock_tbx_csr.h index db157b6aba..345eb871a5 100644 --- a/unit_tests/mocks/mock_tbx_csr.h +++ b/unit_tests/mocks/mock_tbx_csr.h @@ -8,10 +8,10 @@ #pragma once #include "core/command_stream/preemption.h" +#include "core/helpers/hw_info.h" #include "runtime/aub/aub_center.h" #include "runtime/command_stream/tbx_command_stream_receiver_hw.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/helpers/hw_info.h" #include "gmock/gmock.h" diff --git a/unit_tests/offline_compiler/offline_compiler_tests.cpp b/unit_tests/offline_compiler/offline_compiler_tests.cpp index acc2550f46..808547e465 100644 --- a/unit_tests/offline_compiler/offline_compiler_tests.cpp +++ b/unit_tests/offline_compiler/offline_compiler_tests.cpp @@ -8,8 +8,8 @@ #include "offline_compiler_tests.h" #include "core/helpers/file_io.h" +#include "core/helpers/hw_info.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/os_interface/debug_settings_manager.h" #include "unit_tests/mocks/mock_compilers.h" diff --git a/unit_tests/options.cpp b/unit_tests/options.cpp index 4e9852a992..eac1481f95 100644 --- a/unit_tests/options.cpp +++ b/unit_tests/options.cpp @@ -7,9 +7,9 @@ #include "runtime/helpers/options.h" -#include "runtime/gen_common/hw_cmds.h" +#include "core/helpers/hw_cmds.h" +#include "core/helpers/hw_info.h" #include "runtime/helpers/array_count.h" -#include "runtime/helpers/hw_info.h" namespace NEO { const char *folderAUB = "aub_out"; diff --git a/unit_tests/os_interface/device_factory_tests.cpp b/unit_tests/os_interface/device_factory_tests.cpp index 5e2cc39d62..ea43ff3599 100644 --- a/unit_tests/os_interface/device_factory_tests.cpp +++ b/unit_tests/os_interface/device_factory_tests.cpp @@ -5,11 +5,11 @@ * */ +#include "core/helpers/hw_info.h" #include "core/memory_manager/memory_constants.h" #include "core/os_interface/os_library.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/os_interface/device_factory.h" #include "runtime/os_interface/os_interface.h" diff --git a/unit_tests/os_interface/windows/device_command_stream_tests.cpp b/unit_tests/os_interface/windows/device_command_stream_tests.cpp index 20f1294a71..165a837aa0 100644 --- a/unit_tests/os_interface/windows/device_command_stream_tests.cpp +++ b/unit_tests/os_interface/windows/device_command_stream_tests.cpp @@ -7,12 +7,12 @@ #include "core/command_stream/linear_stream.h" #include "core/command_stream/preemption.h" +#include "core/helpers/hw_cmds.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/aub_command_stream_receiver.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h" #include "runtime/command_stream/device_command_stream.h" -#include "runtime/gen_common/hw_cmds.h" #include "runtime/helpers/built_ins_helper.h" #include "runtime/helpers/flush_stamp.h" #include "runtime/helpers/gmm_callbacks.h" diff --git a/unit_tests/os_interface/windows/gdi_dll_fixture.h b/unit_tests/os_interface/windows/gdi_dll_fixture.h index 81bd3a208c..e707ab603f 100644 --- a/unit_tests/os_interface/windows/gdi_dll_fixture.h +++ b/unit_tests/os_interface/windows/gdi_dll_fixture.h @@ -6,8 +6,8 @@ */ #pragma once +#include "core/helpers/hw_info.h" #include "core/os_interface/os_library.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "unit_tests/mock_gdi/mock_gdi.h" diff --git a/unit_tests/os_interface/windows/os_interface_win_tests.h b/unit_tests/os_interface/windows/os_interface_win_tests.h index 320c1160c2..a6266d5147 100644 --- a/unit_tests/os_interface/windows/os_interface_win_tests.h +++ b/unit_tests/os_interface/windows/os_interface_win_tests.h @@ -7,7 +7,7 @@ #pragma once -#include "runtime/helpers/hw_info.h" +#include "core/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/os_interface/device_factory.h" #include "runtime/os_interface/windows/os_interface.h" diff --git a/unit_tests/os_interface/windows/wddm20_tests.cpp b/unit_tests/os_interface/windows/wddm20_tests.cpp index 5d9a73bcf0..d2f7cfdea5 100644 --- a/unit_tests/os_interface/windows/wddm20_tests.cpp +++ b/unit_tests/os_interface/windows/wddm20_tests.cpp @@ -5,12 +5,12 @@ * */ +#include "core/helpers/hw_info.h" #include "core/os_interface/os_library.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" #include "runtime/os_interface/os_time.h" diff --git a/unit_tests/perf_tests/options.cpp b/unit_tests/perf_tests/options.cpp index 78606a639a..6393743fd5 100644 --- a/unit_tests/perf_tests/options.cpp +++ b/unit_tests/perf_tests/options.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/gen_common/hw_cmds.h" +#include "core/helpers/hw_cmds.h" #include "runtime/helpers/array_count.h" namespace NEO { diff --git a/unit_tests/platform/platform_tests.cpp b/unit_tests/platform/platform_tests.cpp index 7ca06f1f4f..1cbd145418 100644 --- a/unit_tests/platform/platform_tests.cpp +++ b/unit_tests/platform/platform_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/helpers/hw_info.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/device/device.h" -#include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/platform/extensions.h" #include "runtime/sharings/sharing_factory.h" diff --git a/unit_tests/program/program_spec_constants_tests.cpp b/unit_tests/program/program_spec_constants_tests.cpp index d427fc5041..4ee99b7da4 100644 --- a/unit_tests/program/program_spec_constants_tests.cpp +++ b/unit_tests/program/program_spec_constants_tests.cpp @@ -8,8 +8,8 @@ #include "core/compiler_interface/compiler_interface.h" #include "core/compiler_interface/compiler_interface.inl" #include "core/helpers/file_io.h" +#include "core/helpers/hw_info.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/helpers/hw_info.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/global_environment.h" #include "unit_tests/helpers/test_files.h" diff --git a/unit_tests/scheduler/scheduler_source_tests.cpp b/unit_tests/scheduler/scheduler_source_tests.cpp index 17ba1191fe..ad7d44fc17 100644 --- a/unit_tests/scheduler/scheduler_source_tests.cpp +++ b/unit_tests/scheduler/scheduler_source_tests.cpp @@ -7,8 +7,8 @@ #include "unit_tests/scheduler/scheduler_source_tests.h" +#include "core/helpers/hw_cmds.h" #include "runtime/device_queue/device_queue_hw.h" -#include "runtime/gen_common/hw_cmds.h" #include "test.h" #include "unit_tests/fixtures/device_host_queue_fixture.h" #include "unit_tests/fixtures/execution_model_fixture.h" diff --git a/unit_tests/windows/get_devices_tests.cpp b/unit_tests/windows/get_devices_tests.cpp index dd04cc10a9..6b7f08b075 100644 --- a/unit_tests/windows/get_devices_tests.cpp +++ b/unit_tests/windows/get_devices_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/helpers/hw_info.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/helpers/hw_info.h" #include "runtime/os_interface/device_factory.h" #include "runtime/platform/platform.h" #include "test.h" diff --git a/unit_tests/windows/wddm_create_tests.cpp b/unit_tests/windows/wddm_create_tests.cpp index a88c26755d..634e53d255 100644 --- a/unit_tests/windows/wddm_create_tests.cpp +++ b/unit_tests/windows/wddm_create_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/helpers/hw_info.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/helpers/hw_info.h" #include "runtime/os_interface/windows/wddm/wddm.h" #include "test.h"