Skip to content

Commit 5f4d54c

Browse files
andrzejswierczynskiandrzejswierczynski
committed
Add revision specific tests and test files generation
Related-To: NEO-4838 Change-Id: I43cdd9108046239ec2535a9010762fb767b0c1eb Signed-off-by: Andrzej Swierczynski <[email protected]>
1 parent 9b057cf commit 5f4d54c

File tree

43 files changed

+209
-144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+209
-144
lines changed

‎cmake/run_ult_target.cmake‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,49 +9,51 @@ list(GET unit_test_config 0 product)
99
list(GET unit_test_config 1 slices)
1010
list(GET unit_test_config 2 subslices)
1111
list(GET unit_test_config 3 eu_per_ss)
12-
add_custom_target(run_${product}_unit_tests ALL DEPENDS unit_tests)
13-
set_target_properties(run_${product}_unit_tests PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${product}")
12+
list(GET unit_test_config 4 revision_id)
13+
14+
add_custom_target(run_${product}_${revision_id}_unit_tests ALL DEPENDS unit_tests)
15+
set_target_properties(run_${product}_${revision_id}_unit_tests PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${product}/${revision_id}")
1416
if(NOT SKIP_NEO_UNIT_TESTS)
1517
add_custom_command(
16-
TARGET run_${product}_unit_tests
18+
TARGET run_${product}_${revision_id}_unit_tests
1719
POST_BUILD
1820
COMMAND WORKING_DIRECTORY ${TargetDir}
1921
COMMAND echo Running neo_shared_tests ${target} ${slices}x${subslices}x${eu_per_ss} in ${TargetDir}/${product}
20-
COMMAND $<TARGET_FILE:neo_shared_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${IGDRCL_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION}
22+
COMMAND $<TARGET_FILE:neo_shared_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${IGDRCL_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION} --rev_id ${revision_id}
2123
)
2224

2325
add_custom_command(
24-
TARGET run_${product}_unit_tests
26+
TARGET run_${product}_${revision_id}_unit_tests
2527
POST_BUILD
2628
COMMAND WORKING_DIRECTORY ${TargetDir}
2729
COMMAND echo Running igdrcl_tests ${target} ${slices}x${subslices}x${eu_per_ss} in ${TargetDir}/${product}
28-
COMMAND ${GTEST_ENV} $<TARGET_FILE:igdrcl_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${IGDRCL_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION}
30+
COMMAND ${GTEST_ENV} $<TARGET_FILE:igdrcl_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${IGDRCL_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION} --rev_id ${revision_id}
2931
)
3032

3133
if(WIN32 AND ${CMAKE_BUILD_TYPE} STREQUAL "Debug" AND "${IGDRCL_OPTION__BITS}" STREQUAL "64" AND APPVERIFIER_ALLOWED)
3234
add_custom_command(
33-
TARGET run_${product}_unit_tests
35+
TARGET run_${product}_${revision_id}_unit_tests
3436
POST_BUILD
3537
COMMAND WORKING_DIRECTORY ${TargetDir}
3638
COMMAND echo Running igdrcl_tests with App Verifier
37-
COMMAND ${NEO_SOURCE_DIR}/scripts/verify.bat $<TARGET_FILE:igdrcl_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} ${IGDRCL_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION}
39+
COMMAND ${NEO_SOURCE_DIR}/scripts/verify.bat $<TARGET_FILE:igdrcl_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} ${IGDRCL_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION} --rev_id ${revision_id}
3840
COMMAND echo App Verifier returned: %errorLevel%
3941
)
4042
endif()
4143
endif()
4244

4345
if(NOT SKIP_L0_UNIT_TESTS AND BUILD_WITH_L0)
4446
add_custom_command(
45-
TARGET run_${product}_unit_tests
47+
TARGET run_${product}_${revision_id}_unit_tests
4648
POST_BUILD
4749
COMMAND WORKING_DIRECTORY ${TargetDir}
4850
COMMAND echo Running ze_intel_gpu_core_tests ${target} ${slices}x${subslices}x${eu_per_ss} in ${TargetDir}/${product}
49-
COMMAND $<TARGET_FILE:ze_intel_gpu_core_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${IGDRCL_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION}
51+
COMMAND $<TARGET_FILE:ze_intel_gpu_core_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${IGDRCL_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION} --rev_id ${revision_id}
5052
COMMAND echo Running ze_intel_gpu_tools_tests ${target} ${slices}x${subslices}x${eu_per_ss} in ${TargetDir}/${product}
51-
COMMAND $<TARGET_FILE:ze_intel_gpu_tools_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${IGDRCL_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION}
53+
COMMAND $<TARGET_FILE:ze_intel_gpu_tools_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${IGDRCL_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION} --rev_id ${revision_id}
5254
COMMAND echo Running ze_intel_gpu_exp_tests ${target} ${slices}x${subslices}x${eu_per_ss} in ${TargetDir}/${product}
53-
COMMAND $<TARGET_FILE:ze_intel_gpu_exp_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${IGDRCL_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION}
55+
COMMAND $<TARGET_FILE:ze_intel_gpu_exp_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${IGDRCL_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION} --rev_id ${revision_id}
5456
)
5557
endif()
5658

57-
add_dependencies(run_unit_tests run_${product}_unit_tests)
59+
add_dependencies(run_unit_tests run_${product}_${revision_id}_unit_tests)

‎cmake/setup_platform_flags.cmake‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ SET_FLAGS_FOR("GEN12LP" "TGLLP" "RKL")
1111

1212
# Add supported and tested platforms
1313
if(SUPPORT_GEN8)
14+
set(GEN8_REVISIONS 0)
1415
if(TESTS_GEN8)
1516
ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" "GEN8" "BDWFamily")
1617
endif()
@@ -27,6 +28,7 @@ if(SUPPORT_GEN8)
2728
endif()
2829

2930
if(SUPPORT_GEN9)
31+
set(GEN9_REVISIONS 0)
3032
if(TESTS_GEN9)
3133
ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" "GEN9" "SKLFamily")
3234
endif()
@@ -92,6 +94,7 @@ if(SUPPORT_GEN9)
9294
endif()
9395

9496
if(SUPPORT_GEN11)
97+
set(GEN11_REVISIONS 0)
9598
if(TESTS_GEN11)
9699
ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" "GEN11" "ICLFamily")
97100
endif()
@@ -130,6 +133,7 @@ if(SUPPORT_GEN11)
130133
endif()
131134

132135
if(SUPPORT_GEN12LP)
136+
set(GEN12LP_REVISIONS 0)
133137
if(TESTS_GEN12LP)
134138
ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" "GEN12LP" "TGLLPFamily")
135139
endif()

‎manifests/manifest.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ components:
1414
infra:
1515
branch: infra
1616
dest_dir: infra
17-
revision: 4354868bb2fc7a244c5d9dc9eb87d71ba21523da
17+
revision: 2b16dfb6bf1d49e3961efbafe29b5634196dfb28
1818
type: git
1919
internal:
2020
branch: master

0 commit comments

Comments
 (0)