From f0c9e99ce78df91eee299cb582a46179893e5a3d Mon Sep 17 00:00:00 2001 From: "Dunajski, Bartosz" Date: Wed, 7 Nov 2018 09:14:46 +0100 Subject: [PATCH] Remove bigger api test files from api_test_wrappers Change-Id: I30bb7a82a03d938b5890ddb53e475202c5aea20a Signed-off-by: Dunajski, Bartosz --- unit_tests/api/CMakeLists.txt | 8 ++++---- unit_tests/api/api_tests_wrapper1.cpp | 2 -- unit_tests/api/api_tests_wrapper2.cpp | 1 - unit_tests/api/api_tests_wrapper3.cpp | 1 - ...create_buffer_tests.inl => cl_create_buffer_tests.cpp} | 0 .../api/cl_create_perf_counters_command_queue_tests.inl | 1 + ... => cl_create_program_with_built_in_kernels_tests.cpp} | 0 ...mem_tests.inl => cl_enqueue_svm_migrate_mem_tests.cpp} | 1 + ...tion_estimation.inl => cl_intel_motion_estimation.cpp} | 0 9 files changed, 6 insertions(+), 8 deletions(-) rename unit_tests/api/{cl_create_buffer_tests.inl => cl_create_buffer_tests.cpp} (100%) rename unit_tests/api/{cl_create_program_with_built_in_kernels_tests.inl => cl_create_program_with_built_in_kernels_tests.cpp} (100%) rename unit_tests/api/{cl_enqueue_svm_migrate_mem_tests.inl => cl_enqueue_svm_migrate_mem_tests.cpp} (99%) rename unit_tests/api/{cl_intel_motion_estimation.inl => cl_intel_motion_estimation.cpp} (100%) diff --git a/unit_tests/api/CMakeLists.txt b/unit_tests/api/CMakeLists.txt index 58855f409d..db0d3fc09c 100644 --- a/unit_tests/api/CMakeLists.txt +++ b/unit_tests/api/CMakeLists.txt @@ -14,7 +14,7 @@ set(IGDRCL_SRCS_tests_api ${CMAKE_CURRENT_SOURCE_DIR}/cl_build_program_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_clone_kernel_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_compile_program_tests.inl - ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_buffer_tests.inl + ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_buffer_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_command_queue_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_command_queue_with_properties_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_context_from_type_tests.inl @@ -25,7 +25,7 @@ set(IGDRCL_SRCS_tests_api ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_perf_counters_command_queue_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_pipe_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_program_with_binary_tests.inl - ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_program_with_built_in_kernels_tests.inl + ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_program_with_built_in_kernels_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_sampler_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_sampler_with_properties_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_sub_buffer_tests.inl @@ -55,7 +55,7 @@ set(IGDRCL_SRCS_tests_api ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_svm_map_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_svm_mem_fill_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_svm_memcpy_tests.inl - ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_svm_migrate_mem_tests.inl + ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_svm_migrate_mem_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_svm_unmap_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_task_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_unmap_mem_object_tests.inl @@ -89,7 +89,7 @@ set(IGDRCL_SRCS_tests_api ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_supported_image_formats_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_icd_get_platform_ids_khr_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_intel_accelerator_tests.inl - ${CMAKE_CURRENT_SOURCE_DIR}/cl_intel_motion_estimation.inl + ${CMAKE_CURRENT_SOURCE_DIR}/cl_intel_motion_estimation.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cl_link_program_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_release_command_queue_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_release_context_tests.inl diff --git a/unit_tests/api/api_tests_wrapper1.cpp b/unit_tests/api/api_tests_wrapper1.cpp index 6d16b34fa3..9e190036fd 100644 --- a/unit_tests/api/api_tests_wrapper1.cpp +++ b/unit_tests/api/api_tests_wrapper1.cpp @@ -8,7 +8,6 @@ #include "unit_tests/api/cl_build_program_tests.inl" #include "unit_tests/api/cl_clone_kernel_tests.inl" #include "unit_tests/api/cl_compile_program_tests.inl" -#include "unit_tests/api/cl_create_buffer_tests.inl" #include "unit_tests/api/cl_create_command_queue_tests.inl" #include "unit_tests/api/cl_create_context_from_type_tests.inl" #include "unit_tests/api/cl_create_context_tests.inl" @@ -17,7 +16,6 @@ #include "unit_tests/api/cl_create_perf_counters_command_queue_tests.inl" #include "unit_tests/api/cl_create_pipe_tests.inl" #include "unit_tests/api/cl_create_program_with_binary_tests.inl" -#include "unit_tests/api/cl_create_program_with_built_in_kernels_tests.inl" #include "unit_tests/api/cl_create_sampler_tests.inl" #include "unit_tests/api/cl_create_sampler_with_properties_tests.inl" #include "unit_tests/api/cl_create_sub_buffer_tests.inl" diff --git a/unit_tests/api/api_tests_wrapper2.cpp b/unit_tests/api/api_tests_wrapper2.cpp index 6e657e814a..64834bac11 100644 --- a/unit_tests/api/api_tests_wrapper2.cpp +++ b/unit_tests/api/api_tests_wrapper2.cpp @@ -15,7 +15,6 @@ #include "unit_tests/api/cl_enqueue_svm_map_tests.inl" #include "unit_tests/api/cl_enqueue_svm_mem_fill_tests.inl" #include "unit_tests/api/cl_enqueue_svm_memcpy_tests.inl" -#include "unit_tests/api/cl_enqueue_svm_migrate_mem_tests.inl" #include "unit_tests/api/cl_enqueue_svm_unmap_tests.inl" #include "unit_tests/api/cl_enqueue_task_tests.inl" #include "unit_tests/api/cl_enqueue_unmap_mem_object_tests.inl" diff --git a/unit_tests/api/api_tests_wrapper3.cpp b/unit_tests/api/api_tests_wrapper3.cpp index 067536c9fa..3ef01acfec 100644 --- a/unit_tests/api/api_tests_wrapper3.cpp +++ b/unit_tests/api/api_tests_wrapper3.cpp @@ -15,7 +15,6 @@ #include "unit_tests/api/cl_get_supported_image_formats_tests.inl" #include "unit_tests/api/cl_icd_get_platform_ids_khr_tests.inl" #include "unit_tests/api/cl_intel_accelerator_tests.inl" -#include "unit_tests/api/cl_intel_motion_estimation.inl" #include "unit_tests/api/cl_link_program_tests.inl" #include "unit_tests/api/cl_release_command_queue_tests.inl" #include "unit_tests/api/cl_release_context_tests.inl" diff --git a/unit_tests/api/cl_create_buffer_tests.inl b/unit_tests/api/cl_create_buffer_tests.cpp similarity index 100% rename from unit_tests/api/cl_create_buffer_tests.inl rename to unit_tests/api/cl_create_buffer_tests.cpp diff --git a/unit_tests/api/cl_create_perf_counters_command_queue_tests.inl b/unit_tests/api/cl_create_perf_counters_command_queue_tests.inl index bf1d7c8a25..4e955a7572 100644 --- a/unit_tests/api/cl_create_perf_counters_command_queue_tests.inl +++ b/unit_tests/api/cl_create_perf_counters_command_queue_tests.inl @@ -10,6 +10,7 @@ #include "runtime/command_queue/command_queue.h" #include "runtime/event/event.h" #include "unit_tests/fixtures/device_instrumentation_fixture.h" +#include "unit_tests/mocks/mock_context.h" #include "unit_tests/os_interface/mock_performance_counters.h" using namespace OCLRT; diff --git a/unit_tests/api/cl_create_program_with_built_in_kernels_tests.inl b/unit_tests/api/cl_create_program_with_built_in_kernels_tests.cpp similarity index 100% rename from unit_tests/api/cl_create_program_with_built_in_kernels_tests.inl rename to unit_tests/api/cl_create_program_with_built_in_kernels_tests.cpp diff --git a/unit_tests/api/cl_enqueue_svm_migrate_mem_tests.inl b/unit_tests/api/cl_enqueue_svm_migrate_mem_tests.cpp similarity index 99% rename from unit_tests/api/cl_enqueue_svm_migrate_mem_tests.inl rename to unit_tests/api/cl_enqueue_svm_migrate_mem_tests.cpp index 18e62532ab..fb3af329da 100644 --- a/unit_tests/api/cl_enqueue_svm_migrate_mem_tests.inl +++ b/unit_tests/api/cl_enqueue_svm_migrate_mem_tests.cpp @@ -9,6 +9,7 @@ #include "unit_tests/mocks/mock_context.h" #include "runtime/command_queue/command_queue.h" #include "runtime/device/device.h" +#include "runtime/event/user_event.h" #include "runtime/memory_manager/graphics_allocation.h" #include "runtime/memory_manager/svm_memory_manager.h" diff --git a/unit_tests/api/cl_intel_motion_estimation.inl b/unit_tests/api/cl_intel_motion_estimation.cpp similarity index 100% rename from unit_tests/api/cl_intel_motion_estimation.inl rename to unit_tests/api/cl_intel_motion_estimation.cpp