Move cmd parse files to shared directory

Related-To: NEO-4519

Change-Id: Id055631d68f1d73ae39c4976843080b8f8e05f1c
Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>

level_zero/core/test/unit_tests/sources/debugger/test_debugger.cpp

@@ -8,9 +8,9 @@
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/gen_common/reg_configs/reg_configs_common.h"
 #include "shared/source/helpers/preamble.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/unit_test/mocks/mock_os_library.h"
 
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/mocks/mock_source_level_debugger.h"
 #include "test.h"

opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp

@@ -10,6 +10,7 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/hw_cmds.h"
 #include "shared/source/helpers/state_base_address.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/utilities/base_object_utils.h"
 
 #include "opencl/extensions/public/cl_ext_private.h"
@@ -17,7 +18,6 @@
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/kernel/kernel.h"
 #include "opencl/test/unit_test/fixtures/hello_world_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "test.h"
 
 using namespace NEO;

opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h

@@ -6,13 +6,14 @@
  */
 
 #pragma once
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
+
 #include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h"
 #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h"
 #include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
 #include "opencl/test/unit_test/command_stream/command_stream_fixture.h"
 #include "opencl/test/unit_test/fixtures/built_in_fixture.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 
 namespace NEO {
 

opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/helpers/ptr_math.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
 #include "opencl/source/command_queue/command_queue.h"
@@ -16,7 +17,6 @@
 #include "opencl/test/unit_test/fixtures/hello_world_fixture.h"
 #include "opencl/test/unit_test/fixtures/simple_arg_fixture.h"
 #include "opencl/test/unit_test/fixtures/two_walker_fixture.h"
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "test.h"

opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp

@@ -11,12 +11,12 @@
 #include "shared/source/device/device.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/os_interface/os_context.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/unit_test/helpers/memory_management.h"
 #include "shared/test/unit_test/tests_configuration.h"
 
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/command_stream/tbx_command_stream_receiver.h"
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 
 #include "gtest/gtest.h"

opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp

@@ -8,11 +8,11 @@
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/source/os_interface/os_context.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 
 #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h"
 #include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "test.h"
 
 #include "aub_command_stream_fixture.h"

opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp

@@ -6,11 +6,11 @@
  */
 
 #include "shared/source/helpers/vec.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 #include "shared/test/unit_test/utilities/base_object_utils.h"
 
 #include "opencl/source/event/user_event.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"

opencl/test/unit_test/command_queue/buffer_operations_fixture.h

@@ -7,11 +7,11 @@
 
 #pragma once
 #include "shared/source/helpers/ptr_math.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 
 #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h"
 #include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 
 #include "gtest/gtest.h"
 

opencl/test/unit_test/command_queue/command_enqueue_fixture.h

@@ -6,13 +6,14 @@
  */
 
 #pragma once
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
+
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
 #include "opencl/test/unit_test/command_stream/command_stream_fixture.h"
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
 #include "opencl/test/unit_test/fixtures/image_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/indirect_heap/indirect_heap_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"
 

opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp

@@ -8,6 +8,7 @@
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/memory_manager/internal_allocation_storage.h"
 #include "shared/source/utilities/tag_allocator.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
 #include "opencl/source/built_ins/aux_translation_builtin.h"
@@ -18,7 +19,6 @@
 #include "opencl/source/helpers/task_information.h"
 #include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"

opencl/test/unit_test/command_queue/enqueue_barrier_tests.cpp

@@ -6,13 +6,13 @@
  */
 
 #include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/command_queue/gpgpu_walker.h"
 #include "opencl/source/event/user_event.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"
 #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h"
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "test.h"
 

opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h

@@ -7,10 +7,10 @@
 
 #pragma once
 #include "shared/source/helpers/ptr_math.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 
 #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h"
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
 #include "gtest/gtest.h"

opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h

@@ -7,10 +7,10 @@
 
 #pragma once
 #include "shared/source/helpers/ptr_math.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 
 #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h"
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
 #include "gtest/gtest.h"

opencl/test/unit_test/command_queue/enqueue_fill_buffer_fixture.h

@@ -6,9 +6,10 @@
  */
 
 #pragma once
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
+
 #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h"
 #include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
 namespace NEO {

opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp

@@ -5,13 +5,13 @@
  *
  */
 
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
 #include "opencl/source/api/api.h"
 #include "opencl/source/built_ins/builtins_dispatch_builder.h"
 #include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
 #include "opencl/test/unit_test/fixtures/hello_world_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"
 #include "opencl/test/unit_test/mocks/mock_submissions_aggregator.h"

opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp

@@ -8,14 +8,14 @@
 #include "shared/source/command_stream/scratch_space_controller.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/memory_manager/allocations_list.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 #include "shared/test/unit_test/utilities/base_object_utils.h"
 
 #include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
 #include "opencl/test/unit_test/fixtures/hello_world_fixture.h"
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"

opencl/test/unit_test/command_queue/enqueue_kernel_two_ioq_tests.cpp

@@ -5,10 +5,11 @@
  *
  */
 
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
+
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/event/event.h"
 #include "opencl/test/unit_test/fixtures/hello_world_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "test.h"
 
 using namespace NEO;

opencl/test/unit_test/command_queue/enqueue_kernel_two_ooq_tests.cpp

@@ -5,10 +5,11 @@
  *
  */
 
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
+
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/event/event.h"
 #include "opencl/test/unit_test/fixtures/hello_world_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "test.h"
 

opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp

@@ -6,10 +6,10 @@
  */
 
 #include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 
 #include "opencl/source/event/user_event.h"
 #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h"
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 #include "test.h"

opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_fixture.h

@@ -8,10 +8,10 @@
 #pragma once
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/ptr_math.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 
 #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h"
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
 #include "gtest/gtest.h"

opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/memory_manager/allocations_list.h"
 #include "shared/source/memory_manager/surface.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 #include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h"
 #include "shared/test/unit_test/utilities/base_object_utils.h"
@@ -20,7 +21,6 @@
 #include "opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h"
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"

opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_fixture.h

@@ -8,11 +8,11 @@
 #pragma once
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/ptr_math.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h"
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
 #include "gtest/gtest.h"

opencl/test/unit_test/command_queue/finish_tests.cpp

@@ -6,12 +6,12 @@
  */
 
 #include "shared/source/command_stream/command_stream_receiver.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 
 #include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
 #include "opencl/test/unit_test/command_stream/command_stream_fixture.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "test.h"
 

opencl/test/unit_test/command_queue/gl/windows/enqueue_kernel_gl_tests_windows.cpp

@@ -9,12 +9,12 @@
 #include "shared/source/helpers/preamble.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
 #include "shared/source/memory_manager/memory_constants.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 
 #include "opencl/source/sharings/gl/gl_buffer.h"
 #include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
 #include "opencl/test/unit_test/fixtures/hello_world_fixture.h"
 #include "opencl/test/unit_test/fixtures/memory_management_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"

opencl/test/unit_test/command_stream/cmd_parse_tests.cpp

@@ -5,8 +5,9 @@
  *
  */
 
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
+
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "test.h"
 
 using namespace NEO;

opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp

@@ -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/linux/debug_env_reader.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 #include "shared/test/unit_test/helpers/ult_hw_helper.h"
 
@@ -29,7 +30,6 @@
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
 #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h"
 #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"

opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.cpp

@@ -21,6 +21,7 @@
 #include "shared/source/memory_manager/unified_memory_manager.h"
 #include "shared/source/os_interface/linux/debug_env_reader.h"
 #include "shared/source/os_interface/os_context.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 #include "shared/test/unit_test/utilities/base_object_utils.h"
 
@@ -34,7 +35,6 @@
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
 #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h"
 #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/helpers/raii_hw_helper.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
 #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"

opencl/test/unit_test/command_stream/compute_mode_tests.h

@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "test.h"

opencl/test/unit_test/command_stream/tbx_command_stream_fixture.cpp

@@ -9,9 +9,9 @@
 
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/device/device.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 
 #include "opencl/source/command_queue/command_queue.h"
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 
 #include "gtest/gtest.h"

opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp

@@ -10,6 +10,7 @@
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/source/os_interface/os_context.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
 #include "opencl/source/command_stream/aub_command_stream_receiver.h"
@@ -22,7 +23,6 @@
 #include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
 #include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h"
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "opencl/test/unit_test/helpers/variable_backup.h"
 #include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_aub_center.h"

opencl/test/unit_test/device_queue/device_queue_hw_tests.cpp

@@ -7,13 +7,13 @@
 
 #include "shared/source/helpers/hw_cmds.h"
 #include "shared/source/utilities/tag_allocator.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
 #include "opencl/source/command_queue/gpgpu_walker.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"
 #include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h"
 #include "opencl/test/unit_test/fixtures/execution_model_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/mocks/mock_device_queue.h"

opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/helpers/engine_node_helper.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 #include "shared/test/unit_test/utilities/base_object_utils.h"
 
@@ -20,7 +21,6 @@
 #include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h"
 #include "opencl/test/unit_test/fixtures/execution_model_fixture.h"
 #include "opencl/test/unit_test/helpers/gtest_helpers.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"
 #include "opencl/test/unit_test/mocks/mock_device_queue.h"

opencl/test/unit_test/execution_model/parent_kernel_dispatch_tests.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
 #include "opencl/source/command_queue/enqueue_kernel.h"
@@ -13,7 +14,6 @@
 #include "opencl/source/kernel/kernel.h"
 #include "opencl/source/sampler/sampler.h"
 #include "opencl/test/unit_test/fixtures/execution_model_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"

opencl/test/unit_test/execution_model/scheduler_dispatch_tests.cpp

@@ -6,13 +6,13 @@
  */
 
 #include "shared/source/built_ins/built_ins.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
 #include "opencl/source/command_queue/enqueue_kernel.h"
 #include "opencl/source/device_queue/device_queue.h"
 #include "opencl/source/scheduler/scheduler_kernel.h"
 #include "opencl/test/unit_test/fixtures/execution_model_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_device_queue.h"

opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h

@@ -8,10 +8,10 @@
 #pragma once
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/memory_manager/internal_allocation_storage.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"
 #include "opencl/test/unit_test/helpers/execution_environment_helper.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"

opencl/test/unit_test/fixtures/hello_world_fixture.h

@@ -9,12 +9,12 @@
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/memory_manager/memory_manager.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 
 #include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
 #include "opencl/test/unit_test/command_stream/command_stream_fixture.h"
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"
 #include "opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h"
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "opencl/test/unit_test/indirect_heap/indirect_heap_fixture.h"
 #include "test.h"
 

opencl/test/unit_test/fixtures/media_kernel_fixture.h

@@ -6,9 +6,10 @@
  */
 
 #pragma once
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
+
 #include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
 #include "opencl/test/unit_test/fixtures/hello_world_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
 
 namespace NEO {

opencl/test/unit_test/fixtures/two_walker_fixture.h

@@ -6,8 +6,9 @@
  */
 
 #pragma once
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
+
 #include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 
 #include "hello_world_fixture.h"
 

opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h

@@ -12,9 +12,9 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/cache_policy.h"
 #include "shared/source/memory_manager/graphics_allocation.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
 #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h"

opencl/test/unit_test/gen11/coherency_tests_gen11.cpp

@@ -8,9 +8,9 @@
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
 #include "shared/source/gen11/reg_configs.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 
 #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "test.h"

opencl/test/unit_test/gen11/command_stream_receiver_hw_tests_gen11.cpp

@@ -7,10 +7,10 @@
 
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/command_stream/linear_stream.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"

opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp

@@ -5,9 +5,10 @@
  *
  */
 
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
+
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/helpers/static_size3.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 #include "test.h"

opencl/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp

@@ -8,10 +8,10 @@
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
 #include "shared/source/gen11/reg_configs.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
 #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "test.h"
 

opencl/test/unit_test/gen11/test_device_queue_hw_gen11.cpp

@@ -5,9 +5,10 @@
  *
  */
 
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
+
 #include "opencl/source/context/context.h"
 #include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_device_queue.h"
 
 #include <memory>

opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl

@@ -8,10 +8,10 @@
 #include "shared/source/command_stream/command_stream_receiver_hw.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/ptr_math.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 
 #include "opencl/source/gen12lp/helpers_gen12lp.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "test.h"
 

opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl

@@ -7,12 +7,12 @@
 
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/command_stream/linear_stream.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
 #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h"
 #include "opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"

opencl/test/unit_test/gen12lp/test_device_queue_hw_gen12lp.inl

@@ -6,11 +6,11 @@
  */
 
 #include "shared/source/utilities/tag_allocator.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 
 #include "opencl/source/command_queue/gpgpu_walker.h"
 #include "opencl/source/context/context.h"
 #include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_device_queue.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 

opencl/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp

@@ -9,6 +9,7 @@
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/windows/gmm_callbacks.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 #include "shared/test/unit_test/helpers/default_hw_info.h"
 
@@ -17,7 +18,6 @@
 #include "opencl/source/os_interface/windows/wddm_device_command_stream.h"
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/helpers/execution_environment_helper.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
 #include "test.h"

opencl/test/unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp

@@ -7,11 +7,11 @@
 
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/command_stream/linear_stream.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
 #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"

opencl/test/unit_test/gen8/scheduler_dispatch_tests_gen8.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/built_ins/built_ins.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 
 #include "opencl/source/command_queue/enqueue_kernel.h"
 #include "opencl/source/command_queue/gpgpu_walker.h"
@@ -14,7 +15,6 @@
 #include "opencl/source/helpers/hardware_commands_helper.h"
 #include "opencl/source/scheduler/scheduler_kernel.h"
 #include "opencl/test/unit_test/fixtures/execution_model_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "test.h"
 
 #include "gtest/gtest.h"

opencl/test/unit_test/gen8/test_device_queue_hw_gen8.cpp

@@ -5,9 +5,10 @@
  *
  */
 
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
+
 #include "opencl/source/context/context.h"
 #include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_device_queue.h"
 
 using namespace NEO;

opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp

@@ -8,13 +8,13 @@
 #include "shared/source/built_ins/built_ins.h"
 #include "shared/source/command_stream/command_stream_receiver.h"
 #include "shared/source/command_stream/linear_stream.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/event/user_event.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
 #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h"
 #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"

opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp

@@ -6,11 +6,11 @@
  */
 
 #include "shared/source/gen9/reg_configs.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
 #include "opencl/test/unit_test/fixtures/memory_management_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/helpers/static_size3.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 #include "test.h"

opencl/test/unit_test/gen9/test_device_queue_hw_gen9.cpp

@@ -5,10 +5,11 @@
  *
  */
 
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
+
 #include "opencl/source/command_queue/gpgpu_walker.h"
 #include "opencl/source/context/context.h"
 #include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_device_queue.h"
 
 using namespace NEO;

opencl/test/unit_test/gen_common/CMakeLists.txt

@@ -6,15 +6,8 @@
 
 set(IGDRCL_SRCS_tests_gen_common
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_base.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_base_mi_arb.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_compute_mode.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_gpgpu_walker.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_mi_arb.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_sip.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/exclude_tests/exclude_test_declare.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/exclude_tests/exclude_test_exclude.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/gen_cmd_parse.h
   ${CMAKE_CURRENT_SOURCE_DIR}/gen_commands_common_validation.h
   ${CMAKE_CURRENT_SOURCE_DIR}/hw_cmds_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/matchers.h

opencl/test/unit_test/gen_common/gen_commands_common_validation.h

@@ -9,8 +9,8 @@
 
 #include "shared/source/indirect_heap/indirect_heap.h"
 #include "shared/source/memory_manager/memory_constants.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
 
 #include "gtest/gtest.h"

opencl/test/unit_test/helpers/CMakeLists.txt

@@ -31,8 +31,6 @@ set(IGDRCL_SRCS_tests_helpers
   ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_default_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/hw_parse.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/hw_parse.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/kernel_filename_helper.h
   ${CMAKE_CURRENT_SOURCE_DIR}/kmd_notify_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/mem_properties_parser_helper_tests.cpp

opencl/test/unit_test/helpers/cmd_buffer_validator.h

@@ -8,8 +8,7 @@
 #pragma once
 
 #include "shared/source/utilities/stackvec.h"
-
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 
 #include <memory>
 #include <string>

opencl/test/unit_test/helpers/cmd_buffer_validator_tests.cpp

@@ -5,11 +5,11 @@
  *
  */
 
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
+
 #include "opencl/test/unit_test/helpers/cmd_buffer_validator.h"
 #include "test.h"
 
-#include "hw_parse.h"
-
 using HwParseTest = ::testing::Test;
 
 using namespace NEO;

opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp

@@ -11,6 +11,7 @@
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
 #include "shared/source/os_interface/os_context.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 #include "shared/test/unit_test/utilities/base_object_utils.h"
 
@@ -21,7 +22,6 @@
 #include "opencl/test/unit_test/fixtures/execution_model_kernel_fixture.h"
 #include "opencl/test/unit_test/fixtures/hello_world_fixture.h"
 #include "opencl/test/unit_test/fixtures/image_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h"
 

opencl/test/unit_test/helpers/timestamp_packet_tests.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/helpers/timestamp_packet.h"
 #include "shared/source/utilities/tag_allocator.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 #include "shared/test/unit_test/utilities/base_object_utils.h"
 
@@ -15,7 +16,6 @@
 #include "opencl/source/event/user_event.h"
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"

opencl/test/unit_test/igdrcl_tests_pch.h

@@ -15,8 +15,8 @@
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/source/memory_manager/memory_constants.h"
 #include "shared/source/sku_info/sku_info_base.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "test.h"
 
 #include "third_party/opencl_headers/CL/cl.h"

opencl/test/unit_test/libult/CMakeLists.txt

@@ -48,6 +48,12 @@ set(IGDRCL_SRCS_LIB_ULT
   ${NEO_SHARED_TEST_DIRECTORY}/unit_test/helpers/memory_management.h
 )
 
+get_property(NEO_SHARED_TESTS_CMD_PARSE GLOBAL PROPERTY NEO_SHARED_TESTS_CMD_PARSE)
+
+list(APPEND IGDRCL_SRCS_LIB_ULT
+   ${NEO_SHARED_TESTS_CMD_PARSE}
+)
+
 set(IGDRCL_SRCS_LIB_ULT_WINDOWS
   ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/mock_environment_variables.cpp
 )
@@ -97,6 +103,7 @@ set(IGDRCL_SRCS_LIB_ULT_ENV
   ${NEO_SOURCE_DIR}/opencl/test/unit_test/ult_config_listener.cpp
   ${NEO_SOURCE_DIR}/opencl/test/unit_test/ult_config_listener.h
 )
+
 add_library (igdrcl_libult_env OBJECT EXCLUDE_FROM_ALL
   ${IGDRCL_SRCS_LIB_ULT_ENV}
 )
@@ -148,3 +155,5 @@ foreach(target_name igdrcl_libult igdrcl_libult_cs igdrcl_libult_env)
   target_compile_definitions(${target_name} PRIVATE $<TARGET_PROPERTY:${NEO_MOCKABLE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>)
   create_project_source_tree(${target_name})
 endforeach()
+
+add_subdirectories()

opencl/test/unit_test/mem_obj/buffer_tests.cpp

@@ -15,6 +15,7 @@
 #include "shared/source/memory_manager/memory_operations_handler.h"
 #include "shared/source/memory_manager/unified_memory_manager.h"
 #include "shared/source/os_interface/os_context.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 #include "shared/test/unit_test/helpers/ult_hw_config.h"
 #include "shared/test/unit_test/utilities/base_object_utils.h"
@@ -30,7 +31,6 @@
 #include "opencl/test/unit_test/fixtures/memory_management_fixture.h"
 #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h"
 #include "opencl/test/unit_test/gen_common/matchers.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/helpers/unit_test_helper.h"
 #include "opencl/test/unit_test/helpers/variable_backup.h"
 #include "opencl/test/unit_test/mocks/mock_allocation_properties.h"

opencl/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp

@@ -17,6 +17,7 @@
 #include "shared/source/os_interface/linux/os_context_linux.h"
 #include "shared/source/os_interface/linux/os_interface.h"
 #include "shared/source/os_interface/os_context.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
 #include "opencl/source/helpers/memory_properties_flags_helpers.h"
@@ -25,7 +26,6 @@
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
 #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h"
 #include "opencl/test/unit_test/helpers/execution_environment_helper.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/linux/mock_drm_command_stream_receiver.h"
 #include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_gmm.h"

opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp

@@ -7,12 +7,12 @@
 
 #include "shared/source/memory_manager/internal_allocation_storage.h"
 #include "shared/source/os_interface/windows/os_interface.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 
 #include "opencl/source/os_interface/windows/wddm_device_command_stream.h"
 #include "opencl/test/unit_test/fixtures/buffer_fixture.h"
 #include "opencl/test/unit_test/helpers/execution_environment_helper.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"

opencl/test/unit_test/scheduler/scheduler_source_tests.cpp

@@ -8,11 +8,11 @@
 #include "opencl/test/unit_test/scheduler/scheduler_source_tests.h"
 
 #include "shared/source/helpers/hw_cmds.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 
 #include "opencl/source/device_queue/device_queue_hw.h"
 #include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h"
 #include "opencl/test/unit_test/fixtures/execution_model_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_device_queue.h"
 #include "test.h"
 

opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.cpp

@@ -6,12 +6,12 @@
  */
 
 #include "shared/source/source_level_debugger/source_level_debugger.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
 #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h"
 #include "opencl/test/unit_test/helpers/execution_environment_helper.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_builtins.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"

shared/test/unit_test/cmd_parse/CMakeLists.txt

@@ -0,0 +1,20 @@
+#
+# Copyright (C) 2020 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+set(NEO_SHARED_TESTS_CMD_PARSE
+  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_base.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_base_mi_arb.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_compute_mode.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_gpgpu_walker.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_mi_arb.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_sip.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/gen_cmd_parse.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/hw_parse.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/hw_parse.inl
+)
+
+set_property(GLOBAL PROPERTY NEO_SHARED_TESTS_CMD_PARSE ${NEO_SHARED_TESTS_CMD_PARSE})

shared/test/unit_test/cmd_parse/cmd_parse_base.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 
 // clang-format off
 using namespace NEO;

shared/test/unit_test/cmd_parse/hw_parse.h

@@ -10,11 +10,11 @@
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/helpers/pipeline_select_helper.h"
 #include "shared/source/helpers/ptr_math.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/unit_test/helpers/default_hw_info.h"
 
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/kernel/kernel.h"
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 
 #include "gtest/gtest.h"
 

shared/test/unit_test/cmd_parse/hw_parse.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "opencl/test/unit_test/helpers/hw_parse.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 
 namespace NEO {
 

shared/test/unit_test/direct_submission/direct_submission_tests.cpp

@@ -10,13 +10,13 @@
 #include "shared/source/direct_submission/dispatchers/render_dispatcher.h"
 #include "shared/source/helpers/flush_stamp.h"
 #include "shared/source/os_interface/os_context.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 #include "shared/test/unit_test/helpers/ult_hw_config.h"
 #include "shared/test/unit_test/mocks/mock_direct_submission_hw.h"
 
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
 #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/helpers/variable_backup.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"
 #include "test.h"

shared/test/unit_test/direct_submission/dispatchers/dispatcher_tests.cpp

@@ -6,9 +6,9 @@
  */
 
 #include "shared/source/direct_submission/dispatchers/dispatcher.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.h"
 
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "test.h"
 
 using namespace NEO;

shared/test/unit_test/direct_submission/dispatchers/render_dispatcher_tests.cpp

@@ -6,10 +6,10 @@
  */
 
 #include "shared/source/direct_submission/dispatchers/render_dispatcher.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.h"
 #include "shared/test/unit_test/fixtures/preemption_fixture.h"
 
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "test.h"
 
 using RenderDispatcheTest = Test<DispatcherFixture>;

shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp

@@ -10,9 +10,9 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/os_interface/windows/os_context_win.h"
 #include "shared/source/os_interface/windows/wddm/wddm.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/helpers/ult_hw_config.h"
 
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/helpers/variable_backup.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"
 #include "opencl/test/unit_test/os_interface/windows/wddm_fixture.h"

shared/test/unit_test/encoders/test_encode_atomic.cpp

@@ -6,10 +6,9 @@
  */
 
 #include "shared/source/helpers/ptr_math.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/unit_test/fixtures/command_container_fixture.h"
 
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
-
 using namespace NEO;
 
 using CommandEncodeAtomic = Test<CommandEncodeStatesFixture>;

shared/test/unit_test/encoders/test_encode_command_buffer.cpp

@@ -7,9 +7,9 @@
 
 #include "shared/source/command_container/cmdcontainer.h"
 #include "shared/source/command_container/command_encoder.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "test.h"
 
 using namespace NEO;

shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp

@@ -6,11 +6,11 @@
  */
 
 #include "shared/source/helpers/ptr_math.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/unit_test/fixtures/command_container_fixture.h"
 #include "shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.h"
 
 #include "opencl/source/helpers/hardware_commands_helper.h"
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 
 using namespace NEO;
 

shared/test/unit_test/encoders/test_encode_math.cpp

@@ -7,9 +7,9 @@
 
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/helpers/register_offsets.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "test.h"
 
 using namespace NEO;

shared/test/unit_test/encoders/test_encode_media_interface_descriptor.cpp

@@ -6,10 +6,9 @@
  */
 
 #include "shared/source/helpers/ptr_math.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/unit_test/fixtures/command_container_fixture.h"
 
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
-
 using namespace NEO;
 
 using CommandEncodeStatesTest = Test<CommandEncodeStatesFixture>;

shared/test/unit_test/encoders/test_encode_semaphore.cpp

@@ -7,10 +7,9 @@
 
 #include "shared/source/command_stream/linear_stream.h"
 #include "shared/source/helpers/ptr_math.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/fixtures/command_container_fixture.h"
 
-#include "opencl/test/unit_test/helpers/hw_parse.h"
-
 using namespace NEO;
 
 using CommandEncodeSemaphore = Test<CommandEncodeStatesFixture>;

shared/test/unit_test/encoders/test_encode_set_mmio.cpp

@@ -6,9 +6,9 @@
  */
 
 #include "shared/source/command_container/command_encoder.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "test.h"
 
 using namespace NEO;

shared/test/unit_test/encoders/test_encode_states.cpp

@@ -7,10 +7,9 @@
 
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/ptr_math.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/unit_test/fixtures/command_container_fixture.h"
 
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
-
 using namespace NEO;
 
 using CommandEncodeStatesTest = Test<CommandEncodeStatesFixture>;

shared/test/unit_test/fixtures/preemption_fixture.cpp

@@ -9,6 +9,7 @@
 
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/helpers/hw_info.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 
 #include "opencl/source/command_queue/enqueue_common.h"
 #include "opencl/source/command_queue/enqueue_kernel.h"
@@ -16,7 +17,6 @@
 #include "opencl/source/helpers/dispatch_info.h"
 #include "opencl/source/scheduler/scheduler_kernel.h"
 #include "opencl/test/unit_test/fixtures/hello_world_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_device.h"

shared/test/unit_test/gen11/cmd_parse_gen11.cpp

@@ -5,17 +5,17 @@
  *
  */
 
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 
 #include "gtest/gtest.h"
 using GenStruct = NEO::GEN11;
 using GenGfxFamily = NEO::ICLFamily;
-#include "opencl/test/unit_test/gen_common/cmd_parse_base.inl"
+#include "shared/test/unit_test/cmd_parse/cmd_parse_base.inl"
-#include "opencl/test/unit_test/gen_common/cmd_parse_base_mi_arb.inl"
+#include "shared/test/unit_test/cmd_parse/cmd_parse_base_mi_arb.inl"
-#include "opencl/test/unit_test/gen_common/cmd_parse_gpgpu_walker.inl"
+#include "shared/test/unit_test/cmd_parse/cmd_parse_gpgpu_walker.inl"
-#include "opencl/test/unit_test/gen_common/cmd_parse_sip.inl"
+#include "shared/test/unit_test/cmd_parse/cmd_parse_sip.inl"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
-#include "opencl/test/unit_test/helpers/hw_parse.inl"
+#include "shared/test/unit_test/cmd_parse/hw_parse.inl"
 
 template <>
 size_t CmdParse<GenGfxFamily>::getCommandLengthHwSpecific(void *cmd) {

shared/test/unit_test/gen11/test_preemption_gen11.cpp

@@ -7,9 +7,9 @@
 
 #include "shared/source/built_ins/built_ins.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/fixtures/preemption_fixture.h"
 
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"

shared/test/unit_test/gen12lp/cmd_parse_gen12lp.cpp

@@ -5,18 +5,18 @@
  *
  */
 
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 
 #include "gtest/gtest.h"
 using GenStruct = NEO::GEN12LP;
 using GenGfxFamily = NEO::TGLLPFamily;
-#include "opencl/test/unit_test/gen_common/cmd_parse_base.inl"
+#include "shared/test/unit_test/cmd_parse/cmd_parse_base.inl"
-#include "opencl/test/unit_test/gen_common/cmd_parse_compute_mode.inl"
+#include "shared/test/unit_test/cmd_parse/cmd_parse_compute_mode.inl"
-#include "opencl/test/unit_test/gen_common/cmd_parse_gpgpu_walker.inl"
+#include "shared/test/unit_test/cmd_parse/cmd_parse_gpgpu_walker.inl"
-#include "opencl/test/unit_test/gen_common/cmd_parse_mi_arb.inl"
+#include "shared/test/unit_test/cmd_parse/cmd_parse_mi_arb.inl"
-#include "opencl/test/unit_test/gen_common/cmd_parse_sip.inl"
+#include "shared/test/unit_test/cmd_parse/cmd_parse_sip.inl"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
-#include "opencl/test/unit_test/helpers/hw_parse.inl"
+#include "shared/test/unit_test/cmd_parse/hw_parse.inl"
 
 #include "cmd_parse_gen12lp.inl"
 

shared/test/unit_test/gen12lp/test_command_encoder_gen12lp.cpp

@@ -7,9 +7,9 @@
 
 #include "shared/source/command_container/cmdcontainer.h"
 #include "shared/source/command_container/command_encoder.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "test.h"
 
 #include "reg_configs_common.h"

shared/test/unit_test/gen8/cmd_parse_gen8.cpp

@@ -5,17 +5,17 @@
  *
  */
 
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 
 #include "gtest/gtest.h"
 using GenStruct = NEO::GEN8;
 using GenGfxFamily = NEO::BDWFamily;
-#include "opencl/test/unit_test/gen_common/cmd_parse_base.inl"
+#include "shared/test/unit_test/cmd_parse/cmd_parse_base.inl"
-#include "opencl/test/unit_test/gen_common/cmd_parse_base_mi_arb.inl"
+#include "shared/test/unit_test/cmd_parse/cmd_parse_base_mi_arb.inl"
-#include "opencl/test/unit_test/gen_common/cmd_parse_gpgpu_walker.inl"
+#include "shared/test/unit_test/cmd_parse/cmd_parse_gpgpu_walker.inl"
-#include "opencl/test/unit_test/gen_common/cmd_parse_sip.inl"
+#include "shared/test/unit_test/cmd_parse/cmd_parse_sip.inl"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
-#include "opencl/test/unit_test/helpers/hw_parse.inl"
+#include "shared/test/unit_test/cmd_parse/hw_parse.inl"
 
 template <>
 size_t CmdParse<GenGfxFamily>::getCommandLengthHwSpecific(void *cmd) {

shared/test/unit_test/gen8/test_preemption_gen8.cpp

@@ -9,11 +9,11 @@
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/memory_manager/memory_constants.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
 #include "shared/test/unit_test/fixtures/preemption_fixture.h"
 
 #include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
 #include "opencl/test/unit_test/fixtures/hello_world_fixture.h"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_command_queue.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"

shared/test/unit_test/gen9/cmd_parse_gen9.cpp

@@ -5,17 +5,17 @@
  *
  */
 
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 
 #include "gtest/gtest.h"
 using GenStruct = NEO::GEN9;
 using GenGfxFamily = NEO::SKLFamily;
-#include "opencl/test/unit_test/gen_common/cmd_parse_base.inl"
+#include "shared/test/unit_test/cmd_parse/cmd_parse_base.inl"
-#include "opencl/test/unit_test/gen_common/cmd_parse_base_mi_arb.inl"
+#include "shared/test/unit_test/cmd_parse/cmd_parse_base_mi_arb.inl"
-#include "opencl/test/unit_test/gen_common/cmd_parse_gpgpu_walker.inl"
+#include "shared/test/unit_test/cmd_parse/cmd_parse_gpgpu_walker.inl"
-#include "opencl/test/unit_test/gen_common/cmd_parse_sip.inl"
+#include "shared/test/unit_test/cmd_parse/cmd_parse_sip.inl"
-#include "opencl/test/unit_test/helpers/hw_parse.h"
+#include "shared/test/unit_test/cmd_parse/hw_parse.h"
-#include "opencl/test/unit_test/helpers/hw_parse.inl"
+#include "shared/test/unit_test/cmd_parse/hw_parse.inl"
 
 template <>
 size_t CmdParse<GenGfxFamily>::getCommandLengthHwSpecific(void *cmd) {

shared/test/unit_test/gen9/skl/test_preamble_skl.cpp

@@ -9,11 +9,10 @@
 #include "shared/source/command_stream/thread_arbitration_policy.h"
 #include "shared/source/gen9/reg_configs.h"
 #include "shared/source/helpers/preamble.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/unit_test/helpers/debug_manager_state_restore.h"
 #include "shared/test/unit_test/preamble/preamble_fixture.h"
 
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
-
 using namespace NEO;
 
 typedef PreambleFixture SklSlm;

shared/test/unit_test/gen9/test_command_encoder_gen9.cpp

@@ -7,9 +7,9 @@
 
 #include "shared/source/command_container/cmdcontainer.h"
 #include "shared/source/command_container/command_encoder.h"
+#include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h"
 
 #include "opencl/test/unit_test/fixtures/device_fixture.h"
-#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h"
 #include "test.h"
 
 #include "reg_configs_common.h"