Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Move shared helper files to shared directory" 

This reverts commit 459524f129.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation 2022-04-27 12:28:48 +02:00 committed by Compute-Runtime-Automation
parent e3b1d8b43c
commit 903cf766b3
46 changed files with 87 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
opencl/source/helpers/CMakeLists.txt
View File

@ -62,7 +62,14 @@ if(SUPPORT_PVC_AND_LATER)
list(APPEND RUNTIME_SRCS_HELPERS_BASE ${CMAKE_CURRENT_SOURCE_DIR}/cl_hw_helper_pvc_and_later.inl)
endif()
set(RUNTIME_SRCS_HELPERS_WINDOWS
${CMAKE_CURRENT_SOURCE_DIR}/windows/gl_helper.h
)
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_HELPERS_BASE})
if(WIN32)
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_HELPERS_WINDOWS})
endif()
set_property(GLOBAL PROPERTY RUNTIME_SRCS_HELPERS_BASE ${RUNTIME_SRCS_HELPERS_BASE})

0
shared/source/helpers/windows/gl_helper.h → opencl/source/helpers/windows/gl_helper.h
View File

3
opencl/source/sharings/gl/windows/gl_sharing_windows.cpp
View File

@ -7,9 +7,8 @@
#include "opencl/source/sharings/gl/windows/gl_sharing_windows.h"
#include "shared/source/helpers/windows/gl_helper.h"
#include "opencl/source/context/context.inl"
#include "opencl/source/helpers/windows/gl_helper.h"
#include "opencl/source/sharings/gl/gl_arb_sync_event.h"
namespace NEO {

4
opencl/test/unit_test/CMakeLists.txt
View File

@ -85,6 +85,10 @@ if(USE_ASAN)
set(GTEST_ENV "LSAN_OPTIONS=suppressions=${CMAKE_CURRENT_SOURCE_DIR}/lsan_suppressions.txt")
endif()
if(COMPILER_SUPPORTS_SSE42)
set_source_files_properties(helpers/uint16_sse4_tests.cpp PROPERTIES COMPILE_FLAGS -msse4.2)
endif()
target_link_libraries(igdrcl_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME})
target_link_libraries(igdrcl_tests igdrcl_mocks)

2
opencl/test/unit_test/api/cl_api_tests.h
View File

@ -12,12 +12,12 @@
#include "shared/test/common/helpers/default_hw_info.h"
#include "shared/test/common/mocks/mock_device.h"
#include "shared/test/common/test_macros/test.h"
#include "shared/test/unit_test/helpers/ult_limits.h"
#include "opencl/source/api/api.h"
#include "opencl/source/command_queue/command_queue.h"
#include "opencl/source/execution_environment/cl_execution_environment.h"
#include "opencl/source/tracing/tracing_api.h"
#include "opencl/test/unit_test/helpers/ult_limits.h"
#include "opencl/test/unit_test/mocks/mock_cl_device.h"
#include "opencl/test/unit_test/mocks/mock_command_queue.h"
#include "opencl/test/unit_test/mocks/mock_kernel.h"

2
opencl/test/unit_test/aub_tests/command_queue/aub_enqueue_resource_barrier_xehp_and_later.cpp
View File

@ -7,12 +7,12 @@
#include "shared/test/common/mocks/mock_device.h"
#include "shared/test/common/test_macros/test.h"
#include "shared/test/unit_test/helpers/cmd_buffer_validator.h"
#include "opencl/source/command_queue/resource_barrier.h"
#include "opencl/source/mem_obj/buffer.h"
#include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h"
#include "opencl/test/unit_test/aub_tests/fixtures/hello_world_fixture.h"
#include "opencl/test/unit_test/helpers/cmd_buffer_validator.h"
#include "opencl/test/unit_test/mocks/mock_command_queue.h"
#include "opencl/test/unit_test/mocks/mock_context.h"

2
opencl/test/unit_test/aub_tests/command_stream/aub_range_based_flush_tests_xehp_and_later.cpp
View File

@ -13,11 +13,11 @@
#include "shared/test/common/helpers/dispatch_flags_helper.h"
#include "shared/test/common/mocks/mock_device.h"
#include "shared/test/common/test_macros/test.h"
#include "shared/test/unit_test/helpers/cmd_buffer_validator.h"
#include "opencl/source/mem_obj/buffer.h"
#include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h"
#include "opencl/test/unit_test/aub_tests/fixtures/hello_world_fixture.h"
#include "opencl/test/unit_test/helpers/cmd_buffer_validator.h"
#include "opencl/test/unit_test/mocks/mock_command_queue.h"
#include "opencl/test/unit_test/mocks/mock_context.h"

2
opencl/test/unit_test/command_queue/command_queue_tests.cpp
View File

@ -27,7 +27,6 @@
#include "shared/test/common/mocks/mock_os_context.h"
#include "shared/test/common/test_macros/test.h"
#include "shared/test/common/test_macros/test_checks_shared.h"
#include "shared/test/unit_test/helpers/raii_hw_helper.h"
#include "opencl/source/command_queue/command_queue_hw.h"
#include "opencl/source/event/event.h"
@ -42,6 +41,7 @@
#include "opencl/test/unit_test/fixtures/dispatch_flags_fixture.h"
#include "opencl/test/unit_test/fixtures/image_fixture.h"
#include "opencl/test/unit_test/fixtures/multi_tile_fixture.h"
#include "opencl/test/unit_test/helpers/raii_hw_helper.h"
#include "opencl/test/unit_test/mocks/mock_command_queue.h"
#include "opencl/test/unit_test/mocks/mock_context.h"
#include "opencl/test/unit_test/mocks/mock_event.h"

2
opencl/test/unit_test/command_stream/cache_flush_tests_dg2_and_later.cpp
View File

@ -10,10 +10,10 @@
#include "shared/test/common/helpers/debug_manager_state_restore.h"
#include "shared/test/common/mocks/mock_csr.h"
#include "shared/test/common/test_macros/test.h"
#include "shared/test/unit_test/helpers/cmd_buffer_validator.h"
#include "opencl/source/command_queue/command_queue_hw.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "opencl/test/unit_test/helpers/cmd_buffer_validator.h"
#include "opencl/test/unit_test/helpers/hardware_commands_helper_tests.h"
using namespace NEO;

2
opencl/test/unit_test/command_stream/cl_command_stream_receiver_tests.cpp
View File

@ -10,10 +10,10 @@
#include "shared/test/common/mocks/mock_csr.h"
#include "shared/test/common/mocks/mock_hw_helper.h"
#include "shared/test/common/test_macros/test.h"
#include "shared/test/unit_test/helpers/raii_hw_helper.h"
#include "opencl/source/mem_obj/buffer.h"
#include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h"
#include "opencl/test/unit_test/helpers/raii_hw_helper.h"
#include "opencl/test/unit_test/mocks/mock_context.h"
#include "gtest/gtest.h"

2
opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp
View File

@ -21,9 +21,9 @@
#include "shared/test/common/mocks/mock_hw_helper.h"
#include "shared/test/common/mocks/mock_submissions_aggregator.h"
#include "shared/test/common/test_macros/test.h"
#include "shared/test/unit_test/helpers/raii_hw_helper.h"
#include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h"
#include "opencl/test/unit_test/helpers/raii_hw_helper.h"
#include "opencl/test/unit_test/mocks/mock_buffer.h"
#include "opencl/test/unit_test/mocks/mock_command_queue.h"
#include "opencl/test/unit_test/mocks/mock_event.h"

2
opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp
View File

@ -18,7 +18,6 @@
#include "shared/test/common/mocks/mock_memory_manager.h"
#include "shared/test/common/mocks/mock_timestamp_container.h"
#include "shared/test/common/test_macros/test.h"
#include "shared/test/unit_test/helpers/raii_hw_helper.h"
#include "shared/test/unit_test/utilities/base_object_utils.h"
#include "opencl/source/event/user_event.h"
@ -27,6 +26,7 @@
#include "opencl/test/unit_test/command_stream/command_stream_receiver_hw_fixture.h"
#include "opencl/test/unit_test/fixtures/image_fixture.h"
#include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h"
#include "opencl/test/unit_test/helpers/raii_hw_helper.h"
#include "opencl/test/unit_test/mocks/mock_image.h"
#include "opencl/test/unit_test/mocks/mock_kernel.h"

2
opencl/test/unit_test/device/device_caps_tests.cpp
View File

@ -19,10 +19,10 @@
#include "shared/test/common/mocks/mock_execution_environment.h"
#include "shared/test/common/mocks/mock_sip.h"
#include "shared/test/unit_test/helpers/gtest_helpers.h"
#include "shared/test/unit_test/helpers/raii_hw_helper.h"
#include "opencl/source/helpers/cl_hw_helper.h"
#include "opencl/test/unit_test/fixtures/device_info_fixture.h"
#include "opencl/test/unit_test/helpers/raii_hw_helper.h"
#include "opencl/test/unit_test/mocks/ult_cl_device_factory.h"
#include "opencl/test/unit_test/test_macros/test_checks_ocl.h"

2
opencl/test/unit_test/device/device_tests.cpp
View File

@ -24,10 +24,10 @@
#include "shared/test/common/mocks/ult_device_factory.h"
#include "shared/test/common/test_macros/test.h"
#include "shared/test/common/test_macros/test_checks_shared.h"
#include "shared/test/unit_test/helpers/raii_hw_helper.h"
#include "opencl/source/platform/platform.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "opencl/test/unit_test/helpers/raii_hw_helper.h"
#include "opencl/test/unit_test/mocks/mock_context.h"
#include "opencl/test/unit_test/mocks/mock_platform.h"

2
opencl/test/unit_test/device/get_device_info_tests.cpp
View File

@ -10,12 +10,12 @@
#include "shared/test/common/mocks/mock_driver_info.h"
#include "shared/test/common/mocks/mock_os_context.h"
#include "shared/test/common/test_macros/test.h"
#include "shared/test/unit_test/helpers/raii_hw_helper.h"
#include "opencl/source/cl_device/cl_device_info_map.h"
#include "opencl/source/helpers/cl_hw_helper.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "opencl/test/unit_test/fixtures/device_info_fixture.h"
#include "opencl/test/unit_test/helpers/raii_hw_helper.h"
#include "opencl/test/unit_test/mocks/mock_command_queue.h"
#include "opencl/test/unit_test/mocks/mock_context.h"
#include "opencl/test/unit_test/mocks/ult_cl_device_factory.h"

2
opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp
View File

@ -6,11 +6,11 @@
*/
#include "shared/test/common/test_macros/test.h"
#include "shared/test/unit_test/helpers/static_size3.h"
#include "opencl/source/command_queue/command_queue_hw.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "opencl/test/unit_test/helpers/cl_hw_parse.h"
#include "opencl/test/unit_test/helpers/static_size3.h"
#include "opencl/test/unit_test/mocks/mock_kernel.h"
#include "reg_configs_common.h"

2
opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp
View File

@ -8,11 +8,11 @@
#include "shared/source/gen9/reg_configs.h"
#include "shared/test/common/fixtures/memory_management_fixture.h"
#include "shared/test/common/test_macros/test.h"
#include "shared/test/unit_test/helpers/static_size3.h"
#include "opencl/source/command_queue/command_queue_hw.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "opencl/test/unit_test/helpers/cl_hw_parse.h"
#include "opencl/test/unit_test/helpers/static_size3.h"
#include "opencl/test/unit_test/mocks/mock_kernel.h"
namespace NEO {

11
opencl/test/unit_test/helpers/CMakeLists.txt
View File

@ -10,6 +10,8 @@ set(IGDRCL_SRCS_tests_helpers
${CMAKE_CURRENT_SOURCE_DIR}/base_object_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/cl_helper_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/cl_hw_parse.h
${CMAKE_CURRENT_SOURCE_DIR}/cmd_buffer_validator.h
${CMAKE_CURRENT_SOURCE_DIR}/cmd_buffer_validator_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/dispatch_info_builder_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/dispatch_info_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/get_info_status_mapper_tests.cpp
@ -20,10 +22,12 @@ set(IGDRCL_SRCS_tests_helpers
${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests_dg2_or_below.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kmd_notify_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/memory_management_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/memory_properties_helpers_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mipmap_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/per_thread_data_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/queue_helpers_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/raii_hw_helper.h
${CMAKE_CURRENT_SOURCE_DIR}/ray_tracing_helper_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/sampler_helpers_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/task_information_tests.cpp
@ -31,11 +35,18 @@ set(IGDRCL_SRCS_tests_helpers
${CMAKE_CURRENT_SOURCE_DIR}/timestamp_packet_2_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/timestamp_packet_tests.h
${CMAKE_CURRENT_SOURCE_DIR}/transfer_properties_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ult_limits.h
${CMAKE_CURRENT_SOURCE_DIR}/validator_tests.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/helpers/aligned_memory_tests.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/helpers/debug_manager_state_restore.h
)
if(MSVC OR COMPILER_SUPPORTS_SSE42)
list(APPEND IGDRCL_SRCS_tests_helpers
${CMAKE_CURRENT_SOURCE_DIR}/uint16_sse4_tests.cpp
)
endif()
if(TESTS_XEHP_AND_LATER)
list(APPEND IGDRCL_SRCS_tests_helpers
${CMAKE_CURRENT_SOURCE_DIR}/aub_helper_hw_tests_xehp_and_later.cpp

0
shared/test/unit_test/helpers/cmd_buffer_validator.h → opencl/test/unit_test/helpers/cmd_buffer_validator.h
View File

3
shared/test/unit_test/helpers/cmd_buffer_validator_tests.cpp → opencl/test/unit_test/helpers/cmd_buffer_validator_tests.cpp
View File

@ -7,7 +7,8 @@
#include "shared/test/common/cmd_parse/hw_parse.h"
#include "shared/test/common/test_macros/test.h"
#include "shared/test/unit_test/helpers/cmd_buffer_validator.h"
#include "opencl/test/unit_test/helpers/cmd_buffer_validator.h"
using HwParseTest = ::testing::Test;

15
opencl/test/unit_test/helpers/linux/CMakeLists.txt Normal file
View File

@ -0,0 +1,15 @@
#
# Copyright (C) 2019-2022 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
if(UNIX)
set(IGDRCL_SRCS_tests_helpers_linux
${CMAKE_CURRENT_SOURCE_DIR}/kmd_notify_linux_tests.cpp
)
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_helpers_linux})
add_subdirectories()
set_property(GLOBAL PROPERTY IGDRCL_SRCS_tests_helpers_linux ${IGDRCL_SRCS_tests_helpers_linux})
endif()

0
shared/test/unit_test/helpers/linux/kmd_notify_linux_tests.cpp → opencl/test/unit_test/helpers/linux/kmd_notify_linux_tests.cpp
View File

0
shared/test/unit_test/helpers/memory_management_tests.cpp → opencl/test/unit_test/helpers/memory_management_tests.cpp
View File

0
shared/test/unit_test/helpers/raii_hw_helper.h → opencl/test/unit_test/helpers/raii_hw_helper.h
View File

0
shared/test/unit_test/helpers/static_size3.h → opencl/test/unit_test/helpers/static_size3.h
View File

0
shared/test/unit_test/helpers/uint16_sse4_tests.cpp → opencl/test/unit_test/helpers/uint16_sse4_tests.cpp
View File

0
shared/test/unit_test/helpers/ult_limits.h → opencl/test/unit_test/helpers/ult_limits.h
View File

17
opencl/test/unit_test/helpers/windows/CMakeLists.txt Normal file
View File

@ -0,0 +1,17 @@
#
# Copyright (C) 2019-2022 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
if(WIN32)
set(IGDRCL_SRCS_tests_helpers_windows
${CMAKE_CURRENT_SOURCE_DIR}/kmd_notify_windows_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/gl_helper_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mock_function.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_function.cpp
)
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_helpers_windows})
add_subdirectories()
endif()

5
shared/test/unit_test/helpers/windows/gl_helper_tests.cpp → opencl/test/unit_test/helpers/windows/gl_helper_tests.cpp
View File

@ -5,11 +5,12 @@
*
*/
#include "shared/source/helpers/windows/gl_helper.h"
#include "shared/source/os_interface/os_library.h"
#include "shared/source/os_interface/windows/windows_wrapper.h"
#include "shared/test/common/test_macros/test.h"
#include "shared/test/unit_test/helpers/windows/mock_function.h"
#include "opencl/source/helpers/windows/gl_helper.h"
#include "opencl/test/unit_test/helpers/windows/mock_function.h"
#include "gtest/gtest.h"

0
shared/test/unit_test/helpers/windows/kmd_notify_windows_tests.cpp → opencl/test/unit_test/helpers/windows/kmd_notify_windows_tests.cpp
View File

0
shared/test/unit_test/helpers/windows/mock_function.cpp → opencl/test/unit_test/helpers/windows/mock_function.cpp
View File

0
shared/test/unit_test/helpers/windows/mock_function.h → opencl/test/unit_test/helpers/windows/mock_function.h
View File

4
opencl/test/unit_test/kernel/cache_flush_tests.inl
View File

@ -15,15 +15,15 @@
#include "shared/test/common/helpers/debug_manager_state_restore.h"
#include "shared/test/common/mocks/mock_allocation_properties.h"
#include "shared/test/common/test_macros/test.h"
#include "shared/test/unit_test/helpers/cmd_buffer_validator.h"
#include "shared/test/unit_test/helpers/static_size3.h"
#include "opencl/source/command_queue/command_queue_hw.h"
#include "opencl/source/command_queue/gpgpu_walker.h"
#include "opencl/source/command_queue/resource_barrier.h"
#include "opencl/source/helpers/hardware_commands_helper.h"
#include "opencl/test/unit_test/fixtures/hello_world_fixture.h"
#include "opencl/test/unit_test/helpers/cmd_buffer_validator.h"
#include "opencl/test/unit_test/helpers/hardware_commands_helper_tests.h"
#include "opencl/test/unit_test/helpers/static_size3.h"
#include "opencl/test/unit_test/mocks/mock_command_queue.h"
using namespace NEO;

4
opencl/test/unit_test/kernel/cache_flush_xehp_and_later_tests.inl
View File

@ -11,11 +11,11 @@
#include "shared/test/common/helpers/debug_manager_state_restore.h"
#include "shared/test/common/mocks/mock_allocation_properties.h"
#include "shared/test/common/test_macros/test.h"
#include "shared/test/unit_test/helpers/cmd_buffer_validator.h"
#include "shared/test/unit_test/helpers/static_size3.h"
#include "opencl/test/unit_test/fixtures/hello_world_fixture.h"
#include "opencl/test/unit_test/helpers/cmd_buffer_validator.h"
#include "opencl/test/unit_test/helpers/hardware_commands_helper_tests.h"
#include "opencl/test/unit_test/helpers/static_size3.h"
#include "opencl/test/unit_test/mocks/mock_command_queue.h"
using namespace NEO;

2
opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp
View File

@ -10,13 +10,13 @@
#include "shared/source/helpers/hw_helper.h"
#include "shared/test/common/mocks/mock_gmm.h"
#include "shared/test/common/test_macros/test.h"
#include "shared/test/unit_test/helpers/raii_hw_helper.h"
#include "opencl/source/cl_device/cl_device_info_map.h"
#include "opencl/source/helpers/cl_memory_properties_helpers.h"
#include "opencl/source/mem_obj/buffer.h"
#include "opencl/source/mem_obj/image.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "opencl/test/unit_test/helpers/raii_hw_helper.h"
#include "opencl/test/unit_test/mocks/mock_context.h"
#include "opencl/test/unit_test/test_macros/test_checks_ocl.h"

2
opencl/test/unit_test/memory_manager/memory_manager_tests.cpp
View File

@ -36,7 +36,6 @@
#include "shared/test/common/mocks/mock_os_context.h"
#include "shared/test/common/test_macros/test.h"
#include "shared/test/unit_test/compiler_interface/linker_mock.h"
#include "shared/test/unit_test/helpers/raii_hw_helper.h"
#include "opencl/source/event/event.h"
#include "opencl/source/helpers/dispatch_info.h"
@ -48,6 +47,7 @@
#include "opencl/source/program/program.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h"
#include "opencl/test/unit_test/helpers/raii_hw_helper.h"
#include "opencl/test/unit_test/mocks/mock_context.h"
#include "opencl/test/unit_test/mocks/mock_kernel.h"
#include "opencl/test/unit_test/mocks/mock_mdi.h"

2
opencl/test/unit_test/mock_gl/windows/CMakeLists.txt
View File

@ -8,7 +8,7 @@ if(WIN32)
set(IGDRCL_SRCS_mock_opengl32
${CMAKE_CURRENT_SOURCE_DIR}/mock_opengl32.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mock_opengl32.def
${NEO_SOURCE_DIR}/shared/test/unit_test/helpers/windows/mock_function.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/windows/mock_function.cpp
)
add_library(mock_opengl32 SHARED ${IGDRCL_SRCS_mock_opengl32})

3
opencl/test/unit_test/mock_gl/windows/mock_opengl32.cpp
View File

@ -7,8 +7,7 @@
#define _GDI32_ //It causes that definitions of functions are not loaded from dll in file wingdi.h because they are in this file.
#include "shared/test/unit_test/helpers/windows/mock_function.h"
#include "opencl/test/unit_test/helpers/windows/mock_function.h"
#include "opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h"
#include "GL/gl.h"

2
opencl/test/unit_test/mocks/mock_program.cpp
View File

@ -15,10 +15,10 @@
#include "shared/test/common/mocks/mock_compiler_interface.h"
#include "shared/test/common/mocks/mock_compilers.h"
#include "shared/test/common/mocks/mock_graphics_allocation.h"
#include "shared/test/unit_test/helpers/ult_limits.h"
#include "opencl/source/context/context.h"
#include "opencl/source/program/create.inl"
#include "opencl/test/unit_test/helpers/ult_limits.h"
#include "opencl/test/unit_test/mocks/mock_cl_device.h"
namespace NEO {

2
opencl/test/unit_test/mt_tests/api/cl_intel_tracing_tests_mt.inl
View File

@ -7,12 +7,12 @@
#include "shared/test/common/helpers/debug_manager_state_restore.h"
#include "shared/test/common/test_macros/test.h"
#include "shared/test/unit_test/helpers/ult_limits.h"
#include "opencl/source/cl_device/cl_device.h"
#include "opencl/source/tracing/tracing_api.h"
#include "opencl/source/tracing/tracing_notify.h"
#include "opencl/test/unit_test/fixtures/platform_fixture.h"
#include "opencl/test/unit_test/helpers/ult_limits.h"
using namespace NEO;

4
shared/source/CMakeLists.txt
View File

@ -145,7 +145,7 @@ append_sources_from_properties(CORE_SOURCES
if(WIN32)
append_sources_from_properties(CORE_SOURCES
NEO_CORE_GMM_HELPER_WINDOWS
NEO_CORE_HELPERS_WINDOWS
NEO_CORE_HELPERS_GMM_CALLBACKS_WINDOWS
NEO_CORE_DIRECT_SUBMISSION_WINDOWS
NEO_CORE_OS_INTERFACE_WINDOWS
NEO_CORE_OS_INTERFACE_WDDM
@ -167,7 +167,7 @@ else()
)
if(NOT DISABLE_WDDM_LINUX)
append_sources_from_properties(CORE_SOURCES
NEO_CORE_HELPERS_WINDOWS
NEO_CORE_HELPERS_GMM_CALLBACKS_WINDOWS
NEO_CORE_SRCS_HELPERS_WINDOWS
NEO_CORE_GMM_HELPER_WINDOWS
NEO_CORE_OS_INTERFACE_WDDM

5
shared/source/helpers/CMakeLists.txt
View File

@ -155,15 +155,14 @@ if(SUPPORT_PVC_AND_LATER)
)
endif()
set(NEO_CORE_HELPERS_WINDOWS
${CMAKE_CURRENT_SOURCE_DIR}/windows/gl_helper.h
set(NEO_CORE_HELPERS_GMM_CALLBACKS_WINDOWS
${CMAKE_CURRENT_SOURCE_DIR}/windows/gmm_callbacks.cpp
${CMAKE_CURRENT_SOURCE_DIR}/windows/gmm_callbacks.h
${CMAKE_CURRENT_SOURCE_DIR}/windows/gmm_callbacks.inl
${CMAKE_CURRENT_SOURCE_DIR}/windows/gmm_callbacks_tgllp_and_later.inl
)
set_property(GLOBAL PROPERTY NEO_CORE_HELPERS_WINDOWS ${NEO_CORE_HELPERS_WINDOWS})
set_property(GLOBAL PROPERTY NEO_CORE_HELPERS_GMM_CALLBACKS_WINDOWS ${NEO_CORE_HELPERS_GMM_CALLBACKS_WINDOWS})
set_property(GLOBAL PROPERTY NEO_CORE_HELPERS ${NEO_CORE_HELPERS})
add_subdirectories()

5
shared/test/unit_test/CMakeLists.txt
View File

@ -43,7 +43,6 @@ if(NOT NEO_SKIP_UNIT_TESTS)
target_include_directories(${TARGET_NAME} PRIVATE
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests
${ENGINE_NODE_DIR}
${KHRONOS_GL_HEADERS_DIR}
${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX}
${NEO_SHARED_TEST_DIRECTORY}/common/helpers/includes${BRANCH_DIR_SUFFIX}
)
@ -65,10 +64,6 @@ if(NOT NEO_SKIP_UNIT_TESTS)
)
endif()
if(COMPILER_SUPPORTS_SSE42)
set_source_files_properties(helpers/uint16_sse4_tests.cpp PROPERTIES COMPILE_FLAGS -msse4.2)
endif()
add_subdirectory(${NEO_SHARED_TEST_DIRECTORY}/common "${NEO_BUILD_DIR}/shared/test/common")
add_subdirectory_unique(mocks)

12
shared/test/unit_test/helpers/CMakeLists.txt
View File

@ -10,8 +10,6 @@ set(IGDRCL_SRCS_tests_helpers
${CMAKE_CURRENT_SOURCE_DIR}/array_count_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/basic_math_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/bit_helpers_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/cmd_buffer_validator.h
${CMAKE_CURRENT_SOURCE_DIR}/cmd_buffer_validator_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/compiler_hw_info_config_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/debug_helpers_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter_helpers_tests.cpp
@ -22,21 +20,11 @@ set(IGDRCL_SRCS_tests_helpers
${CMAKE_CURRENT_SOURCE_DIR}/get_info_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/gtest_helpers.h
${CMAKE_CURRENT_SOURCE_DIR}/l3_range_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/memory_management_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ptr_math_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/raii_hw_helper.h
${CMAKE_CURRENT_SOURCE_DIR}/static_size3.h
${CMAKE_CURRENT_SOURCE_DIR}/test_debug_variables.inl
${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ult_limits.h
)
if(MSVC OR COMPILER_SUPPORTS_SSE42)
list(APPEND IGDRCL_SRCS_tests_helpers
${CMAKE_CURRENT_SOURCE_DIR}/uint16_sse4_tests.cpp
)
endif()
if(COMPILER_SUPPORTS_NEON)
list(APPEND IGDRCL_SRCS_tests_helpers
${CMAKE_CURRENT_SOURCE_DIR}/uint16_neon_tests.cpp

13
shared/test/unit_test/helpers/linux/CMakeLists.txt
View File

@ -1,13 +0,0 @@
#
# Copyright (C) 2019-2022 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
if(UNIX)
target_sources(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/kmd_notify_linux_tests.cpp
)
add_subdirectories()
endif()

16
shared/test/unit_test/helpers/windows/CMakeLists.txt
View File

@ -1,16 +0,0 @@
#
# Copyright (C) 2019-2022 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
if(WIN32)
target_sources(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/gl_helper_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kmd_notify_windows_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mock_function.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_function.cpp
)
add_subdirectories()
endif()