Revert "Improve build time: command_queue tests"

This reverts commit 4181185.

Change-Id: I74d4dba4aa0d840ddd8eeacf5b40503ff54b7c5a
Signed-off-by: Artur Harasimiuk <[email protected]>

Author: ArturHarasimiuk

unit_tests/command_queue/CMakeLists.txt

@@ -22,93 +22,88 @@ set(IGDRCL_SRCS_tests_command_queue
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/buffer_operations_fixture.h
   ${CMAKE_CURRENT_SOURCE_DIR}/buffer_operations_withAsyncGPU_fixture.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_flush_waitlist_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_flush_waitlist_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_hw_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_tests_wrapper1.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_tests_wrapper2.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_tests_wrapper3.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_tests_wrapper4.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_tests_wrapper5.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/drm_requirements_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/command_queue_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/drm_requirements_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_api_tests_mt_with_asyncGPU.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_barrier_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_copy_buffer_event_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_barrier_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_copy_buffer_event_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_copy_buffer_fixture.h
   ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_copy_buffer_rect_fixture.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_copy_buffer_rect_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_copy_buffer_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_copy_buffer_rect_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_copy_buffer_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_copy_buffer_to_image_fixture.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_copy_buffer_to_image_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_copy_buffer_to_image_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_copy_image_fixture.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_copy_image_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_copy_image_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_copy_image_to_buffer_fixture.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_copy_image_to_buffer_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_debug_kernel_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_fill_buffer_event_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_copy_image_to_buffer_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_debug_kernel_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_fill_buffer_event_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_fill_buffer_fixture.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_fill_buffer_negative_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_fill_buffer_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_fill_buffer_negative_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_fill_buffer_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_fill_image_fixture.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_fill_image_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_fill_image_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_fixture.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_fixture.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_handler_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel_event_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel_global_offset_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel_local_work_size_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_handler_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel_event_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel_global_offset_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel_local_work_size_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel_two_ioq_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel_two_ooq_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel_two_walker_ioq_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel_two_walker_ooq_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel_two_ioq_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel_two_ooq_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel_two_walker_ioq_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel_two_walker_ooq_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_map_buffer_fixture.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_map_buffer_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_map_image_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_marker_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_media_kernel.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_migrate_mem_objects_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_read_buffer_event_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_map_buffer_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_map_image_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_marker_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_media_kernel.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_migrate_mem_objects_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_read_buffer_event_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_read_buffer_fixture.h
   ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_read_buffer_rect_fixture.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_read_buffer_rect_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_read_buffer_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_read_buffer_rect_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_read_buffer_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_read_image_fixture.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_read_image_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_svm_mem_copy_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_svm_mem_fill_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_svm_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_thread_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_unmap_memobject_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_waitlist_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_write_buffer_event_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_read_image_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_svm_mem_copy_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_svm_mem_fill_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_svm_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_thread_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_unmap_memobject_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_waitlist_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_write_buffer_event_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_write_buffer_rect_fixture.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_write_buffer_rect_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_write_buffer_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_write_buffer_rect_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_write_buffer_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_write_image_fixture.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_write_image_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/finish_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/flattened_id_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/flush_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/get_command_queue_info_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/get_size_required_buffer_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/get_size_required_image_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/get_size_required_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/ioq_task_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_write_image_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/finish_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/flattened_id_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/flush_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/get_command_queue_info_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/get_size_required_buffer_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/get_size_required_image_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/get_size_required_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/ioq_task_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/ioq_task_tests_mt.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/local_id_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/local_work_size_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/multi_dispatch_info_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/multiple_map_buffer_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/multiple_map_image_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/oom_buffer_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/oom_image_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/oom_tests.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/ooq_task_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/local_id_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/local_work_size_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/multi_dispatch_info_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/multiple_map_buffer_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/multiple_map_image_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/oom_buffer_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/oom_image_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/oom_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/ooq_task_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/ooq_task_tests_mt.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/read_write_buffer_cpu_copy.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/work_group_size_tests.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/read_write_buffer_cpu_copy.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/work_group_size_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/zero_size_enqueue_tests.cpp
 )
 target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_command_queue})

unit_tests/command_queue/command_queue_flush_waitlist_tests.inl renamed to unit_tests/command_queue/command_queue_flush_waitlist_tests.cpp

@@ -37,7 +37,7 @@
 
 using namespace OCLRT;
 
-typedef ::Test<EnqueueFillBufferFixture> EnqueueFillBufferCmdTests;
+typedef Test<EnqueueFillBufferFixture> EnqueueFillBufferCmdTests;
 
 HWTEST_F(EnqueueFillBufferCmdTests, alignsToCSR) {
     //this test case assumes IOQ

unit_tests/command_queue/command_queue_tests.inl renamed to unit_tests/command_queue/command_queue_tests.cpp

@@ -26,11 +26,11 @@
 
 using namespace OCLRT;
 
-struct OOQFixtureFactory1 : public HelloWorldFixtureFactory {
+struct OOQFixtureFactory : public HelloWorldFixtureFactory {
     typedef OOQueueFixture CommandQueueFixture;
 };
 
-typedef TwoWalkerTest<OOQFixtureFactory1> OOQWithTwoWalkers;
+typedef TwoWalkerTest<OOQFixtureFactory> OOQWithTwoWalkers;
 
 HWCMDTEST_F(IGFX_GEN8_CORE, OOQWithTwoWalkers, shouldHaveTwoWalkers) {
     enqueueTwoKernels<FamilyType>();