Revert "Improve build time: command_queue tests"

This reverts commit 41811852db.

Change-Id: I74d4dba4aa0d840ddd8eeacf5b40503ff54b7c5a
Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>

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_tests_wrapper1.cpp

@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2018, Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * 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.
- */
-
-#include "unit_tests/command_queue/command_queue_flush_waitlist_tests.inl"
-#include "unit_tests/command_queue/command_queue_tests.inl"
-#include "unit_tests/command_queue/dispatch_walker_tests.inl"
-#include "unit_tests/command_queue/drm_requirements_tests.inl"
-#include "unit_tests/command_queue/enqueue_barrier_tests.inl"
-#include "unit_tests/command_queue/enqueue_copy_buffer_event_tests.inl"
-#include "unit_tests/command_queue/enqueue_copy_buffer_rect_tests.inl"
-#include "unit_tests/command_queue/enqueue_copy_buffer_tests.inl"
-#include "unit_tests/command_queue/enqueue_copy_buffer_to_image_tests.inl"
-#include "unit_tests/command_queue/enqueue_copy_image_tests.inl"
-#include "unit_tests/command_queue/enqueue_copy_image_to_buffer_tests.inl"
-#include "unit_tests/command_queue/enqueue_debug_kernel_tests.inl"
-#include "unit_tests/command_queue/enqueue_fill_buffer_event_tests.inl"

unit_tests/command_queue/command_queue_tests_wrapper2.cpp

@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2018, Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * 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.
- */
-
-#include "unit_tests/command_queue/enqueue_fill_buffer_negative_tests.inl"
-#include "unit_tests/command_queue/enqueue_fill_buffer_tests.inl"
-#include "unit_tests/command_queue/enqueue_fill_image_tests.inl"
-#include "unit_tests/command_queue/enqueue_handler_tests.inl"
-#include "unit_tests/command_queue/enqueue_kernel_event_tests.inl"
-#include "unit_tests/command_queue/enqueue_kernel_global_offset_tests.inl"
-#include "unit_tests/command_queue/enqueue_kernel_local_work_size_tests.inl"
-#include "unit_tests/command_queue/enqueue_kernel_two_ioq_tests.inl"
-#include "unit_tests/command_queue/enqueue_kernel_two_ooq_tests.inl"
-#include "unit_tests/command_queue/enqueue_kernel_two_walker_ioq_tests.inl"
-#include "unit_tests/command_queue/enqueue_kernel_two_walker_ooq_tests.inl"
-#include "unit_tests/command_queue/enqueue_map_buffer_tests.inl"

unit_tests/command_queue/command_queue_tests_wrapper3.cpp

@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2018, Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * 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.
- */
-
-#include "unit_tests/command_queue/enqueue_map_image_tests.inl"
-#include "unit_tests/command_queue/enqueue_marker_tests.inl"
-#include "unit_tests/command_queue/enqueue_media_kernel.inl"
-#include "unit_tests/command_queue/enqueue_migrate_mem_objects_tests.inl"
-#include "unit_tests/command_queue/enqueue_read_buffer_event_tests.inl"
-#include "unit_tests/command_queue/enqueue_read_buffer_rect_tests.inl"
-#include "unit_tests/command_queue/enqueue_read_buffer_tests.inl"
-#include "unit_tests/command_queue/enqueue_read_image_tests.inl"
-#include "unit_tests/command_queue/enqueue_svm_mem_copy_tests.inl"
-#include "unit_tests/command_queue/enqueue_svm_mem_fill_tests.inl"
-#include "unit_tests/command_queue/enqueue_svm_tests.inl"
-#include "unit_tests/command_queue/enqueue_thread_tests.inl"
-#include "unit_tests/command_queue/enqueue_unmap_memobject_tests.inl"

unit_tests/command_queue/command_queue_tests_wrapper4.cpp

@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2018, Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * 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.
- */
-
-#include "unit_tests/command_queue/enqueue_waitlist_tests.inl"
-#include "unit_tests/command_queue/enqueue_write_buffer_event_tests.inl"
-#include "unit_tests/command_queue/enqueue_write_buffer_rect_tests.inl"
-#include "unit_tests/command_queue/enqueue_write_buffer_tests.inl"
-#include "unit_tests/command_queue/enqueue_write_image_tests.inl"
-#include "unit_tests/command_queue/finish_tests.inl"
-#include "unit_tests/command_queue/flattened_id_tests.inl"
-#include "unit_tests/command_queue/flush_tests.inl"
-#include "unit_tests/command_queue/ooq_task_tests.inl"
-#include "unit_tests/command_queue/read_write_buffer_cpu_copy.inl"
-#include "unit_tests/command_queue/work_group_size_tests.inl"

unit_tests/command_queue/command_queue_tests_wrapper5.cpp

@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2018, Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * 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.
- */
-
-#include "unit_tests/command_queue/get_command_queue_info_tests.inl"
-#include "unit_tests/command_queue/get_size_required_buffer_tests.inl"
-#include "unit_tests/command_queue/get_size_required_image_tests.inl"
-#include "unit_tests/command_queue/get_size_required_tests.inl"
-#include "unit_tests/command_queue/ioq_task_tests.inl"
-#include "unit_tests/command_queue/local_id_tests.inl"
-#include "unit_tests/command_queue/local_work_size_tests.inl"
-#include "unit_tests/command_queue/multi_dispatch_info_tests.inl"
-#include "unit_tests/command_queue/multiple_map_buffer_tests.inl"
-#include "unit_tests/command_queue/multiple_map_image_tests.inl"
-#include "unit_tests/command_queue/oom_buffer_tests.inl"
-#include "unit_tests/command_queue/oom_image_tests.inl"
-#include "unit_tests/command_queue/oom_tests.inl"

unit_tests/command_queue/enqueue_fill_buffer_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/enqueue_kernel_two_walker_ooq_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>();

unit_tests/command_queue/oom_buffer_tests.cpp

@@ -34,12 +34,12 @@
 
 using namespace OCLRT;
 
-struct OOMSetting2 {
+struct OOMSetting {
     bool oomCS;
     bool oomISH;
 };
 
-static OOMSetting2 oomSettings2[] = {
+static OOMSetting oomSettings[] = {
     {true, false},
     {false, true},
     {true, true}};
@@ -49,7 +49,7 @@ struct OOMCommandQueueBufferTest : public MemoryManagementFixture,
                                    public CommandQueueFixture,
                                    public SimpleArgKernelFixture,
                                    public HelloWorldKernelFixture,
-                                   public ::testing::TestWithParam<OOMSetting2> {
+                                   public ::testing::TestWithParam<OOMSetting> {
 
     using CommandQueueFixture::SetUp;
     using HelloWorldKernelFixture::SetUp;
@@ -289,4 +289,4 @@ HWTEST_P(OOMCommandQueueBufferTest, enqueueKernelSimpleArg) {
 INSTANTIATE_TEST_CASE_P(
     OOM,
     OOMCommandQueueBufferTest,
-    testing::ValuesIn(oomSettings2));
+    testing::ValuesIn(oomSettings));

unit_tests/command_queue/oom_image_tests.cpp

@@ -30,19 +30,19 @@
 
 using namespace OCLRT;
 
-struct OOMSetting1 {
+struct OOMSetting {
     bool oomCS;
     bool oomISH;
 };
 
-static OOMSetting1 oomSettings1[] = {
+static OOMSetting oomSettings[] = {
     {true, false},
     {false, true},
     {true, true}};
 
 struct OOMCommandQueueImageTest : public DeviceFixture,
                                   public CommandQueueFixture,
-                                  public ::testing::TestWithParam<OOMSetting1> {
+                                  public ::testing::TestWithParam<OOMSetting> {
 
     using CommandQueueFixture::SetUp;
 
@@ -189,4 +189,4 @@ HWTEST_P(OOMCommandQueueImageTest, enqueueWriteImage) {
 INSTANTIATE_TEST_CASE_P(
     OOM,
     OOMCommandQueueImageTest,
-    testing::ValuesIn(oomSettings1));
+    testing::ValuesIn(oomSettings));