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

Update aubstream interface: use product family from aubstream

Browse Source 
don't build aub tests when aubstream is not available
use only mock aub manager in ULTs

Related-To: NEO-4446
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2022-11-16 11:03:40 +00:00
committed by Compute-Runtime-Automation
parent 4995bddb89
commit 0b3582a93b
54 changed files with 533 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
opencl/source/CMakeLists.txt
View File

@ -112,14 +112,22 @@ if(${GENERATE_EXECUTABLE})
$<TARGET_OBJECTS:${BUILTINS_BINARIES_BINDFUL_LIB_NAME}>
)
if(DEFINED AUB_STREAM_PROJECT_NAME)
list(APPEND NEO_DYNAMIC_LIB__TARGET_OBJECTS $<TARGET_OBJECTS:${AUB_STREAM_PROJECT_NAME}_all_hw>)
endif()
add_library(${NEO_DYNAMIC_LIB_NAME} SHARED
${NEO_DYNAMIC_LIB__TARGET_OBJECTS}
${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp
)
if(DEFINED AUB_STREAM_PROJECT_NAME)
target_sources(${NEO_DYNAMIC_LIB_NAME}
PRIVATE
$<TARGET_OBJECTS:${AUB_STREAM_PROJECT_NAME}_all_hw>
${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp
)
else()
target_sources(${NEO_DYNAMIC_LIB_NAME}
PRIVATE
${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface_stub.cpp
)
endif()
if(UNIX)
if(NEO_BUILD_DEBUG_SYMBOLS_PACKAGE)

102
opencl/test/unit_test/aub_tests/CMakeLists.txt
View File

@ -4,62 +4,62 @@
# SPDX-License-Identifier: MIT
#
project(igdrcl_aub_tests)
set(OPENCL_AUB_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
list(APPEND IGDRCL_AUB_TESTS__TARGET_OBJECTS
${NEO_SOURCE_DIR}/opencl/test/unit_test/test_macros/test_checks_ocl.cpp
${NEO_SOURCE_DIR}/shared/test/common/test_macros/test_checks_shared.cpp
$<TARGET_OBJECTS:${BUILTINS_SOURCES_LIB_NAME}>
$<TARGET_OBJECTS:igdrcl_libult>
$<TARGET_OBJECTS:neo_libult_common>
$<TARGET_OBJECTS:neo_libult_cs>
$<TARGET_OBJECTS:neo_libult>
$<TARGET_OBJECTS:igdrcl_libult_env>
$<TARGET_OBJECTS:neo_shared_mocks>
$<TARGET_OBJECTS:neo_aub_tests_config>
)
if(DEFINED AUB_STREAM_PROJECT_NAME)
project(igdrcl_aub_tests)
set(OPENCL_AUB_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
list(APPEND IGDRCL_AUB_TESTS__TARGET_OBJECTS
${NEO_SOURCE_DIR}/opencl/test/unit_test/test_macros/test_checks_ocl.cpp
${NEO_SOURCE_DIR}/shared/test/common/test_macros/test_checks_shared.cpp
$<TARGET_OBJECTS:${BUILTINS_SOURCES_LIB_NAME}>
$<TARGET_OBJECTS:igdrcl_libult>
$<TARGET_OBJECTS:neo_libult_common>
$<TARGET_OBJECTS:neo_libult_cs>
$<TARGET_OBJECTS:neo_libult>
$<TARGET_OBJECTS:igdrcl_libult_env>
$<TARGET_OBJECTS:neo_shared_mocks>
$<TARGET_OBJECTS:neo_aub_tests_config>
)
list(APPEND IGDRCL_AUB_TESTS__TARGET_OBJECTS $<TARGET_OBJECTS:${AUB_STREAM_PROJECT_NAME}_all_hw>)
endif()
add_executable(igdrcl_aub_tests
${IGDRCL_AUB_TESTS__TARGET_OBJECTS}
)
set_target_properties(igdrcl_aub_tests PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
if(WIN32)
set_target_properties(igdrcl_aub_tests PROPERTIES
VS_DEBUGGER_WORKING_DIRECTORY ${TargetDir}
VS_DEBUGGER_COMMAND_ARGUMENTS " --disable_pagefaulting_tests"
add_executable(igdrcl_aub_tests
${IGDRCL_AUB_TESTS__TARGET_OBJECTS}
)
endif()
if(WIN32)
set_target_properties(igdrcl_aub_tests PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
if(WIN32)
set_target_properties(igdrcl_aub_tests PROPERTIES
VS_DEBUGGER_WORKING_DIRECTORY ${TargetDir}
VS_DEBUGGER_COMMAND_ARGUMENTS " --disable_pagefaulting_tests"
)
endif()
if(WIN32)
target_include_directories(igdrcl_aub_tests PRIVATE
${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks${BRANCH_DIR_SUFFIX}
)
endif()
target_include_directories(igdrcl_aub_tests PRIVATE
${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks${BRANCH_DIR_SUFFIX}
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/aub_tests
${NEO_SOURCE_DIR}/shared/test/common/helpers/includes${BRANCH_DIR_SUFFIX}
)
copy_gmm_dll_for(igdrcl_aub_tests)
add_subdirectories()
target_link_libraries(igdrcl_aub_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME})
target_link_libraries(igdrcl_aub_tests igdrcl_mocks)
target_link_libraries(igdrcl_aub_tests gmock-gtest ${NEO_EXTRA_LIBS})
if(UNIX)
target_link_libraries(igdrcl_aub_tests ${GMM_LINK_NAME})
else()
add_dependencies(igdrcl_aub_tests ${GMM_TARGET_NAME})
endif()
target_include_directories(igdrcl_aub_tests BEFORE PRIVATE ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX})
create_project_source_tree(igdrcl_aub_tests)
endif()
target_include_directories(igdrcl_aub_tests PRIVATE
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/aub_tests
${NEO_SOURCE_DIR}/shared/test/common/helpers/includes${BRANCH_DIR_SUFFIX}
)
copy_gmm_dll_for(igdrcl_aub_tests)
add_subdirectories()
target_link_libraries(igdrcl_aub_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME})
target_link_libraries(igdrcl_aub_tests igdrcl_mocks)
target_link_libraries(igdrcl_aub_tests gmock-gtest ${NEO_EXTRA_LIBS})
if(UNIX)
target_link_libraries(igdrcl_aub_tests ${GMM_LINK_NAME})
else()
add_dependencies(igdrcl_aub_tests ${GMM_TARGET_NAME})
endif()
target_include_directories(igdrcl_aub_tests BEFORE PRIVATE ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX})
create_project_source_tree(igdrcl_aub_tests)