Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Limiting VME tests to supporting platforms 

Change-Id: I06aac13fc69d74fc4db26dfdd3b2035e53405d08
Signed-off-by: Koska, Andrzej <andrzej.koska@intel.com>
Related-To: NEO-3416
This commit is contained in:
Andrzej Koska 2019-07-29 11:07:37 +02:00 committed by sys_ocldev
parent 2548bea71d
commit dd777559ba
5 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
offline_compiler/offline_compiler.cpp
View File

@ -540,9 +540,6 @@ int OfflineCompiler::parseCommandLine(size_t numArgs, const std::vector<std::str
printf("Error: Cannot get HW Info for device %s.\n", deviceName.c_str());
} else {
std::string extensionsList = getExtensionsList(*hwInfo);
std::string vme("cl_intel_device_side_avc_motion_estimation ");
if (extensionsList.find(vme) == std::string::npos)
extensionsList += vme;
internalOptions.append(convertEnabledExtensionsToCompilerInternalOptions(extensionsList.c_str()));
}
}

19
platforms.cmake
View File

@ -114,6 +114,17 @@ macro(PLATFORM_HAS_2_0 GEN_TYPE PLATFORM_NAME OUT_FLAG)
endif()
endmacro()
macro(PLATFORM_HAS_VME GEN_TYPE PLATFORM_NAME OUT_FLAG)
FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX)
GET_LIST_FOR_GEN("PLATFORMS" "SUPPORTED_VME" ${GEN_IDX} GEN_X_PLATFORMS)
list(FIND GEN_X_PLATFORMS ${PLATFORM_NAME} PLATFORM_EXISTS)
if("${PLATFORM_EXISTS}" LESS 0)
set(${OUT_FLAG} FALSE)
else()
set(${OUT_FLAG} TRUE)
endif()
endmacro()
macro(PLATFORM_TESTED_WITH_APPVERIFIER GEN_TYPE PLATFORM_NAME OUT_FLAG)
FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX)
GET_LIST_FOR_GEN("PLATFORMS" "TESTED_APPVERIFIER" ${GEN_IDX} GEN_X_PLATFORMS)
@ -170,6 +181,7 @@ SET_FLAGS_FOR("GEN11" "ICLLP" "LKF" "EHL")
INIT_LIST("FAMILY_NAME" "TESTED")
INIT_LIST("PLATFORMS" "SUPPORTED")
INIT_LIST("PLATFORMS" "SUPPORTED_2_0")
INIT_LIST("PLATFORMS" "SUPPORTED_VME")
INIT_LIST("PLATFORMS" "TESTED")
INIT_LIST("PLATFORMS" "TESTED_APPVERIFIER")
INIT_LIST("CONFIGURATIONS" "UNIT_TESTS")
@ -184,6 +196,7 @@ if(SUPPORT_GEN8)
if(SUPPORT_BDW)
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN8" "BDW" "CORE")
ADD_PLATFORM_FOR_GEN("SUPPORTED_2_0" "GEN8" "BDW" "CORE")
ADD_PLATFORM_FOR_GEN("SUPPORTED_VME" "GEN8" "BDW" "CORE")
if(TESTS_BDW)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN8" "BDW")
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED_APPVERIFIER" "GEN8" "BDW")
@ -201,6 +214,7 @@ if(SUPPORT_GEN9)
if(SUPPORT_SKL)
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN9" "SKL" "CORE")
ADD_PLATFORM_FOR_GEN("SUPPORTED_2_0" "GEN9" "SKL" "CORE")
ADD_PLATFORM_FOR_GEN("SUPPORTED_VME" "GEN9" "SKL" "CORE")
set(PREFERRED_PLATFORM "SKL")
if(TESTS_SKL)
set(PREFERRED_FAMILY_NAME "SKLFamily")
@ -215,6 +229,7 @@ if(SUPPORT_GEN9)
if(SUPPORT_KBL)
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN9" "KBL" "CORE")
ADD_PLATFORM_FOR_GEN("SUPPORTED_2_0" "GEN9" "KBL" "CORE")
ADD_PLATFORM_FOR_GEN("SUPPORTED_VME" "GEN9" "KBL" "CORE")
if(TESTS_KBL)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "KBL")
ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN9" "kbl/1/3/6")
@ -223,6 +238,7 @@ if(SUPPORT_GEN9)
if(SUPPORT_GLK)
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN9" "GLK" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_VME" "GEN9" "GLK" "LP")
if(TESTS_GLK)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "GLK")
ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN9" "glk/1/3/6")
@ -232,6 +248,7 @@ if(SUPPORT_GEN9)
if(SUPPORT_CFL)
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN9" "CFL" "CORE")
ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED_2_0" "GEN9" "CFL")
ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED_VME" "GEN9" "CFL")
if(TESTS_CFL)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "CFL")
ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN9" "cfl/1/3/6")
@ -240,6 +257,7 @@ if(SUPPORT_GEN9)
if(SUPPORT_BXT)
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN9" "BXT" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_VME" "GEN9" "BXT" "LP")
if(TESTS_BXT)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "BXT")
ADD_ITEM_FOR_GEN("CONFIGURATIONS" "AUB_TESTS" "GEN9" "bxt/1/3/6")
@ -256,6 +274,7 @@ if(SUPPORT_GEN11)
if(SUPPORT_ICLLP)
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN11" "ICLLP" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_2_0" "GEN11" "ICLLP" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_VME" "GEN11" "ICLLP" "LP")
if(TESTS_ICLLP)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN11" "ICLLP")
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED_APPVERIFIER" "GEN11" "ICLLP")

13
unit_tests/CMakeLists.txt
View File

@ -342,6 +342,10 @@ set(TEST_KERNEL_2_0
test_files/simple_nonuniform.cl
)
set(TEST_KERNEL_VME
${CMAKE_CURRENT_SOURCE_DIR}/test_files/vme_kernels.cl
)
set(TEST_KERNEL_SIP_DEBUG_options
"-cl-include-sip-kernel-debug -cl-include-sip-csr -cl-set-bti:0"
)
@ -354,6 +358,7 @@ file(GLOB_RECURSE TEST_KERNELS test_files/*.cl)
list(REMOVE_ITEM TEST_KERNELS "${CMAKE_CURRENT_SOURCE_DIR}/test_files/shouldfail.cl")
list(REMOVE_ITEM TEST_KERNELS "${CMAKE_CURRENT_SOURCE_DIR}/test_files/simple_block_kernel.cl")
list(REMOVE_ITEM TEST_KERNELS "${CMAKE_CURRENT_SOURCE_DIR}/test_files/simple_nonuniform.cl")
list(REMOVE_ITEM TEST_KERNELS "${CMAKE_CURRENT_SOURCE_DIR}/test_files/vme_kernels.cl")
function(gen_run_tests_with_appverifier product slices subslices eu_per_ss)
if(${CMAKE_BUILD_TYPE} STREQUAL "Debug" AND "${IGDRCL_OPTION__BITS}" STREQUAL "64" AND APPVERIFIER_ALLOWED)
@ -407,6 +412,10 @@ macro(macro_for_each_platform)
if(PLATFORM_SUPPORTS_2_0)
add_dependencies(unit_tests test_kernel_2_0_${family_name_with_type})
endif()
PLATFORM_HAS_VME(${GEN_TYPE} ${PLATFORM_IT} PLATFORM_SUPPORTS_VME)
if(PLATFORM_SUPPORTS_VME)
add_dependencies(unit_tests test_kernel_vme_${family_name_with_type})
endif()
endif()
endforeach()
endmacro()
@ -418,6 +427,7 @@ macro(macro_for_each_gen)
string(TOLOWER ${PLATFORM_TYPE} PLATFORM_TYPE_LOWER)
set(PLATFORM_LOWER ${DEFAULT_SUPPORTED_${GEN_TYPE}_${PLATFORM_TYPE}_PLATFORM})
set(PLATFORM_2_0_LOWER ${DEFAULT_SUPPORTED_2_0_${GEN_TYPE}_${PLATFORM_TYPE}_PLATFORM})
set(PLATFORM_VME_LOWER ${DEFAULT_SUPPORTED_VME_${GEN_TYPE}_${PLATFORM_TYPE}_PLATFORM})
if(MSVC OR CMAKE_SIZEOF_VOID_P EQUAL 8)
neo_gen_kernels(test_kernels_${family_name_with_type} ${PLATFORM_LOWER} ${family_name_with_type} ${TEST_KERNELS})
@ -449,6 +459,9 @@ macro(macro_for_each_gen)
if(PLATFORM_2_0_LOWER)
neo_gen_kernels_with_options(test_kernel_2_0_${family_name_with_type} ${PLATFORM_2_0_LOWER} ${family_name_with_type} "${TEST_KERNEL_2_0}" ${TEST_KERNEL_2_0_options})
endif()
if(PLATFORM_VME_LOWER)
neo_gen_kernels(test_kernel_vme_${family_name_with_type} ${PLATFORM_VME_LOWER} ${family_name_with_type} ${TEST_KERNEL_VME})
endif()
endif()
endif()
endforeach()

8
unit_tests/fixtures/media_kernel_fixture.h
View File

@ -56,6 +56,10 @@ struct MediaKernelFixture : public HelloWorldFixture<FactoryType>,
}
void SetUp() override {
skipVmeTest = !platform()->peekExecutionEnvironment()->getHardwareInfo()->capabilityTable.supportsVme;
if (skipVmeTest) {
GTEST_SKIP();
}
Parent::kernelFilename = "vme_kernels";
Parent::kernelName = "non_vme_kernel";
@ -78,6 +82,9 @@ struct MediaKernelFixture : public HelloWorldFixture<FactoryType>,
}
void TearDown() override {
if (skipVmeTest) {
return;
}
pVmeKernel->release();
HardwareParse::TearDown();
@ -88,5 +95,6 @@ struct MediaKernelFixture : public HelloWorldFixture<FactoryType>,
GenCmdList::iterator itorWalker2;
Kernel *pVmeKernel = nullptr;
bool skipVmeTest = false;
};
} // namespace NEO

3
unit_tests/program/program_tests.cpp
View File

@ -1485,6 +1485,9 @@ TEST_F(PatchTokenTests, ConstantMemoryObjectKernelArg) {
}
TEST_F(PatchTokenTests, VmeKernelArg) {
if (!pDevice->getExecutionEnvironment()->getHardwareInfo()->capabilityTable.supportsVme) {
GTEST_SKIP();
}
// PATCH_TOKEN_INLINE_VME_SAMPLER_INFO token indicates a VME kernel.
cl_device_id device = pDevice;