From 884ae6fbab3d3ff46be4eb2b674ab3abe835aef6 Mon Sep 17 00:00:00 2001 From: Artur Harasimiuk Date: Sun, 5 Apr 2020 01:28:51 +0200 Subject: [PATCH] remove MT tests from igdrcl_tests target these tests are executed as part of igdrcl_mt_tests Change-Id: I907bbe99b1283962db2b5ad5fae1e4c848683ff1 Signed-off-by: Artur Harasimiuk --- Jenkinsfile | 2 +- manifests/manifest.yml | 2 +- opencl/test/unit_test/api/CMakeLists.txt | 3 --- opencl/test/unit_test/command_queue/CMakeLists.txt | 2 -- opencl/test/unit_test/event/CMakeLists.txt | 2 -- opencl/test/unit_test/helpers/CMakeLists.txt | 1 - opencl/test/unit_test/mt_tests/api/CMakeLists.txt | 8 ++++---- .../{ => mt_tests}/api/cl_create_user_event_tests_mt.cpp | 3 +-- .../{ => mt_tests}/api/cl_get_platform_ids_tests_mt.cpp | 3 +-- .../{ => mt_tests}/api/cl_intel_tracing_tests_mt.cpp | 0 .../cl_set_mem_object_destructor_callback_tests_mt.cpp | 3 +-- .../test/unit_test/mt_tests/command_queue/CMakeLists.txt | 4 ++-- .../{ => mt_tests}/command_queue/ioq_task_tests_mt.cpp | 0 .../{ => mt_tests}/command_queue/ooq_task_tests_mt.cpp | 0 opencl/test/unit_test/mt_tests/event/CMakeLists.txt | 5 ++--- .../unit_test/{ => mt_tests}/event/event_tests_mt.cpp | 3 +-- .../{ => mt_tests}/event/user_events_tests_mt.cpp | 3 +-- opencl/test/unit_test/mt_tests/helpers/CMakeLists.txt | 4 +--- .../{ => mt_tests}/helpers/base_object_tests_mt.cpp | 0 19 files changed, 16 insertions(+), 32 deletions(-) rename opencl/test/unit_test/{ => mt_tests}/api/cl_create_user_event_tests_mt.cpp (95%) rename opencl/test/unit_test/{ => mt_tests}/api/cl_get_platform_ids_tests_mt.cpp (93%) rename opencl/test/unit_test/{ => mt_tests}/api/cl_intel_tracing_tests_mt.cpp (100%) rename opencl/test/unit_test/{ => mt_tests}/api/cl_set_mem_object_destructor_callback_tests_mt.cpp (96%) rename opencl/test/unit_test/{ => mt_tests}/command_queue/ioq_task_tests_mt.cpp (100%) rename opencl/test/unit_test/{ => mt_tests}/command_queue/ooq_task_tests_mt.cpp (100%) rename opencl/test/unit_test/{ => mt_tests}/event/event_tests_mt.cpp (94%) rename opencl/test/unit_test/{ => mt_tests}/event/user_events_tests_mt.cpp (98%) rename opencl/test/unit_test/{ => mt_tests}/helpers/base_object_tests_mt.cpp (100%) diff --git a/Jenkinsfile b/Jenkinsfile index f62507e668..d6a73c835b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ #!groovy dependenciesRevision='3232e5d67b5c3dd2323f13bede3ab1558b5aa4b9-1401' strategy='EQUAL' -allowedCD=245 +allowedCD=246 allowedF=20 diff --git a/manifests/manifest.yml b/manifests/manifest.yml index b23a349327..3e9d541275 100644 --- a/manifests/manifest.yml +++ b/manifests/manifest.yml @@ -14,7 +14,7 @@ components: infra: branch: infra dest_dir: infra - revision: 64e23e03de6adb8a8c3a718d67d35ef8a5318806 + revision: 9759640da5ae63f175bd60216b5b7aa5d54ac5eb type: git internal: branch: master diff --git a/opencl/test/unit_test/api/CMakeLists.txt b/opencl/test/unit_test/api/CMakeLists.txt index 91186be084..4f30076900 100644 --- a/opencl/test/unit_test/api/CMakeLists.txt +++ b/opencl/test/unit_test/api/CMakeLists.txt @@ -33,7 +33,6 @@ set(IGDRCL_SRCS_tests_api ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_sub_buffer_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_sub_devices_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_user_event_tests.inl - ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_user_event_tests_mt.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_barrier_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_barrier_with_wait_list_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_enqueue_copy_buffer_rect_tests.inl @@ -88,7 +87,6 @@ set(IGDRCL_SRCS_tests_api ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_mem_object_info_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_pipe_info_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_platform_ids_tests.inl - ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_platform_ids_tests_mt.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_platform_info_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_program_build_info_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_program_info_tests.inl @@ -115,7 +113,6 @@ set(IGDRCL_SRCS_tests_api ${CMAKE_CURRENT_SOURCE_DIR}/cl_set_kernel_arg_svm_pointer_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_set_kernel_exec_info_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_set_mem_object_destructor_callback_tests.inl - ${CMAKE_CURRENT_SOURCE_DIR}/cl_set_mem_object_destructor_callback_tests_mt.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cl_set_performance_configuration_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_set_program_specialization_constant_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/cl_svm_alloc_tests.inl diff --git a/opencl/test/unit_test/command_queue/CMakeLists.txt b/opencl/test/unit_test/command_queue/CMakeLists.txt index 6cfcf95635..b26ca53f27 100644 --- a/opencl/test/unit_test/command_queue/CMakeLists.txt +++ b/opencl/test/unit_test/command_queue/CMakeLists.txt @@ -77,7 +77,6 @@ set(IGDRCL_SRCS_tests_command_queue ${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.cpp ${CMAKE_CURRENT_SOURCE_DIR}/local_work_size_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/multi_dispatch_info_tests.cpp @@ -87,7 +86,6 @@ set(IGDRCL_SRCS_tests_command_queue ${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.cpp ${CMAKE_CURRENT_SOURCE_DIR}/sync_buffer_handler_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/work_group_size_tests.cpp diff --git a/opencl/test/unit_test/event/CMakeLists.txt b/opencl/test/unit_test/event/CMakeLists.txt index 1ff516d970..d8ad5ac81b 100644 --- a/opencl/test/unit_test/event/CMakeLists.txt +++ b/opencl/test/unit_test/event/CMakeLists.txt @@ -11,9 +11,7 @@ set(IGDRCL_SRCS_tests_event ${CMAKE_CURRENT_SOURCE_DIR}/event_callbacks_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/event_fixture.h ${CMAKE_CURRENT_SOURCE_DIR}/event_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/event_tests_mt.cpp ${CMAKE_CURRENT_SOURCE_DIR}/event_tracker_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/user_events_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/user_events_tests_mt.cpp ) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_event}) diff --git a/opencl/test/unit_test/helpers/CMakeLists.txt b/opencl/test/unit_test/helpers/CMakeLists.txt index 344f191191..4c6923d32b 100644 --- a/opencl/test/unit_test/helpers/CMakeLists.txt +++ b/opencl/test/unit_test/helpers/CMakeLists.txt @@ -8,7 +8,6 @@ set(IGDRCL_SRCS_tests_helpers ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/array_count_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/base_object_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/base_object_tests_mt.cpp ${CMAKE_CURRENT_SOURCE_DIR}/basic_math_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/bit_helpers_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cl_helper_tests.cpp diff --git a/opencl/test/unit_test/mt_tests/api/CMakeLists.txt b/opencl/test/unit_test/mt_tests/api/CMakeLists.txt index 63417c87ec..c81f379e4d 100644 --- a/opencl/test/unit_test/mt_tests/api/CMakeLists.txt +++ b/opencl/test/unit_test/mt_tests/api/CMakeLists.txt @@ -7,12 +7,12 @@ set(IGDRCL_SRCS_mt_tests_api # local files ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/cl_create_user_event_tests_mt.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_platform_ids_tests_mt.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/cl_intel_tracing_tests_mt.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/cl_set_mem_object_destructor_callback_tests_mt.cpp # necessary dependencies from igdrcl_tests ${NEO_SOURCE_DIR}/opencl/test/unit_test/api/cl_api_tests.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/api/cl_create_user_event_tests_mt.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/api/cl_get_platform_ids_tests_mt.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/api/cl_intel_tracing_tests_mt.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/api/cl_set_mem_object_destructor_callback_tests_mt.cpp ) target_sources(igdrcl_mt_tests PRIVATE ${IGDRCL_SRCS_mt_tests_api}) diff --git a/opencl/test/unit_test/api/cl_create_user_event_tests_mt.cpp b/opencl/test/unit_test/mt_tests/api/cl_create_user_event_tests_mt.cpp similarity index 95% rename from opencl/test/unit_test/api/cl_create_user_event_tests_mt.cpp rename to opencl/test/unit_test/mt_tests/api/cl_create_user_event_tests_mt.cpp index 3dd12ffa3d..7d76ae702b 100644 --- a/opencl/test/unit_test/api/cl_create_user_event_tests_mt.cpp +++ b/opencl/test/unit_test/mt_tests/api/cl_create_user_event_tests_mt.cpp @@ -6,8 +6,7 @@ */ #include "opencl/source/context/context.h" - -#include "cl_api_tests.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_get_platform_ids_tests_mt.cpp b/opencl/test/unit_test/mt_tests/api/cl_get_platform_ids_tests_mt.cpp similarity index 93% rename from opencl/test/unit_test/api/cl_get_platform_ids_tests_mt.cpp rename to opencl/test/unit_test/mt_tests/api/cl_get_platform_ids_tests_mt.cpp index 1d693843e8..d826b29c79 100644 --- a/opencl/test/unit_test/api/cl_get_platform_ids_tests_mt.cpp +++ b/opencl/test/unit_test/mt_tests/api/cl_get_platform_ids_tests_mt.cpp @@ -7,8 +7,7 @@ #include "opencl/source/context/context.h" #include "opencl/source/platform/platform.h" - -#include "cl_api_tests.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_intel_tracing_tests_mt.cpp b/opencl/test/unit_test/mt_tests/api/cl_intel_tracing_tests_mt.cpp similarity index 100% rename from opencl/test/unit_test/api/cl_intel_tracing_tests_mt.cpp rename to opencl/test/unit_test/mt_tests/api/cl_intel_tracing_tests_mt.cpp diff --git a/opencl/test/unit_test/api/cl_set_mem_object_destructor_callback_tests_mt.cpp b/opencl/test/unit_test/mt_tests/api/cl_set_mem_object_destructor_callback_tests_mt.cpp similarity index 96% rename from opencl/test/unit_test/api/cl_set_mem_object_destructor_callback_tests_mt.cpp rename to opencl/test/unit_test/mt_tests/api/cl_set_mem_object_destructor_callback_tests_mt.cpp index e85c172299..d94ba1f338 100644 --- a/opencl/test/unit_test/api/cl_set_mem_object_destructor_callback_tests_mt.cpp +++ b/opencl/test/unit_test/mt_tests/api/cl_set_mem_object_destructor_callback_tests_mt.cpp @@ -6,8 +6,7 @@ */ #include "opencl/source/context/context.h" - -#include "cl_api_tests.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/mt_tests/command_queue/CMakeLists.txt b/opencl/test/unit_test/mt_tests/command_queue/CMakeLists.txt index 04904aa355..5090af71a2 100644 --- a/opencl/test/unit_test/mt_tests/command_queue/CMakeLists.txt +++ b/opencl/test/unit_test/mt_tests/command_queue/CMakeLists.txt @@ -7,11 +7,11 @@ set(IGDRCL_SRCS_mt_tests_command_queue # local files ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/ioq_task_tests_mt.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ooq_task_tests_mt.cpp # necessary dependencies from igdrcl_tests ${NEO_SOURCE_DIR}/opencl/test/unit_test/command_queue/enqueue_kernel_mt_tests.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/command_queue/enqueue_fixture.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/command_queue/ooq_task_tests_mt.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/command_queue/ioq_task_tests_mt.cpp ) target_sources(igdrcl_mt_tests PRIVATE ${IGDRCL_SRCS_mt_tests_command_queue}) diff --git a/opencl/test/unit_test/command_queue/ioq_task_tests_mt.cpp b/opencl/test/unit_test/mt_tests/command_queue/ioq_task_tests_mt.cpp similarity index 100% rename from opencl/test/unit_test/command_queue/ioq_task_tests_mt.cpp rename to opencl/test/unit_test/mt_tests/command_queue/ioq_task_tests_mt.cpp diff --git a/opencl/test/unit_test/command_queue/ooq_task_tests_mt.cpp b/opencl/test/unit_test/mt_tests/command_queue/ooq_task_tests_mt.cpp similarity index 100% rename from opencl/test/unit_test/command_queue/ooq_task_tests_mt.cpp rename to opencl/test/unit_test/mt_tests/command_queue/ooq_task_tests_mt.cpp diff --git a/opencl/test/unit_test/mt_tests/event/CMakeLists.txt b/opencl/test/unit_test/mt_tests/event/CMakeLists.txt index 13167cf2d2..92837a6033 100644 --- a/opencl/test/unit_test/mt_tests/event/CMakeLists.txt +++ b/opencl/test/unit_test/mt_tests/event/CMakeLists.txt @@ -7,8 +7,7 @@ set(IGDRCL_SRCS_mt_tests_event # local files ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - - # necessary dependencies from igdrcl_tests - ${NEO_SOURCE_DIR}/opencl/test/unit_test/event/user_events_tests_mt.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/event_tests_mt.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/user_events_tests_mt.cpp ) target_sources(igdrcl_mt_tests PRIVATE ${IGDRCL_SRCS_mt_tests_event}) diff --git a/opencl/test/unit_test/event/event_tests_mt.cpp b/opencl/test/unit_test/mt_tests/event/event_tests_mt.cpp similarity index 94% rename from opencl/test/unit_test/event/event_tests_mt.cpp rename to opencl/test/unit_test/mt_tests/event/event_tests_mt.cpp index 64e0bb6ccd..d431303585 100644 --- a/opencl/test/unit_test/event/event_tests_mt.cpp +++ b/opencl/test/unit_test/mt_tests/event/event_tests_mt.cpp @@ -7,10 +7,9 @@ #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "opencl/test/unit_test/event/event_fixture.h" #include "opencl/test/unit_test/mocks/mock_event.h" -#include "event_fixture.h" - #include class SmallMockEvent : public Event { diff --git a/opencl/test/unit_test/event/user_events_tests_mt.cpp b/opencl/test/unit_test/mt_tests/event/user_events_tests_mt.cpp similarity index 98% rename from opencl/test/unit_test/event/user_events_tests_mt.cpp rename to opencl/test/unit_test/mt_tests/event/user_events_tests_mt.cpp index 34187f2c50..f5924bf032 100644 --- a/opencl/test/unit_test/event/user_events_tests_mt.cpp +++ b/opencl/test/unit_test/mt_tests/event/user_events_tests_mt.cpp @@ -7,11 +7,10 @@ #include "shared/source/memory_manager/memory_manager.h" +#include "opencl/test/unit_test/event/event_fixture.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "event_fixture.h" - #include typedef HelloWorldTest EventTests; diff --git a/opencl/test/unit_test/mt_tests/helpers/CMakeLists.txt b/opencl/test/unit_test/mt_tests/helpers/CMakeLists.txt index 89d1ab3b1d..70aeb195cc 100644 --- a/opencl/test/unit_test/mt_tests/helpers/CMakeLists.txt +++ b/opencl/test/unit_test/mt_tests/helpers/CMakeLists.txt @@ -8,8 +8,6 @@ set(IGDRCL_SRCS_mt_tests_helpers # local files ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/interlocked_max_mt_tests.cpp - - # necessary dependencies from igdrcl_tests - ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/base_object_tests_mt.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/base_object_tests_mt.cpp ) target_sources(igdrcl_mt_tests PRIVATE ${IGDRCL_SRCS_mt_tests_helpers}) diff --git a/opencl/test/unit_test/helpers/base_object_tests_mt.cpp b/opencl/test/unit_test/mt_tests/helpers/base_object_tests_mt.cpp similarity index 100% rename from opencl/test/unit_test/helpers/base_object_tests_mt.cpp rename to opencl/test/unit_test/mt_tests/helpers/base_object_tests_mt.cpp