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

Dont compile aux translation builtin on not supported platforms 

Signed-off-by: Bartosz Dunajski <bartosz.dunajski@intel.com>
This commit is contained in:
Bartosz Dunajski 2021-10-08 10:10:38 +00:00 committed by Compute-Runtime-Automation
parent 5856c283c5
commit 740ceaf2c2
10 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/setup_platform_flags.cmake
View File

@ -153,6 +153,7 @@ if(SUPPORT_GEN12LP)
ADD_PRODUCT("SUPPORTED" "TGLLP" "IGFX_TIGERLAKE_LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN12LP" "TGLLP" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "GEN12LP" "TGLLP" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "TGLLP" "LP")
if(TESTS_TGLLP)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN12LP" "TGLLP")
ADD_PRODUCT("TESTED" "TGLLP" "IGFX_TIGERLAKE_LP")
@ -163,6 +164,7 @@ if(SUPPORT_GEN12LP)
ADD_PRODUCT("SUPPORTED" "DG1" "IGFX_DG1")
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN12LP" "DG1" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "GEN12LP" "DG1" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "DG1" "LP")
if(TESTS_DG1)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN12LP" "DG1")
ADD_PRODUCT("TESTED" "DG1" "IGFX_DG1")
@ -173,6 +175,7 @@ if(SUPPORT_GEN12LP)
ADD_PRODUCT("SUPPORTED" "RKL" "IGFX_ROCKETLAKE")
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN12LP" "RKL" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "GEN12LP" "RKL" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "RKL" "LP")
if(TESTS_RKL)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN12LP" "RKL")
ADD_PRODUCT("TESTED" "RKL" "IGFX_ROCKETLAKE")
@ -183,6 +186,7 @@ if(SUPPORT_GEN12LP)
ADD_PRODUCT("SUPPORTED" "ADLS" "IGFX_ALDERLAKE_S")
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN12LP" "ADLS" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "GEN12LP" "ADLS" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "ADLS" "LP")
if(TESTS_ADLS)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN12LP" "ADLS")
ADD_PRODUCT("TESTED" "ADLS" "IGFX_ALDERLAKE_S")
@ -193,6 +197,7 @@ if(SUPPORT_GEN12LP)
ADD_PRODUCT("SUPPORTED" "ADLP" "IGFX_ALDERLAKE_P")
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN12LP" "ADLP" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "GEN12LP" "ADLP" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "ADLP" "LP")
if(TESTS_ADLP)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN12LP" "ADLP")
ADD_PRODUCT("TESTED" "ADLP" "IGFX_ALDERLAKE_P")
@ -210,6 +215,7 @@ if(SUPPORT_XE_HP_CORE)
ADD_PRODUCT("SUPPORTED" "XE_HP_SDV" "IGFX_XE_HP_SDV")
ADD_PLATFORM_FOR_GEN("SUPPORTED" "XE_HP_CORE" "XE_HP_SDV" "CORE")
ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "XE_HP_CORE" "XE_HP_SDV" "CORE")
ADD_PLATFORM_FOR_GEN("SUPPORTED_AUX_TRANSLATION" "XE_HP_CORE" "XE_HP_SDV" "CORE")
set(PREFERRED_PLATFORM "XE_HP_SDV")
if(TESTS_XE_HP_SDV)
set(PREFERRED_FAMILY_NAME "XeHpFamily")

15
opencl/test/unit_test/built_ins/built_in_tests.cpp
View File

@ -138,6 +138,19 @@ struct AuxBuiltinsMatcher {
}
};
HWTEST2_F(BuiltInTests, GivenBuiltinTypeBinaryWhenGettingAuxTranslationBuiltinThenResourceSizeIsNonZero, MatchAny) {
class MockBuiltinsLib : BuiltinsLib {
public:
BuiltinResourceT getBuiltinResource(EBuiltInOps::Type builtin, BuiltinCode::ECodeType requestedCodeType, Device &device) {
return BuiltinsLib::getBuiltinResource(builtin, requestedCodeType, device);
}
};
auto mockBuiltinsLib = std::unique_ptr<MockBuiltinsLib>(new MockBuiltinsLib());
EXPECT_EQ(TestTraits<NEO::ToGfxCoreFamily<productFamily>::get()>::auxBuiltinsSupported,
mockBuiltinsLib->getBuiltinResource(EBuiltInOps::AuxTranslation, BuiltinCode::ECodeType::Binary, *pDevice).size() != 0);
}
INSTANTIATE_TEST_CASE_P(,
AuxBuiltInTests,
testing::ValuesIn({KernelObjForAuxTranslation::Type::MEM_OBJ, KernelObjForAuxTranslation::Type::GFX_ALLOC}));
@ -1430,7 +1443,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, BuiltInTests, GivenBuiltinTypeBinaryWhenGettingBuilt
}
};
auto mockBuiltinsLib = std::unique_ptr<MockBuiltinsLib>(new MockBuiltinsLib());
EXPECT_NE(0u, mockBuiltinsLib->getBuiltinResource(EBuiltInOps::AuxTranslation, BuiltinCode::ECodeType::Binary, *pDevice).size());
EXPECT_NE(0u, mockBuiltinsLib->getBuiltinResource(EBuiltInOps::CopyBufferToBuffer, BuiltinCode::ECodeType::Binary, *pDevice).size());
EXPECT_NE(0u, mockBuiltinsLib->getBuiltinResource(EBuiltInOps::CopyBufferRect, BuiltinCode::ECodeType::Binary, *pDevice).size());
EXPECT_NE(0u, mockBuiltinsLib->getBuiltinResource(EBuiltInOps::FillBuffer, BuiltinCode::ECodeType::Binary, *pDevice).size());

1
platforms.cmake
View File

@ -201,6 +201,7 @@ INIT_LIST("PLATFORMS" "SUPPORTED")
INIT_LIST("PLATFORMS" "SUPPORTED_2_0")
INIT_LIST("PLATFORMS" "SUPPORTED_VME")
INIT_LIST("PLATFORMS" "SUPPORTED_IMAGES")
INIT_LIST("PLATFORMS" "SUPPORTED_AUX_TRANSLATION")
INIT_LIST("PLATFORMS" "TESTED")
INIT_PRODUCTS_LIST("TESTED")
INIT_PRODUCTS_LIST("SUPPORTED")

5
shared/source/built_ins/builtins_binary.cmake
View File

@ -16,13 +16,16 @@ list(APPEND BIND_MODES
)
set(GENERATED_BUILTINS
"aux_translation"
"copy_buffer_rect"
"copy_buffer_to_buffer"
"copy_kernel_timestamps"
"fill_buffer"
)
set(GENERATED_BUILTINS_AUX_TRANSLATION
"aux_translation"
)
set(GENERATED_BUILTINS_IMAGES
"copy_buffer_to_image3d"
"copy_image3d_to_buffer"

11
shared/source/built_ins/kernels/CMakeLists.txt
View File

@ -12,6 +12,7 @@ if(NOT NEO_DISABLE_BUILTINS_COMPILATION)
add_dependencies(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} builtins)
add_subdirectories()
set(GENERATED_BUILTINS ${GENERATED_BUILTINS} PARENT_SCOPE)
set(GENERATED_BUILTINS_AUX_TRANSLATION ${GENERATED_BUILTINS_AUX_TRANSLATION} PARENT_SCOPE)
set(GENERATED_BUILTINS_IMAGES ${GENERATED_BUILTINS_IMAGES} PARENT_SCOPE)
set(GENERATED_BUILTINS_STATELESS ${GENERATED_BUILTINS_STATELESS} PARENT_SCOPE)
@ -154,7 +155,9 @@ if(NOT NEO_DISABLE_BUILTINS_COMPILATION)
foreach(PLATFORM_TYPE ${PLATFORM_TYPES})
if(${GEN_TYPE}_HAS_${PLATFORM_TYPE})
unset(IMAGE_SUPPORT)
unset(AUX_TRANSLATION_SUPPORT)
GEN_CONTAINS_PLATFORMS("SUPPORTED_IMAGES" ${GEN_TYPE} IMAGE_SUPPORT)
GEN_CONTAINS_PLATFORMS("SUPPORTED_AUX_TRANSLATION" ${GEN_TYPE} AUX_TRANSLATION_SUPPORT)
get_family_name_with_type(${GEN_TYPE} ${PLATFORM_TYPE})
string(TOLOWER ${PLATFORM_TYPE} PLATFORM_TYPE_LOWER)
get_bits_for_stateless(${GEN_TYPE} ${PLATFORM_TYPE})
@ -178,6 +181,11 @@ if(NOT NEO_DISABLE_BUILTINS_COMPILATION)
compile_builtin(${GEN_TYPE} ${PLATFORM_TYPE} ${GENERATED_BUILTIN_IMAGES_STATELESS}.builtin_kernel ${BITS} "${BUILTIN_OPTIONS_STATELESS}" ${MODE})
endforeach()
endif()
if(${AUX_TRANSLATION_SUPPORT})
foreach(GENERATED_BUILTIN_AUX_TRANSLATION ${GENERATED_BUILTINS_AUX_TRANSLATION})
compile_builtin(${GEN_TYPE} ${PLATFORM_TYPE} ${GENERATED_BUILTIN_AUX_TRANSLATION}.builtin_kernel ${NEO_BITS} "${BUILTIN_OPTIONS}" ${MODE})
endforeach()
endif()
get_property(GENERATED_BUILTINS_CPPS_${MODE} GLOBAL PROPERTY GENERATED_BUILTINS_CPPS_${MODE})
foreach(BUILTIN ${BUILTINS_COMMANDS})
list(APPEND GENERATED_BUILTINS_CPPS_${MODE} ${BUILTIN})
@ -198,6 +206,9 @@ if(NOT NEO_DISABLE_BUILTINS_COMPILATION)
foreach(builtin_images ${GENERATED_BUILTINS_IMAGES})
generate_cpp_spirv(${builtin_images})
endforeach()
foreach(builtin_aux_translation ${GENERATED_BUILTINS_AUX_TRANSLATION})
generate_cpp_spirv(${builtin_aux_translation})
endforeach()
foreach(builtin_stateless ${GENERATED_BUILTINS_STATELESS})
generate_cpp_spirv(${builtin_stateless})
endforeach()

3
shared/test/common/gen11/test_traits_gen11.h
View File

@ -10,7 +10,8 @@
template <>
struct TestTraits<IGFX_GEN11_CORE> {
static constexpr bool auxBuiltinsSupported = true;
static constexpr bool auxBuiltinsSupported = false;
static constexpr bool programOnlyChangedFieldsInComputeStateMode = true;
static constexpr bool iohInSbaSupported = true;
static constexpr bool auxTranslationSupported = false;
};

1
shared/test/common/gen12lp/test_traits_gen12lp.h
View File

@ -13,4 +13,5 @@ struct TestTraits<IGFX_GEN12LP_CORE> {
static constexpr bool auxBuiltinsSupported = true;
static constexpr bool programOnlyChangedFieldsInComputeStateMode = true;
static constexpr bool iohInSbaSupported = true;
static constexpr bool auxTranslationSupported = true;
};

2
shared/test/common/gen8/test_traits_gen8.h
View File

@ -10,7 +10,7 @@
template <>
struct TestTraits<IGFX_GEN8_CORE> {
static constexpr bool auxBuiltinsSupported = true;
static constexpr bool auxBuiltinsSupported = false;
static constexpr bool programOnlyChangedFieldsInComputeStateMode = true;
static constexpr bool iohInSbaSupported = true;
};

2
shared/test/common/gen9/test_traits_gen9.h
View File

@ -10,7 +10,7 @@
template <>
struct TestTraits<IGFX_GEN9_CORE> {
static constexpr bool auxBuiltinsSupported = true;
static constexpr bool auxBuiltinsSupported = false;
static constexpr bool programOnlyChangedFieldsInComputeStateMode = true;
static constexpr bool iohInSbaSupported = true;
};

1
shared/test/common/xe_hp_core/test_traits_xe_hp_core.h
View File

@ -19,4 +19,5 @@ struct TestTraits<IGFX_XE_HP_CORE> {
static constexpr bool threadPreemptionDisableBitMatcher = true;
static constexpr bool programOnlyChangedFieldsInComputeStateMode = false;
static constexpr bool iohInSbaSupported = false;
static constexpr bool auxTranslationSupported = true;
};