Skip to content

Commit 28edaa9

Browse files
ArturHarasimiukCompute-Runtime-Automation
ArturHarasimiuk
authored and
Compute-Runtime-Automation
committed
cmake cleanup
Signed-off-by: Artur Harasimiuk <[email protected]>
1 parent c2147e3 commit 28edaa9

File tree

23 files changed

+9
-82
lines changed

23 files changed

+9
-82
lines changed

‎cmake/run_aub_test_target.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ add_custom_target(run_${product}_${revision_id}_aub_tests ALL)
1616
if(NOT NEO_SKIP_OCL_UNIT_TESTS OR NOT NEO_SKIP_L0_UNIT_TESTS)
1717

1818
if(NOT NEO_SKIP_OCL_UNIT_TESTS)
19-
add_dependencies(run_${product}_${revision_id}_aub_tests copy_test_files_per_product)
2019
add_dependencies(run_${product}_${revision_id}_aub_tests prepare_test_kernels_for_ocl)
2120
add_dependencies(run_${product}_${revision_id}_aub_tests prepare_test_kernels_for_shared)
2221
endif()

‎cmake/run_ult_target.cmake‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,14 @@ if(NOT NEO_SKIP_OCL_UNIT_TESTS)
5454
add_custom_target(run_${product}_${revision_id}_ocl_tests DEPENDS unit_tests)
5555
set_target_properties(run_${product}_${revision_id}_ocl_tests PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${product}/${revision_id}")
5656

57+
set(outputdir "${TargetDir}/opencl/${product}/${revision_id}")
5758
add_custom_command(
5859
TARGET run_${product}_${revision_id}_ocl_tests
5960
POST_BUILD
6061
COMMAND WORKING_DIRECTORY ${TargetDir}
6162
COMMAND echo Running igdrcl_tests ${target} ${slices}x${subslices}x${eu_per_ss} in ${TargetDir}
63+
COMMAND ${CMAKE_COMMAND} -E remove_directory ${outputdir}/cl_cache
64+
COMMAND ${CMAKE_COMMAND} -E make_directory ${outputdir}/cl_cache
6265
COMMAND echo Cmd line: ${GTEST_ENV} ${NEO_RUN_INTERCEPTOR_LIST} $<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} ${GTEST_OUTPUT} ${NEO_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION} --rev_id ${revision_id}
6366
COMMAND ${GTEST_ENV} ${NEO_RUN_INTERCEPTOR_LIST} $<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} ${GTEST_OUTPUT} ${NEO_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION} --rev_id ${revision_id}
6467
)

‎opencl/test/unit_test/CMakeLists.txt‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ link_libraries(${ASAN_LIBS} ${TSAN_LIBS})
2323

2424
add_custom_target(prepare_test_kernels_for_ocl)
2525
add_dependencies(prepare_test_kernels_for_ocl ${BUILTINS_BINARIES_BINDFUL_LIB_NAME})
26-
add_custom_target(copy_test_files_per_product)
2726
add_custom_target(run_unit_tests ALL)
28-
add_dependencies(unit_tests copy_test_files_per_product)
2927

3028
add_custom_target(run_ocl_tests)
3129
set_target_properties(run_ocl_tests PROPERTIES FOLDER ${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER})
@@ -107,36 +105,6 @@ target_link_libraries(igdrcl_tests gmock-gtest ${NEO_EXTRA_LIBS})
107105

108106
set(BUILT_IN_KERNEL_DIR "${NEO_SOURCE_DIR}/shared/source/built_ins")
109107

110-
function(neo_copy_test_files target product)
111-
set(outputdir "${TargetDir}/opencl/${product}")
112-
add_custom_target(${target})
113-
add_custom_command(
114-
TARGET ${target}
115-
POST_BUILD
116-
COMMAND echo deleting and re-creating ${product} cache directory...
117-
COMMAND ${CMAKE_COMMAND} -E remove_directory ${outputdir}/cl_cache
118-
COMMAND ${CMAKE_COMMAND} -E make_directory ${outputdir}/cl_cache
119-
COMMAND WORKING_DIRECTORY ${TargetDir}
120-
)
121-
add_dependencies(${target} copy_compiler_files)
122-
set_target_properties(${target} PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${product}")
123-
endfunction()
124-
125-
function(neo_copy_test_files_with_revision target product revision_id)
126-
set(outputdir "${TargetDir}/opencl/${product}/${revision_id}")
127-
add_custom_target(${target})
128-
add_custom_command(
129-
TARGET ${target}
130-
POST_BUILD
131-
COMMAND echo deleting and re-creating ${product} cache directory...
132-
COMMAND ${CMAKE_COMMAND} -E remove_directory ${outputdir}/cl_cache
133-
COMMAND ${CMAKE_COMMAND} -E make_directory ${outputdir}/cl_cache
134-
COMMAND WORKING_DIRECTORY ${TargetDir}
135-
)
136-
add_dependencies(${target} copy_compiler_files)
137-
set_target_properties(${target} PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${product}/${revision_id}")
138-
endfunction()
139-
140108
add_dependencies(unit_tests
141109
igdrcl_tests
142110
prepare_test_kernels_for_ocl
@@ -150,7 +118,6 @@ if(UNIX)
150118
endif()
151119

152120
set_target_properties(unit_tests PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
153-
set_target_properties(copy_test_files_per_product PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
154121
set_target_properties(prepare_test_kernels_for_ocl PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
155122
set_target_properties(run_unit_tests PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
156123

‎opencl/test/unit_test/gen11/ehl/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,4 @@ if(TESTS_EHL)
1616
)
1717
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen11_ehl})
1818
add_subdirectories()
19-
neo_copy_test_files_with_revision(copy_test_files_ehl_0 ehl 0)
20-
add_dependencies(copy_test_files_per_product copy_test_files_ehl_0)
2119
endif()

‎opencl/test/unit_test/gen11/icllp/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,4 @@ if(TESTS_ICLLP)
1212
)
1313
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen11_icllp})
1414
add_subdirectories()
15-
neo_copy_test_files_with_revision(copy_test_files_icllp_0 icllp 0)
16-
add_dependencies(copy_test_files_per_product copy_test_files_icllp_0)
1715
endif()

‎opencl/test/unit_test/gen11/lkf/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,4 @@ if(TESTS_LKF)
1111
)
1212
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen11_lkf})
1313
add_subdirectories()
14-
neo_copy_test_files_with_revision(copy_test_files_lkf_0 lkf 0)
15-
add_dependencies(copy_test_files_per_product copy_test_files_lkf_0)
1614
endif()

‎opencl/test/unit_test/gen12lp/adln/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@
77
if(TESTS_ADLN)
88
include(${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}excludes_ocl_adln.cmake)
99
add_subdirectories()
10-
neo_copy_test_files_with_revision(copy_test_files_adln_0 adln 0)
11-
add_dependencies(copy_test_files_per_product copy_test_files_adln_0)
1210
endif()

‎opencl/test/unit_test/gen12lp/adlp/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,4 @@ if(TESTS_ADLP)
2121

2222
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen12lp_adlp})
2323
add_subdirectories()
24-
neo_copy_test_files_with_revision(copy_test_files_adlp_0 adlp 0)
25-
add_dependencies(copy_test_files_per_product copy_test_files_adlp_0)
2624
endif()

‎opencl/test/unit_test/gen12lp/adls/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,4 @@ if(TESTS_ADLS)
1717
)
1818
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen12lp_adls})
1919
add_subdirectories()
20-
neo_copy_test_files_with_revision(copy_test_files_adls_0 adls 0)
21-
add_dependencies(copy_test_files_per_product copy_test_files_adls_0)
2220
endif()

‎opencl/test/unit_test/gen12lp/dg1/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,4 @@ if(TESTS_DG1)
2020
)
2121
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_dg1})
2222
add_subdirectories()
23-
neo_copy_test_files_with_revision(copy_test_files_dg1_0 dg1 0)
24-
add_dependencies(copy_test_files_per_product copy_test_files_dg1_0)
2523
endif()

0 commit comments

Comments
 (0)