Cleanup shared test files - xe_hpc_core

- move test files from shared/test/common directory to
shared/test/unit_test
- cleanup cmakelists.txt files

Signed-off-by: Mateusz Hoppe <[email protected]>

Author: HoppeMateusz

shared/test/common/xe_hpc_core/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2021 Intel Corporation
+# Copyright (C) 2021-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -8,25 +8,15 @@ if(TESTS_XE_HPC_CORE)
 
   set(NEO_CORE_TESTS_XE_HPC_CORE
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-      ${CMAKE_CURRENT_SOURCE_DIR}/simd_helper_tests_xe_hpc_core.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/test_traits_xe_hpc_core.h
   )
   set_property(GLOBAL PROPERTY NEO_CORE_TESTS_XE_HPC_CORE ${NEO_CORE_TESTS_XE_HPC_CORE})
 
   add_subdirectories()
 
-  set(IGDRCL_SRCS_tests_xe_hpc_core_excludes
-      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpc_core.cpp
-  )
-  set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_xe_hpc_core_excludes})
-
   target_sources(${TARGET_NAME} PRIVATE
-                 ${IGDRCL_SRCS_tests_xe_hpc_core_excludes}
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/image_surface_state_tests_xe_hpc_core.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/test_encode_xe_hpc_core.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_xe_hpc_core.cpp
-                 ${COMPUTE_RUNTIME_ULT_XE_HPC_CORE}
   )
 
 endif()

shared/test/common/xe_hpc_core/pvc/CMakeLists.txt

@@ -13,16 +13,28 @@ if(TESTS_XE_HPC_CORE)
       ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker_tests_xe_hpc_core.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/hw_cmds_xe_hpc_core_tests.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_xe_hpc_core_tests.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/image_surface_state_tests_xe_hpc_core.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/simd_helper_tests_xe_hpc_core.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/test_encode_xe_hpc_core.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_xe_hpc_core.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/test_sample_xe_hpc_core.cpp
   )
 
+  set(IGDRCL_SRCS_tests_xe_hpc_core_excludes
+      ${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpc_core.cpp
+  )
+  set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_xe_hpc_core_excludes})
+
   if(DEFINED AUB_STREAM_PROJECT_NAME)
     list(APPEND NEO_SHARED_tests_xe_hpc_core
          ${CMAKE_CURRENT_SOURCE_DIR}/aub_center_using_aubstream_lib_tests_xe_hpc_core.cpp
     )
   endif()
 
-  target_sources(${TARGET_NAME} PRIVATE ${NEO_SHARED_tests_xe_hpc_core})
+  target_sources(${TARGET_NAME} PRIVATE
+                 ${IGDRCL_SRCS_tests_xe_hpc_core_excludes}
+                 ${NEO_SHARED_tests_xe_hpc_core}
+  )
+
   add_subdirectories()
 endif()

shared/test/unit_test/xe_hpc_core/CMakeLists.txt

@@ -9,6 +9,10 @@ if(TESTS_PVC)
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
       ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker_tests_pvc.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_tests_pvc.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/test_encode_dispatch_kernel_pvc.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_pvc.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_pvc.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/test_sample_pvc.cpp
   )
 
   target_sources(${TARGET_NAME} PRIVATE ${NEO_SHARED_TESTS_PVC})