Cleanup includes 48

Cleaned up files:
shared/source/command_container/command_encoder.inl
shared/source/os_interface/hw_info_config.h

Related-To: NEO-5548
Signed-off-by: Warchulski, Jaroslaw <jaroslaw.warchulski@intel.com>

level_zero/core/source/device/device.h

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include "shared/source/command_stream/preemption_mode.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
 #include <level_zero/ze_api.h>

level_zero/core/source/image/image_imp.cpp

@@ -8,6 +8,7 @@
 #include "level_zero/core/source/image/image_imp.h"
 
 #include "shared/source/device/device.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/memory_manager/memory_manager.h"
 
 #include "level_zero/core/source/device/device.h"

level_zero/tools/source/debug/windows/debug_session.cpp

@@ -10,6 +10,7 @@
 #include "shared/source/device/device.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/register_offsets.h"
 #include "shared/source/os_interface/windows/wddm/wddm.h"
 #include "shared/source/os_interface/windows/wddm_debug.h"

level_zero/tools/source/sysman/frequency/frequency_imp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,6 +11,7 @@
 
 #include "level_zero/tools/source/sysman/sysman_imp.h"
 
+#include <algorithm>
 #include <cmath>
 
 namespace L0 {

level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.cpp

@@ -9,6 +9,7 @@
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
+#include "shared/source/helpers/hw_info.h"
 
 #include "igfxfmid.h"
 #include "sysman/linux/os_sysman_imp.h"

level_zero/tools/source/sysman/global_operations/global_operations_imp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,6 +13,8 @@
 #include "level_zero/core/source/device/device.h"
 #include "level_zero/tools/source/sysman/sysman_const.h"
 
+#include <algorithm>
+
 namespace L0 {
 
 ze_result_t GlobalOperationsImp::processesGetState(uint32_t *pCount, zes_process_state_t *pProcesses) {

level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.cpp

@@ -9,6 +9,7 @@
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/os_interface/linux/i915.h"
 #include "shared/source/os_interface/linux/ioctl_helper.h"

level_zero/tools/source/sysman/performance/linux/os_performance_imp_prelim.cpp

@@ -8,6 +8,7 @@
 #include "level_zero/tools/source/sysman/performance/linux/os_performance_imp_prelim.h"
 
 #include "shared/source/device/device.h"
+#include "shared/source/helpers/hw_info.h"
 
 #include <cmath>
 

level_zero/tools/source/sysman/performance/performance.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,6 +11,8 @@
 
 #include "performance_imp.h"
 
+#include <algorithm>
+
 namespace L0 {
 
 PerformanceHandleContext::~PerformanceHandleContext() {

level_zero/tools/source/sysman/scheduler/scheduler.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,8 @@
 #include "level_zero/tools/source/sysman/os_sysman.h"
 #include "level_zero/tools/source/sysman/scheduler/scheduler_imp.h"
 
+#include <algorithm>
+
 class OsScheduler;
 namespace L0 {
 

level_zero/tools/source/sysman/sysman_imp.cpp

@@ -10,6 +10,7 @@
 #include "shared/source/device/sub_device.h"
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/gfx_core_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/sleep.h"
 
 #include "level_zero/core/source/driver/driver.h"

opencl/source/cl_device/cl_device.cpp

@@ -14,6 +14,7 @@
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/gfx_core_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/os_interface/driver_info.h"
 #include "shared/source/os_interface/os_interface.h"

opencl/source/cl_device/cl_device_caps.cpp

@@ -9,6 +9,7 @@
 #include "shared/source/device/device.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/gfx_core_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/os_interface/driver_info.h"
 

opencl/source/cl_device/cl_device_info.cpp

@@ -12,6 +12,7 @@
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/get_info.h"
 #include "shared/source/helpers/gfx_core_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/os_time.h"
 
 #include "opencl/source/cl_device/cl_device.h"

opencl/source/command_queue/command_queue.cpp

@@ -20,6 +20,7 @@
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/helpers/flush_stamp.h"
 #include "shared/source/helpers/get_info.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/helpers/timestamp_packet.h"

opencl/source/command_queue/command_queue_hw.h

@@ -9,6 +9,7 @@
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/helpers/engine_control.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
 #include "shared/source/os_interface/os_context.h"
 

opencl/source/context/context.cpp

@@ -13,6 +13,7 @@
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/sub_device.h"
 #include "shared/source/helpers/get_info.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/source/memory_manager/deferred_deleter.h"
 #include "shared/source/memory_manager/memory_manager.h"

opencl/source/event/event.cpp

@@ -14,6 +14,7 @@
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/flush_stamp.h"
 #include "shared/source/helpers/get_info.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/mt_helpers.h"
 #include "shared/source/helpers/timestamp_packet.h"
 #include "shared/source/memory_manager/internal_allocation_storage.h"

opencl/source/event/user_event.cpp

@@ -8,6 +8,7 @@
 #include "user_event.h"
 
 #include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/command_stream/wait_status.h"
 #include "shared/source/device/device.h"
 
 #include "opencl/source/command_queue/command_queue.h"

opencl/source/gtpin/gtpin_callbacks.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/memory_manager/surface.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"

opencl/source/kernel/kernel.cpp

@@ -22,6 +22,7 @@
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/get_info.h"
 #include "shared/source/helpers/gfx_core_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/kernel_helpers.h"
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/source/helpers/surface_format_info.h"

opencl/source/mem_obj/buffer.cpp

@@ -16,6 +16,7 @@
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/blit_helper.h"
 #include "shared/source/helpers/gfx_core_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/local_memory_access_modes.h"
 #include "shared/source/helpers/memory_properties_helpers.h"
 #include "shared/source/memory_manager/allocation_properties.h"

opencl/source/platform/platform.cpp

@@ -16,6 +16,7 @@
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/get_info.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/source_level_debugger/source_level_debugger.h"
 
 #include "opencl/source/api/api.h"

opencl/source/program/create.inl

@@ -7,6 +7,7 @@
 
 #include "shared/source/ail/ail_configuration.h"
 #include "shared/source/device/device.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/string_helpers.h"
 
 #include "opencl/source/cl_device/cl_device.h"

opencl/source/program/process_device_binary.cpp

@@ -12,6 +12,7 @@
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/debug_helpers.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/memory_manager/memory_manager.h"

opencl/source/sharings/d3d/d3d_texture.cpp

@@ -13,6 +13,7 @@
 #include "shared/source/gmm_helper/resource_info.h"
 #include "shared/source/helpers/get_info.h"
 #include "shared/source/helpers/gfx_core_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/os_interface/hw_info_config.h"

opencl/source/sharings/unified/unified_image.cpp

@@ -12,6 +12,7 @@
 #include "shared/source/gmm_helper/resource_info.h"
 #include "shared/source/helpers/get_info.h"
 #include "shared/source/helpers/gfx_core_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/os_interface/hw_info_config.h"

opencl/test/unit_test/context/get_supported_image_formats_tests.cpp

@@ -1,10 +1,11 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "shared/source/helpers/hw_info.h"
 #include "shared/test/common/mocks/mock_device.h"
 
 #include "opencl/source/helpers/surface_formats.h"

opencl/test/unit_test/device/get_device_name_tests.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/helpers/hw_info.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/mocks/mock_device.h"
 

opencl/test/unit_test/fixtures/device_instrumentation_fixture.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "opencl/test/unit_test/fixtures/device_instrumentation_fixture.h"
 
+#include "shared/source/helpers/hw_info.h"
 #include "shared/test/common/helpers/execution_environment_helper.h"
 #include "shared/test/common/mocks/mock_device.h"
 

opencl/test/unit_test/helpers/cl_memory_properties_helpers_tests.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/memory_properties_helpers.h"
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"

opencl/test/unit_test/mem_obj/create_image_in_local_memory_tests.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/memory_manager/gfx_partition.h"
 #include "shared/source/memory_manager/memory_pool.h"
 #include "shared/test/common/mocks/mock_device.h"

opencl/test/unit_test/memory_manager/cl_memory_manager_allocate_in_preferred_pool_tests.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/memory_manager/gfx_partition.h"
 #include "shared/test/common/mocks/mock_gmm.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"

opencl/test/unit_test/mocks/mock_cl_device.cpp

@@ -7,6 +7,7 @@
 
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"
 
+#include "shared/source/helpers/hw_info.h"
 #include "shared/test/common/mocks/mock_device.h"
 
 #include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h"

opencl/test/unit_test/mocks/mock_program.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/compiler_interface/external_functions.h"
 #include "shared/source/device_binary_format/patchtokens_decoder.h"
 #include "shared/source/helpers/hash.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/program/program_info_from_patchtokens.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/helpers/ult_limits.h"

opencl/test/unit_test/sharings/unified/unified_sharing_image_tests.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/gmm_helper/gmm.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 #include "shared/test/common/helpers/raii_hw_info_config.h"
 #include "shared/test/common/mocks/mock_gmm_resource_info.h"
 

shared/source/built_ins/built_ins_storage.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/gfx_core_helper.h"
+#include "shared/source/helpers/hw_info.h"
 
 #include "os_inc.h"
 

shared/source/command_container/cmdcontainer.cpp

@@ -15,6 +15,7 @@
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/heap_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/indirect_heap/indirect_heap.h"
 #include "shared/source/memory_manager/allocation_properties.h"

shared/source/command_container/command_encoder.inl

@@ -7,7 +7,6 @@
 
 #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"

shared/source/command_stream/command_stream_receiver_hw_base.inl

@@ -32,6 +32,7 @@
 #include "shared/source/helpers/flat_batch_buffer_helper_hw.h"
 #include "shared/source/helpers/flush_stamp.h"
 #include "shared/source/helpers/gfx_core_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/logical_state_helper.h"
 #include "shared/source/helpers/pause_on_gpu_properties.h"
 #include "shared/source/helpers/preamble.h"

shared/source/command_stream/preemption.cpp

@@ -12,6 +12,7 @@
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
 #include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/kernel/kernel_descriptor.h"
 

shared/source/device/device.h

@@ -15,6 +15,8 @@
 #include "shared/source/os_interface/performance_counters.h"
 #include "shared/source/utilities/reference_tracked_object.h"
 
+#include <array>
+
 namespace NEO {
 class BindlessHeapsHelper;
 class BuiltIns;

shared/source/device/device_caps.cpp

@@ -16,6 +16,7 @@
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/gfx_core_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/os_interface.h"

shared/source/device/root_device.cpp

@@ -15,6 +15,7 @@
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/gfx_core_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/utilities/software_tags_manager.h"
 

shared/source/dll/linux/debugger_l0_dll_linux.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,7 @@
 #include "shared/source/debugger/debugger_l0.h"
 #include "shared/source/device/device.h"
 #include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/os_interface.h"
 

shared/source/dll/windows/debugger_l0_windows.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,6 +8,7 @@
 #include "shared/source/debugger/debugger_l0.h"
 #include "shared/source/device/device.h"
 #include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/source/helpers/hw_info.h"
 
 namespace NEO {
 std::unique_ptr<NEO::Debugger> DebuggerL0::create(NEO::Device *device) {

shared/source/gen11/enable_hw_info_config_ehl.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/gen11/hw_cmds_ehl.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 
 namespace NEO {
 

shared/source/gen11/enable_hw_info_config_icllp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/gen11/hw_cmds_icllp.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 
 namespace NEO {
 

shared/source/gen11/enable_hw_info_config_lkf.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/gen11/hw_cmds_lkf.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 
 namespace NEO {
 

shared/source/gen12lp/enable_hw_info_config_adln.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/gen12lp/hw_cmds_adln.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 
 namespace NEO {
 

shared/source/gen12lp/enable_hw_info_config_adlp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/gen12lp/hw_cmds_adlp.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 
 namespace NEO {
 

shared/source/gen12lp/enable_hw_info_config_adls.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/gen12lp/hw_cmds_adls.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 
 namespace NEO {
 

shared/source/gen12lp/enable_hw_info_config_dg1.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/gen12lp/hw_cmds_dg1.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 
 namespace NEO {
 

shared/source/gen12lp/enable_hw_info_config_rkl.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/gen12lp/hw_cmds_rkl.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 
 namespace NEO {
 

shared/source/gen12lp/enable_hw_info_config_tgllp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/gen12lp/hw_cmds_tgllp.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 
 namespace NEO {
 

shared/source/gen8/enable_hw_info_config_bdw.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/gen8/hw_cmds_bdw.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 
 namespace NEO {
 

shared/source/gen9/enable_hw_info_config_bxt.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/gen9/hw_cmds_bxt.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 
 namespace NEO {
 

shared/source/gen9/enable_hw_info_config_cfl.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/gen9/hw_cmds_cfl.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 
 namespace NEO {
 

shared/source/gen9/enable_hw_info_config_glk.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/gen9/hw_cmds_glk.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 
 namespace NEO {
 

shared/source/gen9/enable_hw_info_config_kbl.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/gen9/hw_cmds_kbl.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 
 namespace NEO {
 

shared/source/gen9/enable_hw_info_config_skl.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/gen9/hw_cmds_skl.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 
 namespace NEO {
 

shared/source/helpers/blit_helper.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/device/device.h"
 #include "shared/source/helpers/blit_properties.h"
 #include "shared/source/helpers/gfx_core_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
 
 namespace NEO {

shared/source/helpers/engine_node_helper.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/device/device.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/gfx_core_helper.h"
+#include "shared/source/helpers/hw_info.h"
 
 namespace NEO::EngineHelpers {
 

shared/source/helpers/ray_tracing_helper.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,6 +10,7 @@
 #include "shared/source/device/device.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/basic_math.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
 #include "ocl_igc_shared/raytracing/ocl_raytracing_structures.h"

shared/source/os_interface/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019-2022 Intel Corporation
+# Copyright (C) 2019-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -41,6 +41,7 @@ set(NEO_CORE_OS_INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters.h
     ${CMAKE_CURRENT_SOURCE_DIR}/print.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/product_helper_hw.h
     ${CMAKE_CURRENT_SOURCE_DIR}/os_inc_base.h
     ${CMAKE_CURRENT_SOURCE_DIR}/sys_calls_common.h
 )

shared/source/os_interface/hw_info_config.h

@@ -6,11 +6,11 @@
  */
 
 #pragma once
-
-#include "shared/source/helpers/hw_info.h"
-
+#include <igfxfmid.h>
 #include <memory>
 #include <optional>
+#include <string>
+#include <vector>
 
 namespace AOT {
 enum PRODUCT_CONFIG : uint32_t;
@@ -209,174 +209,4 @@ class ProductHelper {
     uint32_t threadsPerEu = 0u;
 };
 
-template <PRODUCT_FAMILY gfxProduct>
-class ProductHelperHw : public ProductHelper {
-  public:
-    static std::unique_ptr<ProductHelper> create() {
-        auto productHelper = std::unique_ptr<ProductHelper>(new ProductHelperHw());
-
-        using GfxProduct = typename HwMapper<gfxProduct>::GfxProduct;
-        productHelper->threadsPerEu = GfxProduct::threadsPerEu;
-
-        return productHelper;
-    }
-
-    int configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const override;
-    void adjustPlatformForProductFamily(HardwareInfo *hwInfo) override;
-    void adjustSamplerState(void *sampler, const HardwareInfo &hwInfo) const override;
-    void disableRcsExposure(HardwareInfo *hwInfo) const override;
-    uint64_t getHostMemCapabilities(const HardwareInfo *hwInfo) const override;
-    uint64_t getDeviceMemCapabilities() const override;
-    uint64_t getSingleDeviceSharedMemCapabilities() const override;
-    uint64_t getCrossDeviceSharedMemCapabilities() const override;
-    uint64_t getSharedSystemMemCapabilities(const HardwareInfo *hwInfo) const override;
-    void getKernelExtendedProperties(uint32_t *fp16, uint32_t *fp32, uint32_t *fp64) const override;
-    std::vector<int32_t> getKernelSupportedThreadArbitrationPolicies() const override;
-    uint32_t getDeviceMemoryMaxClkRate(const HardwareInfo &hwInfo, const OSInterface *osIface, uint32_t subDeviceIndex) const override;
-    uint64_t getDeviceMemoryPhysicalSizeInBytes(const OSInterface *osIface, uint32_t subDeviceIndex) const override;
-    uint64_t getDeviceMemoryMaxBandWidthInBytesPerSecond(const HardwareInfo &hwInfo, const OSInterface *osIface, uint32_t subDeviceIndex) const override;
-    bool isAdditionalStateBaseAddressWARequired(const HardwareInfo &hwInfo) const override;
-    bool isMaxThreadsForWorkgroupWARequired(const HardwareInfo &hwInfo) const override;
-    uint32_t getMaxThreadsForWorkgroupInDSSOrSS(const HardwareInfo &hwInfo, uint32_t maxNumEUsPerSubSlice, uint32_t maxNumEUsPerDualSubSlice) const override;
-    uint32_t getMaxThreadsForWorkgroup(const HardwareInfo &hwInfo, uint32_t maxNumEUsPerSubSlice) const override;
-    void setForceNonCoherent(void *const commandPtr, const StateComputeModeProperties &properties) const override;
-    void updateScmCommand(void *const commandPtr, const StateComputeModeProperties &properties) const override;
-    void updateIddCommand(void *const commandPtr, uint32_t numGrf, int32_t threadArbitrationPolicy) const override;
-    bool obtainBlitterPreference(const HardwareInfo &hwInfo) const override;
-    bool isBlitterFullySupported(const HardwareInfo &hwInfo) const override;
-    bool isPageTableManagerSupported(const HardwareInfo &hwInfo) const override;
-    bool overrideGfxPartitionLayoutForWsl() const override;
-    uint32_t getHwRevIdFromStepping(uint32_t stepping, const HardwareInfo &hwInfo) const override;
-    AOT::PRODUCT_CONFIG getProductConfigFromHwInfo(const HardwareInfo &hwInfo) const override;
-    uint32_t getSteppingFromHwRevId(const HardwareInfo &hwInfo) const override;
-    uint32_t getAubStreamSteppingFromHwRevId(const HardwareInfo &hwInfo) const override;
-    std::optional<aub_stream::ProductFamily> getAubStreamProductFamily() const override;
-    bool isDefaultEngineTypeAdjustmentRequired(const HardwareInfo &hwInfo) const override;
-    std::string getDeviceMemoryName() const override;
-    bool isDisableOverdispatchAvailable(const HardwareInfo &hwInfo) const override;
-    bool allowCompression(const HardwareInfo &hwInfo) const override;
-    LocalMemoryAccessMode getLocalMemoryAccessMode(const HardwareInfo &hwInfo) const override;
-    bool isAllocationSizeAdjustmentRequired(const HardwareInfo &hwInfo) const override;
-    bool isPrefetchDisablingRequired(const HardwareInfo &hwInfo) const override;
-    bool isNewResidencyModelSupported() const override;
-    bool isDirectSubmissionSupported(const HardwareInfo &hwInfo) const override;
-    std::pair<bool, bool> isPipeControlPriorToNonPipelinedStateCommandsWARequired(const HardwareInfo &hwInfo, bool isRcs) const override;
-    bool heapInLocalMem(const HardwareInfo &hwInfo) const override;
-    void setCapabilityCoherencyFlag(const HardwareInfo &hwInfo, bool &coherencyFlag) override;
-    bool isAdditionalMediaSamplerProgrammingRequired() const override;
-    bool isInitialFlagsProgrammingRequired() const override;
-    bool isReturnedCmdSizeForMediaSamplerAdjustmentRequired() const override;
-    bool extraParametersInvalid(const HardwareInfo &hwInfo) const override;
-    bool pipeControlWARequired(const HardwareInfo &hwInfo) const override;
-    bool imagePitchAlignmentWARequired(const HardwareInfo &hwInfo) const override;
-    bool isForceEmuInt32DivRemSPWARequired(const HardwareInfo &hwInfo) const override;
-    bool is3DPipelineSelectWARequired() const override;
-    bool isStorageInfoAdjustmentRequired() const override;
-    bool isBlitterForImagesSupported() const override;
-    bool isPageFaultSupported() const override;
-    bool isTile64With3DSurfaceOnBCSSupported(const HardwareInfo &hwInfo) const override;
-    bool isDcFlushAllowed() const override;
-    uint32_t computeMaxNeededSubSliceSpace(const HardwareInfo &hwInfo) const override;
-    bool getUuid(Device *device, std::array<uint8_t, ProductHelper::uuidSize> &uuid) const override;
-    bool isFlushTaskAllowed() const override;
-    bool programAllStateComputeCommandFields() const override;
-    bool isSystolicModeConfigurable(const HardwareInfo &hwInfo) const override;
-    bool isComputeDispatchAllWalkerEnableInComputeWalkerRequired(const HardwareInfo &hwInfo) const override;
-    bool isCopyEngineSelectorEnabled(const HardwareInfo &hwInfo) const override;
-    bool isGlobalFenceInCommandStreamRequired(const HardwareInfo &hwInfo) const override;
-    bool isGlobalFenceInDirectSubmissionRequired(const HardwareInfo &hwInfo) const override;
-    bool isAdjustProgrammableIdPreferredSlmSizeRequired(const HardwareInfo &hwInfo) const override;
-    uint32_t getThreadEuRatioForScratch(const HardwareInfo &hwInfo) const override;
-    size_t getSvmCpuAlignment() const override;
-    bool isComputeDispatchAllWalkerEnableInCfeStateRequired(const HardwareInfo &hwInfo) const override;
-    bool isVmBindPatIndexProgrammingSupported() const override;
-    bool isBFloat16ConversionSupported(const HardwareInfo &hwInfo) const override;
-    bool isMatrixMultiplyAccumulateSupported(const HardwareInfo &hwInfo) const override;
-    bool isIpSamplingSupported(const HardwareInfo &hwInfo) const override;
-    bool isGrfNumReportedWithScm() const override;
-    bool isThreadArbitrationPolicyReportedWithScm() const override;
-    bool isCooperativeEngineSupported(const HardwareInfo &hwInfo) const override;
-    bool isTimestampWaitSupportedForEvents() const override;
-    bool isTilePlacementResourceWaRequired(const HardwareInfo &hwInfo) const override;
-    bool isBlitSplitEnqueueWARequired(const HardwareInfo &hwInfo) const override;
-    bool isInitDeviceWithFirstSubmissionRequired(const HardwareInfo &hwInfo) const override;
-    bool allowMemoryPrefetch(const HardwareInfo &hwInfo) const override;
-    bool isBcsReportWaRequired(const HardwareInfo &hwInfo) const override;
-    bool isBlitCopyRequiredForLocalMemory(const RootDeviceEnvironment &rootDeviceEnvironment, const GraphicsAllocation &allocation) const override;
-    bool isImplicitScalingSupported(const HardwareInfo &hwInfo) const override;
-    bool isCpuCopyNecessary(const void *ptr, MemoryManager *memoryManager) const override;
-    bool isUnlockingLockedPtrNecessary(const HardwareInfo &hwInfo) const override;
-    bool isAdjustWalkOrderAvailable(const HardwareInfo &hwInfo) const override;
-    bool isAssignEngineRoundRobinSupported() const override;
-    uint32_t getL1CachePolicy(bool isDebuggerActive) const override;
-    bool isEvictionIfNecessaryFlagSupported() const override;
-    void adjustNumberOfCcs(HardwareInfo &hwInfo) const override;
-    bool isPrefetcherDisablingInDirectSubmissionRequired() const override;
-    bool isStatefulAddressingModeSupported() const override;
-    bool isPlatformQuerySupported() const override;
-    bool isNonBlockingGpuSubmissionSupported() const override;
-    bool isResolveDependenciesByPipeControlsSupported(const HardwareInfo &hwInfo, bool isOOQ) const override;
-    bool isMidThreadPreemptionDisallowedForRayTracingKernels() const override;
-    bool isBufferPoolAllocatorSupported() const override;
-    uint64_t overridePatIndex(AllocationType allocationType, uint64_t patIndex) const override;
-    bool isTlbFlushRequired() const override;
-    bool getFrontEndPropertyScratchSizeSupport() const override;
-    bool getFrontEndPropertyPrivateScratchSizeSupport() const override;
-    bool getFrontEndPropertyComputeDispatchAllWalkerSupport() const override;
-    bool getFrontEndPropertyDisableEuFusionSupport() const override;
-    bool getFrontEndPropertyDisableOverDispatchSupport() const override;
-    bool getFrontEndPropertySingleSliceDispatchCcsModeSupport() const override;
-
-    bool getScmPropertyThreadArbitrationPolicySupport() const override;
-    bool getScmPropertyCoherencyRequiredSupport() const override;
-    bool getScmPropertyZPassAsyncComputeThreadLimitSupport() const override;
-    bool getScmPropertyPixelAsyncComputeThreadLimitSupport() const override;
-    bool getScmPropertyLargeGrfModeSupport() const override;
-    bool getScmPropertyDevicePreemptionModeSupport() const override;
-
-    bool getStateBaseAddressPropertyGlobalAtomicsSupport() const override;
-    bool getStateBaseAddressPropertyStatelessMocsSupport() const override;
-    bool getStateBaseAddressPropertyBindingTablePoolBaseAddressSupport() const override;
-
-    bool getPreemptionDbgPropertyPreemptionModeSupport() const override;
-    bool getPreemptionDbgPropertyStateSipSupport() const override;
-    bool getPreemptionDbgPropertyCsrSurfaceSupport() const override;
-
-    bool getPipelineSelectPropertyModeSelectedSupport() const override;
-    bool getPipelineSelectPropertyMediaSamplerDopClockGateSupport() const override;
-    bool getPipelineSelectPropertySystolicModeSupport() const override;
-
-    void fillScmPropertiesSupportStructure(StateComputeModePropertiesSupport &propertiesSupport) const override;
-    void fillFrontEndPropertiesSupportStructure(FrontEndPropertiesSupport &propertiesSupport, const HardwareInfo &hwInfo) const override;
-    void fillPipelineSelectPropertiesSupportStructure(PipelineSelectPropertiesSupport &propertiesSupport, const HardwareInfo &hwInfo) const override;
-    void fillStateBaseAddressPropertiesSupportStructure(StateBaseAddressPropertiesSupport &propertiesSupport) const override;
-    uint32_t getDefaultRevisionId() const override;
-
-    bool isMultiContextResourceDeferDeletionSupported() const override;
-
-    ~ProductHelperHw() override = default;
-
-  protected:
-    ProductHelperHw() = default;
-
-    void enableCompression(HardwareInfo *hwInfo) const;
-    void enableBlitterOperationsSupport(HardwareInfo *hwInfo) const;
-    bool getConcurrentAccessMemCapabilitiesSupported(UsmAccessCapabilities capability) const;
-    uint64_t getHostMemCapabilitiesValue() const;
-    bool getHostMemCapabilitiesSupported(const HardwareInfo *hwInfo) const;
-    LocalMemoryAccessMode getDefaultLocalMemoryAccessMode(const HardwareInfo &hwInfo) const override;
-    void fillScmPropertiesSupportStructureBase(StateComputeModePropertiesSupport &propertiesSupport) const override;
-};
-
-template <PRODUCT_FAMILY gfxProduct>
-struct EnableProductProductHelper {
-
-    using GfxProduct = typename HwMapper<gfxProduct>::GfxProduct;
-
-    EnableProductProductHelper() {
-        auto productHelperCreateFunction = ProductHelperHw<gfxProduct>::create;
-        productHelperFactory[gfxProduct] = productHelperCreateFunction;
-    }
-};
-
 } // namespace NEO

shared/source/os_interface/hw_info_config.inl

@@ -18,6 +18,7 @@
 #include "shared/source/memory_manager/graphics_allocation.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 #include "shared/source/unified_memory/usm_memory_support.h"
 
 #include <bitset>

shared/source/os_interface/linux/drm_memory_operations_handler_bind.cpp

@@ -8,6 +8,7 @@
 #include "shared/source/os_interface/linux/drm_memory_operations_handler_bind.h"
 
 #include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/source/command_stream/wait_status.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
 #include "shared/source/execution_environment/execution_environment.h"

shared/source/os_interface/product_helper_hw.h

@@ -0,0 +1,184 @@
+/*
+ * Copyright (C) 2023 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+#include "shared/source/helpers/hw_info.h"
+#include "shared/source/os_interface/hw_info_config.h"
+
+namespace NEO {
+
+template <PRODUCT_FAMILY gfxProduct>
+class ProductHelperHw : public ProductHelper {
+  public:
+    static std::unique_ptr<ProductHelper> create() {
+        auto productHelper = std::unique_ptr<ProductHelper>(new ProductHelperHw());
+
+        using GfxProduct = typename HwMapper<gfxProduct>::GfxProduct;
+        productHelper->threadsPerEu = GfxProduct::threadsPerEu;
+
+        return productHelper;
+    }
+
+    int configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const override;
+    void adjustPlatformForProductFamily(HardwareInfo *hwInfo) override;
+    void adjustSamplerState(void *sampler, const HardwareInfo &hwInfo) const override;
+    void disableRcsExposure(HardwareInfo *hwInfo) const override;
+    uint64_t getHostMemCapabilities(const HardwareInfo *hwInfo) const override;
+    uint64_t getDeviceMemCapabilities() const override;
+    uint64_t getSingleDeviceSharedMemCapabilities() const override;
+    uint64_t getCrossDeviceSharedMemCapabilities() const override;
+    uint64_t getSharedSystemMemCapabilities(const HardwareInfo *hwInfo) const override;
+    void getKernelExtendedProperties(uint32_t *fp16, uint32_t *fp32, uint32_t *fp64) const override;
+    std::vector<int32_t> getKernelSupportedThreadArbitrationPolicies() const override;
+    uint32_t getDeviceMemoryMaxClkRate(const HardwareInfo &hwInfo, const OSInterface *osIface, uint32_t subDeviceIndex) const override;
+    uint64_t getDeviceMemoryPhysicalSizeInBytes(const OSInterface *osIface, uint32_t subDeviceIndex) const override;
+    uint64_t getDeviceMemoryMaxBandWidthInBytesPerSecond(const HardwareInfo &hwInfo, const OSInterface *osIface, uint32_t subDeviceIndex) const override;
+    bool isAdditionalStateBaseAddressWARequired(const HardwareInfo &hwInfo) const override;
+    bool isMaxThreadsForWorkgroupWARequired(const HardwareInfo &hwInfo) const override;
+    uint32_t getMaxThreadsForWorkgroupInDSSOrSS(const HardwareInfo &hwInfo, uint32_t maxNumEUsPerSubSlice, uint32_t maxNumEUsPerDualSubSlice) const override;
+    uint32_t getMaxThreadsForWorkgroup(const HardwareInfo &hwInfo, uint32_t maxNumEUsPerSubSlice) const override;
+    void setForceNonCoherent(void *const commandPtr, const StateComputeModeProperties &properties) const override;
+    void updateScmCommand(void *const commandPtr, const StateComputeModeProperties &properties) const override;
+    void updateIddCommand(void *const commandPtr, uint32_t numGrf, int32_t threadArbitrationPolicy) const override;
+    bool obtainBlitterPreference(const HardwareInfo &hwInfo) const override;
+    bool isBlitterFullySupported(const HardwareInfo &hwInfo) const override;
+    bool isPageTableManagerSupported(const HardwareInfo &hwInfo) const override;
+    bool overrideGfxPartitionLayoutForWsl() const override;
+    uint32_t getHwRevIdFromStepping(uint32_t stepping, const HardwareInfo &hwInfo) const override;
+    AOT::PRODUCT_CONFIG getProductConfigFromHwInfo(const HardwareInfo &hwInfo) const override;
+    uint32_t getSteppingFromHwRevId(const HardwareInfo &hwInfo) const override;
+    uint32_t getAubStreamSteppingFromHwRevId(const HardwareInfo &hwInfo) const override;
+    std::optional<aub_stream::ProductFamily> getAubStreamProductFamily() const override;
+    bool isDefaultEngineTypeAdjustmentRequired(const HardwareInfo &hwInfo) const override;
+    std::string getDeviceMemoryName() const override;
+    bool isDisableOverdispatchAvailable(const HardwareInfo &hwInfo) const override;
+    bool allowCompression(const HardwareInfo &hwInfo) const override;
+    LocalMemoryAccessMode getLocalMemoryAccessMode(const HardwareInfo &hwInfo) const override;
+    bool isAllocationSizeAdjustmentRequired(const HardwareInfo &hwInfo) const override;
+    bool isPrefetchDisablingRequired(const HardwareInfo &hwInfo) const override;
+    bool isNewResidencyModelSupported() const override;
+    bool isDirectSubmissionSupported(const HardwareInfo &hwInfo) const override;
+    std::pair<bool, bool> isPipeControlPriorToNonPipelinedStateCommandsWARequired(const HardwareInfo &hwInfo, bool isRcs) const override;
+    bool heapInLocalMem(const HardwareInfo &hwInfo) const override;
+    void setCapabilityCoherencyFlag(const HardwareInfo &hwInfo, bool &coherencyFlag) override;
+    bool isAdditionalMediaSamplerProgrammingRequired() const override;
+    bool isInitialFlagsProgrammingRequired() const override;
+    bool isReturnedCmdSizeForMediaSamplerAdjustmentRequired() const override;
+    bool extraParametersInvalid(const HardwareInfo &hwInfo) const override;
+    bool pipeControlWARequired(const HardwareInfo &hwInfo) const override;
+    bool imagePitchAlignmentWARequired(const HardwareInfo &hwInfo) const override;
+    bool isForceEmuInt32DivRemSPWARequired(const HardwareInfo &hwInfo) const override;
+    bool is3DPipelineSelectWARequired() const override;
+    bool isStorageInfoAdjustmentRequired() const override;
+    bool isBlitterForImagesSupported() const override;
+    bool isPageFaultSupported() const override;
+    bool isTile64With3DSurfaceOnBCSSupported(const HardwareInfo &hwInfo) const override;
+    bool isDcFlushAllowed() const override;
+    uint32_t computeMaxNeededSubSliceSpace(const HardwareInfo &hwInfo) const override;
+    bool getUuid(Device *device, std::array<uint8_t, ProductHelper::uuidSize> &uuid) const override;
+    bool isFlushTaskAllowed() const override;
+    bool programAllStateComputeCommandFields() const override;
+    bool isSystolicModeConfigurable(const HardwareInfo &hwInfo) const override;
+    bool isComputeDispatchAllWalkerEnableInComputeWalkerRequired(const HardwareInfo &hwInfo) const override;
+    bool isCopyEngineSelectorEnabled(const HardwareInfo &hwInfo) const override;
+    bool isGlobalFenceInCommandStreamRequired(const HardwareInfo &hwInfo) const override;
+    bool isGlobalFenceInDirectSubmissionRequired(const HardwareInfo &hwInfo) const override;
+    bool isAdjustProgrammableIdPreferredSlmSizeRequired(const HardwareInfo &hwInfo) const override;
+    uint32_t getThreadEuRatioForScratch(const HardwareInfo &hwInfo) const override;
+    size_t getSvmCpuAlignment() const override;
+    bool isComputeDispatchAllWalkerEnableInCfeStateRequired(const HardwareInfo &hwInfo) const override;
+    bool isVmBindPatIndexProgrammingSupported() const override;
+    bool isBFloat16ConversionSupported(const HardwareInfo &hwInfo) const override;
+    bool isMatrixMultiplyAccumulateSupported(const HardwareInfo &hwInfo) const override;
+    bool isIpSamplingSupported(const HardwareInfo &hwInfo) const override;
+    bool isGrfNumReportedWithScm() const override;
+    bool isThreadArbitrationPolicyReportedWithScm() const override;
+    bool isCooperativeEngineSupported(const HardwareInfo &hwInfo) const override;
+    bool isTimestampWaitSupportedForEvents() const override;
+    bool isTilePlacementResourceWaRequired(const HardwareInfo &hwInfo) const override;
+    bool isBlitSplitEnqueueWARequired(const HardwareInfo &hwInfo) const override;
+    bool isInitDeviceWithFirstSubmissionRequired(const HardwareInfo &hwInfo) const override;
+    bool allowMemoryPrefetch(const HardwareInfo &hwInfo) const override;
+    bool isBcsReportWaRequired(const HardwareInfo &hwInfo) const override;
+    bool isBlitCopyRequiredForLocalMemory(const RootDeviceEnvironment &rootDeviceEnvironment, const GraphicsAllocation &allocation) const override;
+    bool isImplicitScalingSupported(const HardwareInfo &hwInfo) const override;
+    bool isCpuCopyNecessary(const void *ptr, MemoryManager *memoryManager) const override;
+    bool isUnlockingLockedPtrNecessary(const HardwareInfo &hwInfo) const override;
+    bool isAdjustWalkOrderAvailable(const HardwareInfo &hwInfo) const override;
+    bool isAssignEngineRoundRobinSupported() const override;
+    uint32_t getL1CachePolicy(bool isDebuggerActive) const override;
+    bool isEvictionIfNecessaryFlagSupported() const override;
+    void adjustNumberOfCcs(HardwareInfo &hwInfo) const override;
+    bool isPrefetcherDisablingInDirectSubmissionRequired() const override;
+    bool isStatefulAddressingModeSupported() const override;
+    bool isPlatformQuerySupported() const override;
+    bool isNonBlockingGpuSubmissionSupported() const override;
+    bool isResolveDependenciesByPipeControlsSupported(const HardwareInfo &hwInfo, bool isOOQ) const override;
+    bool isMidThreadPreemptionDisallowedForRayTracingKernels() const override;
+    bool isBufferPoolAllocatorSupported() const override;
+    uint64_t overridePatIndex(AllocationType allocationType, uint64_t patIndex) const override;
+    bool isTlbFlushRequired() const override;
+    bool getFrontEndPropertyScratchSizeSupport() const override;
+    bool getFrontEndPropertyPrivateScratchSizeSupport() const override;
+    bool getFrontEndPropertyComputeDispatchAllWalkerSupport() const override;
+    bool getFrontEndPropertyDisableEuFusionSupport() const override;
+    bool getFrontEndPropertyDisableOverDispatchSupport() const override;
+    bool getFrontEndPropertySingleSliceDispatchCcsModeSupport() const override;
+
+    bool getScmPropertyThreadArbitrationPolicySupport() const override;
+    bool getScmPropertyCoherencyRequiredSupport() const override;
+    bool getScmPropertyZPassAsyncComputeThreadLimitSupport() const override;
+    bool getScmPropertyPixelAsyncComputeThreadLimitSupport() const override;
+    bool getScmPropertyLargeGrfModeSupport() const override;
+    bool getScmPropertyDevicePreemptionModeSupport() const override;
+
+    bool getStateBaseAddressPropertyGlobalAtomicsSupport() const override;
+    bool getStateBaseAddressPropertyStatelessMocsSupport() const override;
+    bool getStateBaseAddressPropertyBindingTablePoolBaseAddressSupport() const override;
+
+    bool getPreemptionDbgPropertyPreemptionModeSupport() const override;
+    bool getPreemptionDbgPropertyStateSipSupport() const override;
+    bool getPreemptionDbgPropertyCsrSurfaceSupport() const override;
+
+    bool getPipelineSelectPropertyModeSelectedSupport() const override;
+    bool getPipelineSelectPropertyMediaSamplerDopClockGateSupport() const override;
+    bool getPipelineSelectPropertySystolicModeSupport() const override;
+
+    void fillScmPropertiesSupportStructure(StateComputeModePropertiesSupport &propertiesSupport) const override;
+    void fillFrontEndPropertiesSupportStructure(FrontEndPropertiesSupport &propertiesSupport, const HardwareInfo &hwInfo) const override;
+    void fillPipelineSelectPropertiesSupportStructure(PipelineSelectPropertiesSupport &propertiesSupport, const HardwareInfo &hwInfo) const override;
+    void fillStateBaseAddressPropertiesSupportStructure(StateBaseAddressPropertiesSupport &propertiesSupport) const override;
+    uint32_t getDefaultRevisionId() const override;
+
+    bool isMultiContextResourceDeferDeletionSupported() const override;
+
+    ~ProductHelperHw() override = default;
+
+  protected:
+    ProductHelperHw() = default;
+
+    void enableCompression(HardwareInfo *hwInfo) const;
+    void enableBlitterOperationsSupport(HardwareInfo *hwInfo) const;
+    bool getConcurrentAccessMemCapabilitiesSupported(UsmAccessCapabilities capability) const;
+    uint64_t getHostMemCapabilitiesValue() const;
+    bool getHostMemCapabilitiesSupported(const HardwareInfo *hwInfo) const;
+    LocalMemoryAccessMode getDefaultLocalMemoryAccessMode(const HardwareInfo &hwInfo) const override;
+    void fillScmPropertiesSupportStructureBase(StateComputeModePropertiesSupport &propertiesSupport) const override;
+};
+
+template <PRODUCT_FAMILY gfxProduct>
+struct EnableProductProductHelper {
+
+    using GfxProduct = typename HwMapper<gfxProduct>::GfxProduct;
+
+    EnableProductProductHelper() {
+        auto productHelperCreateFunction = ProductHelperHw<gfxProduct>::create;
+        productHelperFactory[gfxProduct] = productHelperCreateFunction;
+    }
+};
+
+} // namespace NEO

shared/source/os_interface/windows/performance_counters_win.cpp

@@ -9,6 +9,7 @@
 
 #include "shared/source/device/device.h"
 #include "shared/source/helpers/gfx_core_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/source/os_interface/windows/os_time_win.h"
 #include "shared/source/os_interface/windows/wddm/wddm.h"

shared/source/os_interface/windows/wddm/wddm.cpp

@@ -20,6 +20,7 @@
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/heap_assigner.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/mt_helpers.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/helpers/windows/gmm_callbacks.h"

shared/source/os_interface/windows/wddm_memory_manager.cpp

@@ -21,6 +21,7 @@
 #include "shared/source/helpers/deferred_deleter_helper.h"
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/heap_assigner.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/helpers/surface_format_info.h"

shared/source/xe_hpc_core/enable_hw_info_config_pvc.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 #include "shared/source/xe_hpc_core/hw_cmds_pvc.h"
 
 namespace NEO {

shared/source/xe_hpg_core/enable_hw_info_config_dg2.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 #include "shared/source/xe_hpg_core/hw_cmds_dg2.h"
 
 namespace NEO {

shared/source/xe_hpg_core/enable_hw_info_config_mtl.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 #include "shared/source/xe_hpg_core/hw_cmds_mtl.h"
 
 namespace NEO {

shared/test/common/helpers/mock_hw_info_config_hw.h

@@ -7,6 +7,7 @@
 
 #pragma once
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 
 namespace NEO {
 

shared/test/common/mocks/debugger_l0_create.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/device/device.h"
 #include "shared/source/execution_environment/root_device_environment.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/test/common/mocks/mock_l0_debugger.h"
 
 NEO::DebugerL0CreateFn mockDebuggerL0HwFactory[IGFX_MAX_CORE];

shared/test/common/mocks/mock_device.cpp

@@ -10,6 +10,7 @@
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/debug_settings/debug_settings_manager.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/memory_manager/multi_graphics_allocation.h"
 #include "shared/source/os_interface/os_context.h"
 #include "shared/test/common/fixtures/mock_aub_center_fixture.h"

shared/test/common/mocks/mock_hw_info_config.cpp

@@ -8,8 +8,10 @@
 #include "shared/source/aub_mem_dump/aub_mem_dump.h"
 #include "shared/source/helpers/cache_policy.h"
 #include "shared/source/helpers/constants.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/local_memory_access_modes.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 
 #include "platforms.h"
 

shared/test/common/mocks/ult_device_factory.cpp

@@ -8,6 +8,7 @@
 #include "shared/test/common/mocks/ult_device_factory.h"
 
 #include "shared/source/helpers/gfx_core_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/memory_manager/multi_graphics_allocation.h"
 #include "shared/source/os_interface/device_factory.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"

shared/test/unit_test/execution_environment/execution_environment_tests.cpp

@@ -14,6 +14,7 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/driver_model_type.h"
 #include "shared/source/helpers/gfx_core_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/device_factory.h"
 #include "shared/source/os_interface/driver_info.h"
 #include "shared/source/os_interface/os_interface.h"

shared/test/unit_test/helpers/engine_node_helper_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,6 +7,7 @@
 
 #include "shared/source/device/device.h"
 #include "shared/source/helpers/engine_node_helper.h"
+#include "shared/source/helpers/hw_info.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"

shared/test/unit_test/preemption/preemption_tests.cpp

@@ -10,6 +10,7 @@
 #include "shared/source/kernel/kernel_descriptor.h"
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/os_agnostic_memory_manager.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/dispatch_flags_helper.h"

shared/test/unit_test/xe_hpg_core/test_encode_dispatch_kernel_xe_hpg_core.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/product_helper_hw.h"
 #include "shared/test//common/helpers/raii_hw_info_config.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/helpers/variable_backup.h"