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

Compile builtins and test kernels per product family

Browse Source 
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2022-11-28 15:05:25 +00:00
committed by Compute-Runtime-Automation
parent fb8aa01a01
commit d7e4117dcf
35 changed files with 148 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
shared/source/built_ins/built_ins_storage.cpp
View File

@@ -80,6 +80,7 @@ std::string createBuiltinResourceName(EBuiltInOps::Type builtin, const std::stri
StackVec<std::string, 3> getBuiltinResourceNames(EBuiltInOps::Type builtin, BuiltinCode::ECodeType type, const Device &device) {
auto &hwInfo = device.getHardwareInfo();
auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
auto &productHelper = device.getRootDeviceEnvironment().getHelper<ProductHelper>();
const auto platformName = getFamilyNameWithType(hwInfo);
const auto revisionId = std::to_string(hwInfo.platform.usRevId);
@@ -114,7 +115,7 @@ StackVec<std::string, 3> getBuiltinResourceNames(EBuiltInOps::Type builtin, Buil
const bool requiresSpecificResource = (BuiltinCode::ECodeType::Binary == type && hwHelper.isRevisionSpecificBinaryBuiltinRequired());
if (false == requiresSpecificResource) {
const auto defaultRevisionId = std::to_string(hwHelper.getDefaultRevisionId(hwInfo));
const auto defaultRevisionId = std::to_string(productHelper.getDefaultRevisionId());
resourcesToLookup.push_back(createBuiltinResourceName(platformName, defaultRevisionId, addressingMode, builtinName, extension));
resourcesToLookup.push_back(createBuiltinResourceName("", "", addressingMode, builtinName, extension));
}

2
shared/source/gen11/hw_info_ehl.cpp
View File

@@ -36,7 +36,7 @@ const RuntimeCapabilityTable EHL::capabilityTable{
0, // sharedSystemMemCapabilities
83.333, // defaultProfilingTimerResolution
MemoryConstants::pageSize, // requiredPreemptionSurfaceSize
"lp", // platformType
"ehl", // platformType
"", // deviceName
PreemptionMode::MidThread, // defaultPreemptionMode
aub_stream::ENGINE_RCS, // defaultEngineType

2
shared/source/gen11/hw_info_icllp.cpp
View File

@@ -36,7 +36,7 @@ const RuntimeCapabilityTable ICLLP::capabilityTable{
0, // sharedSystemMemCapabilities
83.333, // defaultProfilingTimerResolution
MemoryConstants::pageSize, // requiredPreemptionSurfaceSize
"lp", // platformType
"icllp", // platformType
"", // deviceName
PreemptionMode::MidThread, // defaultPreemptionMode
aub_stream::ENGINE_RCS, // defaultEngineType

2
shared/source/gen11/hw_info_lkf.cpp
View File

@@ -36,7 +36,7 @@ const RuntimeCapabilityTable LKF::capabilityTable{
0, // sharedSystemMemCapabilities
83.333, // defaultProfilingTimerResolution
MemoryConstants::pageSize, // requiredPreemptionSurfaceSize
"lp", // platformType
"lkf", // platformType
"", // deviceName
PreemptionMode::MidThread, // defaultPreemptionMode
aub_stream::ENGINE_RCS, // defaultEngineType

2
shared/source/gen12lp/hw_info_adln.cpp
View File

@@ -37,7 +37,7 @@ const RuntimeCapabilityTable ADLN::capabilityTable{
0, // sharedSystemMemCapabilities
83.333, // defaultProfilingTimerResolution
MemoryConstants::pageSize, // requiredPreemptionSurfaceSize
"lp", // platformType
"adln", // platformType
"", // deviceName
PreemptionMode::MidThread, // defaultPreemptionMode
aub_stream::ENGINE_RCS, // defaultEngineType

2
shared/source/gen12lp/hw_info_adlp.cpp
View File

@@ -37,7 +37,7 @@ const RuntimeCapabilityTable ADLP::capabilityTable{
0, // sharedSystemMemCapabilities
83.333, // defaultProfilingTimerResolution
MemoryConstants::pageSize, // requiredPreemptionSurfaceSize
"lp", // platformType
"adlp", // platformType
"", // deviceName
PreemptionMode::MidThread, // defaultPreemptionMode
aub_stream::ENGINE_RCS, // defaultEngineType

2
shared/source/gen12lp/hw_info_adls.cpp
View File

@@ -37,7 +37,7 @@ const RuntimeCapabilityTable ADLS::capabilityTable{
0, // sharedSystemMemCapabilities
83.333, // defaultProfilingTimerResolution
MemoryConstants::pageSize, // requiredPreemptionSurfaceSize
"lp", // platformType
"adls", // platformType
"", // deviceName
PreemptionMode::MidThread, // defaultPreemptionMode
aub_stream::ENGINE_RCS, // defaultEngineType

2
shared/source/gen12lp/hw_info_dg1.cpp
View File

@@ -37,7 +37,7 @@ const RuntimeCapabilityTable DG1::capabilityTable{
0, // sharedSystemMemCapabilities
83.333, // defaultProfilingTimerResolution
MemoryConstants::pageSize, // requiredPreemptionSurfaceSize
"lp", // platformType
"dg1", // platformType
"", // deviceName
PreemptionMode::MidThread, // defaultPreemptionMode
aub_stream::ENGINE_RCS, // defaultEngineType

2
shared/source/gen12lp/hw_info_rkl.cpp
View File

@@ -37,7 +37,7 @@ const RuntimeCapabilityTable RKL::capabilityTable{
0, // sharedSystemMemCapabilities
83.333, // defaultProfilingTimerResolution
MemoryConstants::pageSize, // requiredPreemptionSurfaceSize
"lp", // platformType
"rkl", // platformType
"", // deviceName
PreemptionMode::MidThread, // defaultPreemptionMode
aub_stream::ENGINE_RCS, // defaultEngineType

2
shared/source/gen12lp/hw_info_tgllp.cpp
View File

@@ -37,7 +37,7 @@ const RuntimeCapabilityTable TGLLP::capabilityTable{
0, // sharedSystemMemCapabilities
83.333, // defaultProfilingTimerResolution
MemoryConstants::pageSize, // requiredPreemptionSurfaceSize
"lp", // platformType
"tgllp", // platformType
"", // deviceName
PreemptionMode::MidThread, // defaultPreemptionMode
aub_stream::ENGINE_RCS, // defaultEngineType

2
shared/source/gen8/hw_info_bdw.cpp
View File

@@ -36,7 +36,7 @@ const RuntimeCapabilityTable BDW::capabilityTable{
0, // sharedSystemMemCapabilities
80, // defaultProfilingTimerResolution
MemoryConstants::pageSize, // requiredPreemptionSurfaceSize
"core", // platformType
"bdw", // platformType
"", // deviceName
PreemptionMode::Disabled, // defaultPreemptionMode
aub_stream::ENGINE_RCS, // defaultEngineType

5
shared/source/gen9/cfl/os_agnostic_hw_info_config_cfl.inl
View File

@@ -35,4 +35,9 @@ std::optional<aub_stream::ProductFamily> HwInfoConfigHw<gfxProduct>::getAubStrea
return aub_stream::ProductFamily::Cfl;
};
template <>
uint32_t HwInfoConfigHw<gfxProduct>::getDefaultRevisionId() const {
return 9u;
}
} // namespace NEO

8
shared/source/gen9/hw_helper_gen9.cpp
View File

@@ -36,14 +36,6 @@ int32_t HwHelperHw<Family>::getDefaultThreadArbitrationPolicy() const {
return ThreadArbitrationPolicy::RoundRobin;
}
template <>
uint32_t HwHelperHw<Family>::getDefaultRevisionId(const HardwareInfo &hwInfo) const {
if (std::strcmp(hwInfo.capabilityTable.platformType, "core") == 0) {
return 9u;
}
return 0u;
}
template <>
bool MemorySynchronizationCommands<Family>::isBarrierWaRequired(const HardwareInfo &hwInfo) { return true; }

2
shared/source/gen9/hw_info_bxt.cpp
View File

@@ -36,7 +36,7 @@ const RuntimeCapabilityTable BXT::capabilityTable{
0, // sharedSystemMemCapabilities
52.083, // defaultProfilingTimerResolution
MemoryConstants::pageSize, // requiredPreemptionSurfaceSize
"lp", // platformType
"bxt", // platformType
"", // deviceName
PreemptionMode::MidThread, // defaultPreemptionMode
aub_stream::ENGINE_RCS, // defaultEngineType

2
shared/source/gen9/hw_info_cfl.cpp
View File

@@ -36,7 +36,7 @@ const RuntimeCapabilityTable CFL::capabilityTable{
0, // sharedSystemMemCapabilities
83.333, // defaultProfilingTimerResolution
MemoryConstants::pageSize, // requiredPreemptionSurfaceSize
"core", // platformType
"cfl", // platformType
"", // deviceName
PreemptionMode::MidThread, // defaultPreemptionMode
aub_stream::ENGINE_RCS, // defaultEngineType

2
shared/source/gen9/hw_info_glk.cpp
View File

@@ -36,7 +36,7 @@ const RuntimeCapabilityTable GLK::capabilityTable{
0, // sharedSystemMemCapabilities
52.083, // defaultProfilingTimerResolution
MemoryConstants::pageSize, // requiredPreemptionSurfaceSize
"lp", // platformType
"glk", // platformType
"", // deviceName
PreemptionMode::MidThread, // defaultPreemptionMode
aub_stream::ENGINE_RCS, // defaultEngineType

2
shared/source/gen9/hw_info_kbl.cpp
View File

@@ -36,7 +36,7 @@ const RuntimeCapabilityTable KBL::capabilityTable{
0, // sharedSystemMemCapabilities
83.333, // defaultProfilingTimerResolution
MemoryConstants::pageSize, // requiredPreemptionSurfaceSize
"core", // platformType
"kbl", // platformType
"", // deviceName
PreemptionMode::MidThread, // defaultPreemptionMode
aub_stream::ENGINE_RCS, // defaultEngineType

2
shared/source/gen9/hw_info_skl.cpp
View File

@@ -36,7 +36,7 @@ const RuntimeCapabilityTable SKL::capabilityTable{
0, // sharedSystemMemCapabilities
83.333, // defaultProfilingTimerResolution
MemoryConstants::pageSize, // requiredPreemptionSurfaceSize
"core", // platformType
"skl", // platformType
"", // deviceName
PreemptionMode::MidThread, // defaultPreemptionMode
aub_stream::ENGINE_RCS, // defaultEngineType

5
shared/source/gen9/kbl/os_agnostic_hw_info_config_kbl.inl
View File

@@ -32,4 +32,9 @@ std::optional<aub_stream::ProductFamily> HwInfoConfigHw<gfxProduct>::getAubStrea
return aub_stream::ProductFamily::Kbl;
};
template <>
uint32_t HwInfoConfigHw<gfxProduct>::getDefaultRevisionId() const {
return 9u;
}
} // namespace NEO

5
shared/source/gen9/skl/os_agnostic_hw_info_config_skl.inl
View File

@@ -18,4 +18,9 @@ std::optional<aub_stream::ProductFamily> HwInfoConfigHw<gfxProduct>::getAubStrea
return aub_stream::ProductFamily::Skl;
};
template <>
uint32_t HwInfoConfigHw<gfxProduct>::getDefaultRevisionId() const {
return 9u;
}
} // namespace NEO

3
shared/source/helpers/hw_helper.h
View File

@@ -113,7 +113,6 @@ class HwHelper {
virtual bool isCpuImageTransferPreferred(const HardwareInfo &hwInfo) const = 0;
virtual bool isKmdMigrationSupported(const HardwareInfo &hwInfo) const = 0;
virtual aub_stream::MMIOList getExtraMmioList(const HardwareInfo &hwInfo, const GmmHelper &gmmHelper) const = 0;
virtual uint32_t getDefaultRevisionId(const HardwareInfo &hwInfo) const = 0;
virtual uint32_t getNumCacheRegions() const = 0;
virtual bool isSubDeviceEngineSupported(const HardwareInfo &hwInfo, const DeviceBitfield &deviceBitfield, aub_stream::EngineType engineType) const = 0;
virtual uint32_t getPlanarYuvMaxHeight() const = 0;
@@ -318,8 +317,6 @@ class HwHelperHw : public HwHelper {
aub_stream::MMIOList getExtraMmioList(const HardwareInfo &hwInfo, const GmmHelper &gmmHelper) const override;
uint32_t getDefaultRevisionId(const HardwareInfo &hwInfo) const override;
uint32_t getNumCacheRegions() const override;
bool isSubDeviceEngineSupported(const HardwareInfo &hwInfo, const DeviceBitfield &deviceBitfield, aub_stream::EngineType engineType) const override;

5
shared/source/helpers/hw_helper_base.inl
View File

@@ -619,11 +619,6 @@ bool HwHelperHw<GfxFamily>::isAdditionalFeatureFlagRequired(const FeatureTable *
return false;
}
template <typename GfxFamily>
uint32_t HwHelperHw<GfxFamily>::getDefaultRevisionId(const HardwareInfo &hwInfo) const {
return 0u;
}
template <typename GfxFamily>
uint32_t HwHelperHw<GfxFamily>::getNumCacheRegions() const {
return 0;

2
shared/source/os_interface/hw_info_config.h
View File

@@ -180,6 +180,7 @@ class HwInfoConfig {
virtual void fillFrontEndPropertiesSupportStructure(FrontEndPropertiesSupport &propertiesSupport, const HardwareInfo &hwInfo) = 0;
virtual void fillPipelineSelectPropertiesSupportStructure(PipelineSelectPropertiesSupport &propertiesSupport, const HardwareInfo &hwInfo) = 0;
virtual void fillStateBaseAddressPropertiesSupportStructure(StateBaseAddressPropertiesSupport &propertiesSupport, const HardwareInfo &hwInfo) = 0;
virtual uint32_t getDefaultRevisionId() const = 0;
MOCKABLE_VIRTUAL ~HwInfoConfig() = default;
@@ -320,6 +321,7 @@ class HwInfoConfigHw : public HwInfoConfig {
void fillFrontEndPropertiesSupportStructure(FrontEndPropertiesSupport &propertiesSupport, const HardwareInfo &hwInfo) override;
void fillPipelineSelectPropertiesSupportStructure(PipelineSelectPropertiesSupport &propertiesSupport, const HardwareInfo &hwInfo) override;
void fillStateBaseAddressPropertiesSupportStructure(StateBaseAddressPropertiesSupport &propertiesSupport, const HardwareInfo &hwInfo) override;
uint32_t getDefaultRevisionId() const override;
protected:
HwInfoConfigHw() = default;

5
shared/source/os_interface/hw_info_config.inl
View File

@@ -679,4 +679,9 @@ void HwInfoConfigHw<gfxProduct>::fillPipelineSelectPropertiesSupportStructure(Pi
propertiesSupport.systolicMode = isSystolicModeConfigurable(hwInfo);
}
template <PRODUCT_FAMILY gfxProduct>
uint32_t HwInfoConfigHw<gfxProduct>::getDefaultRevisionId() const {
return 0u;
}
} // namespace NEO

15
shared/test/unit_test/built_ins/builtin_tests.cpp
View File

@@ -23,9 +23,10 @@ HWTEST2_F(BuiltInSharedTest, givenUseBindlessBuiltinDisabledWhenBinExtensionPass
DebugManagerStateRestore dbgRestorer;
DebugManager.flags.UseBindlessMode.set(0);
auto &hwInfo = *pDevice->getRootDeviceEnvironment().getMutableHardwareInfo();
auto &productHelper = pDevice->getRootDeviceEnvironment().getHelper<ProductHelper>();
const std::string platformName = getFamilyNameWithType(hwInfo);
const std::string revId = std::to_string(hwInfo.platform.usRevId);
const std::string defaultRevId = std::to_string(HwHelper::get(hwInfo.platform.eRenderCoreFamily).getDefaultRevisionId(hwInfo));
const std::string defaultRevId = std::to_string(productHelper.getDefaultRevisionId());
auto resourceNames = getBuiltinResourceNames(EBuiltInOps::CopyBufferToBuffer, BuiltinCode::ECodeType::Binary, *pDevice);
@@ -42,9 +43,10 @@ HWTEST2_F(BuiltInSharedTest, givenUseBindlessBuiltinEnabledWhenBinExtensionPasse
DebugManagerStateRestore dbgRestorer;
DebugManager.flags.UseBindlessMode.set(1);
auto &hwInfo = *pDevice->getRootDeviceEnvironment().getMutableHardwareInfo();
auto &productHelper = pDevice->getRootDeviceEnvironment().getHelper<ProductHelper>();
const std::string platformName = getFamilyNameWithType(hwInfo);
const std::string revId = std::to_string(hwInfo.platform.usRevId);
const std::string defaultRevId = std::to_string(HwHelper::get(hwInfo.platform.eRenderCoreFamily).getDefaultRevisionId(hwInfo));
const std::string defaultRevId = std::to_string(productHelper.getDefaultRevisionId());
auto resourceNames = getBuiltinResourceNames(EBuiltInOps::CopyBufferToBuffer, BuiltinCode::ECodeType::Binary, *pDevice);
@@ -85,9 +87,10 @@ HWTEST2_F(BuiltInSharedTest, GivenBuiltinTypeBinaryWhenGettingBuiltinResourceFor
HWTEST2_F(BuiltInSharedTest, GivenStatelessBuiltinWhenGettingResourceNameThenAddressingIsStateless, HasStatefulSupport) {
auto &hwInfo = *pDevice->getRootDeviceEnvironment().getMutableHardwareInfo();
auto &productHelper = pDevice->getRootDeviceEnvironment().getHelper<ProductHelper>();
const std::string platformName = getFamilyNameWithType(hwInfo);
const std::string revId = std::to_string(hwInfo.platform.usRevId);
const std::string defaultRevId = std::to_string(HwHelper::get(hwInfo.platform.eRenderCoreFamily).getDefaultRevisionId(hwInfo));
const std::string defaultRevId = std::to_string(productHelper.getDefaultRevisionId());
auto resourceNames = getBuiltinResourceNames(EBuiltInOps::CopyBufferToBufferStateless, BuiltinCode::ECodeType::Binary, *pDevice);
@@ -122,9 +125,10 @@ HWTEST_F(BuiltInSharedTest, GivenRequestedTypeIntermediateWhenGettingResourceNam
DebugManagerStateRestore dbgRestorer;
DebugManager.flags.UseBindlessMode.set(0);
auto &hwInfo = *pDevice->getRootDeviceEnvironment().getMutableHardwareInfo();
auto &productHelper = pDevice->getRootDeviceEnvironment().getHelper<ProductHelper>();
const std::string platformName = getFamilyNameWithType(hwInfo);
const std::string revId = std::to_string(hwInfo.platform.usRevId);
const std::string defaultRevId = std::to_string(HwHelper::get(hwInfo.platform.eRenderCoreFamily).getDefaultRevisionId(hwInfo));
const std::string defaultRevId = std::to_string(productHelper.getDefaultRevisionId());
auto resourceNames = getBuiltinResourceNames(EBuiltInOps::CopyBufferToBuffer, BuiltinCode::ECodeType::Intermediate, *pDevice);
@@ -147,9 +151,10 @@ HWTEST_F(BuiltInSharedTest, GivenValidBuiltinTypeAndAnyTypeWhenGettingBuiltinCod
auto builtinsLib = std::make_unique<MockBuiltinsLib>();
auto &hwInfo = *pDevice->getRootDeviceEnvironment().getMutableHardwareInfo();
auto &productHelper = pDevice->getRootDeviceEnvironment().getHelper<ProductHelper>();
const std::string platformName = getFamilyNameWithType(hwInfo);
const std::string revId = std::to_string(hwInfo.platform.usRevId);
const std::string defaultRevId = std::to_string(HwHelper::get(hwInfo.platform.eRenderCoreFamily).getDefaultRevisionId(hwInfo));
const std::string defaultRevId = std::to_string(productHelper.getDefaultRevisionId());
auto builtinCode = builtinsLib->getBuiltinCode(EBuiltInOps::CopyBufferToBuffer, BuiltinCode::ECodeType::Any, *pDevice);
EXPECT_EQ(BuiltinCode::ECodeType::Binary, builtinCode.type);

5
shared/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp
View File

@@ -20,6 +20,11 @@ using namespace NEO;
using CflProductHelper = HwInfoConfigTest;
HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, whenGettingDefaultRevisionIdThenZeroIsReturned, IGFX_COFFEELAKE)
CFLTEST_F(CflProductHelper, whenGettingDefaultRevisionIdThen9IsReturned) {
EXPECT_EQ(9u, productHelper->getDefaultRevisionId());
}
CFLTEST_F(CflProductHelper, GivenIncorrectDataWhenConfiguringHwInfoThenErrorIsReturned) {
GT_SYSTEM_INFO &gtSystemInfo = pInHwInfo.gtSystemInfo;

5
shared/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp
View File

@@ -18,6 +18,11 @@ using namespace NEO;
using KblProductHelper = HwInfoConfigTest;
HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, whenGettingDefaultRevisionIdThenZeroIsReturned, IGFX_KABYLAKE)
KBLTEST_F(KblProductHelper, whenGettingDefaultRevisionIdThen9IsReturned) {
EXPECT_EQ(9u, productHelper->getDefaultRevisionId());
}
KBLTEST_F(KblProductHelper, GivenIncorrectDataWhenConfiguringHwInfoThenErrorIsReturned) {
GT_SYSTEM_INFO &gtSystemInfo = pInHwInfo.gtSystemInfo;

5
shared/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp
View File

@@ -18,6 +18,11 @@
using namespace NEO;
using SklProductHelper = HwInfoConfigTest;
HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, whenGettingDefaultRevisionIdThenZeroIsReturned, IGFX_SKYLAKE)
SKLTEST_F(SklProductHelper, whenGettingDefaultRevisionIdThen9IsReturned) {
EXPECT_EQ(9u, productHelper->getDefaultRevisionId());
}
SKLTEST_F(SklProductHelper, GivenIncorrectDataWhenConfiguringHwInfoThenErrorIsReturned) {
GT_SYSTEM_INFO &gtSystemInfo = pInHwInfo.gtSystemInfo;

11
shared/test/unit_test/helpers/hw_helper_tests.cpp
View File

@@ -1149,17 +1149,6 @@ TEST_F(HwHelperTest, whenFtrGpGpuMidThreadLevelPreemptFeatureDisabledThenFalseIs
EXPECT_FALSE(result);
}
HWTEST_F(HwHelperTest, whenGettingDefaultRevisionIdThenCorrectValueIsReturned) {
auto &hwHelper = HwHelper::get(renderCoreFamily);
auto revisionId = hwHelper.getDefaultRevisionId(*defaultHwInfo);
if ((defaultHwInfo->platform.eRenderCoreFamily == IGFX_GEN9_CORE) &&
(strcmp(defaultHwInfo->capabilityTable.platformType, "core") == 0)) {
EXPECT_EQ(9u, revisionId);
} else {
EXPECT_EQ(0u, revisionId);
}
}
HWTEST_F(HwHelperTest, whenGettingNumberOfCacheRegionsThenReturnZero) {
auto &hwHelper = HwHelper::get(renderCoreFamily);
EXPECT_EQ(0u, hwHelper.getNumCacheRegions());

4
shared/test/unit_test/os_interface/hw_info_config_tests.cpp
View File

@@ -46,6 +46,10 @@ HWTEST_F(HwInfoConfigTest, givenDebugFlagSetWhenAskingForHostMemCapabilitesThenR
EXPECT_NE(0u, hwInfoConfig->getHostMemCapabilities(&pInHwInfo));
}
HWTEST_F(HwInfoConfigTest, whenGettingDefaultRevisionIdThenZeroIsReturned) {
EXPECT_EQ(0u, productHelper->getDefaultRevisionId());
}
HWTEST_F(HwInfoConfigTest, givenHwInfoConfigWhenGettingSharedSystemMemCapabilitiesThenCorrectValueIsReturned) {
DebugManagerStateRestore restore;