Move Preemption tests to core

Change-Id: I717f2e485cac962373474c30e7ed7c52eab58e7f
Signed-off-by: Zbigniew Zdanowicz <zbigniew.zdanowicz@intel.com>

core/command_stream/CMakeLists.txt

@@ -15,3 +15,4 @@ set(NEO_CORE_COMMAND_STREAM
 )
 
 set_property(GLOBAL PROPERTY NEO_CORE_COMMAND_STREAM ${NEO_CORE_COMMAND_STREAM})
+add_subdirectories()

core/unit_tests/fixtures/CMakeLists.txt

@@ -0,0 +1,12 @@
+#
+# Copyright (C) 2019 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+set(NEO_CORE_tests_fixtures
+  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/preemption_fixture.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/preemption_fixture.cpp
+)
+set_property(GLOBAL PROPERTY NEO_CORE_tests_fixtures ${NEO_CORE_tests_fixtures})

core/unit_tests/fixtures/preemption_fixture.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "unit_tests/fixtures/preemption_fixture.h"
+#include "core/unit_tests/fixtures/preemption_fixture.h"
 
 #include "core/command_stream/preemption.h"
 #include "runtime/command_queue/enqueue_common.h"

core/unit_tests/gen11/CMakeLists.txt

@@ -9,6 +9,7 @@ set(NEO_CORE_TESTS_GEN11
   ${CMAKE_CURRENT_SOURCE_DIR}/preamble_tests_gen11.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/simd_helper_tests_gen11.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_gen11.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_gen11.cpp
 )
 set_property(GLOBAL PROPERTY NEO_CORE_TESTS_GEN11 ${NEO_CORE_TESTS_GEN11})
 add_subdirectories()

core/unit_tests/gen11/test_preemption_gen11.cpp

@@ -6,8 +6,8 @@
  */
 
 #include "core/helpers/hw_helper.h"
+#include "core/unit_tests/fixtures/preemption_fixture.h"
 #include "runtime/built_ins/built_ins.h"
-#include "unit_tests/fixtures/preemption_fixture.h"
 #include "unit_tests/helpers/hw_parse.h"
 #include "unit_tests/mocks/mock_buffer.h"
 #include "unit_tests/mocks/mock_command_queue.h"

core/unit_tests/gen12lp/CMakeLists.txt

@@ -8,6 +8,7 @@ set(NEO_CORE_TESTS_GEN12LP
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/simd_helper_tests_gen12lp.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_gen12lp.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_gen12lp.inl
 )
 set_property(GLOBAL PROPERTY NEO_CORE_TESTS_GEN12LP ${NEO_CORE_TESTS_GEN12LP})
 add_subdirectories()

core/unit_tests/gen12lp/test_preemption_gen12lp.inl

@@ -5,7 +5,7 @@
  *
  */
 
-#include "unit_tests/fixtures/preemption_fixture.h"
+#include "core/unit_tests/fixtures/preemption_fixture.h"
 #include "unit_tests/mocks/mock_buffer.h"
 #include "unit_tests/mocks/mock_command_queue.h"
 #include "unit_tests/mocks/mock_csr.h"

core/unit_tests/gen8/CMakeLists.txt

@@ -6,8 +6,9 @@
 
 set(NEO_CORE_TESTS_GEN8
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_gen8.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/simd_helper_tests_gen8.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_gen8.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_gen8.cpp
 )
 set_property(GLOBAL PROPERTY NEO_CORE_TESTS_GEN8 ${NEO_CORE_TESTS_GEN8})
 add_subdirectories()

core/unit_tests/gen8/test_preemption_gen8.cpp

@@ -7,9 +7,9 @@
 
 #include "core/command_stream/preemption.h"
 #include "core/helpers/hw_helper.h"
+#include "core/unit_tests/fixtures/preemption_fixture.h"
 #include "unit_tests/command_queue/enqueue_fixture.h"
 #include "unit_tests/fixtures/hello_world_fixture.h"
-#include "unit_tests/fixtures/preemption_fixture.h"
 #include "unit_tests/helpers/hw_parse.h"
 #include "unit_tests/mocks/mock_buffer.h"
 #include "unit_tests/mocks/mock_command_queue.h"

core/unit_tests/gen9/CMakeLists.txt

@@ -8,6 +8,7 @@ set(NEO_CORE_TESTS_GEN9
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/preamble_tests_gen9.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/simd_helper_tests_gen9.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_gen9.cpp
 )
 set_property(GLOBAL PROPERTY NEO_CORE_TESTS_GEN9 ${NEO_CORE_TESTS_GEN9})
 add_subdirectories()

core/unit_tests/gen9/test_preemption_gen9.cpp

@@ -7,9 +7,9 @@
 
 #include "core/command_stream/preemption.h"
 #include "core/helpers/hw_helper.h"
+#include "core/unit_tests/fixtures/preemption_fixture.h"
 #include "runtime/built_ins/built_ins.h"
 #include "unit_tests/command_queue/enqueue_fixture.h"
-#include "unit_tests/fixtures/preemption_fixture.h"
 #include "unit_tests/helpers/hw_parse.h"
 #include "unit_tests/mocks/mock_buffer.h"
 #include "unit_tests/mocks/mock_command_queue.h"

core/unit_tests/os_interface/windows/CMakeLists.txt

@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2019 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+if(WIN32)
+  set(NEO_CORE_tests_os_interface_windows
+    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/wddm_preemption_tests.cpp
+  )
+  set_property(GLOBAL PROPERTY NEO_CORE_tests_os_interface_windows ${NEO_CORE_tests_os_interface_windows})
+endif()

core/unit_tests/preemption/CMakeLists.txt

@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2018-2019 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+set(NEO_CORE_SRCS_tests_preemption
+  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/preemption_tests.cpp
+)
+
+set_property(GLOBAL PROPERTY NEO_CORE_SRCS_tests_preemption ${NEO_CORE_SRCS_tests_preemption})
+add_subdirectories()

core/unit_tests/preemption/preemption_tests.cpp

@@ -7,11 +7,11 @@
 
 #include "core/command_stream/preemption.h"
 #include "core/helpers/hw_helper.h"
+#include "core/unit_tests/fixtures/preemption_fixture.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/helpers/options.h"
-#include "unit_tests/fixtures/preemption_fixture.h"
 #include "unit_tests/helpers/dispatch_flags_helper.h"
 #include "unit_tests/helpers/hw_parse.h"
 #include "unit_tests/mocks/mock_builtins.h"

unit_tests/command_stream/CMakeLists.txt

@@ -32,5 +32,11 @@ set(IGDRCL_SRCS_tests_command_stream
   ${CMAKE_CURRENT_SOURCE_DIR}/tbx_stream_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/compute_mode_tests.h
 )
+
+get_property(NEO_CORE_SRCS_tests_preemption GLOBAL PROPERTY NEO_CORE_SRCS_tests_preemption)
+list(APPEND IGDRCL_SRCS_tests_command_stream
+   ${NEO_CORE_SRCS_tests_preemption}
+)
+
 target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_command_stream})
 add_subdirectories()

unit_tests/fixtures/CMakeLists.txt

@@ -36,8 +36,6 @@ set(IGDRCL_SRCS_tests_fixtures
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_center_fixture.h
   ${CMAKE_CURRENT_SOURCE_DIR}/platform_fixture.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/platform_fixture.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/preemption_fixture.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/preemption_fixture.h
   ${CMAKE_CURRENT_SOURCE_DIR}/run_kernel_fixture.h
   ${CMAKE_CURRENT_SOURCE_DIR}/scenario_test_fixture.h
   ${CMAKE_CURRENT_SOURCE_DIR}/simple_arg_fixture.h
@@ -46,6 +44,12 @@ set(IGDRCL_SRCS_tests_fixtures
   ${CMAKE_CURRENT_SOURCE_DIR}/two_walker_fixture.h
   ${CMAKE_CURRENT_SOURCE_DIR}/ult_command_stream_receiver_fixture.h
 )
+
+get_property(NEO_CORE_tests_fixtures GLOBAL PROPERTY NEO_CORE_tests_fixtures)
+list(APPEND IGDRCL_SRCS_tests_fixtures
+   ${NEO_CORE_tests_fixtures}
+)
+
 target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_fixtures})
 set_property(GLOBAL PROPERTY IGDRCL_SRCS_tests_fixtures ${IGDRCL_SRCS_tests_fixtures})
 add_subdirectories()

unit_tests/gen11/CMakeLists.txt

@@ -21,7 +21,6 @@ if(TESTS_GEN11)
     ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_gen11.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_device_queue_hw_gen11.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_platform_caps_gen11.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_gen11.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_sample_gen11.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/unit_test_helper_gen11.cpp
   )

unit_tests/gen12lp/CMakeLists.txt

@@ -27,7 +27,6 @@ if(TESTS_GEN12LP)
     ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_gen12lp.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/test_device_queue_hw_gen12lp.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/test_platform_caps_gen12lp.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_gen12lp.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/test_sample_gen12lp.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/unit_test_helper_gen12lp.cpp
   )

unit_tests/gen12lp/gen12lp_tests_wrapper.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/unit_tests/gen12lp/test_preemption_gen12lp.inl"
 #include "unit_tests/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl"
 #include "unit_tests/gen12lp/coherency_tests_gen12lp.inl"
 #include "unit_tests/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl"
@@ -22,5 +23,4 @@
 #include "unit_tests/gen12lp/test_device_caps_gen12lp.inl"
 #include "unit_tests/gen12lp/test_device_queue_hw_gen12lp.inl"
 #include "unit_tests/gen12lp/test_platform_caps_gen12lp.inl"
-#include "unit_tests/gen12lp/test_preemption_gen12lp.inl"
 #include "unit_tests/gen12lp/test_sample_gen12lp.inl"

unit_tests/gen8/CMakeLists.txt

@@ -19,7 +19,6 @@ if(TESTS_GEN8)
     ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_gen8.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_device_queue_hw_gen8.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_platform_caps_gen8.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_gen8.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_sample_gen8.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/unit_test_helper_gen8.cpp
   )

unit_tests/gen9/CMakeLists.txt

@@ -20,7 +20,6 @@ if(TESTS_GEN9)
     ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_gen9.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_device_queue_hw_gen9.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_platform_caps_gen9.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_gen9.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/test_sample_gen9.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/unit_test_helper_gen9.cpp
   )

unit_tests/os_interface/windows/CMakeLists.txt

@@ -39,12 +39,14 @@ set(IGDRCL_SRCS_tests_os_interface_windows
   ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/wddm_mapper_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/wddm_memory_manager_allocate_in_device_pool_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_manager_allocate_in_device_pool_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/wddm_preemption_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/wddm_residency_controller_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/wddm_residency_handler_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_registry_reader.cpp
 )
 if(WIN32)
+  get_property(NEO_CORE_tests_os_interface_windows GLOBAL PROPERTY NEO_CORE_tests_os_interface_windows)
+  list(APPEND IGDRCL_SRCS_tests_os_interface_windows ${NEO_CORE_tests_os_interface_windows})
+
   file(GLOB IGDRCL_SRC_tests_wddm_interface "${CMAKE_CURRENT_SOURCE_DIR}/wddm2[0-9]_tests\.cpp")
   target_sources(igdrcl_tests PRIVATE
     ${IGDRCL_SRCS_tests_os_interface_windows}

unit_tests/preemption/CMakeLists.txt

@@ -1,11 +0,0 @@
-#
-# Copyright (C) 2018 Intel Corporation
-#
-# SPDX-License-Identifier: MIT
-#
-
-set(IGDRCL_SRCS_tests_preemption
-  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/preemption_tests.cpp
-)
-target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_preemption})