Cmake refactor part 14

cleanup unit_tests/aub_tests/CMakeLists.txt cleanup unit_tests/elflib/CMakeLists.txt cleanup unit_tests/libult/CMakeLists.txt cleanup unit_tests/tbx/CMakeLists.txt partially cleanup unit_tests/CMakeLists.txt solution source tree changes: - make test projects folder as variable - make platform specific targets folder as variable - move platform specific targets to \"test platforms\" folder Change-Id: Iff7da009e13c3ac9e5af76325be32e5056e8cd7b
2025-11-10 05:49:51 +08:00 · 2018-03-08 09:14:07 +01:00
parent 0c5f42c854
commit 36a8bd8878
7 changed files with 130 additions and 213 deletions
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -84,12 +84,14 @@ target_include_directories(${NEO_STATIC_LIB_NAME} PUBLIC
 )

 if(WIN32)
+  set(IGDRCL_EXTRA_LIBS Ws2_32)
  target_include_directories(${NEO_STATIC_LIB_NAME} PUBLIC
    ${WDK_INCLUDE_PATHS}
    os_interface/windows
  )
  target_compile_definitions(${NEO_STATIC_LIB_NAME} PRIVATE OGL=1)
 else()
+  set(IGDRCL_EXTRA_LIBS dl pthread)
  target_include_directories(${NEO_STATIC_LIB_NAME} PUBLIC
    os_interface/linux
    ${LIBDRM_DIR}/include
@@ -118,7 +120,6 @@ list(APPEND LIB_FLAGS_DEFINITIONS -DCIF_HEADERS_ONLY_BUILD ${SUPPORTED_GEN_FLAGS

 target_compile_definitions(${NEO_STATIC_LIB_NAME} PUBLIC ${LIB_FLAGS_DEFINITIONS})

-set(IGDRCL_LIB_FLAGS_DEFINITIONS ${LIB_FLAGS_DEFINITIONS} PARENT_SCOPE)
 set_target_properties(${NEO_STATIC_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)

 set_property(TARGET ${NEO_STATIC_LIB_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS})
@@ -151,7 +152,7 @@ if(${GENERATE_EXECUTABLE})
    target_link_libraries(${NEO_DYNAMIC_LIB_NAME} ${INSTRUMENTATION_LIB_NAME})
  endif()

-  target_link_libraries(${NEO_DYNAMIC_LIB_NAME} ${NEO_STATIC_LIB_NAME})
+  target_link_libraries(${NEO_DYNAMIC_LIB_NAME} ${NEO_STATIC_LIB_NAME} ${IGDRCL_EXTRA_LIBS})

  target_include_directories(${NEO_DYNAMIC_LIB_NAME} BEFORE PRIVATE
    ${CMAKE_CURRENT_BINARY_DIR}
@@ -159,12 +160,11 @@ if(${GENERATE_EXECUTABLE})
  )

  if(WIN32)
-    target_link_libraries(${NEO_DYNAMIC_LIB_NAME} ${NEO_STATIC_LIB_NAME} dxgi Ws2_32.lib)
+    target_link_libraries(${NEO_DYNAMIC_LIB_NAME} dxgi)
  else()
    target_include_directories(${NEO_DYNAMIC_LIB_NAME} PRIVATE
      ${CMAKE_CURRENT_SOURCE_DIR}/dll/linux/devices${BRANCH_DIR_SUFFIX}
    )
-    target_link_libraries(${NEO_DYNAMIC_LIB_NAME} dl pthread)
    set_property(TARGET ${NEO_DYNAMIC_LIB_NAME}
      APPEND_STRING PROPERTY LINK_FLAGS " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/dll/linux/ocl.exports"
    )
@@ -198,3 +198,5 @@ if(UNIX AND NOT (TARGET clang-tidy))
    WORKING_DIRECTORY ${IGDRCL_SOURCE_DIR}
  )
 endif()
+
+set(IGDRCL_EXTRA_LIBS ${IGDRCL_EXTRA_LIBS} PARENT_SCOPE)
--- a/unit_tests/CMakeLists.txt
+++ b/unit_tests/CMakeLists.txt
@@ -20,6 +20,9 @@

 project(igdrcl_tests)

+set(TEST_PROJECTS_FOLDER "opencl runtime")
+set(PLATFORM_SPECIFIC_TARGETS_FOLDER "${TEST_PROJECTS_FOLDER}/test platforms")
+
 add_custom_target(unit_tests)

 set(IGDRCL_SRCS_tests_local
@@ -121,7 +124,6 @@ if(NEO_DRIVER_VERSION)
  set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/device/device_caps_tests.cpp PROPERTIES COMPILE_DEFINITIONS NEO_DRIVER_VERSION="${NEO_DRIVER_VERSION}")
 endif(NEO_DRIVER_VERSION)

-link_directories(${GMM_LIB_PATHS})
 if(CLELF_LIB_DIR)
  link_directories(${CLELF_LIB_DIR})
 endif(CLELF_LIB_DIR)
@@ -177,20 +179,15 @@ endif()
 set(BUILT_IN_KERNEL_DIR "${IGDRCL_SOURCE_DIR}/runtime/built_ins")

 target_include_directories(igdrcl_tests PRIVATE
-  ${GMM_INCLUDE_PATHS}
-  ${UMKM_SHAREDDATA_INCLUDE_PATHS}
  ${INSTRUMENTATION_INCLUDE_PATH}
  ${GTEST_INCLUDE_DIR}
  ${GMOCK_INCLUDE_DIR}
  ${IGDRCL_SOURCE_DIR}/unit_tests/mocks${BRANCH_DIR_SUFFIX}
 )

+target_link_libraries (igdrcl_tests gtest gmock ${IGDRCL_EXTRA_LIBS})
 if(MSVC)
-  target_include_directories(igdrcl_tests PUBLIC
-    ${WDK_INCLUDE_PATHS}
-  )
  message(STATUS "TargetDir is: ${TargetDir}")
-  target_link_libraries (igdrcl_tests gtest gmock Ws2_32.lib)
 else()
  add_executable(igdrcl_linux
    ${IGDRCL_SRCS_linux_tests}
@@ -207,9 +204,8 @@ else()
    ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/debug_helpers.cpp
    ${IGDRCL_SOURCE_DIR}/unit_tests/program/evaluate_unhandled_token_ult.cpp
  )
-  target_link_libraries(igdrcl_linux ${NEO_MOCKABLE_LIB_NAME} igdrcl_mocks dl pthread gtest gmock)
-  target_link_libraries(igdrcl_linux_dll_tests ${NEO_MOCKABLE_LIB_NAME} igdrcl_mocks dl pthread gtest gmock)
-  target_link_libraries(igdrcl_tests dl pthread gtest gmock)
+  target_link_libraries(igdrcl_linux ${NEO_MOCKABLE_LIB_NAME} igdrcl_mocks ${IGDRCL_EXTRA_LIBS} gtest gmock)
+  target_link_libraries(igdrcl_linux_dll_tests ${NEO_MOCKABLE_LIB_NAME} igdrcl_mocks ${IGDRCL_EXTRA_LIBS} gtest gmock)

  set_property(TARGET igdrcl_linux_dll_tests APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})
  set_property(TARGET igdrcl_linux APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})
@@ -253,7 +249,7 @@ function(neo_copy_test_files target gen)
    COMMAND WORKING_DIRECTORY ${TargetDir}
  )
  add_dependencies(${target} copy_compiler_files)
-  set_target_properties(${target} PROPERTIES FOLDER "opencl runtime/${gen}")
+  set_target_properties(${target} PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TARGETS_FOLDER}/${gen}")
 endfunction()

 add_dependencies(unit_tests
@@ -286,16 +282,14 @@ else (MSVC)
  endif(PRE_ULT_COMMAND)
 endif (MSVC)

-create_project_source_tree(igdrcl_tests ${IGDRCL_SOURCE_DIR}/runtime)
-
-set_target_properties(igdrcl_tests PROPERTIES FOLDER "opencl runtime")
+set_target_properties(igdrcl_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})
 set_property(TARGET igdrcl_tests APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})
 if(NOT MSVC)
  set_property(TARGET igdrcl_tests APPEND_STRING PROPERTY COMPILE_FLAGS " -g")
 endif()

-set_target_properties(unit_tests PROPERTIES FOLDER "opencl runtime")
-set_target_properties(run_unit_tests PROPERTIES FOLDER "opencl runtime")
+set_target_properties(unit_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})
+set_target_properties(run_unit_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})

 target_compile_definitions(igdrcl_tests PUBLIC ${TESTED_GEN_FLAGS_DEFINITONS})

@@ -488,7 +482,7 @@ function(gen_run_unit_tests product slices subslices eu_per_ss)
  add_custom_target(run_${product}_unit_tests ALL DEPENDS unit_tests)
  neo_copy_test_files(copy_test_files_${product} ${product})
  add_dependencies(unit_tests copy_test_files_${product})
-  set_target_properties(run_${product}_unit_tests PROPERTIES FOLDER "opencl runtime/${product}")
+  set_target_properties(run_${product}_unit_tests PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TARGETS_FOLDER}/${product}")
  add_custom_command(
    TARGET run_${product}_unit_tests
    POST_BUILD
@@ -561,3 +555,4 @@ add_subdirectory(elflib)
 add_subdirectory(mt_tests)
 add_subdirectory(aub_tests)
 add_subdirectory(tbx)
+create_project_source_tree(igdrcl_tests ${IGDRCL_SOURCE_DIR}/runtime)
--- a/unit_tests/aub_tests/CMakeLists.txt
+++ b/unit_tests/aub_tests/CMakeLists.txt
@@ -18,110 +18,85 @@
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.

-cmake_minimum_required(VERSION 3.2.0 FATAL_ERROR)
-
 project(igdrcl_aub_tests)

 include(${CMAKE_CURRENT_SOURCE_DIR}/common.cmake)

 add_executable(igdrcl_aub_tests
-    ${IGDRCL_SOURCE_DIR}/unit_tests/main.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration.cpp
-    $<TARGET_OBJECTS:${BUILTINS_SOURCES_LIB_NAME}>
-    $<TARGET_OBJECTS:${SCHEDULER_BINARY_LIB_NAME}>
-    $<TARGET_OBJECTS:igdrcl_libult>
-    $<TARGET_OBJECTS:igdrcl_libult_cs>
+  ${IGDRCL_SOURCE_DIR}/unit_tests/main.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration.cpp
+  $<TARGET_OBJECTS:${BUILTINS_SOURCES_LIB_NAME}>
+  $<TARGET_OBJECTS:${SCHEDULER_BINARY_LIB_NAME}>
+  $<TARGET_OBJECTS:igdrcl_libult>
+  $<TARGET_OBJECTS:igdrcl_libult_cs>
 )

-set_target_properties(igdrcl_aub_tests PROPERTIES FOLDER "opencl runtime")
+set_target_properties(igdrcl_aub_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})

 add_custom_target(run_aub_tests)
-set_target_properties(run_aub_tests PROPERTIES FOLDER "opencl runtime")
+set_target_properties(run_aub_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})

 target_include_directories(igdrcl_aub_tests PRIVATE
    ${GTEST_INCLUDE_DIR}
    ${GMOCK_INCLUDE_DIR}
-    ${GMM_INCLUDE_PATHS}
 )

 if(WIN32)
  target_include_directories(igdrcl_aub_tests PRIVATE
    ${IGDRCL_SOURCE_DIR}/unit_tests/mocks${BRANCH_DIR_SUFFIX}
  )
-endif(WIN32)
-
-add_subdirectory(command_queue)
-add_subdirectory(command_stream)
-add_subdirectory(fixtures)
-add_subdirectory(mem_obj)
+endif()

 target_sources(igdrcl_aub_tests PRIVATE
-    ${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/command_queue_fixture.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/buffer_fixture.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/built_in_fixture.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/device_fixture.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/program_fixture.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/memory_management_fixture.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/memory_management.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/kernel_binary_helper.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/indirect_heap/indirect_heap_fixture.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/test_files.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/base_object_allocator.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/global_environment.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/memory_leak_listener.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/options.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/program/evaluate_unhandled_token_ult.cpp
-    ${IGDRCL_SOURCE_DIR}/unit_tests/abort.cpp
-    ${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/resource_info.cpp
+  ${IGDRCL_SOURCE_DIR}/unit_tests/command_queue/command_queue_fixture.cpp
+  ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/buffer_fixture.cpp
+  ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/built_in_fixture.cpp
+  ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/device_fixture.cpp
+  ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/program_fixture.cpp
+  ${IGDRCL_SOURCE_DIR}/unit_tests/fixtures/memory_management_fixture.cpp
+  ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/memory_management.cpp
+  ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/kernel_binary_helper.cpp
+  ${IGDRCL_SOURCE_DIR}/unit_tests/indirect_heap/indirect_heap_fixture.cpp
+  ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/test_files.cpp
+  ${IGDRCL_SOURCE_DIR}/unit_tests/base_object_allocator.cpp
+  ${IGDRCL_SOURCE_DIR}/unit_tests/global_environment.cpp
+  ${IGDRCL_SOURCE_DIR}/unit_tests/memory_leak_listener.cpp
+  ${IGDRCL_SOURCE_DIR}/unit_tests/options.cpp
+  ${IGDRCL_SOURCE_DIR}/unit_tests/program/evaluate_unhandled_token_ult.cpp
+  ${IGDRCL_SOURCE_DIR}/unit_tests/abort.cpp
+  ${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/resource_info.cpp
 )

-if(MSVC)
-    target_sources(igdrcl_aub_tests PRIVATE
-        ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/options.cpp
-        ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/ult_dxgi_factory.cpp
-        ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/wddm_create.cpp
-        ${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/gmm_memory.cpp
-    )
-else(MSVC)
-    target_sources(igdrcl_aub_tests PRIVATE
-        ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/linux/options.cpp
-    )
-endif(MSVC)
+if(WIN32)
+  target_sources(igdrcl_aub_tests PRIVATE
+    ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/options.cpp
+    ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/ult_dxgi_factory.cpp
+    ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/wddm_create.cpp
+    ${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/gmm_memory.cpp
+  )
+else()
+  target_sources(igdrcl_aub_tests PRIVATE
+    ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/linux/options.cpp
+  )
+endif()

-add_subdirectory(gen8)
-add_subdirectory(gen9)
+add_subdirectories()

 target_link_libraries(igdrcl_aub_tests igdrcl_mocks)
 target_link_libraries(igdrcl_aub_tests ${NEO_MOCKABLE_LIB_NAME})
 target_link_libraries(igdrcl_aub_tests igdrcl_mocks)
-target_link_libraries(igdrcl_aub_tests gtest gmock)
+target_link_libraries(igdrcl_aub_tests gtest gmock ${IGDRCL_EXTRA_LIBS})

-link_directories(${GMM_LIB_PATHS})
-create_project_source_tree(igdrcl_aub_tests ${IGDRCL_SOURCE_DIR}/runtime ${IGDRCL_SOURCE_DIR}/unit_tests)
-
-if(MSVC)
-    target_link_libraries(igdrcl_aub_tests Ws2_32.lib)
-    target_include_directories(igdrcl_aub_tests PRIVATE ${UMKM_SHAREDDATA_INCLUDE_PATHS})
-else(MSVC)
-    target_link_libraries(igdrcl_aub_tests pthread dl)
-    target_include_directories(igdrcl_aub_tests PRIVATE 
-        ${GMM_SOURCE_DIR}/inc
-        ${GMM_SOURCE_DIR}/inc/common
-    )
-endif(MSVC)
-
-target_include_directories(igdrcl_aub_tests BEFORE PRIVATE ${IGDRCL_SOURCE_DIR}/unit_tests/gen_common ${IGDRCL_SOURCE_DIR}/runtime/gen_common)
+target_include_directories(igdrcl_aub_tests BEFORE PRIVATE ${IGDRCL_SOURCE_DIR}/unit_tests/gen_common)

 target_compile_definitions(igdrcl_aub_tests PUBLIC ${TESTED_GEN_FLAGS_DEFINITONS})
-foreach(GEN_NUM RANGE 0 ${MAX_GEN} 1)
+foreach(GEN_NUM RANGE ${MAX_GEN})
  GEN_CONTAINS_PLATFORMS("TESTED" ${GEN_NUM} GENX_HAS_PLATFORMS)
  if(${GENX_HAS_PLATFORMS})
-    message(STATUS "Generating GEN${GEN_NUM} AUBs")
    GET_PLATFORMS_FOR_GEN("TESTED" ${GEN_NUM} TESTED_GENX_PLATFORMS)
-
    foreach(PLATFORM_IT ${TESTED_GENX_PLATFORMS})
      string(TOLOWER ${PLATFORM_IT} PLATFORM_IT_LOWER)
-      target_sources(igdrcl_aub_tests PUBLIC
+      target_sources(igdrcl_aub_tests PRIVATE
        ${IGDRCL_SOURCE_DIR}/unit_tests/gen${GEN_NUM}/cmd_parse_gen${GEN_NUM}.cpp
      )
      add_custom_target(${PLATFORM_IT_LOWER}_aub_tests
@@ -136,11 +111,11 @@ foreach(GEN_NUM RANGE 0 ${MAX_GEN} 1)
      endif(${PLATFORM_SUPPORTS_2_0})
      add_custom_target(run_${PLATFORM_IT_LOWER}_aub_tests ALL DEPENDS ${PLATFORM_IT_LOWER}_aub_tests)
      add_dependencies(run_aub_tests run_${PLATFORM_IT_LOWER}_aub_tests)
-      set_target_properties(${PLATFORM_IT_LOWER}_aub_tests PROPERTIES FOLDER "opencl runtime/${PLATFORM_IT_LOWER}")
-      set_target_properties(run_${PLATFORM_IT_LOWER}_aub_tests PROPERTIES FOLDER "opencl runtime/${PLATFORM_IT_LOWER}")
-      if(MSVC)
+      set_target_properties(${PLATFORM_IT_LOWER}_aub_tests PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TARGETS_FOLDER}/${PLATFORM_IT_LOWER}")
+      set_target_properties(run_${PLATFORM_IT_LOWER}_aub_tests PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TARGETS_FOLDER}/${PLATFORM_IT_LOWER}")
+      if(WIN32)
        add_dependencies(${PLATFORM_IT_LOWER}_aub_tests mock_gdi)
-      endif(MSVC)
+      endif()
      GET_TEST_CONFIGURATIONS_FOR_PLATFORM("AUB_TESTS" ${GEN_NUM} ${PLATFORM_IT} PLATFORM_CONFIGURATIONS)
      foreach(PLATFORM_CONFIGURATION ${PLATFORM_CONFIGURATIONS})
        string(REPLACE "/" ";" CONFIGURATION_PARAMS ${PLATFORM_CONFIGURATION})
@@ -148,7 +123,8 @@ foreach(GEN_NUM RANGE 0 ${MAX_GEN} 1)
        list(GET CONFIGURATION_PARAMS 2 SUBSLICES)
        list(GET CONFIGURATION_PARAMS 3 EU_PER_SS)
        neo_run_aub_target(${PLATFORM_IT_LOWER} "${PLATFORM_IT} ${SLICES}x${SUBSLICES}x${EU_PER_SS}" ${PLATFORM_IT_LOWER} ${SLICES} ${SUBSLICES} ${EU_PER_SS})
-      endforeach(PLATFORM_CONFIGURATION)
-    endforeach(PLATFORM_IT)
-  endif(${GENX_HAS_PLATFORMS})
-endforeach(GEN_NUM)
+      endforeach()
+    endforeach()
+  endif()
+endforeach()
+create_project_source_tree(igdrcl_aub_tests ${IGDRCL_SOURCE_DIR}/runtime ${IGDRCL_SOURCE_DIR}/unit_tests)
--- a/unit_tests/elflib/CMakeLists.txt
+++ b/unit_tests/elflib/CMakeLists.txt
@@ -39,14 +39,14 @@ target_include_directories(elflib_tests PRIVATE
 )

 if(UNIX)
-  target_link_libraries(elflib_tests pthread dl)
+  target_link_libraries(elflib_tests ${IGDRCL_EXTRA_LIBS})
 endif()

 add_custom_target(run_elflib_tests ALL DEPENDS elflib_tests)
 add_custom_command(
-    TARGET run_elflib_tests
-    POST_BUILD
-    COMMAND elflib_tests ${IGDRCL_TESTS_LISTENER_OPTION}
+  TARGET run_elflib_tests
+  POST_BUILD
+  COMMAND elflib_tests ${IGDRCL_TESTS_LISTENER_OPTION}
 )
 add_dependencies(run_unit_tests run_elflib_tests)

--- a/unit_tests/libult/CMakeLists.txt
+++ b/unit_tests/libult/CMakeLists.txt
@@ -18,39 +18,27 @@
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.

-set(OPTIONAL_RUNTIME_GENX_FILES
-  hw_info.cpp
-)
-
-foreach(GEN_NUM RANGE 0 ${MAX_GEN} 1)
+foreach(GEN_NUM RANGE ${MAX_GEN})
  GEN_CONTAINS_PLATFORMS("TESTED" ${GEN_NUM} GENX_HAS_PLATFORMS)
  if(${GENX_HAS_PLATFORMS})
-    foreach(SRC_IT ${OPTIONAL_RUNTIME_GENX_FILES})
-      set(SRC_FILE ${IGDRCL_SOURCE_DIR}/runtime/gen${GEN_NUM}/${SRC_IT})
-      if(EXISTS ${SRC_FILE})
-        list(APPEND CLOC_SRCS_LIB ${SRC_FILE})
-      endif()
-    endforeach()
-    GET_PLATFORMS_FOR_GEN("TESTED" ${GEN_NUM} TESTED_GENX_PLATFORMS)
-    list (APPEND IGDRCL_SRCS_LIB_ULT
+    list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW
      ${IGDRCL_SOURCE_DIR}/unit_tests/libult/gen${GEN_NUM}.cpp
      ${IGDRCL_SOURCE_DIR}/runtime/gen${GEN_NUM}/enable_family_full.cpp
    )
+    GET_PLATFORMS_FOR_GEN("TESTED" ${GEN_NUM} TESTED_GENX_PLATFORMS)
    foreach(PLATFORM_IT ${TESTED_GENX_PLATFORMS})
      string(TOLOWER ${PLATFORM_IT} PLATFORM_IT_LOWER)
-      list (APPEND IGDRCL_SRCS_LIB_ULT
+      list (APPEND IGDRCL_SRCS_ENABLE_TESTED_HW
        ${IGDRCL_SOURCE_DIR}/runtime/gen${GEN_NUM}/enable_${PLATFORM_IT_LOWER}.cpp
      )
-      if (NOT WIN32)
-        list (APPEND IGDRCL_SRCS_LIB_ULT
-          ${IGDRCL_SOURCE_DIR}/runtime/gen${GEN_NUM}/linux/enable_${PLATFORM_IT_LOWER}.cpp
-        )
-      endif (NOT WIN32)
-    endforeach(PLATFORM_IT)
-  endif(${GENX_HAS_PLATFORMS})
-endforeach(GEN_NUM)
+      list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW_LINUX
+        ${IGDRCL_SOURCE_DIR}/runtime/gen${GEN_NUM}/linux/enable_${PLATFORM_IT_LOWER}.cpp
+      )
+    endforeach()
+  endif()
+endforeach()

-list(APPEND IGDRCL_SRCS_LIB_ULT
+set(IGDRCL_SRCS_LIB_ULT
  ${IGDRCL_SOURCE_DIR}/unit_tests/libult/create_tbx_sockets.cpp
  ${IGDRCL_SOURCE_DIR}/unit_tests/libult/ult_command_stream_receiver.h
  ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/debug_helpers.cpp
@@ -60,58 +48,25 @@ list(APPEND IGDRCL_SRCS_LIB_ULT

 add_library (igdrcl_libult OBJECT
  ${IGDRCL_SRCS_LIB_ULT}
+  ${IGDRCL_SRCS_ENABLE_TESTED_HW}
 )
-add_library (igdrcl_libult_cs OBJECT
+if(UNIX)
+  target_sources(igdrcl_libult PRIVATE ${IGDRCL_SRCS_ENABLE_TESTED_HW_LINUX})
+endif()
+
+set(IGDRCL_SRCS_LIB_ULT_CS
  ${IGDRCL_SOURCE_DIR}/unit_tests/libult/create_command_stream.cpp
  ${IGDRCL_SOURCE_DIR}/unit_tests/libult/create_command_stream.h
 )
-
-create_project_source_tree(igdrcl_libult ${IGDRCL_SOURCE_DIR}/runtime ${IGDRCL_SOURCE_DIR}/unit_tests)
-create_project_source_tree(igdrcl_libult_cs ${IGDRCL_SOURCE_DIR}/runtime ${IGDRCL_SOURCE_DIR}/unit_tests)
-
-if(MSVC)
-  target_include_directories(igdrcl_libult PRIVATE ${WDK_INCLUDE_PATHS})
-endif()
-
-if (WIN32)
-  target_compile_definitions(igdrcl_libult PUBLIC OGL=1)
-  target_compile_definitions(igdrcl_libult PUBLIC INSTR_WIN_UMD=1)
-else (WIN32)
-  target_compile_definitions(igdrcl_libult PUBLIC OGL_GEM=1)
-endif (WIN32)
-
-target_compile_definitions(igdrcl_libult PUBLIC DEFAULT_PLATFORM=${DEFAULT_PLATFORM})
-target_include_directories(igdrcl_libult PRIVATE
-  ${GMM_INCLUDE_PATHS}
-  ${UMKM_SHAREDDATA_INCLUDE_PATHS}
-  ${INSTRUMENTATION_INCLUDE_PATH}
-  ${GTEST_INCLUDE_DIR}
-  ${KHRONOS_HEADERS_DIR}
-  ${IGDRCL__IGC_INCLUDE_DIR}
-  ${THIRD_PARTY_DIR}
-  ${GMOCK_INCLUDE_DIR}
+add_library (igdrcl_libult_cs OBJECT
+  ${IGDRCL_SRCS_LIB_ULT_CS}
 )
-target_include_directories(igdrcl_libult_cs PRIVATE
-  ${GMM_INCLUDE_PATHS}
-  ${UMKM_SHAREDDATA_INCLUDE_PATHS}
-  ${KHRONOS_HEADERS_DIR}
-)
-target_include_directories(igdrcl_libult BEFORE PRIVATE ${HW_SRC_INCLUDE_PATH})
-target_include_directories(igdrcl_libult_cs BEFORE PRIVATE ${HW_SRC_INCLUDE_PATH})

-# if(HAVE_INSTRUMENTATION)
-# target_include_directories(igdrcl_libult PRIVATE $<TARGET_PROPERTY:instrumentation_umd,INTERFACE_INCLUDE_DIRECTORIES>)
-# endif()
-
-set_target_properties (igdrcl_libult PROPERTIES POSITION_INDEPENDENT_CODE ON)
-set_target_properties (igdrcl_libult_cs PROPERTIES POSITION_INDEPENDENT_CODE ON)
-target_compile_definitions(igdrcl_libult PUBLIC ${IGDRCL_LIB_FLAGS_DEFINITIONS} ${TESTED_GEN_FLAGS_DEFINITONS})
-target_compile_definitions(igdrcl_libult_cs PUBLIC ${IGDRCL_LIB_FLAGS_DEFINITIONS} ${TESTED_GEN_FLAGS_DEFINITONS})
-
-set_property(TARGET igdrcl_libult APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS})
-
-set_target_properties(igdrcl_libult PROPERTIES FOLDER "opencl runtime")
-set_target_properties(igdrcl_libult_cs PROPERTIES FOLDER "opencl runtime")
-
-target_compile_definitions(igdrcl_libult PUBLIC MOCKABLE_VIRTUAL=virtual)
-target_compile_definitions(igdrcl_libult_cs PUBLIC MOCKABLE_VIRTUAL=virtual)
+foreach(target_name igdrcl_libult igdrcl_libult_cs)
+  set_target_properties(${target_name} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+  set_target_properties(${target_name} PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})
+  set_property(TARGET ${target_name} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS})
+  target_include_directories(${target_name} PRIVATE $<TARGET_PROPERTY:${NEO_MOCKABLE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>)
+  target_compile_definitions(${target_name} PRIVATE $<TARGET_PROPERTY:${NEO_MOCKABLE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>)
+  create_project_source_tree(${target_name} ${IGDRCL_SOURCE_DIR}/runtime ${IGDRCL_SOURCE_DIR}/unit_tests)
+endforeach()
--- a/unit_tests/mt_tests/CMakeLists.txt
+++ b/unit_tests/mt_tests/CMakeLists.txt
@@ -124,13 +124,13 @@ add_dependencies(igdrcl_mt_tests test_dynamic_lib)

 create_project_source_tree(igdrcl_mt_tests ${IGDRCL_SOURCE_DIR}/runtime ${IGDRCL_SOURCE_DIR}/unit_tests)

-set_target_properties(igdrcl_mt_tests PROPERTIES FOLDER "opencl runtime")
+set_target_properties(igdrcl_mt_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})
 set_property(TARGET igdrcl_mt_tests APPEND_STRING PROPERTY COMPILE_FLAGS ${TSAN_FLAGS})
 if(NOT MSVC)
  set_property(TARGET igdrcl_mt_tests APPEND_STRING PROPERTY COMPILE_FLAGS " -g")
 endif()

-set_target_properties(run_mt_unit_tests PROPERTIES FOLDER "opencl runtime")
+set_target_properties(run_mt_unit_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})

 function(run_mt_tests target slices subslices eu_per_ss)
  add_custom_target(run_${target}_mt_unit_tests DEPENDS igdrcl_mt_tests)
@@ -138,7 +138,7 @@ function(run_mt_tests target slices subslices eu_per_ss)
    add_dependencies(run_${target}_mt_unit_tests copy_test_files_${target})
  endif()
  add_dependencies(run_mt_unit_tests run_${target}_mt_unit_tests)
-  set_target_properties(run_${target}_mt_unit_tests PROPERTIES FOLDER "opencl runtime/${target}")
+  set_target_properties(run_${target}_mt_unit_tests PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TARGETS_FOLDER}/${target}")

  add_custom_command(
    TARGET run_${target}_mt_unit_tests
--- a/unit_tests/tbx/CMakeLists.txt
+++ b/unit_tests/tbx/CMakeLists.txt
@@ -17,57 +17,46 @@
 # OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
-
-cmake_minimum_required(VERSION 3.2.0 FATAL_ERROR)
-
 project(igdrcl_tbx_tests)

 add_executable(igdrcl_tbx_tests 
-    "${CMAKE_CURRENT_SOURCE_DIR}/main_tbx.cpp"
-    "${IGDRCL_SOURCE_DIR}/runtime/dll/create_command_stream.cpp"
-    "${IGDRCL_SOURCE_DIR}/unit_tests/abort.cpp"
-    "${IGDRCL_SOURCE_DIR}/unit_tests/options.cpp"
-    "${IGDRCL_SOURCE_DIR}/unit_tests/program/evaluate_unhandled_token_ult.cpp"
-    $<TARGET_OBJECTS:igdrcl_libult>
+  ${CMAKE_CURRENT_SOURCE_DIR}/main_tbx.cpp
+  ${IGDRCL_SOURCE_DIR}/runtime/dll/create_command_stream.cpp
+  ${IGDRCL_SOURCE_DIR}/unit_tests/abort.cpp
+  ${IGDRCL_SOURCE_DIR}/unit_tests/options.cpp
+  ${IGDRCL_SOURCE_DIR}/unit_tests/program/evaluate_unhandled_token_ult.cpp
+  $<TARGET_OBJECTS:igdrcl_libult>
 )

-target_link_libraries(igdrcl_tbx_tests ${NEO_MOCKABLE_LIB_NAME} igdrcl_mocks gtest gmock igdrcl_mocks)
+target_link_libraries(igdrcl_tbx_tests ${NEO_MOCKABLE_LIB_NAME} igdrcl_mocks gtest gmock ${IGDRCL_EXTRA_LIBS})

-target_compile_definitions(igdrcl_tbx_tests PRIVATE MOCKABLE_VIRTUAL=virtual)
-if(UNIX)
-  target_link_libraries(igdrcl_tbx_tests dl pthread)
-elseif(WIN32)
-    target_include_directories(igdrcl_tbx_tests PRIVATE
-      ${IGDRCL_SOURCE_DIR}/unit_tests/mocks${BRANCH_DIR_SUFFIX}
-    )
-	target_sources(igdrcl_tbx_tests PUBLIC
-		${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/wddm_create.cpp
-		${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/ult_dxgi_factory.cpp
-	 )
-	target_link_libraries(igdrcl_tbx_tests Ws2_32)
-endif(UNIX)
+if(WIN32)
+  target_include_directories(igdrcl_tbx_tests PRIVATE
+    ${IGDRCL_SOURCE_DIR}/unit_tests/mocks${BRANCH_DIR_SUFFIX}
+  )
+  target_sources(igdrcl_tbx_tests PRIVATE
+    ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/wddm_create.cpp
+    ${IGDRCL_SOURCE_DIR}/unit_tests/os_interface/windows/ult_dxgi_factory.cpp
+  )
+endif()

 target_include_directories(igdrcl_tbx_tests PRIVATE
-	${GTEST_INCLUDE_DIR}
-	${GMOCK_INCLUDE_DIR}
-	${UMKM_SHAREDDATA_INCLUDE_PATHS}
-	${GMM_INCLUDE_PATHS}
-	${KHRONOS_HEADERS_DIR}
-	${IGDRCL__IGC_INCLUDE_DIR}
+  ${GTEST_INCLUDE_DIR}
+  ${GMOCK_INCLUDE_DIR}
 )

 create_project_source_tree(igdrcl_tbx_tests ${IGDRCL_SOURCE_DIR}/runtime ${IGDRCL_SOURCE_DIR}/unit_tests)

 add_custom_target(run_tbx_tests ALL DEPENDS igdrcl_tbx_tests)
 add_custom_command(
-	TARGET run_tbx_tests
-	POST_BUILD
-	COMMAND WORKING_DIRECTORY ${TargetDir}
-	COMMAND echo Target Directory is: ${TargetDir}
-	COMMAND echo Running TBX tests
-	COMMAND igdrcl_tbx_tests
+  TARGET run_tbx_tests
+  POST_BUILD
+  COMMAND WORKING_DIRECTORY ${TargetDir}
+  COMMAND echo Target Directory is: ${TargetDir}
+  COMMAND echo Running TBX tests
+  COMMAND igdrcl_tbx_tests
 )
 add_dependencies(run_unit_tests run_tbx_tests)

-set_target_properties(igdrcl_tbx_tests PROPERTIES FOLDER "opencl runtime")
-set_target_properties(run_tbx_tests PROPERTIES FOLDER "opencl runtime")
+set_target_properties(igdrcl_tbx_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})
+set_target_properties(run_tbx_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})