From 049ba5c62594bdecbedd7d44a37e86eb6440437e Mon Sep 17 00:00:00 2001 From: Maciej Dziuban Date: Mon, 10 Sep 2018 10:37:36 +0200 Subject: [PATCH] Revert "Improve build time: command_queue tests" This reverts commit 76c78f017e3582e58374c63d67980d03a85803ae. Change-Id: Icb7eb473a17de5c072ba1833812fa084c4873465 --- unit_tests/command_queue/CMakeLists.txt | 130 +++++++++--------- ...=> command_queue_flush_waitlist_tests.cpp} | 0 ...ueue_tests.inl => command_queue_tests.cpp} | 0 .../command_queue_tests_wrapper1.cpp | 32 ----- .../command_queue_tests_wrapper2.cpp | 34 ----- .../command_queue_tests_wrapper3.cpp | 32 ----- .../command_queue_tests_wrapper4.cpp | 31 ----- .../command_queue_tests_wrapper5.cpp | 32 ----- .../command_queue_tests_wrapper6.cpp | 34 ----- ...er_tests.inl => dispatch_walker_tests.cpp} | 0 ...s_tests.inl => drm_requirements_tests.cpp} | 0 ...er_tests.inl => enqueue_barrier_tests.cpp} | 0 ...nl => enqueue_copy_buffer_event_tests.cpp} | 0 ...inl => enqueue_copy_buffer_rect_tests.cpp} | 0 ...ests.inl => enqueue_copy_buffer_tests.cpp} | 0 ...=> enqueue_copy_buffer_to_image_tests.cpp} | 0 ...tests.inl => enqueue_copy_image_tests.cpp} | 0 ...=> enqueue_copy_image_to_buffer_tests.cpp} | 0 ...sts.inl => enqueue_debug_kernel_tests.cpp} | 0 ...nl => enqueue_fill_buffer_event_tests.cpp} | 0 ...=> enqueue_fill_buffer_negative_tests.cpp} | 0 ...ests.inl => enqueue_fill_buffer_tests.cpp} | 2 +- ...tests.inl => enqueue_fill_image_tests.cpp} | 0 ...er_tests.inl => enqueue_handler_tests.cpp} | 0 ...sts.inl => enqueue_kernel_event_tests.cpp} | 0 ...=> enqueue_kernel_global_offset_tests.cpp} | 0 ... enqueue_kernel_local_work_size_tests.cpp} | 0 ...s.inl => enqueue_kernel_two_ioq_tests.cpp} | 0 ...s.inl => enqueue_kernel_two_ooq_tests.cpp} | 0 ...> enqueue_kernel_two_walker_ioq_tests.cpp} | 0 ...> enqueue_kernel_two_walker_ooq_tests.cpp} | 4 +- ...tests.inl => enqueue_map_buffer_tests.cpp} | 0 ..._tests.inl => enqueue_map_image_tests.cpp} | 0 ...ker_tests.inl => enqueue_marker_tests.cpp} | 0 ...ia_kernel.inl => enqueue_media_kernel.cpp} | 0 ... => enqueue_migrate_mem_objects_tests.cpp} | 0 ...nl => enqueue_read_buffer_event_tests.cpp} | 0 ...inl => enqueue_read_buffer_rect_tests.cpp} | 0 ...ests.inl => enqueue_read_buffer_tests.cpp} | 0 ...tests.inl => enqueue_read_image_tests.cpp} | 0 ...sts.inl => enqueue_svm_mem_copy_tests.cpp} | 0 ...sts.inl => enqueue_svm_mem_fill_tests.cpp} | 0 ...ue_svm_tests.inl => enqueue_svm_tests.cpp} | 0 ...ead_tests.inl => enqueue_thread_tests.cpp} | 0 ....inl => enqueue_unmap_memobject_tests.cpp} | 0 ...t_tests.inl => enqueue_waitlist_tests.cpp} | 0 ...l => enqueue_write_buffer_event_tests.cpp} | 0 ...nl => enqueue_write_buffer_rect_tests.cpp} | 0 ...sts.inl => enqueue_write_buffer_tests.cpp} | 0 ...ests.inl => enqueue_write_image_tests.cpp} | 0 .../{finish_tests.inl => finish_tests.cpp} | 0 ...ed_id_tests.inl => flattened_id_tests.cpp} | 0 .../{flush_tests.inl => flush_tests.cpp} | 0 ...s.inl => get_command_queue_info_tests.cpp} | 0 ...inl => get_size_required_buffer_tests.cpp} | 0 ....inl => get_size_required_image_tests.cpp} | 0 ..._tests.inl => get_size_required_tests.cpp} | 0 ...{ioq_task_tests.inl => ioq_task_tests.cpp} | 0 ...{local_id_tests.inl => local_id_tests.cpp} | 0 ...ze_tests.inl => local_work_size_tests.cpp} | 0 ...ests.inl => multi_dispatch_info_tests.cpp} | 0 ...ests.inl => multiple_map_buffer_tests.cpp} | 0 ...tests.inl => multiple_map_image_tests.cpp} | 0 ..._buffer_tests.inl => oom_buffer_tests.cpp} | 8 +- ...om_image_tests.inl => oom_image_tests.cpp} | 8 +- .../{oom_tests.inl => oom_tests.cpp} | 0 ...{ooq_task_tests.inl => ooq_task_tests.cpp} | 0 ...opy.inl => read_write_buffer_cpu_copy.cpp} | 0 ...ze_tests.inl => work_group_size_tests.cpp} | 0 69 files changed, 73 insertions(+), 274 deletions(-) rename unit_tests/command_queue/{command_queue_flush_waitlist_tests.inl => command_queue_flush_waitlist_tests.cpp} (100%) rename unit_tests/command_queue/{command_queue_tests.inl => command_queue_tests.cpp} (100%) delete mode 100644 unit_tests/command_queue/command_queue_tests_wrapper1.cpp delete mode 100644 unit_tests/command_queue/command_queue_tests_wrapper2.cpp delete mode 100644 unit_tests/command_queue/command_queue_tests_wrapper3.cpp delete mode 100644 unit_tests/command_queue/command_queue_tests_wrapper4.cpp delete mode 100644 unit_tests/command_queue/command_queue_tests_wrapper5.cpp delete mode 100644 unit_tests/command_queue/command_queue_tests_wrapper6.cpp rename unit_tests/command_queue/{dispatch_walker_tests.inl => dispatch_walker_tests.cpp} (100%) rename unit_tests/command_queue/{drm_requirements_tests.inl => drm_requirements_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_barrier_tests.inl => enqueue_barrier_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_copy_buffer_event_tests.inl => enqueue_copy_buffer_event_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_copy_buffer_rect_tests.inl => enqueue_copy_buffer_rect_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_copy_buffer_tests.inl => enqueue_copy_buffer_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_copy_buffer_to_image_tests.inl => enqueue_copy_buffer_to_image_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_copy_image_tests.inl => enqueue_copy_image_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_copy_image_to_buffer_tests.inl => enqueue_copy_image_to_buffer_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_debug_kernel_tests.inl => enqueue_debug_kernel_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_fill_buffer_event_tests.inl => enqueue_fill_buffer_event_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_fill_buffer_negative_tests.inl => enqueue_fill_buffer_negative_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_fill_buffer_tests.inl => enqueue_fill_buffer_tests.cpp} (99%) rename unit_tests/command_queue/{enqueue_fill_image_tests.inl => enqueue_fill_image_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_handler_tests.inl => enqueue_handler_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_kernel_event_tests.inl => enqueue_kernel_event_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_kernel_global_offset_tests.inl => enqueue_kernel_global_offset_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_kernel_local_work_size_tests.inl => enqueue_kernel_local_work_size_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_kernel_two_ioq_tests.inl => enqueue_kernel_two_ioq_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_kernel_two_ooq_tests.inl => enqueue_kernel_two_ooq_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_kernel_two_walker_ioq_tests.inl => enqueue_kernel_two_walker_ioq_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_kernel_two_walker_ooq_tests.inl => enqueue_kernel_two_walker_ooq_tests.cpp} (94%) rename unit_tests/command_queue/{enqueue_map_buffer_tests.inl => enqueue_map_buffer_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_map_image_tests.inl => enqueue_map_image_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_marker_tests.inl => enqueue_marker_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_media_kernel.inl => enqueue_media_kernel.cpp} (100%) rename unit_tests/command_queue/{enqueue_migrate_mem_objects_tests.inl => enqueue_migrate_mem_objects_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_read_buffer_event_tests.inl => enqueue_read_buffer_event_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_read_buffer_rect_tests.inl => enqueue_read_buffer_rect_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_read_buffer_tests.inl => enqueue_read_buffer_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_read_image_tests.inl => enqueue_read_image_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_svm_mem_copy_tests.inl => enqueue_svm_mem_copy_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_svm_mem_fill_tests.inl => enqueue_svm_mem_fill_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_svm_tests.inl => enqueue_svm_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_thread_tests.inl => enqueue_thread_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_unmap_memobject_tests.inl => enqueue_unmap_memobject_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_waitlist_tests.inl => enqueue_waitlist_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_write_buffer_event_tests.inl => enqueue_write_buffer_event_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_write_buffer_rect_tests.inl => enqueue_write_buffer_rect_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_write_buffer_tests.inl => enqueue_write_buffer_tests.cpp} (100%) rename unit_tests/command_queue/{enqueue_write_image_tests.inl => enqueue_write_image_tests.cpp} (100%) rename unit_tests/command_queue/{finish_tests.inl => finish_tests.cpp} (100%) rename unit_tests/command_queue/{flattened_id_tests.inl => flattened_id_tests.cpp} (100%) rename unit_tests/command_queue/{flush_tests.inl => flush_tests.cpp} (100%) rename unit_tests/command_queue/{get_command_queue_info_tests.inl => get_command_queue_info_tests.cpp} (100%) rename unit_tests/command_queue/{get_size_required_buffer_tests.inl => get_size_required_buffer_tests.cpp} (100%) rename unit_tests/command_queue/{get_size_required_image_tests.inl => get_size_required_image_tests.cpp} (100%) rename unit_tests/command_queue/{get_size_required_tests.inl => get_size_required_tests.cpp} (100%) rename unit_tests/command_queue/{ioq_task_tests.inl => ioq_task_tests.cpp} (100%) rename unit_tests/command_queue/{local_id_tests.inl => local_id_tests.cpp} (100%) rename unit_tests/command_queue/{local_work_size_tests.inl => local_work_size_tests.cpp} (100%) rename unit_tests/command_queue/{multi_dispatch_info_tests.inl => multi_dispatch_info_tests.cpp} (100%) rename unit_tests/command_queue/{multiple_map_buffer_tests.inl => multiple_map_buffer_tests.cpp} (100%) rename unit_tests/command_queue/{multiple_map_image_tests.inl => multiple_map_image_tests.cpp} (100%) rename unit_tests/command_queue/{oom_buffer_tests.inl => oom_buffer_tests.cpp} (98%) rename unit_tests/command_queue/{oom_image_tests.inl => oom_image_tests.cpp} (98%) rename unit_tests/command_queue/{oom_tests.inl => oom_tests.cpp} (100%) rename unit_tests/command_queue/{ooq_task_tests.inl => ooq_task_tests.cpp} (100%) rename unit_tests/command_queue/{read_write_buffer_cpu_copy.inl => read_write_buffer_cpu_copy.cpp} (100%) rename unit_tests/command_queue/{work_group_size_tests.inl => work_group_size_tests.cpp} (100%) diff --git a/unit_tests/command_queue/CMakeLists.txt b/unit_tests/command_queue/CMakeLists.txt index 4d1b562111..16b4ae7b91 100644 --- a/unit_tests/command_queue/CMakeLists.txt +++ b/unit_tests/command_queue/CMakeLists.txt @@ -22,94 +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}/command_queue_tests_wrapper6.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}) diff --git a/unit_tests/command_queue/command_queue_flush_waitlist_tests.inl b/unit_tests/command_queue/command_queue_flush_waitlist_tests.cpp similarity index 100% rename from unit_tests/command_queue/command_queue_flush_waitlist_tests.inl rename to unit_tests/command_queue/command_queue_flush_waitlist_tests.cpp diff --git a/unit_tests/command_queue/command_queue_tests.inl b/unit_tests/command_queue/command_queue_tests.cpp similarity index 100% rename from unit_tests/command_queue/command_queue_tests.inl rename to unit_tests/command_queue/command_queue_tests.cpp diff --git a/unit_tests/command_queue/command_queue_tests_wrapper1.cpp b/unit_tests/command_queue/command_queue_tests_wrapper1.cpp deleted file mode 100644 index 993cf72b3c..0000000000 --- a/unit_tests/command_queue/command_queue_tests_wrapper1.cpp +++ /dev/null @@ -1,32 +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/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" diff --git a/unit_tests/command_queue/command_queue_tests_wrapper2.cpp b/unit_tests/command_queue/command_queue_tests_wrapper2.cpp deleted file mode 100644 index 9bf89f1133..0000000000 --- a/unit_tests/command_queue/command_queue_tests_wrapper2.cpp +++ /dev/null @@ -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" diff --git a/unit_tests/command_queue/command_queue_tests_wrapper3.cpp b/unit_tests/command_queue/command_queue_tests_wrapper3.cpp deleted file mode 100644 index 87973cfa03..0000000000 --- a/unit_tests/command_queue/command_queue_tests_wrapper3.cpp +++ /dev/null @@ -1,32 +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_thread_tests.inl" diff --git a/unit_tests/command_queue/command_queue_tests_wrapper4.cpp b/unit_tests/command_queue/command_queue_tests_wrapper4.cpp deleted file mode 100644 index 378666c140..0000000000 --- a/unit_tests/command_queue/command_queue_tests_wrapper4.cpp +++ /dev/null @@ -1,31 +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/ooq_task_tests.inl" -#include "unit_tests/command_queue/work_group_size_tests.inl" diff --git a/unit_tests/command_queue/command_queue_tests_wrapper5.cpp b/unit_tests/command_queue/command_queue_tests_wrapper5.cpp deleted file mode 100644 index 05f1747d4e..0000000000 --- a/unit_tests/command_queue/command_queue_tests_wrapper5.cpp +++ /dev/null @@ -1,32 +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" diff --git a/unit_tests/command_queue/command_queue_tests_wrapper6.cpp b/unit_tests/command_queue/command_queue_tests_wrapper6.cpp deleted file mode 100644 index b25c358557..0000000000 --- a/unit_tests/command_queue/command_queue_tests_wrapper6.cpp +++ /dev/null @@ -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/command_queue_tests.inl" -#include "unit_tests/command_queue/enqueue_debug_kernel_tests.inl" -#include "unit_tests/command_queue/enqueue_fill_buffer_event_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_unmap_memobject_tests.inl" -#include "unit_tests/command_queue/flush_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" -#include "unit_tests/command_queue/read_write_buffer_cpu_copy.inl" diff --git a/unit_tests/command_queue/dispatch_walker_tests.inl b/unit_tests/command_queue/dispatch_walker_tests.cpp similarity index 100% rename from unit_tests/command_queue/dispatch_walker_tests.inl rename to unit_tests/command_queue/dispatch_walker_tests.cpp diff --git a/unit_tests/command_queue/drm_requirements_tests.inl b/unit_tests/command_queue/drm_requirements_tests.cpp similarity index 100% rename from unit_tests/command_queue/drm_requirements_tests.inl rename to unit_tests/command_queue/drm_requirements_tests.cpp diff --git a/unit_tests/command_queue/enqueue_barrier_tests.inl b/unit_tests/command_queue/enqueue_barrier_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_barrier_tests.inl rename to unit_tests/command_queue/enqueue_barrier_tests.cpp diff --git a/unit_tests/command_queue/enqueue_copy_buffer_event_tests.inl b/unit_tests/command_queue/enqueue_copy_buffer_event_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_copy_buffer_event_tests.inl rename to unit_tests/command_queue/enqueue_copy_buffer_event_tests.cpp diff --git a/unit_tests/command_queue/enqueue_copy_buffer_rect_tests.inl b/unit_tests/command_queue/enqueue_copy_buffer_rect_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_copy_buffer_rect_tests.inl rename to unit_tests/command_queue/enqueue_copy_buffer_rect_tests.cpp diff --git a/unit_tests/command_queue/enqueue_copy_buffer_tests.inl b/unit_tests/command_queue/enqueue_copy_buffer_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_copy_buffer_tests.inl rename to unit_tests/command_queue/enqueue_copy_buffer_tests.cpp diff --git a/unit_tests/command_queue/enqueue_copy_buffer_to_image_tests.inl b/unit_tests/command_queue/enqueue_copy_buffer_to_image_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_copy_buffer_to_image_tests.inl rename to unit_tests/command_queue/enqueue_copy_buffer_to_image_tests.cpp diff --git a/unit_tests/command_queue/enqueue_copy_image_tests.inl b/unit_tests/command_queue/enqueue_copy_image_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_copy_image_tests.inl rename to unit_tests/command_queue/enqueue_copy_image_tests.cpp diff --git a/unit_tests/command_queue/enqueue_copy_image_to_buffer_tests.inl b/unit_tests/command_queue/enqueue_copy_image_to_buffer_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_copy_image_to_buffer_tests.inl rename to unit_tests/command_queue/enqueue_copy_image_to_buffer_tests.cpp diff --git a/unit_tests/command_queue/enqueue_debug_kernel_tests.inl b/unit_tests/command_queue/enqueue_debug_kernel_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_debug_kernel_tests.inl rename to unit_tests/command_queue/enqueue_debug_kernel_tests.cpp diff --git a/unit_tests/command_queue/enqueue_fill_buffer_event_tests.inl b/unit_tests/command_queue/enqueue_fill_buffer_event_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_fill_buffer_event_tests.inl rename to unit_tests/command_queue/enqueue_fill_buffer_event_tests.cpp diff --git a/unit_tests/command_queue/enqueue_fill_buffer_negative_tests.inl b/unit_tests/command_queue/enqueue_fill_buffer_negative_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_fill_buffer_negative_tests.inl rename to unit_tests/command_queue/enqueue_fill_buffer_negative_tests.cpp diff --git a/unit_tests/command_queue/enqueue_fill_buffer_tests.inl b/unit_tests/command_queue/enqueue_fill_buffer_tests.cpp similarity index 99% rename from unit_tests/command_queue/enqueue_fill_buffer_tests.inl rename to unit_tests/command_queue/enqueue_fill_buffer_tests.cpp index b85f7fcef1..784ecf0bd4 100644 --- a/unit_tests/command_queue/enqueue_fill_buffer_tests.inl +++ b/unit_tests/command_queue/enqueue_fill_buffer_tests.cpp @@ -37,7 +37,7 @@ using namespace OCLRT; -typedef ::Test EnqueueFillBufferCmdTests; +typedef Test EnqueueFillBufferCmdTests; HWTEST_F(EnqueueFillBufferCmdTests, alignsToCSR) { //this test case assumes IOQ diff --git a/unit_tests/command_queue/enqueue_fill_image_tests.inl b/unit_tests/command_queue/enqueue_fill_image_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_fill_image_tests.inl rename to unit_tests/command_queue/enqueue_fill_image_tests.cpp diff --git a/unit_tests/command_queue/enqueue_handler_tests.inl b/unit_tests/command_queue/enqueue_handler_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_handler_tests.inl rename to unit_tests/command_queue/enqueue_handler_tests.cpp diff --git a/unit_tests/command_queue/enqueue_kernel_event_tests.inl b/unit_tests/command_queue/enqueue_kernel_event_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_kernel_event_tests.inl rename to unit_tests/command_queue/enqueue_kernel_event_tests.cpp diff --git a/unit_tests/command_queue/enqueue_kernel_global_offset_tests.inl b/unit_tests/command_queue/enqueue_kernel_global_offset_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_kernel_global_offset_tests.inl rename to unit_tests/command_queue/enqueue_kernel_global_offset_tests.cpp diff --git a/unit_tests/command_queue/enqueue_kernel_local_work_size_tests.inl b/unit_tests/command_queue/enqueue_kernel_local_work_size_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_kernel_local_work_size_tests.inl rename to unit_tests/command_queue/enqueue_kernel_local_work_size_tests.cpp diff --git a/unit_tests/command_queue/enqueue_kernel_two_ioq_tests.inl b/unit_tests/command_queue/enqueue_kernel_two_ioq_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_kernel_two_ioq_tests.inl rename to unit_tests/command_queue/enqueue_kernel_two_ioq_tests.cpp diff --git a/unit_tests/command_queue/enqueue_kernel_two_ooq_tests.inl b/unit_tests/command_queue/enqueue_kernel_two_ooq_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_kernel_two_ooq_tests.inl rename to unit_tests/command_queue/enqueue_kernel_two_ooq_tests.cpp diff --git a/unit_tests/command_queue/enqueue_kernel_two_walker_ioq_tests.inl b/unit_tests/command_queue/enqueue_kernel_two_walker_ioq_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_kernel_two_walker_ioq_tests.inl rename to unit_tests/command_queue/enqueue_kernel_two_walker_ioq_tests.cpp diff --git a/unit_tests/command_queue/enqueue_kernel_two_walker_ooq_tests.inl b/unit_tests/command_queue/enqueue_kernel_two_walker_ooq_tests.cpp similarity index 94% rename from unit_tests/command_queue/enqueue_kernel_two_walker_ooq_tests.inl rename to unit_tests/command_queue/enqueue_kernel_two_walker_ooq_tests.cpp index cef4a8a03f..3611d78bfa 100644 --- a/unit_tests/command_queue/enqueue_kernel_two_walker_ooq_tests.inl +++ b/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 OOQWithTwoWalkers; +typedef TwoWalkerTest OOQWithTwoWalkers; HWCMDTEST_F(IGFX_GEN8_CORE, OOQWithTwoWalkers, shouldHaveTwoWalkers) { enqueueTwoKernels(); diff --git a/unit_tests/command_queue/enqueue_map_buffer_tests.inl b/unit_tests/command_queue/enqueue_map_buffer_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_map_buffer_tests.inl rename to unit_tests/command_queue/enqueue_map_buffer_tests.cpp diff --git a/unit_tests/command_queue/enqueue_map_image_tests.inl b/unit_tests/command_queue/enqueue_map_image_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_map_image_tests.inl rename to unit_tests/command_queue/enqueue_map_image_tests.cpp diff --git a/unit_tests/command_queue/enqueue_marker_tests.inl b/unit_tests/command_queue/enqueue_marker_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_marker_tests.inl rename to unit_tests/command_queue/enqueue_marker_tests.cpp diff --git a/unit_tests/command_queue/enqueue_media_kernel.inl b/unit_tests/command_queue/enqueue_media_kernel.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_media_kernel.inl rename to unit_tests/command_queue/enqueue_media_kernel.cpp diff --git a/unit_tests/command_queue/enqueue_migrate_mem_objects_tests.inl b/unit_tests/command_queue/enqueue_migrate_mem_objects_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_migrate_mem_objects_tests.inl rename to unit_tests/command_queue/enqueue_migrate_mem_objects_tests.cpp diff --git a/unit_tests/command_queue/enqueue_read_buffer_event_tests.inl b/unit_tests/command_queue/enqueue_read_buffer_event_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_read_buffer_event_tests.inl rename to unit_tests/command_queue/enqueue_read_buffer_event_tests.cpp diff --git a/unit_tests/command_queue/enqueue_read_buffer_rect_tests.inl b/unit_tests/command_queue/enqueue_read_buffer_rect_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_read_buffer_rect_tests.inl rename to unit_tests/command_queue/enqueue_read_buffer_rect_tests.cpp diff --git a/unit_tests/command_queue/enqueue_read_buffer_tests.inl b/unit_tests/command_queue/enqueue_read_buffer_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_read_buffer_tests.inl rename to unit_tests/command_queue/enqueue_read_buffer_tests.cpp diff --git a/unit_tests/command_queue/enqueue_read_image_tests.inl b/unit_tests/command_queue/enqueue_read_image_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_read_image_tests.inl rename to unit_tests/command_queue/enqueue_read_image_tests.cpp diff --git a/unit_tests/command_queue/enqueue_svm_mem_copy_tests.inl b/unit_tests/command_queue/enqueue_svm_mem_copy_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_svm_mem_copy_tests.inl rename to unit_tests/command_queue/enqueue_svm_mem_copy_tests.cpp diff --git a/unit_tests/command_queue/enqueue_svm_mem_fill_tests.inl b/unit_tests/command_queue/enqueue_svm_mem_fill_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_svm_mem_fill_tests.inl rename to unit_tests/command_queue/enqueue_svm_mem_fill_tests.cpp diff --git a/unit_tests/command_queue/enqueue_svm_tests.inl b/unit_tests/command_queue/enqueue_svm_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_svm_tests.inl rename to unit_tests/command_queue/enqueue_svm_tests.cpp diff --git a/unit_tests/command_queue/enqueue_thread_tests.inl b/unit_tests/command_queue/enqueue_thread_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_thread_tests.inl rename to unit_tests/command_queue/enqueue_thread_tests.cpp diff --git a/unit_tests/command_queue/enqueue_unmap_memobject_tests.inl b/unit_tests/command_queue/enqueue_unmap_memobject_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_unmap_memobject_tests.inl rename to unit_tests/command_queue/enqueue_unmap_memobject_tests.cpp diff --git a/unit_tests/command_queue/enqueue_waitlist_tests.inl b/unit_tests/command_queue/enqueue_waitlist_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_waitlist_tests.inl rename to unit_tests/command_queue/enqueue_waitlist_tests.cpp diff --git a/unit_tests/command_queue/enqueue_write_buffer_event_tests.inl b/unit_tests/command_queue/enqueue_write_buffer_event_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_write_buffer_event_tests.inl rename to unit_tests/command_queue/enqueue_write_buffer_event_tests.cpp diff --git a/unit_tests/command_queue/enqueue_write_buffer_rect_tests.inl b/unit_tests/command_queue/enqueue_write_buffer_rect_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_write_buffer_rect_tests.inl rename to unit_tests/command_queue/enqueue_write_buffer_rect_tests.cpp diff --git a/unit_tests/command_queue/enqueue_write_buffer_tests.inl b/unit_tests/command_queue/enqueue_write_buffer_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_write_buffer_tests.inl rename to unit_tests/command_queue/enqueue_write_buffer_tests.cpp diff --git a/unit_tests/command_queue/enqueue_write_image_tests.inl b/unit_tests/command_queue/enqueue_write_image_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_write_image_tests.inl rename to unit_tests/command_queue/enqueue_write_image_tests.cpp diff --git a/unit_tests/command_queue/finish_tests.inl b/unit_tests/command_queue/finish_tests.cpp similarity index 100% rename from unit_tests/command_queue/finish_tests.inl rename to unit_tests/command_queue/finish_tests.cpp diff --git a/unit_tests/command_queue/flattened_id_tests.inl b/unit_tests/command_queue/flattened_id_tests.cpp similarity index 100% rename from unit_tests/command_queue/flattened_id_tests.inl rename to unit_tests/command_queue/flattened_id_tests.cpp diff --git a/unit_tests/command_queue/flush_tests.inl b/unit_tests/command_queue/flush_tests.cpp similarity index 100% rename from unit_tests/command_queue/flush_tests.inl rename to unit_tests/command_queue/flush_tests.cpp diff --git a/unit_tests/command_queue/get_command_queue_info_tests.inl b/unit_tests/command_queue/get_command_queue_info_tests.cpp similarity index 100% rename from unit_tests/command_queue/get_command_queue_info_tests.inl rename to unit_tests/command_queue/get_command_queue_info_tests.cpp diff --git a/unit_tests/command_queue/get_size_required_buffer_tests.inl b/unit_tests/command_queue/get_size_required_buffer_tests.cpp similarity index 100% rename from unit_tests/command_queue/get_size_required_buffer_tests.inl rename to unit_tests/command_queue/get_size_required_buffer_tests.cpp diff --git a/unit_tests/command_queue/get_size_required_image_tests.inl b/unit_tests/command_queue/get_size_required_image_tests.cpp similarity index 100% rename from unit_tests/command_queue/get_size_required_image_tests.inl rename to unit_tests/command_queue/get_size_required_image_tests.cpp diff --git a/unit_tests/command_queue/get_size_required_tests.inl b/unit_tests/command_queue/get_size_required_tests.cpp similarity index 100% rename from unit_tests/command_queue/get_size_required_tests.inl rename to unit_tests/command_queue/get_size_required_tests.cpp diff --git a/unit_tests/command_queue/ioq_task_tests.inl b/unit_tests/command_queue/ioq_task_tests.cpp similarity index 100% rename from unit_tests/command_queue/ioq_task_tests.inl rename to unit_tests/command_queue/ioq_task_tests.cpp diff --git a/unit_tests/command_queue/local_id_tests.inl b/unit_tests/command_queue/local_id_tests.cpp similarity index 100% rename from unit_tests/command_queue/local_id_tests.inl rename to unit_tests/command_queue/local_id_tests.cpp diff --git a/unit_tests/command_queue/local_work_size_tests.inl b/unit_tests/command_queue/local_work_size_tests.cpp similarity index 100% rename from unit_tests/command_queue/local_work_size_tests.inl rename to unit_tests/command_queue/local_work_size_tests.cpp diff --git a/unit_tests/command_queue/multi_dispatch_info_tests.inl b/unit_tests/command_queue/multi_dispatch_info_tests.cpp similarity index 100% rename from unit_tests/command_queue/multi_dispatch_info_tests.inl rename to unit_tests/command_queue/multi_dispatch_info_tests.cpp diff --git a/unit_tests/command_queue/multiple_map_buffer_tests.inl b/unit_tests/command_queue/multiple_map_buffer_tests.cpp similarity index 100% rename from unit_tests/command_queue/multiple_map_buffer_tests.inl rename to unit_tests/command_queue/multiple_map_buffer_tests.cpp diff --git a/unit_tests/command_queue/multiple_map_image_tests.inl b/unit_tests/command_queue/multiple_map_image_tests.cpp similarity index 100% rename from unit_tests/command_queue/multiple_map_image_tests.inl rename to unit_tests/command_queue/multiple_map_image_tests.cpp diff --git a/unit_tests/command_queue/oom_buffer_tests.inl b/unit_tests/command_queue/oom_buffer_tests.cpp similarity index 98% rename from unit_tests/command_queue/oom_buffer_tests.inl rename to unit_tests/command_queue/oom_buffer_tests.cpp index af130797a1..65387eb47a 100644 --- a/unit_tests/command_queue/oom_buffer_tests.inl +++ b/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 { + public ::testing::TestWithParam { 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)); diff --git a/unit_tests/command_queue/oom_image_tests.inl b/unit_tests/command_queue/oom_image_tests.cpp similarity index 98% rename from unit_tests/command_queue/oom_image_tests.inl rename to unit_tests/command_queue/oom_image_tests.cpp index bc6703446d..9afe995937 100644 --- a/unit_tests/command_queue/oom_image_tests.inl +++ b/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 { + public ::testing::TestWithParam { using CommandQueueFixture::SetUp; @@ -189,4 +189,4 @@ HWTEST_P(OOMCommandQueueImageTest, enqueueWriteImage) { INSTANTIATE_TEST_CASE_P( OOM, OOMCommandQueueImageTest, - testing::ValuesIn(oomSettings1)); + testing::ValuesIn(oomSettings)); diff --git a/unit_tests/command_queue/oom_tests.inl b/unit_tests/command_queue/oom_tests.cpp similarity index 100% rename from unit_tests/command_queue/oom_tests.inl rename to unit_tests/command_queue/oom_tests.cpp diff --git a/unit_tests/command_queue/ooq_task_tests.inl b/unit_tests/command_queue/ooq_task_tests.cpp similarity index 100% rename from unit_tests/command_queue/ooq_task_tests.inl rename to unit_tests/command_queue/ooq_task_tests.cpp diff --git a/unit_tests/command_queue/read_write_buffer_cpu_copy.inl b/unit_tests/command_queue/read_write_buffer_cpu_copy.cpp similarity index 100% rename from unit_tests/command_queue/read_write_buffer_cpu_copy.inl rename to unit_tests/command_queue/read_write_buffer_cpu_copy.cpp diff --git a/unit_tests/command_queue/work_group_size_tests.inl b/unit_tests/command_queue/work_group_size_tests.cpp similarity index 100% rename from unit_tests/command_queue/work_group_size_tests.inl rename to unit_tests/command_queue/work_group_size_tests.cpp