Move files between shared/test/common/helpers and shared/test/unit_test/helpersi

unit_test/helpers/cmd_buffer_validator.h -> common/helpers unit_test/helpers/gtest_helpers.h -> common/helpers common/helpers/blit_commands_helper_tests.inl -> unit_test/helpers common/helpers/simd_helper_tests.inl -> unit_test/helpers common/helpers/simd_helper_tests_pvc_and_later.inl -> unit_test/helpers common/helpers/state_base_address_tests.h -> unit_test/helpers Related-To: NEO-6524 Signed-off-by: Warchulski, Jaroslaw <jaroslaw.warchulski@intel.com>
2026-01-05 09:09:04 +08:00 · 2022-08-10 11:24:38 +00:00
parent 1b9d50660a
commit a6c1d9578e
114 changed files with 132 additions and 124 deletions
--- a/shared/test/common/gen11/CMakeLists.txt
+++ b/shared/test/common/gen11/CMakeLists.txt
@@ -5,7 +5,7 @@
 #

 if(TESTS_GEN11)
-  target_sources(${TARGET_NAME} PRIVATE
+  target_sources(neo_libult_common PRIVATE
                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                 ${CMAKE_CURRENT_SOURCE_DIR}/test_traits_gen11.h
  )
--- a/shared/test/common/gen12lp/CMakeLists.txt
+++ b/shared/test/common/gen12lp/CMakeLists.txt
@@ -5,7 +5,7 @@
 #

 if(TESTS_GEN12LP)
-  target_sources(${TARGET_NAME} PRIVATE
+  target_sources(neo_libult_common PRIVATE
                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                 ${CMAKE_CURRENT_SOURCE_DIR}/test_traits_gen12lp.h
  )
--- a/shared/test/common/gen8/CMakeLists.txt
+++ b/shared/test/common/gen8/CMakeLists.txt
@@ -5,7 +5,7 @@
 #

 if(TESTS_GEN8)
-  target_sources(${TARGET_NAME} PRIVATE
+  target_sources(neo_libult_common PRIVATE
                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                 ${CMAKE_CURRENT_SOURCE_DIR}/test_traits_gen8.h
  )
--- a/shared/test/common/gen9/CMakeLists.txt
+++ b/shared/test/common/gen9/CMakeLists.txt
@@ -5,7 +5,7 @@
 #

 if(TESTS_GEN9)
-  target_sources(${TARGET_NAME} PRIVATE
+  target_sources(neo_libult_common PRIVATE
                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                 ${CMAKE_CURRENT_SOURCE_DIR}/test_traits_gen9.h
  )
--- a/shared/test/common/helpers/CMakeLists.txt
+++ b/shared/test/common/helpers/CMakeLists.txt
@@ -4,8 +4,10 @@
 # SPDX-License-Identifier: MIT
 #

-if(TESTS_PVC_AND_LATER)
-  target_sources(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/simd_helper_tests_pvc_and_later.inl)
-endif()
+target_sources(neo_libult_common PRIVATE
+               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+               ${CMAKE_CURRENT_SOURCE_DIR}/cmd_buffer_validator.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/gtest_helpers.h
+)

-add_subdirectories()
+add_subdirectories()
--- a/shared/test/unit_test/helpers/cmd_buffer_validator.h
+++ b/shared/test/unit_test/helpers/cmd_buffer_validator.h
--- a/shared/test/unit_test/helpers/gtest_helpers.h
+++ b/shared/test/unit_test/helpers/gtest_helpers.h
--- a/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp
+++ b/shared/test/unit_test/command_stream/command_stream_receiver_tests.cpp
@@ -20,6 +20,7 @@
 #include "shared/test/common/fixtures/device_fixture.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/mocks/mock_allocation_properties.h"
 #include "shared/test/common/mocks/mock_csr.h"
@@ -31,7 +32,6 @@
 #include "shared/test/common/test_macros/hw_test.h"
 #include "shared/test/common/test_macros/test_checks_shared.h"
 #include "shared/test/unit_test/direct_submission/direct_submission_controller_mock.h"
-#include "shared/test/unit_test/helpers/gtest_helpers.h"

 #include "gtest/gtest.h"

--- a/shared/test/unit_test/compiler_interface/linker_tests.cpp
+++ b/shared/test/unit_test/compiler_interface/linker_tests.cpp
@@ -16,11 +16,11 @@
 #include "shared/test/common/device_binary_format/zebin_tests.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_elf.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/ult_device_factory.h"
-#include "shared/test/unit_test/helpers/gtest_helpers.h"

 #include "RelocationInfo.h"
 #include "gtest/gtest.h"
--- a/shared/test/unit_test/device_binary_format/elf/elf_decoder_tests.cpp
+++ b/shared/test/unit_test/device_binary_format/elf/elf_decoder_tests.cpp
@@ -10,9 +10,9 @@
 #include "shared/source/device_binary_format/elf/elf_encoder.h"
 #include "shared/source/helpers/array_count.h"
 #include "shared/source/helpers/file_io.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/mocks/mock_elf.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/helpers/gtest_helpers.h"

 #include "gtest/gtest.h"

--- a/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp
+++ b/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp
@@ -16,11 +16,11 @@
 #include "shared/test/common/device_binary_format/patchtokens_tests.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/test_macros/test.h"
 #include "shared/test/unit_test/fixtures/command_container_fixture.h"
 #include "shared/test/unit_test/fixtures/front_window_fixture.h"
-#include "shared/test/unit_test/helpers/gtest_helpers.h"
 #include "shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.h"

 using namespace NEO;
--- a/shared/test/unit_test/gen11/ehl/linux/hw_info_config_tests_ehl.cpp
+++ b/shared/test/unit_test/gen11/ehl/linux/hw_info_config_tests_ehl.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/test/unit_test/helpers/gtest_helpers.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"

 using namespace NEO;
--- a/shared/test/unit_test/gen11/icllp/CMakeLists.txt
+++ b/shared/test/unit_test/gen11/icllp/CMakeLists.txt
@@ -5,13 +5,13 @@
 #

 if(TESTS_ICLLP)
-  set(NEO_SHARED_tests_gen11_icllp
-      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_gen11_icllp.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_icllp.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/test_program_media_sampler_icllp.cpp
-  )
+  set(NEO_SHARED_tests_gen11_icllp ${CMAKE_CURRENT_SOURCE_DIR}/excludes_gen11_icllp.cpp)

-  target_sources(${TARGET_NAME} PRIVATE ${NEO_SHARED_tests_gen11_icllp})
+  target_sources(neo_shared_tests PRIVATE
+                 ${NEO_SHARED_tests_gen11_icllp}
+                 ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_icllp.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/test_program_media_sampler_icllp.cpp
+  )

  add_subdirectories()
 endif()
--- a/shared/test/unit_test/gen11/icllp/linux/hw_info_config_tests_icllp.cpp
+++ b/shared/test/unit_test/gen11/icllp/linux/hw_info_config_tests_icllp.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/test/unit_test/helpers/gtest_helpers.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"

 using namespace NEO;
--- a/shared/test/unit_test/gen11/lkf/linux/hw_info_config_tests_lkf.cpp
+++ b/shared/test/unit_test/gen11/lkf/linux/hw_info_config_tests_lkf.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/test/unit_test/helpers/gtest_helpers.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"

 using namespace NEO;
--- a/shared/test/unit_test/gen11/simd_helper_tests_gen11.cpp
+++ b/shared/test/unit_test/gen11/simd_helper_tests_gen11.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/test/common/helpers/simd_helper_tests.inl"
+#include "shared/test/unit_test/helpers/simd_helper_tests.inl"

 using namespace NEO;

--- a/shared/test/unit_test/gen12lp/adln/linux/hw_info_config_tests_adln.cpp
+++ b/shared/test/unit_test/gen12lp/adln/linux/hw_info_config_tests_adln.cpp
@@ -6,8 +6,8 @@
 */

 #include "shared/source/os_interface/os_interface.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
-#include "shared/test/unit_test/helpers/gtest_helpers.h"
 #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"

 using namespace NEO;
--- a/shared/test/unit_test/gen12lp/adlp/linux/hw_info_config_tests_adlp.cpp
+++ b/shared/test/unit_test/gen12lp/adlp/linux/hw_info_config_tests_adlp.cpp
@@ -7,8 +7,8 @@

 #include "shared/source/os_interface/os_interface.h"
 #include "shared/test/common/helpers/default_hw_info.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
-#include "shared/test/unit_test/helpers/gtest_helpers.h"
 #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"

 using namespace NEO;
--- a/shared/test/unit_test/gen12lp/adls/linux/hw_info_config_tests_adls.cpp
+++ b/shared/test/unit_test/gen12lp/adls/linux/hw_info_config_tests_adls.cpp
@@ -6,8 +6,8 @@
 */

 #include "shared/source/os_interface/os_interface.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
-#include "shared/test/unit_test/helpers/gtest_helpers.h"
 #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"

 using namespace NEO;
--- a/shared/test/unit_test/gen12lp/rkl/linux/hw_info_config_tests_rkl.cpp
+++ b/shared/test/unit_test/gen12lp/rkl/linux/hw_info_config_tests_rkl.cpp
@@ -6,8 +6,8 @@
 */

 #include "shared/source/os_interface/os_interface.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
-#include "shared/test/unit_test/helpers/gtest_helpers.h"
 #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"

 using namespace NEO;
--- a/shared/test/unit_test/gen12lp/simd_helper_tests_gen12lp.cpp
+++ b/shared/test/unit_test/gen12lp/simd_helper_tests_gen12lp.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/test/common/helpers/simd_helper_tests.inl"
+#include "shared/test/unit_test/helpers/simd_helper_tests.inl"

 using namespace NEO;

--- a/shared/test/unit_test/gen12lp/tgllp/CMakeLists.txt
+++ b/shared/test/unit_test/gen12lp/tgllp/CMakeLists.txt
@@ -5,12 +5,12 @@
 #

 if(TESTS_TGLLP)
-  set(NEO_SHARED_tests_genlp12_tgllp
-      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_gen12lp_tgllp.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_tgllp.cpp
-  )
+  set(NEO_SHARED_tests_genlp12_tgllp ${CMAKE_CURRENT_SOURCE_DIR}/excludes_gen12lp_tgllp.cpp)

-  target_sources(${TARGET_NAME} PRIVATE ${NEO_SHARED_tests_genlp12_tgllp})
+  target_sources(neo_shared_tests PRIVATE
+                 ${NEO_SHARED_tests_genlp12_tgllp}
+                 ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_tgllp.cpp
+  )

  add_subdirectories()
 endif()
--- a/shared/test/unit_test/gen12lp/tgllp/linux/hw_info_config_tests_tgllp.cpp
+++ b/shared/test/unit_test/gen12lp/tgllp/linux/hw_info_config_tests_tgllp.cpp
@@ -8,9 +8,9 @@
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/os_interface/os_interface.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/helpers/hw_helper_tests.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
-#include "shared/test/unit_test/helpers/gtest_helpers.h"
 #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"

 using namespace NEO;
--- a/shared/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp
+++ b/shared/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/test/unit_test/helpers/gtest_helpers.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"

 using namespace NEO;
--- a/shared/test/unit_test/gen8/simd_helper_tests_gen8.cpp
+++ b/shared/test/unit_test/gen8/simd_helper_tests_gen8.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/test/common/helpers/simd_helper_tests.inl"
+#include "shared/test/unit_test/helpers/simd_helper_tests.inl"

 using namespace NEO;

--- a/shared/test/unit_test/gen8/state_base_address_tests_gen8.cpp
+++ b/shared/test/unit_test/gen8/state_base_address_tests_gen8.cpp
@@ -6,9 +6,9 @@
 */

 #include "shared/source/gen8/hw_cmds.h"
-#include "shared/test/common/helpers/state_base_address_tests.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
+#include "shared/test/unit_test/helpers/state_base_address_tests.h"

 BDWTEST_F(SBATest, givenUsedBindlessBuffersWhenAppendStateBaseAddressParametersIsCalledThenSBACmdHasNotBindingSurfaceStateProgrammed) {
    using STATE_BASE_ADDRESS = typename FamilyType::STATE_BASE_ADDRESS;
--- a/shared/test/unit_test/gen9/bxt/CMakeLists.txt
+++ b/shared/test/unit_test/gen9/bxt/CMakeLists.txt
@@ -5,9 +5,10 @@
 #

 if(TESTS_BXT)
-  target_sources(${TARGET_NAME} PRIVATE
+  target_sources(neo_shared_tests PRIVATE
                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                 ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_bxt.cpp
  )
+
  add_subdirectories()
 endif()
--- a/shared/test/unit_test/gen9/bxt/linux/hw_info_config_tests.cpp
+++ b/shared/test/unit_test/gen9/bxt/linux/hw_info_config_tests.cpp
@@ -6,7 +6,7 @@
 */

 #include "shared/test/common/helpers/default_hw_info.h"
-#include "shared/test/unit_test/helpers/gtest_helpers.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"

 using namespace NEO;
--- a/shared/test/unit_test/gen9/cfl/CMakeLists.txt
+++ b/shared/test/unit_test/gen9/cfl/CMakeLists.txt
@@ -5,9 +5,10 @@
 #

 if(TESTS_CFL)
-  target_sources(${TARGET_NAME} PRIVATE
+  target_sources(neo_shared_tests PRIVATE
                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                 ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_cfl.cpp
  )
+
  add_subdirectories()
 endif()
--- a/shared/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp
+++ b/shared/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp
@@ -6,7 +6,7 @@
 */

 #include "shared/source/execution_environment/execution_environment.h"
-#include "shared/test/unit_test/helpers/gtest_helpers.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"

 using namespace NEO;
--- a/shared/test/unit_test/gen9/glk/CMakeLists.txt
+++ b/shared/test/unit_test/gen9/glk/CMakeLists.txt
@@ -5,9 +5,10 @@
 #

 if(TESTS_GLK)
-  target_sources(${TARGET_NAME} PRIVATE
+  target_sources(neo_shared_tests PRIVATE
                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                 ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_glk.cpp
  )
+
  add_subdirectories()
 endif()
--- a/shared/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp
+++ b/shared/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/test/unit_test/helpers/gtest_helpers.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"

 using namespace NEO;
--- a/shared/test/unit_test/gen9/kbl/CMakeLists.txt
+++ b/shared/test/unit_test/gen9/kbl/CMakeLists.txt
@@ -5,9 +5,10 @@
 #

 if(TESTS_KBL)
-  target_sources(${TARGET_NAME} PRIVATE
+  target_sources(neo_shared_tests PRIVATE
                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                 ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_kbl.cpp
  )
+
  add_subdirectories()
 endif()
--- a/shared/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp
+++ b/shared/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp
@@ -6,7 +6,7 @@
 */

 #include "shared/source/execution_environment/execution_environment.h"
-#include "shared/test/unit_test/helpers/gtest_helpers.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"

 using namespace NEO;
--- a/shared/test/unit_test/gen9/simd_helper_tests_gen9.cpp
+++ b/shared/test/unit_test/gen9/simd_helper_tests_gen9.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/test/common/helpers/simd_helper_tests.inl"
+#include "shared/test/unit_test/helpers/simd_helper_tests.inl"

 using namespace NEO;

--- a/shared/test/unit_test/gen9/skl/CMakeLists.txt
+++ b/shared/test/unit_test/gen9/skl/CMakeLists.txt
@@ -5,9 +5,10 @@
 #

 if(TESTS_SKL)
-  target_sources(${TARGET_NAME} PRIVATE
+  target_sources(neo_shared_tests PRIVATE
                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                 ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_skl.cpp
  )
+
  add_subdirectories()
 endif()
--- a/shared/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp
+++ b/shared/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/test/unit_test/helpers/gtest_helpers.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"

 using namespace NEO;
--- a/shared/test/unit_test/gmm_helper/CMakeLists.txt
+++ b/shared/test/unit_test/gmm_helper/CMakeLists.txt
@@ -4,10 +4,10 @@
 # SPDX-License-Identifier: MIT
 #

-target_sources(${TARGET_NAME} PRIVATE
+target_sources(neo_shared_tests PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
               ${CMAKE_CURRENT_SOURCE_DIR}/gmm_resource_info_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/gmm_tests.cpp
 )

-add_subdirectories()
+add_subdirectories()
--- a/shared/test/unit_test/heap_assigner/CMakeLists.txt
+++ b/shared/test/unit_test/heap_assigner/CMakeLists.txt
@@ -1,10 +1,10 @@
 #
-# Copyright (C) 2020 Intel Corporation
+# Copyright (C) 2020-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #

-target_sources(${TARGET_NAME} PRIVATE
+target_sources(neo_shared_tests PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
               ${CMAKE_CURRENT_SOURCE_DIR}/heap_assigner_tests.cpp
 )
--- a/shared/test/unit_test/helpers/CMakeLists.txt
+++ b/shared/test/unit_test/helpers/CMakeLists.txt
@@ -15,7 +15,6 @@ target_sources(neo_shared_tests PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/bit_helpers_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper_tests_gen12lp.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/cmd_buffer_validator.h
               ${CMAKE_CURRENT_SOURCE_DIR}/cmd_buffer_validator_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/compiler_hw_info_config_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/debug_helpers_tests.cpp
@@ -27,7 +26,6 @@ target_sources(neo_shared_tests PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/flush_stamp_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/get_gpgpu_engines_tests.inl
               ${CMAKE_CURRENT_SOURCE_DIR}/get_info_tests.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/gtest_helpers.h
               ${CMAKE_CURRENT_SOURCE_DIR}/hash_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/heap_assigner_shared_tests.cpp
               ${CMAKE_CURRENT_SOURCE_DIR}/kernel_helpers_tests.cpp
@@ -65,7 +63,10 @@ if(TESTS_DG2_AND_LATER)
 endif()

 if(TESTS_PVC_AND_LATER)
-  target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/test_blit_commands_helper_pvc_and_later.cpp)
+  target_sources(neo_shared_tests PRIVATE
+                 ${CMAKE_CURRENT_SOURCE_DIR}/test_blit_commands_helper_pvc_and_later.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/simd_helper_tests_pvc_and_later.inl
+  )
 endif()

 add_subdirectories()
--- a/shared/test/unit_test/helpers/blit_commands_helper_tests.cpp
+++ b/shared/test/unit_test/helpers/blit_commands_helper_tests.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/test/common/helpers/blit_commands_helper_tests.inl"
+#include "shared/test/unit_test/helpers/blit_commands_helper_tests.inl"

 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/command_stream/command_stream_receiver.h"
--- a/shared/test/unit_test/helpers/blit_commands_helper_tests.inl
+++ b/shared/test/unit_test/helpers/blit_commands_helper_tests.inl
--- a/shared/test/unit_test/helpers/blit_commands_helper_tests_gen12lp.cpp
+++ b/shared/test/unit_test/helpers/blit_commands_helper_tests_gen12lp.cpp
@@ -9,10 +9,10 @@
 #include "shared/source/helpers/blit_commands_helper.h"
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/fixtures/device_fixture.h"
-#include "shared/test/common/helpers/blit_commands_helper_tests.inl"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/mocks/mock_gmm.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
+#include "shared/test/unit_test/helpers/blit_commands_helper_tests.inl"

 #include "gtest/gtest.h"

--- a/shared/test/unit_test/helpers/cmd_buffer_validator_tests.cpp
+++ b/shared/test/unit_test/helpers/cmd_buffer_validator_tests.cpp
@@ -6,8 +6,8 @@
 */

 #include "shared/test/common/cmd_parse/hw_parse.h"
+#include "shared/test/common/helpers/cmd_buffer_validator.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/helpers/cmd_buffer_validator.h"

 using HwParseTest = ::testing::Test;

--- a/shared/test/unit_test/helpers/get_gpgpu_engines_tests.inl
+++ b/shared/test/unit_test/helpers/get_gpgpu_engines_tests.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
--- a/shared/test/unit_test/helpers/simd_helper_tests.inl
+++ b/shared/test/unit_test/helpers/simd_helper_tests.inl
--- a/shared/test/unit_test/helpers/simd_helper_tests_pvc_and_later.inl
+++ b/shared/test/unit_test/helpers/simd_helper_tests_pvc_and_later.inl
--- a/shared/test/unit_test/helpers/state_base_address_tests.cpp
+++ b/shared/test/unit_test/helpers/state_base_address_tests.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/test/common/helpers/state_base_address_tests.h"
+#include "shared/test/unit_test/helpers/state_base_address_tests.h"

 #include "shared/source/command_container/command_encoder.h"
 #include "shared/test/common/test_macros/hw_test.h"
--- a/shared/test/unit_test/helpers/state_base_address_tests.h
+++ b/shared/test/unit_test/helpers/state_base_address_tests.h
--- a/shared/test/unit_test/helpers/test_blit_commands_helper_pvc_and_later.cpp
+++ b/shared/test/unit_test/helpers/test_blit_commands_helper_pvc_and_later.cpp
@@ -6,9 +6,9 @@
 */

 #include "shared/source/gmm_helper/client_context/gmm_client_context.h"
-#include "shared/test/common/helpers/blit_commands_helper_tests.inl"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/mocks/mock_gmm.h"
+#include "shared/test/unit_test/helpers/blit_commands_helper_tests.inl"

 #include "gtest/gtest.h"

--- a/shared/test/unit_test/helpers/test_blit_commands_helper_xehp_and_later.cpp
+++ b/shared/test/unit_test/helpers/test_blit_commands_helper_xehp_and_later.cpp
@@ -9,11 +9,11 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/os_interface/hw_info_config.h"
-#include "shared/test/common/helpers/blit_commands_helper_tests.inl"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/mocks/mock_gmm.h"
 #include "shared/test/common/mocks/mock_gmm_client_context.h"
 #include "shared/test/common/mocks/ult_device_factory.h"
+#include "shared/test/unit_test/helpers/blit_commands_helper_tests.inl"

 #include "gtest/gtest.h"
 #include "test_traits_common.h"
--- a/shared/test/unit_test/os_interface/hw_info_config_tests.cpp
+++ b/shared/test/unit_test/os_interface/hw_info_config_tests.cpp
@@ -11,12 +11,12 @@
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/unified_memory/usm_memory_support.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/helpers/mock_hw_info_config_hw.h"
 #include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/mocks/mock_gmm.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
-#include "shared/test/unit_test/helpers/gtest_helpers.h"

 #include "gtest/gtest.h"

--- a/shared/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp
+++ b/shared/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp
@@ -7,6 +7,7 @@

 #include "shared/source/os_interface/os_interface.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
 #include "shared/test/common/mocks/linux/mock_drm_allocation.h"
 #include "shared/test/common/mocks/linux/mock_drm_wrappers.h"
@@ -15,7 +16,6 @@
 #include "shared/test/common/os_interface/linux/device_command_stream_fixture.h"
 #include "shared/test/common/os_interface/linux/drm_buffer_object_fixture.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/helpers/gtest_helpers.h"

 using namespace NEO;

--- a/shared/test/unit_test/os_interface/linux/drm_debug_prelim_tests.cpp
+++ b/shared/test/unit_test/os_interface/linux/drm_debug_prelim_tests.cpp
@@ -8,11 +8,11 @@
 #include "shared/source/os_interface/linux/drm_debug.h"
 #include "shared/source/os_interface/linux/os_context_linux.h"
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/libult/linux/drm_query_mock.h"
 #include "shared/test/common/mocks/linux/mock_drm_allocation.h"
 #include "shared/test/common/mocks/linux/mock_drm_memory_manager.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/helpers/gtest_helpers.h"

 #include "gtest/gtest.h"

--- a/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp
+++ b/shared/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp
@@ -12,6 +12,7 @@
 #include "shared/source/os_interface/linux/os_context_linux.h"
 #include "shared/test/common/fixtures/memory_allocator_multi_device_fixture.h"
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
 #include "shared/test/common/mocks/linux/mock_drm_allocation.h"
 #include "shared/test/common/mocks/linux/mock_drm_command_stream_receiver.h"
@@ -22,7 +23,6 @@
 #include "shared/test/common/os_interface/linux/drm_memory_manager_fixture.h"
 #include "shared/test/common/os_interface/linux/drm_mock_cache_info.h"
 #include "shared/test/common/test_macros/hw_test.h"
-#include "shared/test/unit_test/helpers/gtest_helpers.h"

 #include "gtest/gtest.h"

--- a/shared/test/unit_test/os_interface/linux/drm_system_info_tests.cpp
+++ b/shared/test/unit_test/os_interface/linux/drm_system_info_tests.cpp
@@ -8,9 +8,9 @@
 #include "shared/source/os_interface/linux/system_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/helpers/gtest_helpers.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
 #include "shared/test/common/os_interface/linux/drm_mock_device_blob.h"
-#include "shared/test/unit_test/helpers/gtest_helpers.h"

 #include "gtest/gtest.h"

--- a/shared/test/unit_test/utilities/logger_tests.cpp
+++ b/shared/test/unit_test/utilities/logger_tests.cpp
@@ -12,7 +12,7 @@
 #include "shared/source/memory_manager/memory_pool.h"
 #include "shared/source/utilities/logger.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
-#include "shared/test/unit_test/helpers/gtest_helpers.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/unit_test/utilities/base_object_utils.h"

 #include "gtest/gtest.h"
--- a/shared/test/unit_test/xe_hp_core/simd_helper_tests_xe_hp_core.cpp
+++ b/shared/test/unit_test/xe_hp_core/simd_helper_tests_xe_hp_core.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/test/common/helpers/simd_helper_tests.inl"
+#include "shared/test/unit_test/helpers/simd_helper_tests.inl"

 using namespace NEO;

--- a/shared/test/unit_test/xe_hp_core/xe_hp_sdv/linux/hw_info_config_tests_xe_hp_sdv.cpp
+++ b/shared/test/unit_test/xe_hp_core/xe_hp_sdv/linux/hw_info_config_tests_xe_hp_sdv.cpp
@@ -7,8 +7,8 @@

 #include "shared/source/os_interface/os_interface.h"
 #include "shared/test/common/helpers/default_hw_info.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
-#include "shared/test/unit_test/helpers/gtest_helpers.h"
 #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"

 using namespace NEO;
--- a/shared/test/unit_test/xe_hpc_core/pvc/linux/hw_info_config_tests_pvc.cpp
+++ b/shared/test/unit_test/xe_hpc_core/pvc/linux/hw_info_config_tests_pvc.cpp
@@ -8,12 +8,12 @@
 #include "shared/source/helpers/compiler_hw_info_config.h"
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/test/common/helpers/default_hw_info.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
 #include "shared/test/common/os_interface/linux/sys_calls_linux_ult.h"
 #include "shared/test/common/xe_hpc_core/pvc/product_configs_pvc.h"
 #include "shared/test/unit_test/fixtures/product_config_fixture.h"
-#include "shared/test/unit_test/helpers/gtest_helpers.h"
 #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"

 using namespace NEO;
--- a/shared/test/unit_test/xe_hpc_core/simd_helper_tests_xe_hpc_core.cpp
+++ b/shared/test/unit_test/xe_hpc_core/simd_helper_tests_xe_hpc_core.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/test/common/helpers/simd_helper_tests_pvc_and_later.inl"
+#include "shared/test/unit_test/helpers/simd_helper_tests_pvc_and_later.inl"

 using namespace NEO;

--- a/shared/test/unit_test/xe_hpg_core/dg2/cache_policy_tests_dg2.cpp
+++ b/shared/test/unit_test/xe_hpg_core/dg2/cache_policy_tests_dg2.cpp
@@ -8,9 +8,9 @@
 #include "shared/source/helpers/cache_policy.h"
 #include "shared/source/xe_hpg_core/hw_cmds_dg2.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/helpers/gtest_helpers.h"
 #include "shared/test/unit_test/os_interface/hw_info_config_tests.h"

 using namespace NEO;
--- a/shared/test/unit_test/xe_hpg_core/dg2/hw_helper_tests_dg2.cpp
+++ b/shared/test/unit_test/xe_hpg_core/dg2/hw_helper_tests_dg2.cpp
@@ -8,10 +8,10 @@
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/xe_hpg_core/hw_cmds_dg2.h"
 #include "shared/test/common/helpers/default_hw_info.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/mocks/ult_device_factory.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
-#include "shared/test/unit_test/helpers/gtest_helpers.h"

 using namespace NEO;

--- a/shared/test/unit_test/xe_hpg_core/dg2/linux/hw_info_config_tests_dg2.cpp
+++ b/shared/test/unit_test/xe_hpg_core/dg2/linux/hw_info_config_tests_dg2.cpp
@@ -7,8 +7,8 @@

 #include "shared/source/os_interface/os_interface.h"
 #include "shared/test/common/helpers/default_hw_info.h"
+#include "shared/test/common/helpers/gtest_helpers.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
-#include "shared/test/unit_test/helpers/gtest_helpers.h"
 #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h"

 using namespace NEO;
--- a/shared/test/unit_test/xe_hpg_core/simd_helper_tests_xe_hpg_core.cpp
+++ b/shared/test/unit_test/xe_hpg_core/simd_helper_tests_xe_hpg_core.cpp
@@ -5,7 +5,7 @@
 *
 */

-#include "shared/test/common/helpers/simd_helper_tests.inl"
+#include "shared/test/unit_test/helpers/simd_helper_tests.inl"

 using namespace NEO;