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

Add revision specific tests and test files generation

Browse Source 
Related-To: NEO-4838

Change-Id: I43cdd9108046239ec2535a9010762fb767b0c1eb
Signed-off-by: Andrzej Swierczynski <andrzej.swierczynski@intel.com>
This commit is contained in:
Andrzej Swierczynski
2020-09-24 08:09:02 -07:00
parent 9b057cfdac
commit 5f4d54c4fe
43 changed files with 209 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
shared/test/unit_test/main.cpp
View File

@@ -207,7 +207,7 @@ int main(int argc, char **argv) {
uint32_t euPerSubSlice = 0;
uint32_t sliceCount = 0;
uint32_t subSlicePerSliceCount = 0;
int32_t revId = -1;
int32_t revId = 0;
int dieRecovery = 0;
for (int i = 1; i < argc; ++i) {
@@ -302,10 +302,7 @@ int main(int argc, char **argv) {
renderCoreFamily = hwInfoForTests.platform.eRenderCoreFamily;
uint32_t threadsPerEu = hwInfoConfigFactory[productFamily]->threadsPerEu;
PLATFORM &platform = hwInfoForTests.platform;
if (revId != -1) {
platform.usRevId = revId;
}
platform.usRevId = revId;
uint64_t hwInfoConfig = defaultHardwareInfoConfigTable[productFamily];
setHwInfoValuesFromConfig(hwInfoConfig, hwInfoForTests);
@@ -336,11 +333,15 @@ int main(int argc, char **argv) {
testBinaryFiles.append("/");
testBinaryFiles.append(binaryNameSuffix);
testBinaryFiles.append("/");
testBinaryFiles.append(std::to_string(revId));
testBinaryFiles.append("/");
testBinaryFiles.append(testFiles);
testFiles = testBinaryFiles;
std::string executionDirectory(hardwarePrefix[productFamily]);
executionDirectory += NEO::executionDirectorySuffix; // _aub for aub_tests, empty otherwise
executionDirectory += "/";
executionDirectory += std::to_string(revId);
#ifdef WIN32
#include <direct.h>

34
shared/test/unit_test/test_files/CMakeLists.txt
View File

@@ -16,9 +16,9 @@ if(NOT DEFINED cloc_cmd_prefix)
endif()
endif()
function(compile_kernels_gen platform_name_with_type platform_name suffix)
function(compile_kernels_gen platform_name_with_type revision_id platform_name suffix)
set(outputdir "${TargetDir}/${suffix}/test_files/${NEO_ARCH}/")
set(outputdir "${TargetDir}/${suffix}/${revision_id}/test_files/${NEO_ARCH}/")
set(compiled_kernels)
foreach(filepath ${ARGN})
@@ -36,7 +36,7 @@ function(compile_kernels_gen platform_name_with_type platform_name suffix)
add_custom_command(
OUTPUT ${output_files}
COMMAND ${cloc_cmd_prefix} -file ${filename} -device ${platform_name} -${NEO_BITS} -out_dir ${outputdir}
COMMAND ${cloc_cmd_prefix} -file ${filename} -device ${platform_name} -${NEO_BITS} -out_dir ${outputdir} -revision_id ${revision_id}
WORKING_DIRECTORY ${workdir}
DEPENDS ${filepath} ocloc copy_compiler_files
)
@@ -44,13 +44,13 @@ function(compile_kernels_gen platform_name_with_type platform_name suffix)
list(APPEND compiled_kernels ${output_files})
endforeach()
list(APPEND compiled_kernels_${platform_name_with_type} ${compiled_kernels})
set(compiled_kernels_${platform_name_with_type} ${compiled_kernels_${platform_name_with_type}} PARENT_SCOPE)
list(APPEND compiled_kernels_${platform_name_with_type}_${revision_id} ${compiled_kernels})
set(compiled_kernels_${platform_name_with_type}_${revision_id} ${compiled_kernels_${platform_name_with_type}_${revision_id}} PARENT_SCOPE)
endfunction()
function(neo_shared_copy_test_files target product)
function(neo_shared_copy_test_files target product revision_id)
string(TOLOWER ${product} product)
set(dest_dir "${TargetDir}/${product}/test_files")
set(dest_dir "${TargetDir}/${product}/${revision_id}/test_files")
set(source_dir "${NEO_SOURCE_DIR}/shared/test/unit_test/test_files")
add_custom_target(${target})
add_custom_command(
@@ -62,15 +62,17 @@ function(neo_shared_copy_test_files target product)
DEPENDS ${source_dir}
)
add_dependencies(${target} copy_compiler_files)
set_target_properties(${target} PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${product}")
set_target_properties(${target} PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${product}/${revision_id}")
endfunction()
file(GLOB_RECURSE TEST_KERNELS *.cl)
add_custom_target(prepare_test_kernel_for_shared)
macro(macro_for_each_platform)
neo_shared_copy_test_files(copy_test_kernel_${PLATFORM_IT} ${PLATFORM_IT})
add_dependencies(prepare_test_kernel_for_shared copy_test_kernel_${PLATFORM_IT})
foreach(REVISION_ID ${${GEN_TYPE}_REVISIONS})
neo_shared_copy_test_files(copy_test_kernel_${PLATFORM_IT}_${REVISION_ID} ${PLATFORM_IT} ${REVISION_ID})
add_dependencies(prepare_test_kernel_for_shared copy_test_kernel_${PLATFORM_IT}_${REVISION_ID})
endforeach()
endmacro()
macro(macro_for_each_gen)
@@ -81,13 +83,13 @@ macro(macro_for_each_gen)
get_family_name_with_type(${GEN_TYPE} ${PLATFORM_TYPE})
set(PLATFORM_LOWER ${DEFAULT_SUPPORTED_${GEN_TYPE}_${PLATFORM_TYPE}_PLATFORM})
foreach(REVISION_ID ${${GEN_TYPE}_REVISIONS})
compile_kernels_gen(${family_name_with_type} ${REVISION_ID} ${PLATFORM_LOWER} ${family_name_with_type} ${TEST_KERNELS})
compile_kernels_gen(${family_name_with_type} ${PLATFORM_LOWER} ${family_name_with_type} ${TEST_KERNELS})
add_custom_target(prepare_test_kernel_for_shared_${family_name_with_type} DEPENDS ${compiled_kernels_${family_name_with_type}})
set_target_properties(prepare_test_kernel_for_shared_${family_name_with_type} PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${family_name_with_type}")
add_dependencies(prepare_test_kernel_for_shared prepare_test_kernel_for_shared_${family_name_with_type})
add_custom_target(prepare_test_kernel_for_shared_${family_name_with_type}_${REVISION_ID} DEPENDS ${compiled_kernels_${family_name_with_type}_${REVISION_ID}})
set_target_properties(prepare_test_kernel_for_shared_${family_name_with_type}_${REVISION_ID} PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${family_name_with_type}/${REVISION_ID}")
add_dependencies(prepare_test_kernel_for_shared prepare_test_kernel_for_shared_${family_name_with_type}_${REVISION_ID})
endforeach()
endif()
endforeach()
endmacro()