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 ult helper to shared common library

Browse Source 
Signed-off-by: Zbigniew Zdanowicz <zbigniew.zdanowicz@intel.com>
This commit is contained in:
Zbigniew Zdanowicz
2021-11-04 23:50:45 +00:00
committed by Compute-Runtime-Automation
parent 3d3881e7ad
commit f646422076
27 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
opencl/test/unit_test/aub_tests/gen11/CMakeLists.txt
View File

@ -7,7 +7,6 @@
if(TESTS_GEN11)
target_sources(igdrcl_aub_tests PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${NEO_SOURCE_DIR}/shared/test/common/gen11/unit_test_helper_gen11.cpp
)
add_subdirectories()
endif()

2
opencl/test/unit_test/aub_tests/gen12lp/CMakeLists.txt
View File

@ -8,8 +8,6 @@ if(TESTS_GEN12LP)
target_sources(igdrcl_aub_tests PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/aub_mem_dump_tests_gen12lp.cpp
${NEO_SOURCE_DIR}/shared/test/common/gen12lp/special_ult_helper_gen12lp.cpp
${NEO_SOURCE_DIR}/shared/test/common/gen12lp/unit_test_helper_gen12lp.cpp
)
add_subdirectories()
endif()

1
opencl/test/unit_test/aub_tests/gen8/CMakeLists.txt
View File

@ -7,7 +7,6 @@
if(TESTS_GEN8)
target_sources(igdrcl_aub_tests PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${NEO_SOURCE_DIR}/shared/test/common/gen8/unit_test_helper_gen8.cpp
)
add_subdirectories()
endif()

2
opencl/test/unit_test/aub_tests/gen9/CMakeLists.txt
View File

@ -6,7 +6,7 @@
if(TESTS_GEN9)
target_sources(igdrcl_aub_tests PRIVATE
${NEO_SOURCE_DIR}/shared/test/common/gen9/unit_test_helper_gen9.cpp
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
)
add_subdirectories()
endif()

1
opencl/test/unit_test/aub_tests/xe_hp_core/CMakeLists.txt
View File

@ -7,7 +7,6 @@
if(TESTS_XE_HP_CORE)
target_sources(igdrcl_aub_tests PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${NEO_SOURCE_DIR}/shared/test/common/xe_hp_core/unit_test_helper_xe_hp_core.cpp
)
add_subdirectories()
endif()

1
opencl/test/unit_test/gen11/CMakeLists.txt
View File

@ -21,7 +21,6 @@ if(TESTS_GEN11)
${CMAKE_CURRENT_SOURCE_DIR}/test_device_queue_hw_gen11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_platform_caps_gen11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_sample_gen11.cpp
${NEO_SOURCE_DIR}/shared/test/common/gen11/unit_test_helper_gen11.cpp
)
get_property(NEO_CORE_TESTS_GEN11 GLOBAL PROPERTY NEO_CORE_TESTS_GEN11)

2
opencl/test/unit_test/gen12lp/CMakeLists.txt
View File

@ -34,8 +34,6 @@ if(TESTS_GEN12LP)
${CMAKE_CURRENT_SOURCE_DIR}/test_device_queue_hw_gen12lp.inl
${CMAKE_CURRENT_SOURCE_DIR}/test_platform_caps_gen12lp.inl
${CMAKE_CURRENT_SOURCE_DIR}/test_sample_gen12lp.inl
${NEO_SOURCE_DIR}/shared/test/common/gen12lp/unit_test_helper_gen12lp.cpp
${NEO_SOURCE_DIR}/shared/test/common/gen12lp/special_ult_helper_gen12lp.cpp
)
get_property(NEO_CORE_TESTS_GEN12LP GLOBAL PROPERTY NEO_CORE_TESTS_GEN12LP)

2
opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl
View File

@ -9,8 +9,8 @@
#include "shared/source/helpers/hw_helper.h"
#include "shared/source/helpers/ptr_math.h"
#include "shared/test/common/cmd_parse/hw_parse.h"
#include "shared/test/common/gen12lp/special_ult_helper_gen12lp.h"
#include "shared/test/common/helpers/dispatch_flags_helper.h"
#include "shared/test/common/libult/gen12lp/special_ult_helper_gen12lp.h"
#include "shared/test/common/mocks/mock_device.h"
#include "test.h"

2
opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl
View File

@ -8,7 +8,7 @@
#include "shared/source/command_stream/command_stream_receiver.h"
#include "shared/source/command_stream/linear_stream.h"
#include "shared/test/common/cmd_parse/hw_parse.h"
#include "shared/test/common/gen12lp/special_ult_helper_gen12lp.h"
#include "shared/test/common/libult/gen12lp/special_ult_helper_gen12lp.h"
#include "shared/test/common/mocks/mock_csr.h"
#include "opencl/source/command_queue/command_queue_hw.h"

2
opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl
View File

@ -6,9 +6,9 @@
*/
#include "shared/source/os_interface/hw_info_config.h"
#include "shared/test/common/gen12lp/special_ult_helper_gen12lp.h"
#include "shared/test/common/helpers/debug_manager_state_restore.h"
#include "shared/test/common/helpers/hw_helper_tests.h"
#include "shared/test/common/libult/gen12lp/special_ult_helper_gen12lp.h"
#include "shared/test/common/mocks/mock_memory_manager.h"
#include "opencl/source/helpers/cl_hw_helper.h"

2
opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl
View File

@ -9,8 +9,8 @@
#include "shared/source/gmm_helper/gmm_helper.h"
#include "shared/source/image/image_surface_state.h"
#include "shared/source/memory_manager/memory_manager.h"
#include "shared/test/common/gen12lp/special_ult_helper_gen12lp.h"
#include "shared/test/common/helpers/variable_backup.h"
#include "shared/test/common/libult/gen12lp/special_ult_helper_gen12lp.h"
#include "shared/test/common/mocks/mock_allocation_properties.h"
#include "shared/test/common/mocks/mock_gmm.h"

4
opencl/test/unit_test/gen12lp/windows/hw_info_config_tests_gen12lp.cpp
View File

@ -6,8 +6,8 @@
*/
#include "shared/source/os_interface/os_interface.h"
#include "shared/test/common/gen12lp/special_ult_helper_gen12lp.h"
#include "shared/test/common/helpers/debug_manager_state_restore.h"
#include "shared/test/common/libult/gen12lp/special_ult_helper_gen12lp.h"
#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h"
@ -67,9 +67,9 @@ GEN12LPTEST_F(HwInfoConfigTestWindowsGen12lp, givenGen12LpSkuWhenGettingCapabili
auto &hwInfoConfig = *HwInfoConfig::get(productFamily);
bool coherency = false;
hwInfoConfig.setCapabilityCoherencyFlag(outHwInfo, coherency);
const bool checkDone = SpecialUltHelperGen12lp::additionalCoherencyCheck(outHwInfo.platform.eProductFamily, coherency);
if (checkDone) {
EXPECT_FALSE(coherency);
return;
}

1
opencl/test/unit_test/gen8/CMakeLists.txt
View File

@ -21,7 +21,6 @@ if(TESTS_GEN8)
${CMAKE_CURRENT_SOURCE_DIR}/test_platform_caps_gen8.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_gen8.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_sample_gen8.cpp
${NEO_SOURCE_DIR}/shared/test/common/gen8/unit_test_helper_gen8.cpp
)
get_property(NEO_CORE_TESTS_GEN8 GLOBAL PROPERTY NEO_CORE_TESTS_GEN8)

1
opencl/test/unit_test/gen9/CMakeLists.txt
View File

@ -23,7 +23,6 @@ if(TESTS_GEN9)
${CMAKE_CURRENT_SOURCE_DIR}/test_platform_caps_gen9.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_gen9.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_sample_gen9.cpp
${NEO_SOURCE_DIR}/shared/test/common/gen9/unit_test_helper_gen9.cpp
)
get_property(NEO_CORE_TESTS_GEN9 GLOBAL PROPERTY NEO_CORE_TESTS_GEN9)

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

@ -39,8 +39,6 @@ set(IGDRCL_SRCS_tests_helpers
${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
${NEO_SHARED_TEST_DIRECTORY}/common/helpers/unit_test_helper.h
${NEO_SHARED_TEST_DIRECTORY}/common/helpers/unit_test_helper.inl
)
if(MSVC OR COMPILER_SUPPORTS_SSE42)
@ -55,7 +53,6 @@ if(TESTS_XEHP_AND_LATER)
${CMAKE_CURRENT_SOURCE_DIR}/engine_node_helper_tests_xehp_and_later.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests_xehp_and_later.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_xehp_and_later.cpp
${NEO_SOURCE_DIR}/shared/test/common/helpers/unit_test_helper_xehp_and_later.inl
)
endif()

1
opencl/test/unit_test/xe_hp_core/CMakeLists.txt
View File

@ -20,7 +20,6 @@ if(TESTS_XE_HP_CORE)
${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests_xe_hp_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_platform_caps_xe_hp_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_sample_xe_hp_core.cpp
${NEO_SOURCE_DIR}/shared/test/common/xe_hp_core/unit_test_helper_xe_hp_core.cpp
)
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_xe_hp_core})

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

@ -21,7 +21,6 @@ if(TESTS_GEN11)
${CMAKE_CURRENT_SOURCE_DIR}/image_surface_state_tests_gen11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_encode_math_gen11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_gen11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/unit_test_helper_gen11.cpp
)
endif()

3
shared/test/common/gen12lp/CMakeLists.txt
View File

@ -19,13 +19,10 @@ if(TESTS_GEN12LP)
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/command_encoder_tests_gen12lp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/image_surface_state_tests_gen12lp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/special_ult_helper_gen12lp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/special_ult_helper_gen12lp.h
${CMAKE_CURRENT_SOURCE_DIR}/test_command_encoder_gen12lp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_encode_gen12lp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_encode_math_gen12lp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_gen12lp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/unit_test_helper_gen12lp.cpp
)
endif()

2
shared/test/common/gen12lp/unit_test_helper_gen12lp.cpp
View File

@ -6,9 +6,9 @@
*/
#include "shared/source/gen12lp/hw_info.h"
#include "shared/test/common/gen12lp/special_ult_helper_gen12lp.h"
#include "shared/test/common/helpers/unit_test_helper.h"
#include "shared/test/common/helpers/unit_test_helper.inl"
#include "shared/test/common/libult/gen12lp/special_ult_helper_gen12lp.h"
namespace NEO {

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

@ -22,7 +22,6 @@ if(TESTS_GEN8)
${CMAKE_CURRENT_SOURCE_DIR}/state_base_address_tests_gen8.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_encode_math_gen8.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_gen8.cpp
${CMAKE_CURRENT_SOURCE_DIR}/unit_test_helper_gen8.cpp
)
endif()

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

@ -22,7 +22,6 @@ if(TESTS_GEN9)
${CMAKE_CURRENT_SOURCE_DIR}/test_command_encoder_gen9.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_encode_math_gen9.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_gen9.cpp
${CMAKE_CURRENT_SOURCE_DIR}/unit_test_helper_gen9.cpp
)
endif()

3
shared/test/common/helpers/CMakeLists.txt
View File

@ -35,15 +35,12 @@ set(NEO_CORE_HELPERS_TESTS
${CMAKE_CURRENT_SOURCE_DIR}/ult_hw_config.h
${CMAKE_CURRENT_SOURCE_DIR}/ult_hw_config.inl
${CMAKE_CURRENT_SOURCE_DIR}/ult_hw_helper.h
${CMAKE_CURRENT_SOURCE_DIR}/unit_test_helper.h
${CMAKE_CURRENT_SOURCE_DIR}/unit_test_helper.inl
${CMAKE_CURRENT_SOURCE_DIR}/variable_backup.h
)
if(TESTS_XEHP_AND_LATER)
list(APPEND NEO_CORE_HELPERS_TESTS
${CMAKE_CURRENT_SOURCE_DIR}/test_blit_commands_helper_xehp_and_later.cpp
${CMAKE_CURRENT_SOURCE_DIR}/unit_test_helper_xehp_and_later.inl
)
endif()

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

@ -36,6 +36,10 @@ macro(macro_for_each_gen)
if(EXISTS ${SRC_FILE})
list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE})
endif()
set(SRC_FILE ${NEO_SHARED_TEST_DIRECTORY}/common/${BRANCH}${GEN_TYPE_LOWER}/unit_test_helper_${GEN_TYPE_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE})
endif()
foreach(SRC_IT "enable_" "enable_family_full_core_" "implicit_scaling_")
set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH}${GEN_TYPE_LOWER}${BRANCH_DIR}${SRC_IT}${GEN_TYPE_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
@ -72,6 +76,8 @@ set(neo_libult_common_SRCS_LIB_ULT
${NEO_SHARED_TEST_DIRECTORY}/common/helpers/sip_init.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/helpers/test_files.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/helpers/test_files.h
${NEO_SHARED_TEST_DIRECTORY}/common/helpers/unit_test_helper.h
${NEO_SHARED_TEST_DIRECTORY}/common/helpers/unit_test_helper.inl
${NEO_SHARED_TEST_DIRECTORY}/common/libult/abort.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/libult/create_tbx_sockets.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/libult/debug_settings_reader_creator.cpp
@ -95,6 +101,12 @@ set(neo_libult_common_SRCS_LIB_ULT
${NEO_SHARED_DIRECTORY}/gmm_helper/resource_info_impl.cpp
)
if(TESTS_XEHP_AND_LATER)
list(APPEND neo_libult_common_SRCS_LIB_ULT
${NEO_SHARED_TEST_DIRECTORY}/common/helpers/unit_test_helper_xehp_and_later.inl
)
endif()
get_property(NEO_SHARED_TESTS_CMD_PARSE GLOBAL PROPERTY NEO_SHARED_TESTS_CMD_PARSE)
list(APPEND neo_libult_common_SRCS_LIB_ULT

15
shared/test/common/libult/gen12lp/CMakeLists.txt Normal file
View File

@ -0,0 +1,15 @@
#
# Copyright (C) 2021 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
if(TESTS_GEN12LP)
add_subdirectories()
target_sources(neo_libult_common PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/special_ult_helper_gen12lp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/special_ult_helper_gen12lp.h
)
endif()

10
shared/test/common/gen12lp/special_ult_helper_gen12lp.cpp → shared/test/common/libult/gen12lp/special_ult_helper_gen12lp.cpp
View File

@ -5,18 +5,12 @@
*
*/
#include "shared/test/common/gen12lp/special_ult_helper_gen12lp.h"
#include "test.h"
#include "shared/test/common/libult/gen12lp/special_ult_helper_gen12lp.h"
namespace NEO {
bool SpecialUltHelperGen12lp::additionalCoherencyCheck(PRODUCT_FAMILY productFamily, bool coherency) {
if (productFamily == IGFX_DG1) {
EXPECT_FALSE(coherency);
return true;
}
return false;
return productFamily == IGFX_DG1;
}
bool SpecialUltHelperGen12lp::isAdditionalCapabilityCoherencyFlagSettingRequired(PRODUCT_FAMILY productFamily) {

0
shared/test/common/gen12lp/special_ult_helper_gen12lp.h → shared/test/common/libult/gen12lp/special_ult_helper_gen12lp.h
View File

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

@ -14,7 +14,6 @@ if(TESTS_XE_HP_CORE)
${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_xe_hp_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_xe_hp_core.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_traits_xe_hp_core.h
${CMAKE_CURRENT_SOURCE_DIR}/unit_test_helper_xe_hp_core.cpp
)
set_property(GLOBAL PROPERTY NEO_CORE_TESTS_XE_HP_CORE ${NEO_CORE_TESTS_XE_HP_CORE})
add_subdirectories()