intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-03 06:49:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Create shared libult_common object library

Browse Source 
Signed-off-by: Kacper Nowak <kacper.nowak@intel.com>
This commit is contained in:
Kacper Nowak
2021-06-07 11:15:00 +02:00
committed by Compute-Runtime-Automation
parent 717b857689
commit ca4068aafc
25 changed files with 122 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,6 @@ if(TESTS_GEN11)
${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
${COMPUTE_RUNTIME_ULT_GEN11}
)
endif()

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

@@ -24,7 +24,6 @@ if(TESTS_GEN12LP)
${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
${COMPUTE_RUNTIME_ULT_GEN12LP}
${NEO_SOURCE_DIR}/opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.cpp
)

38
shared/test/common/gen12lp/cmd_parse/cmd_parse_gen12lp.inl
View File

@@ -1,38 +0,0 @@
/*
* Copyright (C) 2021 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "shared/test/common/cmd_parse/cmd_parse_l3_control.inl"
size_t getAdditionalCommandLengthHwSpecific(void *cmd) {
using L3_CONTROL_WITH_POST_SYNC = typename GenGfxFamily::L3_CONTROL;
using L3_CONTROL_WITHOUT_POST_SYNC = typename GenGfxFamily::L3_CONTROL;
auto pCmdWithPostSync = genCmdCast<L3_CONTROL_WITH_POST_SYNC *>(cmd);
if (pCmdWithPostSync)
return pCmdWithPostSync->getBase().TheStructure.Common.Length + 2;
auto pCmdWithoutPostSync = genCmdCast<L3_CONTROL_WITHOUT_POST_SYNC *>(cmd);
if (pCmdWithoutPostSync)
return pCmdWithoutPostSync->getBase().TheStructure.Common.Length + 2;
return 0;
}
const char *getAdditionalCommandNameHwSpecific(void *cmd) {
using L3_CONTROL_WITH_POST_SYNC = typename GenGfxFamily::L3_CONTROL;
using L3_CONTROL_WITHOUT_POST_SYNC = typename GenGfxFamily::L3_CONTROL;
if (nullptr != genCmdCast<L3_CONTROL_WITH_POST_SYNC *>(cmd)) {
return "L3_CONTROL(POST_SYNC)";
}
if (nullptr != genCmdCast<L3_CONTROL_WITHOUT_POST_SYNC *>(cmd)) {
return "L3_CONTROL(NO_POST_SYNC)";
}
return "UNKNOWN";
}

31
shared/test/common/gen12lp/cmd_parse_gen12lp.cpp
View File

@@ -13,12 +13,41 @@ using GenGfxFamily = NEO::TGLLPFamily;
#include "shared/test/common/cmd_parse/cmd_parse_base.inl"
#include "shared/test/common/cmd_parse/cmd_parse_compute_mode.inl"
#include "shared/test/common/cmd_parse/cmd_parse_gpgpu_walker.inl"
#include "shared/test/common/cmd_parse/cmd_parse_l3_control.inl"
#include "shared/test/common/cmd_parse/cmd_parse_mi_arb.inl"
#include "shared/test/common/cmd_parse/cmd_parse_sip.inl"
#include "shared/test/common/cmd_parse/hw_parse.h"
#include "shared/test/common/cmd_parse/hw_parse.inl"
#include "cmd_parse_gen12lp.inl"
size_t getAdditionalCommandLengthHwSpecific(void *cmd) {
using L3_CONTROL_WITH_POST_SYNC = typename GenGfxFamily::L3_CONTROL;
using L3_CONTROL_WITHOUT_POST_SYNC = typename GenGfxFamily::L3_CONTROL;
auto pCmdWithPostSync = genCmdCast<L3_CONTROL_WITH_POST_SYNC *>(cmd);
if (pCmdWithPostSync)
return pCmdWithPostSync->getBase().TheStructure.Common.Length + 2;
auto pCmdWithoutPostSync = genCmdCast<L3_CONTROL_WITHOUT_POST_SYNC *>(cmd);
if (pCmdWithoutPostSync)
return pCmdWithoutPostSync->getBase().TheStructure.Common.Length + 2;
return 0;
}
const char *getAdditionalCommandNameHwSpecific(void *cmd) {
using L3_CONTROL_WITH_POST_SYNC = typename GenGfxFamily::L3_CONTROL;
using L3_CONTROL_WITHOUT_POST_SYNC = typename GenGfxFamily::L3_CONTROL;
if (nullptr != genCmdCast<L3_CONTROL_WITH_POST_SYNC *>(cmd)) {
return "L3_CONTROL(POST_SYNC)";
}
if (nullptr != genCmdCast<L3_CONTROL_WITHOUT_POST_SYNC *>(cmd)) {
return "L3_CONTROL(NO_POST_SYNC)";
}
return "UNKNOWN";
}
template <>
size_t CmdParse<GenGfxFamily>::getCommandLengthHwSpecific(void *cmd) {

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

@@ -23,7 +23,6 @@ if(TESTS_GEN8)
${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
${COMPUTE_RUNTIME_ULT_GEN8}
)
endif()

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

@@ -23,7 +23,6 @@ if(TESTS_GEN9)
${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
${COMPUTE_RUNTIME_ULT_GEN9}
)
endif()

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

@@ -23,7 +23,6 @@ set(NEO_CORE_HELPERS_TESTS
${CMAKE_CURRENT_SOURCE_DIR}/memory_leak_listener.h
${CMAKE_CURRENT_SOURCE_DIR}/memory_management.h
${CMAKE_CURRENT_SOURCE_DIR}/simd_helper_tests.inl
${CMAKE_CURRENT_SOURCE_DIR}/sip_init.cpp
${CMAKE_CURRENT_SOURCE_DIR}/string_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/string_to_hash_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_traits.h

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

@@ -0,0 +1,77 @@
#
# Copyright (C) 2021 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
macro(macro_for_each_gen)
foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
foreach(BRANCH ${BRANCH_DIR_LIST})
set(SRC_FILE ${NEO_SHARED_TEST_DIRECTORY}/common/${BRANCH}${GEN_TYPE_LOWER}/cmd_parse_${GEN_TYPE_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND igdrcl_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE})
endif()
set(SRC_FILE ${NEO_SHARED_TEST_DIRECTORY}/common/libult/${BRANCH}${GEN_TYPE_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND igdrcl_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE})
endif()
string(REGEX REPLACE "/$" "" _BRANCH_FILENAME_SUFFIX "${BRANCH_DIR}")
string(REGEX REPLACE "^/" "_" _BRANCH_FILENAME_SUFFIX "${_BRANCH_FILENAME_SUFFIX}")
foreach(SRC_IT "enable_hw_info_config_" "enable_" "enable_family_full_core_")
set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH}${GEN_TYPE_LOWER}${BRANCH_DIR}${SRC_IT}${GEN_TYPE_LOWER}${_BRANCH_FILENAME_SUFFIX}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND igdrcl_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE})
endif()
set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH_DIR}${GEN_TYPE_LOWER}/${SRC_IT}${GEN_TYPE_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND igdrcl_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE})
endif()
endforeach()
endforeach()
endforeach()
endmacro()
apply_macro_for_each_gen("TESTED")
set(igdrcl_libult_common_SRCS_LIB_ULT
${NEO_SHARED_TEST_DIRECTORY}/common/helpers/memory_leak_listener.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/helpers/memory_leak_listener.h
${NEO_SHARED_TEST_DIRECTORY}/common/helpers/memory_management.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/helpers/memory_management.h
${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/libult/create_tbx_sockets.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_library.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_library.h
${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_ult.cpp
${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}/unit_test/helpers/debug_helpers.cpp
${NEO_SHARED_TEST_DIRECTORY}/unit_test/utilities/cpuintrinsics.cpp
)
get_property(NEO_SHARED_TESTS_CMD_PARSE GLOBAL PROPERTY NEO_SHARED_TESTS_CMD_PARSE)
list(APPEND igdrcl_libult_common_SRCS_LIB_ULT
${NEO_SHARED_TESTS_CMD_PARSE}
)
add_library(igdrcl_libult_common OBJECT EXCLUDE_FROM_ALL
${igdrcl_libult_common_SRCS_LIB_ULT}
${igdrcl_libult_common_SRCS_ENABLE_TESTED_HW}
)
target_include_directories(igdrcl_libult_common PRIVATE
$<TARGET_PROPERTY:gmock-gtest,INTERFACE_INCLUDE_DIRECTORIES>
${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR}
)
set_target_properties(igdrcl_libult_common PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(igdrcl_libult_common PROPERTIES FOLDER ${NEO_SHARED_TEST_DIRECTORY})
set_property(TARGET igdrcl_libult_common APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS})
target_include_directories(igdrcl_libult_common PRIVATE $<TARGET_PROPERTY:${NEO_SHARED_MOCKABLE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>)
target_compile_definitions(igdrcl_libult_common PRIVATE $<TARGET_PROPERTY:${NEO_SHARED_MOCKABLE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>)
create_project_source_tree(igdrcl_libult_common)
add_subdirectories()

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

@@ -44,8 +44,6 @@ if(NOT SKIP_UNIT_TESTS)
add_executable(${TARGET_NAME}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/base_ult_config_listener.cpp
${CMAKE_CURRENT_SOURCE_DIR}/base_ult_config_listener.h
${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
${CMAKE_CURRENT_SOURCE_DIR}/tests_configuration.h
@@ -61,11 +59,10 @@ if(NOT SKIP_UNIT_TESTS)
${NEO_SOURCE_DIR}/opencl/test/unit_test/ult_config_listener.cpp
${NEO_SOURCE_DIR}/shared/source/helpers/allow_deferred_deleter.cpp
${NEO_SOURCE_DIR}/shared/test/common/helpers/api_specific_config_shared_tests.cpp
${NEO_SOURCE_DIR}/shared/test/common/helpers/memory_leak_listener.cpp
${NEO_SOURCE_DIR}/shared/test/common/helpers/memory_management.cpp
${NEO_SOURCE_DIR}/shared/test/common/test_macros/test_checks_shared.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp
$<TARGET_OBJECTS:mock_gmm>
$<TARGET_OBJECTS:igdrcl_libult_common>
)
if(UNIX)