diff --git a/level_zero/core/source/hw_helpers/l0_hw_helper_pvc_and_later.inl b/level_zero/core/source/hw_helpers/l0_hw_helper_pvc_and_later.inl index ac6fa31afc..1bc28ac138 100644 --- a/level_zero/core/source/hw_helpers/l0_hw_helper_pvc_and_later.inl +++ b/level_zero/core/source/hw_helpers/l0_hw_helper_pvc_and_later.inl @@ -6,12 +6,11 @@ */ #include "shared/source/debug_settings/debug_settings_manager.h" +#include "shared/source/helpers/definitions/engine_group_types.h" #include "shared/source/helpers/engine_node_helper.h" #include "level_zero/core/source/hw_helpers/l0_hw_helper.h" -#include "engine_group_types.h" - #include namespace L0 { diff --git a/opencl/source/helpers/cl_hw_helper.h b/opencl/source/helpers/cl_hw_helper.h index 2b596e3f66..53c3b36586 100644 --- a/opencl/source/helpers/cl_hw_helper.h +++ b/opencl/source/helpers/cl_hw_helper.h @@ -7,9 +7,10 @@ #pragma once +#include "shared/source/helpers/definitions/engine_group_types.h" + #include "opencl/extensions/public/cl_ext_private.h" -#include "engine_group_types.h" #include "igfxfmid.h" #include diff --git a/shared/source/device/device.h b/shared/source/device/device.h index d1f1fca4e9..3b3b8aa9ae 100644 --- a/shared/source/device/device.h +++ b/shared/source/device/device.h @@ -12,14 +12,13 @@ #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/bindless_heaps_helper.h" #include "shared/source/helpers/common_types.h" +#include "shared/source/helpers/definitions/engine_group_types.h" #include "shared/source/helpers/engine_control.h" #include "shared/source/helpers/engine_node_helper.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/performance_counters.h" #include "shared/source/program/sync_buffer_handler.h" -#include "engine_group_types.h" - namespace NEO { class OSTime; class SourceLevelDebugger; diff --git a/shared/source/helpers/CMakeLists.txt b/shared/source/helpers/CMakeLists.txt index db926d5f4f..ac30d8ce59 100644 --- a/shared/source/helpers/CMakeLists.txt +++ b/shared/source/helpers/CMakeLists.txt @@ -126,7 +126,7 @@ set(NEO_CORE_HELPERS ${CMAKE_CURRENT_SOURCE_DIR}/validators.h ${CMAKE_CURRENT_SOURCE_DIR}/vec.h ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}hw_cmds.h - ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}engine_group_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/definitions/engine_group_types.h ${CMAKE_CURRENT_SOURCE_DIR}/definitions/mi_flush_args.h ${CMAKE_CURRENT_SOURCE_DIR}/definitions/pipe_control_args_base.h ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}pipe_control_args.h diff --git a/shared/source/helpers/constants.h b/shared/source/helpers/constants.h index 9a20d65f00..075793eef9 100644 --- a/shared/source/helpers/constants.h +++ b/shared/source/helpers/constants.h @@ -7,8 +7,7 @@ #pragma once #include "shared/source/helpers/common_types.h" - -#include "engine_group_types.h" +#include "shared/source/helpers/definitions/engine_group_types.h" #include #include diff --git a/shared/source/helpers/definitions/engine_group_types.h b/shared/source/helpers/definitions/engine_group_types.h index f251d0d8ed..a151cec4da 100644 --- a/shared/source/helpers/definitions/engine_group_types.h +++ b/shared/source/helpers/definitions/engine_group_types.h @@ -15,6 +15,8 @@ enum class EngineGroupType : uint32_t { Compute = 0, RenderCompute, Copy, + LinkedCopy, + CooperativeCompute, MaxEngineGroups }; diff --git a/shared/source/helpers/hw_helper.h b/shared/source/helpers/hw_helper.h index 666623247b..d94f32027b 100644 --- a/shared/source/helpers/hw_helper.h +++ b/shared/source/helpers/hw_helper.h @@ -12,11 +12,11 @@ #include "shared/source/command_stream/linear_stream.h" #include "shared/source/commands/bxml_generator_glue.h" #include "shared/source/helpers/aux_translation.h" +#include "shared/source/helpers/definitions/engine_group_types.h" #include "shared/source/helpers/engine_node_helper.h" #include "shared/source/helpers/options.h" #include "shared/source/utilities/stackvec.h" -#include "engine_group_types.h" #include "hw_cmds.h" #include "third_party/aub_stream/headers/aubstream.h" diff --git a/shared/source/helpers/preamble.h b/shared/source/helpers/preamble.h index b0a84acae0..3b4b489136 100644 --- a/shared/source/helpers/preamble.h +++ b/shared/source/helpers/preamble.h @@ -6,10 +6,10 @@ */ #pragma once +#include "shared/source/helpers/definitions/engine_group_types.h" #include "shared/source/helpers/pipeline_select_helper.h" #include "shared/source/kernel/kernel_execution_type.h" -#include "engine_group_types.h" #include "engine_node.h" #include "igfxfmid.h"