Cleanup includes 39

Cleaned up files: shared/source/command_container/command_encoder.h Related-To: NEO-5548 Signed-off-by: Warchulski, Jaroslaw <jaroslaw.warchulski@intel.com>
2025-12-20 00:24:58 +08:00 · 2023-01-20 17:45:04 +00:00
parent 8d66517c79
commit 49837b7bb5
69 changed files with 172 additions and 119 deletions
--- a/level_zero/core/source/cmdlist/cmdlist_hw.inl
+++ b/level_zero/core/source/cmdlist/cmdlist_hw.inl
@@ -6,7 +6,7 @@
 */

 #include "shared/source/built_ins/built_ins.h"
-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/command_stream/preemption.h"
--- a/level_zero/core/source/cmdlist/cmdlist_hw_xehp_and_later.inl
+++ b/level_zero/core/source/cmdlist/cmdlist_hw_xehp_and_later.inl
@@ -6,6 +6,7 @@
 */

 #pragma once
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/command_container/implicit_scaling.h"
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/helpers/cache_flush_xehp_and_later.inl"
--- a/level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl
+++ b/level_zero/core/source/cmdqueue/cmdqueue_hw_base.inl
@@ -8,7 +8,7 @@
 #pragma once

 #include "shared/source/command_container/cmdcontainer.h"
-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/command_stream/csr_definitions.h"
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/device/device.h"
--- a/level_zero/core/source/cmdqueue/cmdqueue_xe_hp_core_and_later.inl
+++ b/level_zero/core/source/cmdqueue/cmdqueue_xe_hp_core_and_later.inl
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/command_container/implicit_scaling.h"
 #include "shared/source/command_stream/csr_definitions.h"
 #include "shared/source/command_stream/scratch_space_controller.h"
--- a/level_zero/core/source/image/image_hw.inl
+++ b/level_zero/core/source/image/image_hw.inl
@@ -7,7 +7,7 @@

 #pragma once

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/device/device.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm.h"
--- a/level_zero/core/source/kernel/kernel_hw.h
+++ b/level_zero/core/source/kernel/kernel_hw.h
@@ -8,6 +8,7 @@
 #pragma once

 #include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/device/device.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/cache_policy.h"
--- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_3.cpp
+++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_3.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/memory_manager/internal_allocation_storage.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
--- a/opencl/source/command_queue/command_queue_hw_xehp_and_later.inl
+++ b/opencl/source/command_queue/command_queue_hw_xehp_and_later.inl
@@ -6,6 +6,7 @@
 */

 #include "shared/source/helpers/cache_flush_xehp_and_later.inl"
+#include "shared/source/helpers/timestamp_packet.h"

 #include "opencl/extensions/public/cl_ext_private.h"
 #include "opencl/source/command_queue/command_queue_hw_base.inl"
--- a/opencl/source/command_queue/enqueue_common.h
+++ b/opencl/source/command_queue/enqueue_common.h
@@ -13,6 +13,7 @@
 #include "shared/source/helpers/flat_batch_buffer_helper.h"
 #include "shared/source/helpers/flush_stamp.h"
 #include "shared/source/helpers/pipe_control_args.h"
+#include "shared/source/helpers/timestamp_packet.h"
 #include "shared/source/memory_manager/internal_allocation_storage.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/memory_manager/surface.h"
--- a/opencl/source/helpers/hardware_commands_helper_base.inl
+++ b/opencl/source/helpers/hardware_commands_helper_base.inl
@@ -6,6 +6,7 @@
 */

 #include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/command_stream/csr_definitions.h"
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
--- a/opencl/source/helpers/task_information.h
+++ b/opencl/source/helpers/task_information.h
@@ -10,7 +10,7 @@
 #include "shared/source/helpers/blit_properties.h"
 #include "shared/source/helpers/completion_stamp.h"
 #include "shared/source/helpers/map_operation_type.h"
-#include "shared/source/helpers/timestamp_packet.h"
+#include "shared/source/helpers/timestamp_packet_container.h"
 #include "shared/source/indirect_heap/indirect_heap.h"
 #include "shared/source/utilities/iflist.h"

--- a/opencl/source/mem_obj/buffer_base.inl
+++ b/opencl/source/mem_obj/buffer_base.inl
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2019-2022 Intel Corporation
+ * Copyright (C) 2019-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/command_container/implicit_scaling.h"
 #include "shared/source/device/device.h"
 #include "shared/source/helpers/bit_helpers.h"
--- a/opencl/source/mem_obj/image.inl
+++ b/opencl/source/mem_obj/image.inl
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm.h"
--- a/opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.h
+++ b/opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.h
@@ -10,8 +10,8 @@
 #include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
+#include "shared/source/helpers/aux_translation.h"
 #include "shared/source/helpers/blit_properties.h"
-#include "shared/source/helpers/timestamp_packet.h"
 #include "shared/source/memory_manager/surface.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
--- a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp
+++ b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp
@@ -5,6 +5,7 @@
 *
 */

+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/hw_helper.h"
--- a/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp
+++ b/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp
@@ -5,6 +5,7 @@
 *
 */

+#include "shared/source/command_container/command_encoder.h"
 #include "shared/source/command_container/implicit_scaling.h"
 #include "shared/source/command_stream/scratch_space_controller.h"
 #include "shared/source/command_stream/wait_status.h"
--- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_fixture.h
+++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_fixture.h
@@ -6,7 +6,7 @@
 */

 #pragma once
-#include "shared/source/helpers/timestamp_packet.h"
+#include "shared/source/helpers/timestamp_packet_container.h"
 #include "shared/test/common/test_macros/hw_test.h"

 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
--- a/opencl/test/unit_test/event/event_builder_tests.cpp
+++ b/opencl/test/unit_test/event/event_builder_tests.cpp
@@ -5,6 +5,7 @@
 *
 */

+#include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/internal_allocation_storage.h"
 #include "shared/source/utilities/arrayref.h"
 #include "shared/test/common/mocks/mock_csr.h"
--- a/opencl/test/unit_test/event/event_tests.cpp
+++ b/opencl/test/unit_test/event/event_tests.cpp
@@ -7,6 +7,7 @@

 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/command_stream/wait_status.h"
+#include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/memory_manager/internal_allocation_storage.h"
 #include "shared/source/os_interface/os_interface.h"
--- a/opencl/test/unit_test/gen11/image_tests_gen11.cpp
+++ b/opencl/test/unit_test/gen11/image_tests_gen11.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/image/image_surface_state.h"
 #include "shared/test/common/test_macros/test.h"

--- a/opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl
+++ b/opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl
@@ -1,10 +1,11 @@
 /*
- * Copyright (C) 2019-2022 Intel Corporation
+ * Copyright (C) 2019-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/image/image_surface_state.h"
--- a/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp
+++ b/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp
@@ -5,6 +5,7 @@
 *
 */

+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/gen9/reg_configs.h"
 #include "shared/source/helpers/hw_helper.h"
--- a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp
+++ b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp
@@ -8,6 +8,7 @@
 #include "opencl/test/unit_test/helpers/hardware_commands_helper_tests.h"

 #include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/helpers/address_patch.h"
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/engine_node_helper.h"
--- a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.h
+++ b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 Intel Corporation
+ * Copyright (C) 2019-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -8,7 +8,7 @@
 #pragma once

 #include "shared/source/built_ins/built_ins.h"
-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"

 #include "opencl/source/helpers/hardware_commands_helper.h"
--- a/opencl/test/unit_test/helpers/task_information_tests.cpp
+++ b/opencl/test/unit_test/helpers/task_information_tests.cpp
@@ -5,6 +5,7 @@
 *
 */

+#include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/internal_allocation_storage.h"
 #include "shared/test/common/mocks/mock_csr.h"
 #include "shared/test/common/test_macros/hw_test.h"
--- a/opencl/test/unit_test/helpers/test_preamble_xehp_and_later.cpp
+++ b/opencl/test/unit_test/helpers/test_preamble_xehp_and_later.cpp
@@ -5,6 +5,7 @@
 *
 */

+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/command_stream/stream_properties.h"
 #include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/helpers/hw_helper.h"
--- a/opencl/test/unit_test/kernel/kernel_slm_tests.cpp
+++ b/opencl/test/unit_test/kernel/kernel_slm_tests.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/program/kernel_info.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/test_macros/hw_test.h"
--- a/opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp
+++ b/opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/address_patch.h"
--- a/opencl/test/unit_test/mem_obj/buffer_tests.cpp
+++ b/opencl/test/unit_test/mem_obj/buffer_tests.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/array_count.h"
 #include "shared/source/helpers/compiler_hw_info_config.h"
--- a/opencl/test/unit_test/mem_obj/buffer_tests_xehp_and_later.cpp
+++ b/opencl/test/unit_test/mem_obj/buffer_tests_xehp_and_later.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/aligned_memory.h"
--- a/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp
+++ b/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/aligned_memory.h"
--- a/opencl/test/unit_test/mem_obj/image_tests_xehp_and_later.cpp
+++ b/opencl/test/unit_test/mem_obj/image_tests_xehp_and_later.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/memory_manager/memory_manager.h"
--- a/opencl/test/unit_test/xe_hpc_core/test_cmds_programming_xe_hpc_core.cpp
+++ b/opencl/test/unit_test/xe_hpc_core/test_cmds_programming_xe_hpc_core.cpp
@@ -5,6 +5,7 @@
 *
 */

+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/state_base_address.h"
--- a/opencl/test/unit_test/xe_hpg_core/dg2/test_cmds_programming_dg2.cpp
+++ b/opencl/test/unit_test/xe_hpg_core/dg2/test_cmds_programming_dg2.cpp
@@ -5,6 +5,7 @@
 *
 */

+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/state_base_address.h"
--- a/opencl/test/unit_test/xe_hpg_core/test_cmds_programming_xe_hpg_core.cpp
+++ b/opencl/test/unit_test/xe_hpg_core/test_cmds_programming_xe_hpg_core.cpp
@@ -5,6 +5,7 @@
 *
 */

+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
--- a/shared/source/command_container/CMakeLists.txt
+++ b/shared/source/command_container/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019-2022 Intel Corporation
+# Copyright (C) 2019-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -15,6 +15,7 @@ set(NEO_CORE_COMMAND_CONTAINER
    ${CMAKE_CURRENT_SOURCE_DIR}/encode_alu_helper.h
    ${CMAKE_CURRENT_SOURCE_DIR}/encode_compute_mode_bdw_and_later.inl
    ${CMAKE_CURRENT_SOURCE_DIR}/encode_compute_mode_tgllp_and_later.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/encode_surface_state.h
    ${CMAKE_CURRENT_SOURCE_DIR}/implicit_scaling.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/implicit_scaling.h
    ${CMAKE_CURRENT_SOURCE_DIR}/definitions/encode_surface_state_args_base.h
--- a/shared/source/command_container/command_encoder.h
+++ b/shared/source/command_container/command_encoder.h
@@ -10,7 +10,6 @@
 #include "shared/source/command_container/cmdcontainer.h"
 #include "shared/source/command_container/encode_alu_helper.h"
 #include "shared/source/debugger/debugger.h"
-#include "shared/source/gmm_helper/gmm_lib.h"
 #include "shared/source/helpers/register_offsets.h"
 #include "shared/source/kernel/kernel_arg_descriptor.h"

@@ -332,46 +331,6 @@ struct EncodeStoreMMIO {
    static void appendFlags(MI_STORE_REGISTER_MEM *storeRegMem, bool workloadPartition);
 };

-template <typename GfxFamily>
-struct EncodeSurfaceState {
-    using R_SURFACE_STATE = typename GfxFamily::RENDER_SURFACE_STATE;
-    using SURFACE_FORMAT = typename R_SURFACE_STATE::SURFACE_FORMAT;
-    using AUXILIARY_SURFACE_MODE = typename R_SURFACE_STATE::AUXILIARY_SURFACE_MODE;
-    using COHERENCY_TYPE = typename R_SURFACE_STATE::COHERENCY_TYPE;
-
-    static void encodeBuffer(EncodeSurfaceStateArgs &args);
-    static void encodeExtraBufferParams(EncodeSurfaceStateArgs &args);
-    static void encodeImplicitScalingParams(const EncodeSurfaceStateArgs &args);
-    static void encodeExtraCacheSettings(R_SURFACE_STATE *surfaceState, const EncodeSurfaceStateArgs &args);
-    static void appendBufferSurfaceState(EncodeSurfaceStateArgs &args);
-
-    static constexpr uintptr_t getSurfaceBaseAddressAlignmentMask() {
-        return ~(getSurfaceBaseAddressAlignment() - 1);
-    }
-
-    static constexpr uintptr_t getSurfaceBaseAddressAlignment() { return 4; }
-
-    static void getSshAlignedPointer(uintptr_t &ptr, size_t &offset);
-    static bool doBindingTablePrefetch();
-    static bool isBindingTablePrefetchPreferred();
-
-    static size_t pushBindingTableAndSurfaceStates(IndirectHeap &dstHeap, size_t bindingTableCount,
-                                                   const void *srcKernelSsh, size_t srcKernelSshSize,
-                                                   size_t numberOfBindingTableStates, size_t offsetOfBindingTable);
-
-    static void appendImageCompressionParams(R_SURFACE_STATE *surfaceState, GraphicsAllocation *allocation, GmmHelper *gmmHelper,
-                                             bool imageFromBuffer, GMM_YUV_PLANE_ENUM plane);
-    static void setCoherencyType(R_SURFACE_STATE *surfaceState, COHERENCY_TYPE coherencyType);
-    static void setBufferAuxParamsForCCS(R_SURFACE_STATE *surfaceState);
-    static void setImageAuxParamsForCCS(R_SURFACE_STATE *surfaceState, Gmm *gmm);
-    static bool isAuxModeEnabled(R_SURFACE_STATE *surfaceState, Gmm *gmm);
-    static void setAuxParamsForMCSCCS(R_SURFACE_STATE *surfaceState);
-    static void setClearColorParams(R_SURFACE_STATE *surfaceState, Gmm *gmm);
-    static void setFlagsForMediaCompression(R_SURFACE_STATE *surfaceState, Gmm *gmm);
-    static void disableCompressionFlags(R_SURFACE_STATE *surfaceState);
-    static void appendParamsForImageFromBuffer(R_SURFACE_STATE *surfaceState);
-};
-
 template <typename GfxFamily>
 struct EncodeComputeMode {
    static size_t getCmdSizeForComputeMode(const HardwareInfo &hwInfo, bool hasSharedHandles, bool isRcs);
@@ -383,21 +342,6 @@ struct EncodeComputeMode {
    static void adjustPipelineSelect(CommandContainer &container, const NEO::KernelDescriptor &kernelDescriptor);
 };

-template <typename GfxFamily>
-struct EncodeWA {
-    static void encodeAdditionalPipelineSelect(LinearStream &stream, const PipelineSelectArgs &args, bool is3DPipeline,
-                                               const HardwareInfo &hwInfo, bool isRcs);
-    static size_t getAdditionalPipelineSelectSize(Device &device, bool isRcs);
-
-    static void addPipeControlPriorToNonPipelinedStateCommand(LinearStream &commandStream, PipeControlArgs args,
-                                                              const RootDeviceEnvironment &rootDeviceEnvironment, bool isRcs);
-    static void setAdditionalPipeControlFlagsForNonPipelineStateCommand(PipeControlArgs &args);
-
-    static void addPipeControlBeforeStateBaseAddress(LinearStream &commandStream, const RootDeviceEnvironment &rootDeviceEnvironment, bool isRcs, bool dcFlushRequired);
-
-    static void adjustCompressionFormatForPlanarImage(uint32_t &compressionFormat, GMM_YUV_PLANE_ENUM plane);
-};
-
 template <typename GfxFamily>
 struct EncodeSempahore {
    using MI_SEMAPHORE_WAIT = typename GfxFamily::MI_SEMAPHORE_WAIT;
--- a/shared/source/command_container/command_encoder.inl
+++ b/shared/source/command_container/command_encoder.inl
@@ -7,6 +7,7 @@

 #pragma once
 #include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/debugger/debugger_l0.h"
 #include "shared/source/device/device.h"
--- a/shared/source/command_container/command_encoder_bdw_and_later.inl
+++ b/shared/source/command_container/command_encoder_bdw_and_later.inl
@@ -7,6 +7,7 @@

 #pragma once
 #include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/execution_environment/execution_environment.h"
--- a/shared/source/command_container/definitions/encode_surface_state.inl
+++ b/shared/source/command_container/definitions/encode_surface_state.inl
@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

 #include "shared/source/command_container/definitions/encode_surface_state_args_base.h"
+#include "shared/source/command_container/encode_surface_state.h"

 namespace NEO {

--- a/shared/source/command_container/encode_surface_state.h
+++ b/shared/source/command_container/encode_surface_state.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2023 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+#include "shared/source/gmm_helper/gmm_lib.h"
+
+namespace NEO {
+class Device;
+class Gmm;
+class GmmHelper;
+class GraphicsAllocation;
+class IndirectHeap;
+class LinearStream;
+struct EncodeSurfaceStateArgs;
+struct HardwareInfo;
+struct PipeControlArgs;
+struct PipelineSelectArgs;
+struct RootDeviceEnvironment;
+
+template <typename GfxFamily>
+struct EncodeSurfaceState {
+    using R_SURFACE_STATE = typename GfxFamily::RENDER_SURFACE_STATE;
+    using SURFACE_FORMAT = typename R_SURFACE_STATE::SURFACE_FORMAT;
+    using AUXILIARY_SURFACE_MODE = typename R_SURFACE_STATE::AUXILIARY_SURFACE_MODE;
+    using COHERENCY_TYPE = typename R_SURFACE_STATE::COHERENCY_TYPE;
+
+    static void encodeBuffer(EncodeSurfaceStateArgs &args);
+    static void encodeExtraBufferParams(EncodeSurfaceStateArgs &args);
+    static void encodeImplicitScalingParams(const EncodeSurfaceStateArgs &args);
+    static void encodeExtraCacheSettings(R_SURFACE_STATE *surfaceState, const EncodeSurfaceStateArgs &args);
+    static void appendBufferSurfaceState(EncodeSurfaceStateArgs &args);
+
+    static constexpr uintptr_t getSurfaceBaseAddressAlignmentMask() {
+        return ~(getSurfaceBaseAddressAlignment() - 1);
+    }
+
+    static constexpr uintptr_t getSurfaceBaseAddressAlignment() { return 4; }
+
+    static void getSshAlignedPointer(uintptr_t &ptr, size_t &offset);
+    static bool doBindingTablePrefetch();
+    static bool isBindingTablePrefetchPreferred();
+
+    static size_t pushBindingTableAndSurfaceStates(IndirectHeap &dstHeap, size_t bindingTableCount,
+                                                   const void *srcKernelSsh, size_t srcKernelSshSize,
+                                                   size_t numberOfBindingTableStates, size_t offsetOfBindingTable);
+
+    static void appendImageCompressionParams(R_SURFACE_STATE *surfaceState, GraphicsAllocation *allocation, GmmHelper *gmmHelper,
+                                             bool imageFromBuffer, GMM_YUV_PLANE_ENUM plane);
+    static void setCoherencyType(R_SURFACE_STATE *surfaceState, COHERENCY_TYPE coherencyType);
+    static void setBufferAuxParamsForCCS(R_SURFACE_STATE *surfaceState);
+    static void setImageAuxParamsForCCS(R_SURFACE_STATE *surfaceState, Gmm *gmm);
+    static bool isAuxModeEnabled(R_SURFACE_STATE *surfaceState, Gmm *gmm);
+    static void setAuxParamsForMCSCCS(R_SURFACE_STATE *surfaceState);
+    static void setClearColorParams(R_SURFACE_STATE *surfaceState, Gmm *gmm);
+    static void setFlagsForMediaCompression(R_SURFACE_STATE *surfaceState, Gmm *gmm);
+    static void disableCompressionFlags(R_SURFACE_STATE *surfaceState);
+    static void appendParamsForImageFromBuffer(R_SURFACE_STATE *surfaceState);
+};
+
+template <typename GfxFamily>
+struct EncodeWA {
+    static void encodeAdditionalPipelineSelect(LinearStream &stream, const PipelineSelectArgs &args, bool is3DPipeline,
+                                               const HardwareInfo &hwInfo, bool isRcs);
+    static size_t getAdditionalPipelineSelectSize(Device &device, bool isRcs);
+
+    static void addPipeControlPriorToNonPipelinedStateCommand(LinearStream &commandStream, PipeControlArgs args,
+                                                              const RootDeviceEnvironment &rootDeviceEnvironment, bool isRcs);
+    static void setAdditionalPipeControlFlagsForNonPipelineStateCommand(PipeControlArgs &args);
+
+    static void addPipeControlBeforeStateBaseAddress(LinearStream &commandStream, const RootDeviceEnvironment &rootDeviceEnvironment, bool isRcs, bool dcFlushRequired);
+
+    static void adjustCompressionFormatForPlanarImage(uint32_t &compressionFormat, GMM_YUV_PLANE_ENUM plane);
+};
+
+} // namespace NEO
--- a/shared/source/command_stream/command_stream_receiver_hw_base.inl
+++ b/shared/source/command_stream/command_stream_receiver_hw_base.inl
@@ -6,7 +6,7 @@
 */

 #include "shared/source/built_ins/sip.h"
-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
 #include "shared/source/command_stream/experimental_command_buffer.h"
 #include "shared/source/command_stream/linear_stream.h"
--- a/shared/source/command_stream/command_stream_receiver_hw_dg2_and_later.inl
+++ b/shared/source/command_stream/command_stream_receiver_hw_dg2_and_later.inl
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
 #include "shared/source/command_stream/device_command_stream.h"
 #include "shared/source/helpers/hw_helper.h"
--- a/shared/source/helpers/hw_helper_base.inl
+++ b/shared/source/helpers/hw_helper_base.inl
@@ -6,7 +6,7 @@
 */

 #include "shared/source/aub_mem_dump/aub_mem_dump.h"
-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
--- a/shared/source/helpers/timestamp_packet.h
+++ b/shared/source/helpers/timestamp_packet.h
@@ -78,16 +78,6 @@ class TimestampPackets : public TagTypeBase {
 static_assert(((4 * TimestampPacketSizeControl::preferredPacketCount) * sizeof(uint32_t)) == sizeof(TimestampPackets<uint32_t>),
              "This structure is consumed by GPU and has to follow specific restrictions for padding and size");

-struct TimestampPacketDependencies : public NonCopyableClass {
-    TimestampPacketContainer cacheFlushNodes;
-    TimestampPacketContainer previousEnqueueNodes;
-    TimestampPacketContainer barrierNodes;
-    TimestampPacketContainer auxToNonAuxNodes;
-    TimestampPacketContainer nonAuxToAuxNodes;
-
-    void moveNodesToNewContainer(TimestampPacketContainer &timestampPacketContainer);
-};
-
 struct TimestampPacketHelper {
    static uint64_t getContextEndGpuAddress(const TagNodeBase &timestampPacketNode) {
        return timestampPacketNode.getGpuAddress() + timestampPacketNode.getContextEndOffset();
--- a/shared/source/helpers/timestamp_packet_container.h
+++ b/shared/source/helpers/timestamp_packet_container.h
@@ -30,4 +30,14 @@ class TimestampPacketContainer : public NonCopyableClass {
    StackVec<TagNodeBase *, 32u> timestampPacketNodes;
 };

+struct TimestampPacketDependencies : public NonCopyableClass {
+    TimestampPacketContainer cacheFlushNodes;
+    TimestampPacketContainer previousEnqueueNodes;
+    TimestampPacketContainer barrierNodes;
+    TimestampPacketContainer auxToNonAuxNodes;
+    TimestampPacketContainer nonAuxToAuxNodes;
+
+    void moveNodesToNewContainer(TimestampPacketContainer &timestampPacketContainer);
+};
+
 } // namespace NEO
--- a/shared/test/unit_test/command_container/command_encoder_tests.cpp
+++ b/shared/test/unit_test/command_container/command_encoder_tests.cpp
@@ -6,6 +6,7 @@
 */

 #include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/gmm_helper/gmm_lib.h"
--- a/shared/test/unit_test/command_container/command_encoder_tests_xe_hpg_core_and_later.cpp
+++ b/shared/test/unit_test/command_container/command_encoder_tests_xe_hpg_core_and_later.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/memory_manager.h"
--- a/shared/test/unit_test/encoders/command_encoder_tests_xehp_and_later.cpp
+++ b/shared/test/unit_test/encoders/command_encoder_tests_xehp_and_later.cpp
@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

 #include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
--- a/shared/test/unit_test/encoders/test_command_encoder.cpp
+++ b/shared/test/unit_test/encoders/test_command_encoder.cpp
@@ -7,6 +7,7 @@

 #include "shared/source/command_container/cmdcontainer.h"
 #include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/fixtures/device_fixture.h"
 #include "shared/test/common/mocks/mock_device.h"
--- a/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp
+++ b/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp
@@ -5,6 +5,7 @@
 *
 */

+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/bindless_heaps_helper.h"
--- a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_dg2_and_later.cpp
+++ b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_dg2_and_later.cpp
@@ -8,6 +8,7 @@
 #include "shared/test/unit_test/encoders/test_encode_dispatch_kernel_dg2_and_later.h"

 #include "shared/source/gmm_helper/gmm_helper.h"
+#include "shared/source/gmm_helper/gmm_lib.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
--- a/shared/test/unit_test/encoders/test_encode_dispatch_kernel_xehp_and_later.cpp
+++ b/shared/test/unit_test/encoders/test_encode_dispatch_kernel_xehp_and_later.cpp
@@ -5,6 +5,7 @@
 *
 */

+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/command_container/implicit_scaling.h"
 #include "shared/source/command_container/walker_partition_xehp_and_later.h"
 #include "shared/source/command_stream/stream_properties.h"
--- a/shared/test/unit_test/encoders/test_encode_states.cpp
+++ b/shared/test/unit_test/encoders/test_encode_states.cpp
@@ -5,6 +5,7 @@
 *
 */

+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/bindless_heaps_helper.h"
 #include "shared/source/helpers/hw_helper.h"
--- a/shared/test/unit_test/encoders/test_encode_states_dg2.cpp
+++ b/shared/test/unit_test/encoders/test_encode_states_dg2.cpp
@@ -6,6 +6,7 @@
 */

 #include "shared/source/gmm_helper/gmm_helper.h"
+#include "shared/source/gmm_helper/gmm_lib.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/mocks/mock_debugger.h"
--- a/shared/test/unit_test/gen11/command_encoder_tests_gen11.cpp
+++ b/shared/test/unit_test/gen11/command_encoder_tests_gen11.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/gen11/hw_cmds.h"
 #include "shared/source/helpers/blit_commands_helper.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
--- a/shared/test/unit_test/gen11/image_surface_state_tests_gen11.cpp
+++ b/shared/test/unit_test/gen11/image_surface_state_tests_gen11.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/gen11/hw_cmds.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
--- a/shared/test/unit_test/gen12lp/command_encoder_tests_gen12lp.cpp
+++ b/shared/test/unit_test/gen12lp/command_encoder_tests_gen12lp.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/helpers/preamble.h"
 #include "shared/test/common/mocks/mock_command_stream_receiver.h"
 #include "shared/test/common/mocks/mock_device.h"
--- a/shared/test/unit_test/gen12lp/image_surface_state_tests_gen12lp.cpp
+++ b/shared/test/unit_test/gen12lp/image_surface_state_tests_gen12lp.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/test/common/test_macros/hw_test.h"
 #include "shared/test/unit_test/image/image_surface_state_fixture.h"

--- a/shared/test/unit_test/gen8/command_encoder_tests_gen8.cpp
+++ b/shared/test/unit_test/gen8/command_encoder_tests_gen8.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/gen8/hw_cmds.h"
 #include "shared/source/helpers/blit_commands_helper.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
--- a/shared/test/unit_test/gen8/image_surface_state_tests_gen8.cpp
+++ b/shared/test/unit_test/gen8/image_surface_state_tests_gen8.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/gen8/hw_cmds.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
--- a/shared/test/unit_test/gen9/command_encoder_tests_gen9.cpp
+++ b/shared/test/unit_test/gen9/command_encoder_tests_gen9.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
--- a/shared/test/unit_test/gen9/image_surface_state_tests_gen9.cpp
+++ b/shared/test/unit_test/gen9/image_surface_state_tests_gen9.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
--- a/shared/test/unit_test/helpers/hw_helper_tests.cpp
+++ b/shared/test/unit_test/helpers/hw_helper_tests.cpp
@@ -8,7 +8,7 @@
 #include "shared/test/common/helpers/hw_helper_tests.h"

 #include "shared/source/aub_mem_dump/aub_mem_dump.h"
-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/hw_helper.h"
--- a/shared/test/unit_test/helpers/state_base_address_tests.cpp
+++ b/shared/test/unit_test/helpers/state_base_address_tests.cpp
@@ -7,7 +7,7 @@

 #include "shared/test/unit_test/helpers/state_base_address_tests.h"

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/test/common/mocks/mock_device.h"
--- a/shared/test/unit_test/image/image_surface_state_tests.cpp
+++ b/shared/test/unit_test/image/image_surface_state_tests.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/test_macros/hw_test.h"
 #include "shared/test/unit_test/image/image_surface_state_fixture.h"
--- a/shared/test/unit_test/xe_hpc_core/image_surface_state_tests_xe_hpc_core.cpp
+++ b/shared/test/unit_test/xe_hpc_core/image_surface_state_tests_xe_hpc_core.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
 #include "shared/test/unit_test/image/image_surface_state_fixture.h"
--- a/shared/test/unit_test/xe_hpg_core/image_surface_state_tests_xe_hpg_core.cpp
+++ b/shared/test/unit_test/xe_hpg_core/image_surface_state_tests_xe_hpg_core.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

-#include "shared/source/command_container/command_encoder.h"
+#include "shared/source/command_container/encode_surface_state.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
 #include "shared/test/unit_test/image/image_surface_state_fixture.h"
--- a/shared/test/unit_test/xe_hpg_core/mtl/test_encode_dispatch_kernel_mtl.cpp
+++ b/shared/test/unit_test/xe_hpg_core/mtl/test_encode_dispatch_kernel_mtl.cpp
@@ -6,6 +6,7 @@
 */

 #include "shared/source/gmm_helper/gmm_helper.h"
+#include "shared/source/gmm_helper/gmm_lib.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/mocks/mock_device.h"