Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move files between shared/test/common and /unit_test (xe_*_core, page_fault...)

Browse Source 
common/xe_hpc_core/test_preemption_xe_hpc_core -> unit_test/xe_hpc_core
common/xe_hpg_core/excludes_xe_hpg_core -> unit_test/xe_hpg_core
common/xe_hpg_core/dg2/excludes_dg2 -> unit_test/xe_hpg_core/dg2
common/xe_hpg_core/test_preemption_xe_hpg_core -> unit_test/xe_hpg_core
unit_test/base_ult_config_listener.cpp -> common
unit_test/base_ult_config_listener.h -> common
unit_test/test_stats.h -> common
unit_test/test_configuration.h -> common
unit_test/page_fault_manager/cpu_page_fault_manager_tests.h -> common/fixtures
unit_test/page_fault_manager/mock_cpu_page_fault_manager.h -> common/mocks

Related-To: NEO-6524

Signed-off-by: Warchulski, Jaroslaw <jaroslaw.warchulski@intel.com>
This commit is contained in:
Warchulski, Jaroslaw
2022-08-17 10:17:02 +00:00
committed by Compute-Runtime-Automation
parent 497e5a4765
commit 260a324a6f
63 changed files with 141 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shared/test/unit_test/base_ult_config_listener.cpp → shared/test/common/base_ult_config_listener.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2020-2021 Intel Corporation
* Copyright (C) 2020-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*

2
shared/test/unit_test/base_ult_config_listener.h → shared/test/common/base_ult_config_listener.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2020 Intel Corporation
* Copyright (C) 2020-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*

1
shared/test/common/fixtures/CMakeLists.txt
View File

@ -6,6 +6,7 @@
target_sources(neo_libult_common PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/cpu_page_fault_manager_tests_fixture.h
${CMAKE_CURRENT_SOURCE_DIR}/linear_stream_fixture.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_center_fixture.h
${CMAKE_CURRENT_SOURCE_DIR}/preamble_fixture.h

2
shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h → shared/test/common/fixtures/cpu_page_fault_manager_tests_fixture.h
View File

@ -8,8 +8,8 @@
#pragma once
#include "shared/source/memory_manager/unified_memory_manager.h"
#include "shared/test/common/mocks/mock_cpu_page_fault_manager.h"
#include "shared/test/common/mocks/mock_memory_manager.h"
#include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h"
#include <memory>

2
shared/test/common/fixtures/mock_aub_center_fixture.h
View File

@ -11,7 +11,7 @@
#include "shared/test/common/helpers/default_hw_info.h"
#include "shared/test/common/mocks/mock_aub_center.h"
#include "shared/test/common/mocks/mock_aub_manager.h"
#include "shared/test/unit_test/tests_configuration.h"
#include "shared/test/common/tests_configuration.h"
namespace NEO {
struct MockAubCenterFixture {

4
shared/test/common/libult/CMakeLists.txt
View File

@ -115,8 +115,8 @@ set(neo_libult_common_SRCS_LIB_ULT
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_gmm_page_table_mngr.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/test_excludes.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/test_excludes.h
${NEO_SHARED_TEST_DIRECTORY}/unit_test/base_ult_config_listener.cpp
${NEO_SHARED_TEST_DIRECTORY}/unit_test/base_ult_config_listener.h
${NEO_SHARED_TEST_DIRECTORY}/common/base_ult_config_listener.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/base_ult_config_listener.h
${NEO_SHARED_TEST_DIRECTORY}/unit_test/helpers/debug_helpers.cpp
${NEO_SHARED_TEST_DIRECTORY}/unit_test/utilities/cpuintrinsics.cpp
${NEO_SHARED_DIRECTORY}/gmm_helper/resource_info_impl.cpp

4
shared/test/common/libult/create_tbx_sockets.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2021 Intel Corporation
* Copyright (C) 2018-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -7,7 +7,7 @@
#include "shared/source/tbx/tbx_sockets_imp.h"
#include "shared/test/common/mocks/mock_tbx_sockets.h"
#include "shared/test/unit_test/tests_configuration.h"
#include "shared/test/common/tests_configuration.h"
namespace NEO {
TbxSockets *TbxSockets::create() {

1
shared/test/common/mocks/CMakeLists.txt
View File

@ -33,6 +33,7 @@ set(NEO_CORE_tests_mocks
${CMAKE_CURRENT_SOURCE_DIR}/mock_compiler_interface_spirv.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_compilers.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mock_compilers.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_cpu_page_fault_manager.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_csr.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_debugger.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_deferrable_deletion.cpp

0
shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h → shared/test/common/mocks/mock_cpu_page_fault_manager.h
View File

2
shared/test/common/mocks/mock_device.cpp
View File

@ -14,7 +14,7 @@
#include "shared/test/common/mocks/mock_memory_manager.h"
#include "shared/test/common/mocks/mock_ostime.h"
#include "shared/test/common/mocks/ult_device_factory.h"
#include "shared/test/unit_test/tests_configuration.h"
#include "shared/test/common/tests_configuration.h"
using namespace NEO;

4
shared/test/common/test_configuration/aub_tests/test_mode.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2019-2021 Intel Corporation
* Copyright (C) 2019-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -7,7 +7,7 @@
#pragma once
#include "shared/test/unit_test/tests_configuration.h"
#include "shared/test/common/tests_configuration.h"
namespace NEO {
constexpr TestMode defaultTestMode = TestMode::AubTests;

4
shared/test/common/test_configuration/unit_tests/test_mode.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2019-2021 Intel Corporation
* Copyright (C) 2019-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -7,7 +7,7 @@
#pragma once
#include "shared/test/unit_test/tests_configuration.h"
#include "shared/test/common/tests_configuration.h"
namespace NEO {
constexpr TestMode defaultTestMode = TestMode::UnitTests;

0
shared/test/unit_test/test_stats.h → shared/test/common/test_stats.h
View File

2
shared/test/unit_test/tests_configuration.h → shared/test/common/tests_configuration.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2020 Intel Corporation
* Copyright (C) 2018-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*

4
shared/test/common/xe_hp_core/CMakeLists.txt
View File

@ -5,10 +5,10 @@
#
if(TESTS_XE_HP_CORE)
target_sources(${TARGET_NAME} PRIVATE
target_sources(neo_libult_common PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/test_traits_xe_hp_core.h
)
add_subdirectories()
endif()
endif()

9
shared/test/common/xe_hpc_core/CMakeLists.txt
View File

@ -5,7 +5,6 @@
#
if(TESTS_XE_HPC_CORE)
set(NEO_CORE_TESTS_XE_HPC_CORE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}unit_test_helper_xe_hpc_core_extra.inl
@ -16,9 +15,5 @@ if(TESTS_XE_HPC_CORE)
add_subdirectories()
target_sources(${TARGET_NAME} PRIVATE
${NEO_CORE_TESTS_XE_HPC_CORE}
${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_xe_hpc_core.cpp
)
endif()
target_sources(neo_libult_common PRIVATE ${NEO_CORE_TESTS_XE_HPC_CORE})
endif()

11
shared/test/common/xe_hpc_core/pvc/CMakeLists.txt
View File

@ -5,11 +5,8 @@
#
if(TESTS_PVC)
set(NEO_CORE_TESTS_PVC
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/product_configs_pvc.h
target_sources(neo_libult_common PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/product_configs_pvc.h
)
set_property(GLOBAL PROPERTY NEO_CORE_TESTS_PVC ${NEO_CORE_TESTS_PVC})
target_sources(${TARGET_NAME} PRIVATE ${NEO_CORE_TESTS_PVC})
endif()
endif()

11
shared/test/common/xe_hpg_core/CMakeLists.txt
View File

@ -5,17 +5,10 @@
#
if(TESTS_XE_HPG_CORE)
set(IGDRCL_SRCS_tests_xe_hpg_core_excludes
${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpg_core.cpp
)
set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_xe_hpg_core_excludes})
target_sources(${TARGET_NAME} PRIVATE
${IGDRCL_SRCS_tests_xe_hpg_core_excludes}
target_sources(neo_libult_common PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_xe_hpg_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_traits_xe_hpg_core.h
)
add_subdirectories()
endif()
endif()

11
shared/test/common/xe_hpg_core/dg2/CMakeLists.txt
View File

@ -5,18 +5,11 @@
#
if(TESTS_DG2)
set(IGDRCL_SRCS_tests_xe_hpg_core_dg2_excludes
${CMAKE_CURRENT_SOURCE_DIR}/excludes_dg2.cpp
)
set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_xe_hpg_core_dg2_excludes})
target_sources(${TARGET_NAME} PRIVATE
${IGDRCL_SRCS_tests_xe_hpg_core_dg2_excludes}
target_sources(neo_libult_common PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/product_configs_dg2.h
${CMAKE_CURRENT_SOURCE_DIR}/test_traits_dg2.h
)
add_subdirectories()
endif()
endif()

13
shared/test/common/xe_hpg_core/dg2/excludes_dg2.cpp
View File

@ -1,13 +0,0 @@
/*
* Copyright (C) 2021-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "shared/test/common/test_macros/hw_test_base.h"
HWTEST_EXCLUDE_PRODUCT(CommandEncodeStatesTest, givenSlmTotalSizeEqualZeroWhenDispatchingKernelThenSharedMemorySizeIsSetCorrectly, IGFX_DG2);
HWTEST_EXCLUDE_PRODUCT(MemoryManagerTests, givenEnabledLocalMemoryWhenAllocateInternalAllocationInDevicePoolThen32BitAllocationIsCreated, IGFX_DG2);
HWTEST_EXCLUDE_PRODUCT(MemoryManagerTests, givenEnabledLocalMemoryWhenLinearStreamIsAllocatedInDevicePoolThenLocalMemoryPoolIsUsed, IGFX_DG2);
HWTEST_EXCLUDE_PRODUCT(MemoryManagerTests, givenEnabledLocalMemoryWhenAllocateKernelIsaInDevicePoolThenLocalMemoryPoolIsUsed, IGFX_DG2);

14
shared/test/common/xe_hpg_core/excludes_xe_hpg_core.cpp
View File

@ -1,14 +0,0 @@
/*
* Copyright (C) 2021-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "shared/test/common/test_macros/hw_test_base.h"
HWTEST_EXCLUDE_PRODUCT(CommandEncodeStatesTest, givenEventAddressWhenEncodeThenMocsFromGmmHelperIsSet, IGFX_XE_HPG_CORE);
HWTEST_EXCLUDE_PRODUCT(XeHPAndLaterPreemptionTests, GivenDebuggerUsedWhenProgrammingStateSipThenStateSipIsAdded, IGFX_XE_HPG_CORE);
HWTEST_EXCLUDE_PRODUCT(ComputeModeRequirements, givenComputeModeCmdSizeWhenLargeGrfModeChangeIsRequiredThenSCMCommandSizeIsCalculated, IGFX_XE_HPG_CORE);
HWTEST_EXCLUDE_PRODUCT(ComputeModeRequirements, givenCoherencyWithSharedHandlesWhenCommandSizeIsCalculatedThenCorrectCommandSizeIsReturned, IGFX_XE_HPG_CORE);
HWTEST_EXCLUDE_PRODUCT(ComputeModeRequirements, givenCoherencyWithoutSharedHandlesWhenCommandSizeIsCalculatedThenCorrectCommandSizeIsReturned, IGFX_XE_HPG_CORE);

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

@ -22,12 +22,12 @@ if(NOT NEO_SKIP_UNIT_TESTS)
ADD_SUPPORTED_TEST_PRODUCT_FAMILIES_DEFINITION()
link_libraries(${ASAN_LIBS} ${TSAN_LIBS})
add_executable(${TARGET_NAME}
add_executable(neo_shared_tests
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tests_configuration.h
${CMAKE_CURRENT_SOURCE_DIR}/ult_specific_config.cpp
${NEO_SHARED_DIRECTORY}/helpers/allow_deferred_deleter.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/tests_configuration.h
${NEO_SHARED_TEST_DIRECTORY}/common/helpers/api_specific_config_shared_tests.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/test_checks_shared.cpp
$<TARGET_OBJECTS:mock_gmm>
@ -37,12 +37,12 @@ if(NOT NEO_SKIP_UNIT_TESTS)
$<TARGET_OBJECTS:neo_shared_mocks>
)
add_dependencies(${TARGET_NAME} test_dynamic_lib)
add_dependencies(neo_shared_tests test_dynamic_lib)
set_property(TARGET ${TARGET_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "${SHARED_TEST_PROJECTS_FOLDER}")
set_property(TARGET neo_shared_tests APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})
set_target_properties(neo_shared_tests PROPERTIES FOLDER "${SHARED_TEST_PROJECTS_FOLDER}")
target_include_directories(${TARGET_NAME} PRIVATE
target_include_directories(neo_shared_tests PRIVATE
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests
${ENGINE_NODE_DIR}
${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX}
@ -50,21 +50,21 @@ if(NOT NEO_SKIP_UNIT_TESTS)
)
if(UNIX AND NOT DISABLE_WDDM_LINUX)
target_include_directories(${TARGET_NAME} PUBLIC ${WDK_INCLUDE_PATHS})
target_include_directories(neo_shared_tests PUBLIC ${WDK_INCLUDE_PATHS})
endif()
if(WIN32)
target_link_libraries(${TARGET_NAME} dbghelp)
target_link_libraries(neo_shared_tests dbghelp)
endif()
target_link_libraries(${TARGET_NAME}
target_link_libraries(neo_shared_tests
gmock-gtest
${NEO_SHARED_MOCKABLE_LIB_NAME}
${NEO_EXTRA_LIBS}
)
if(MSVC)
set_target_properties(${TARGET_NAME} PROPERTIES
set_target_properties(neo_shared_tests PROPERTIES
VS_DEBUGGER_COMMAND_ARGUMENTS "--gtest_filter=* --gtest_catch_exceptions=0 --enable_default_listener --disable_pagefaulting_tests"
VS_DEBUGGER_WORKING_DIRECTORY "$(OutDir)"
)
@ -81,9 +81,9 @@ if(NOT NEO_SKIP_UNIT_TESTS)
add_subdirectories()
endif()
target_sources(${TARGET_NAME} PRIVATE $<TARGET_OBJECTS:neo_unit_tests_config>)
target_sources(neo_shared_tests PRIVATE $<TARGET_OBJECTS:neo_unit_tests_config>)
add_dependencies(unit_tests prepare_test_kernels_for_shared)
add_dependencies(unit_tests ${TARGET_NAME})
add_dependencies(unit_tests neo_shared_tests)
create_project_source_tree(${TARGET_NAME})
create_project_source_tree(neo_shared_tests)
endif()

6
shared/test/unit_test/main.cpp
View File

@ -12,6 +12,7 @@
#include "shared/source/helpers/api_specific_config.h"
#include "shared/source/os_interface/hw_info_config.h"
#include "shared/source/utilities/debug_settings_reader.h"
#include "shared/test/common/base_ult_config_listener.h"
#include "shared/test/common/helpers/custom_event_listener.h"
#include "shared/test/common/helpers/default_hw_info.inl"
#include "shared/test/common/helpers/kernel_binary_helper.h"
@ -24,9 +25,8 @@
#include "shared/test/common/mocks/mock_gmm_client_context.h"
#include "shared/test/common/mocks/mock_sip.h"
#include "shared/test/common/test_macros/test_checks_shared.h"
#include "shared/test/unit_test/base_ult_config_listener.h"
#include "shared/test/unit_test/test_stats.h"
#include "shared/test/unit_test/tests_configuration.h"
#include "shared/test/common/test_stats.h"
#include "shared/test/common/tests_configuration.h"
#include "gmock/gmock.h"
#include "hw_cmds_default.h"

2
shared/test/unit_test/memory_manager/surface_tests.cpp
View File

@ -9,12 +9,12 @@
#include "shared/source/helpers/hw_helper.h"
#include "shared/source/memory_manager/graphics_allocation.h"
#include "shared/test/common/helpers/engine_descriptor_helper.h"
#include "shared/test/common/mocks/mock_cpu_page_fault_manager.h"
#include "shared/test/common/mocks/mock_csr.h"
#include "shared/test/common/mocks/mock_execution_environment.h"
#include "shared/test/common/mocks/mock_graphics_allocation.h"
#include "shared/test/common/mocks/mock_memory_manager.h"
#include "shared/test/common/test_macros/hw_test.h"
#include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h"
#include "gtest/gtest.h"

7
shared/test/unit_test/page_fault_manager/CMakeLists.txt
View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2019-2020 Intel Corporation
# Copyright (C) 2019-2022 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
@ -7,11 +7,8 @@
set(NEO_CORE_CPU_PAGE_FAULT_MANAGER_TESTS
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/cpu_page_fault_manager_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/cpu_page_fault_manager_tests_fixture.h
${CMAKE_CURRENT_SOURCE_DIR}/default_asan_options.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mock_cpu_page_fault_manager.h
)
set_property(GLOBAL PROPERTY NEO_CORE_CPU_PAGE_FAULT_MANAGER_TESTS ${NEO_CORE_CPU_PAGE_FAULT_MANAGER_TESTS})
add_subdirectories()
add_subdirectories()

2
shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests.cpp
View File

@ -5,10 +5,10 @@
*
*/
#include "shared/test/common/fixtures/cpu_page_fault_manager_tests_fixture.h"
#include "shared/test/common/helpers/debug_manager_state_restore.h"
#include "shared/test/common/mocks/mock_graphics_allocation.h"
#include "shared/test/common/test_macros/test_checks_shared.h"
#include "shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h"
using namespace NEO;

6
shared/test/unit_test/page_fault_manager/linux/cpu_page_fault_manager_linux_tests.cpp
View File

@ -1,17 +1,17 @@
/*
* Copyright (C) 2019-2021 Intel Corporation
* Copyright (C) 2019-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "shared/source/page_fault_manager/linux/cpu_page_fault_manager_linux.h"
#include "shared/test/common/fixtures/cpu_page_fault_manager_tests_fixture.h"
#include "shared/test/common/helpers/debug_manager_state_restore.h"
#include "shared/test/common/mocks/mock_cpu_page_fault_manager.h"
#include "shared/test/common/mocks/mock_device.h"
#include "shared/test/common/mocks/mock_graphics_allocation.h"
#include "shared/test/common/mocks/mock_memory_operations_handler.h"
#include "shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h"
#include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h"
#include "gtest/gtest.h"

6
shared/test/unit_test/page_fault_manager/windows/cpu_page_fault_manager_windows_tests.cpp
View File

@ -1,13 +1,13 @@
/*
* Copyright (C) 2019-2020 Intel Corporation
* Copyright (C) 2019-2022 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "shared/source/page_fault_manager/windows/cpu_page_fault_manager_windows.h"
#include "shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h"
#include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h"
#include "shared/test/common/fixtures/cpu_page_fault_manager_tests_fixture.h"
#include "shared/test/common/mocks/mock_cpu_page_fault_manager.h"
#include "gtest/gtest.h"
#include <windows.h>

12
shared/test/unit_test/xe_hp_core/xe_hp_sdv/CMakeLists.txt
View File

@ -5,14 +5,12 @@
#
if(TESTS_XE_HP_SDV)
set(NEO_CORE_TESTS_XE_HP_CORE_XE_HP_SDV
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_xe_hp_sdv.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_xe_hp_sdv.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_xe_hp_sdv.cpp
target_sources(neo_shared_tests PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_xe_hp_sdv.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_xe_hp_sdv.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_xe_hp_sdv.cpp
)
target_sources(${TARGET_NAME} PRIVATE ${NEO_CORE_TESTS_XE_HP_CORE_XE_HP_SDV})
add_subdirectories()
endif()

47
shared/test/unit_test/xe_hpc_core/CMakeLists.txt
View File

@ -5,36 +5,29 @@
#
if(TESTS_XE_HPC_CORE)
set(NEO_SHARED_tests_xe_hpc_core
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/aub_command_stream_receiver_2_tests_xe_hpc_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_tests_xe_hpc_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/compute_mode_tests_xe_hpc_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker_tests_xe_hpc_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hw_cmds_xe_hpc_core_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_xe_hpc_core_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/image_surface_state_tests_xe_hpc_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/simd_helper_tests_xe_hpc_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_encode_xe_hpc_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_xe_hpc_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_sample_xe_hpc_core.cpp
)
set(IGDRCL_SRCS_tests_xe_hpc_core_excludes
${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpc_core.cpp
)
set(IGDRCL_SRCS_tests_xe_hpc_core_excludes ${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpc_core.cpp)
set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_xe_hpc_core_excludes})
if(DEFINED AUB_STREAM_PROJECT_NAME)
list(APPEND NEO_SHARED_tests_xe_hpc_core
${CMAKE_CURRENT_SOURCE_DIR}/aub_center_using_aubstream_lib_tests_xe_hpc_core.cpp
)
endif()
target_sources(${TARGET_NAME} PRIVATE
target_sources(neo_shared_tests PRIVATE
${IGDRCL_SRCS_tests_xe_hpc_core_excludes}
${NEO_SHARED_tests_xe_hpc_core}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/aub_command_stream_receiver_2_tests_xe_hpc_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_tests_xe_hpc_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/compute_mode_tests_xe_hpc_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker_tests_xe_hpc_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hw_cmds_xe_hpc_core_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_xe_hpc_core_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/image_surface_state_tests_xe_hpc_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/simd_helper_tests_xe_hpc_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_encode_xe_hpc_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_xe_hpc_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_xe_hpc_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_sample_xe_hpc_core.cpp
)
if(DEFINED AUB_STREAM_PROJECT_NAME)
target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/aub_center_using_aubstream_lib_tests_xe_hpc_core.cpp)
endif()
add_subdirectories()
endif()
endif()

27
shared/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt
View File

@ -5,20 +5,19 @@
#
if(TESTS_PVC)
set(NEO_SHARED_TESTS_PVC
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/device_binary_format_ar_tests_pvc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/device_tests_pvc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker_tests_pvc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hw_info_tests_pvc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/product_config_helper_tests_pvc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/product_config_tests_pvc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_encode_dispatch_kernel_pvc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_pvc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_pvc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_sample_pvc.cpp
target_sources(neo_shared_tests PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/device_binary_format_ar_tests_pvc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/device_tests_pvc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker_tests_pvc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hw_info_tests_pvc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/product_config_helper_tests_pvc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/product_config_tests_pvc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_encode_dispatch_kernel_pvc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_pvc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_pvc.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_sample_pvc.cpp
)
target_sources(${TARGET_NAME} PRIVATE ${NEO_SHARED_TESTS_PVC})
add_subdirectories()
endif()
endif()

0
shared/test/common/xe_hpc_core/test_preemption_xe_hpc_core.cpp → shared/test/unit_test/xe_hpc_core/test_preemption_xe_hpc_core.cpp
View File

8
shared/test/unit_test/xe_hpg_core/CMakeLists.txt
View File

@ -5,15 +5,19 @@
#
if(TESTS_XE_HPG_CORE)
set(IGDRCL_SRCS_tests_xe_hpg_core_excludes ${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpg_core.cpp)
set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_xe_hpg_core_excludes})
target_sources(neo_shared_tests PRIVATE
${IGDRCL_SRCS_tests_xe_hpg_core_excludes}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/compute_mode_tests_xe_hpg_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpg_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hw_cmds_xe_hpg_core_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests_xe_hpg_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/image_surface_state_tests_xe_hpg_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/simd_helper_tests_xe_hpg_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_encode_dispatch_kernel_xe_hpg_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_xe_hpg_core.cpp
)
if(DEFINED AUB_STREAM_PROJECT_NAME)
@ -21,4 +25,4 @@ if(TESTS_XE_HPG_CORE)
endif()
add_subdirectories()
endif()
endif()

7
shared/test/unit_test/xe_hpg_core/dg2/CMakeLists.txt
View File

@ -5,13 +5,16 @@
#
if(TESTS_DG2)
set(IGDRCL_SRCS_tests_xe_hpg_core_dg2_excludes ${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpg_core_dg2.cpp)
set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_xe_hpg_core_dg2_excludes})
target_sources(neo_shared_tests PRIVATE
${IGDRCL_SRCS_tests_xe_hpg_core_dg2_excludes}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/ail_tests_dg2.cpp
${CMAKE_CURRENT_SOURCE_DIR}/cache_policy_tests_dg2.cpp
${CMAKE_CURRENT_SOURCE_DIR}/compute_mode_tests_dg2.cpp
${CMAKE_CURRENT_SOURCE_DIR}/device_binary_format_ar_tests_dg2.cpp
${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpg_core_dg2.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests_dg2.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_dg2.cpp
${CMAKE_CURRENT_SOURCE_DIR}/product_config_helper_tests_dg2.cpp
@ -22,4 +25,4 @@ if(TESTS_DG2)
)
add_subdirectories()
endif()
endif()

4
shared/test/unit_test/xe_hpg_core/dg2/excludes_xe_hpg_core_dg2.cpp
View File

@ -19,3 +19,7 @@ HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, WhenAllowRenderCompressionIsCalledThenT
HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, whenConvertingTimestampsToCsDomainThenNothingIsChanged, IGFX_DG2);
HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfStorageInfoAdjustmentIsRequiredThenFalseIsReturned, IGFX_DG2);
HWTEST_EXCLUDE_PRODUCT(AILTests, whenModifyKernelIfRequiredIsCalledThenDontChangeKernelSources, IGFX_DG2);
HWTEST_EXCLUDE_PRODUCT(CommandEncodeStatesTest, givenSlmTotalSizeEqualZeroWhenDispatchingKernelThenSharedMemorySizeIsSetCorrectly, IGFX_DG2);
HWTEST_EXCLUDE_PRODUCT(MemoryManagerTests, givenEnabledLocalMemoryWhenAllocateInternalAllocationInDevicePoolThen32BitAllocationIsCreated, IGFX_DG2);
HWTEST_EXCLUDE_PRODUCT(MemoryManagerTests, givenEnabledLocalMemoryWhenLinearStreamIsAllocatedInDevicePoolThenLocalMemoryPoolIsUsed, IGFX_DG2);
HWTEST_EXCLUDE_PRODUCT(MemoryManagerTests, givenEnabledLocalMemoryWhenAllocateKernelIsaInDevicePoolThenLocalMemoryPoolIsUsed, IGFX_DG2);

5
shared/test/unit_test/xe_hpg_core/excludes_xe_hpg_core.cpp
View File

@ -10,3 +10,8 @@
HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenSamplerStateWhenAdjustSamplerStateThenNothingIsChanged, IGFX_XE_HPG_CORE);
HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfBlitterForImagesIsSupportedThenFalseIsReturned, IGFX_XE_HPG_CORE);
HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfTile64With3DSurfaceOnBCSIsSupportedThenTrueIsReturned, IGFX_XE_HPG_CORE);
HWTEST_EXCLUDE_PRODUCT(CommandEncodeStatesTest, givenEventAddressWhenEncodeThenMocsFromGmmHelperIsSet, IGFX_XE_HPG_CORE);
HWTEST_EXCLUDE_PRODUCT(XeHPAndLaterPreemptionTests, GivenDebuggerUsedWhenProgrammingStateSipThenStateSipIsAdded, IGFX_XE_HPG_CORE);
HWTEST_EXCLUDE_PRODUCT(ComputeModeRequirements, givenComputeModeCmdSizeWhenLargeGrfModeChangeIsRequiredThenSCMCommandSizeIsCalculated, IGFX_XE_HPG_CORE);
HWTEST_EXCLUDE_PRODUCT(ComputeModeRequirements, givenCoherencyWithSharedHandlesWhenCommandSizeIsCalculatedThenCorrectCommandSizeIsReturned, IGFX_XE_HPG_CORE);
HWTEST_EXCLUDE_PRODUCT(ComputeModeRequirements, givenCoherencyWithoutSharedHandlesWhenCommandSizeIsCalculatedThenCorrectCommandSizeIsReturned, IGFX_XE_HPG_CORE);

0
shared/test/common/xe_hpg_core/test_preemption_xe_hpg_core.cpp → shared/test/unit_test/xe_hpg_core/test_preemption_xe_hpg_core.cpp
View File