intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-20 08:53:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: enable split taskcount from wait only on dg2

Browse Source 
Related-To: NEO-6948

Signed-off-by: Dominik Dabek <dominik.dabek@intel.com>
This commit is contained in:
Dominik Dabek
2022-05-13 12:04:24 +00:00
committed by Compute-Runtime-Automation
parent aae107fb00
commit 5dcdf53d12
16 changed files with 49 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
opencl/source/event/event.cpp
View File

@@ -681,9 +681,10 @@ bool Event::isCompleted() {
} }
bool Event::isWaitForTimestampsEnabled() const { bool Event::isWaitForTimestampsEnabled() const {
const auto &hwHelper = HwHelper::get(cmdQueue->getDevice().getHardwareInfo().platform.eRenderCoreFamily); const auto &hwInfo = cmdQueue->getDevice().getHardwareInfo();
const auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
auto enabled = cmdQueue->isTimestampWaitEnabled(); auto enabled = cmdQueue->isTimestampWaitEnabled();
enabled &= hwHelper.isTimestampWaitSupportedForEvents(); enabled &= hwHelper.isTimestampWaitSupportedForEvents(hwInfo);
switch (DebugManager.flags.EnableTimestampWaitForEvents.get()) { switch (DebugManager.flags.EnableTimestampWaitForEvents.get()) {
case 0: case 0:

5
opencl/test/unit_test/event/event_tests.cpp
View File

@@ -1834,8 +1834,9 @@ TEST(EventTimestampTest, givenEnableTimestampWaitWhenCheckIsTimestampWaitEnabled
{ {
DebugManager.flags.EnableTimestampWaitForEvents.set(-1); DebugManager.flags.EnableTimestampWaitForEvents.set(-1);
const auto &hwHelper = HwHelper::get(mockDevice->getHardwareInfo().platform.eRenderCoreFamily); const auto &hwInfo = mockDevice->getHardwareInfo();
EXPECT_EQ(event.isWaitForTimestampsEnabled(), hwHelper.isTimestampWaitSupportedForEvents()); const auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
EXPECT_EQ(event.isWaitForTimestampsEnabled(), hwHelper.isTimestampWaitSupportedForEvents(hwInfo));
} }
{ {

5
opencl/test/unit_test/os_interface/hw_info_config_tests.cpp
View File

@@ -400,3 +400,8 @@ HWTEST2_F(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfUseChannelRedForUnusedSh
const auto &hwInfoConfig = *HwInfoConfig::get(pInHwInfo.platform.eProductFamily); const auto &hwInfoConfig = *HwInfoConfig::get(pInHwInfo.platform.eProductFamily);
EXPECT_TRUE(hwInfoConfig.useChannelRedForUnusedShaderChannels()); EXPECT_TRUE(hwInfoConfig.useChannelRedForUnusedShaderChannels());
} }
HWTEST2_F(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfIsTimestampWaitSupportedForEventsThenFalseIsReturned, IsNotXeHpgCore) {
const auto &hwInfoConfig = *HwInfoConfig::get(pInHwInfo.platform.eProductFamily);
EXPECT_FALSE(hwInfoConfig.isTimestampWaitSupportedForEvents());
}

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

@@ -64,7 +64,7 @@ class HwHelper {
static bool cacheFlushAfterWalkerSupported(const HardwareInfo &hwInfo); static bool cacheFlushAfterWalkerSupported(const HardwareInfo &hwInfo);
virtual bool timestampPacketWriteSupported() const = 0; virtual bool timestampPacketWriteSupported() const = 0;
virtual bool isTimestampWaitSupportedForQueues() const = 0; virtual bool isTimestampWaitSupportedForQueues() const = 0;
virtual bool isTimestampWaitSupportedForEvents() const = 0; virtual bool isTimestampWaitSupportedForEvents(const HardwareInfo &hwInfo) const = 0;
virtual bool isUpdateTaskCountFromWaitSupported() const = 0; virtual bool isUpdateTaskCountFromWaitSupported() const = 0;
virtual size_t getRenderSurfaceStateSize() const = 0; virtual size_t getRenderSurfaceStateSize() const = 0;
virtual void setRenderSurfaceStateForBuffer(const RootDeviceEnvironment &rootDeviceEnvironment, virtual void setRenderSurfaceStateForBuffer(const RootDeviceEnvironment &rootDeviceEnvironment,
@@ -250,7 +250,7 @@ class HwHelperHw : public HwHelper {
bool isTimestampWaitSupportedForQueues() const override; bool isTimestampWaitSupportedForQueues() const override;
bool isTimestampWaitSupportedForEvents() const override; bool isTimestampWaitSupportedForEvents(const HardwareInfo &hwInfo) const override;
bool isUpdateTaskCountFromWaitSupported() const override; bool isUpdateTaskCountFromWaitSupported() const override;

2
shared/source/helpers/hw_helper_bdw_and_later.inl
View File

@@ -46,7 +46,7 @@ bool HwHelperHw<GfxFamily>::isTimestampWaitSupportedForQueues() const {
} }
template <typename GfxFamily> template <typename GfxFamily>
bool HwHelperHw<GfxFamily>::isTimestampWaitSupportedForEvents() const { bool HwHelperHw<GfxFamily>::isTimestampWaitSupportedForEvents(const HardwareInfo &hwInfo) const {
return false; return false;
} }

2
shared/source/helpers/hw_helper_xehp_and_later.inl
View File

@@ -61,7 +61,7 @@ bool HwHelperHw<GfxFamily>::isTimestampWaitSupportedForQueues() const {
} }
template <typename GfxFamily> template <typename GfxFamily>
bool HwHelperHw<GfxFamily>::isTimestampWaitSupportedForEvents() const { bool HwHelperHw<GfxFamily>::isTimestampWaitSupportedForEvents(const HardwareInfo &hwInfo) const {
return false; return false;
} }

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

@@ -103,6 +103,7 @@ class HwInfoConfig {
virtual bool isIpSamplingSupported(const NEO::HardwareInfo &hwInfo) const = 0; virtual bool isIpSamplingSupported(const NEO::HardwareInfo &hwInfo) const = 0;
virtual bool isGrfNumReportedWithScm() const = 0; virtual bool isGrfNumReportedWithScm() const = 0;
virtual bool isCooperativeEngineSupported(const HardwareInfo &hwInfo) const = 0; virtual bool isCooperativeEngineSupported(const HardwareInfo &hwInfo) const = 0;
virtual bool isTimestampWaitSupportedForEvents() const = 0;
MOCKABLE_VIRTUAL ~HwInfoConfig() = default; MOCKABLE_VIRTUAL ~HwInfoConfig() = default;
@@ -190,6 +191,7 @@ class HwInfoConfigHw : public HwInfoConfig {
bool isIpSamplingSupported(const NEO::HardwareInfo &hwInfo) const override; bool isIpSamplingSupported(const NEO::HardwareInfo &hwInfo) const override;
bool isGrfNumReportedWithScm() const override; bool isGrfNumReportedWithScm() const override;
bool isCooperativeEngineSupported(const HardwareInfo &hwInfo) const override; bool isCooperativeEngineSupported(const HardwareInfo &hwInfo) const override;
bool isTimestampWaitSupportedForEvents() const override;
protected: protected:
HwInfoConfigHw() = default; HwInfoConfigHw() = default;

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

@@ -362,4 +362,9 @@ bool HwInfoConfigHw<gfxProduct>::isCooperativeEngineSupported(const HardwareInfo
return false; return false;
} }
template <PRODUCT_FAMILY gfxProduct>
bool HwInfoConfigHw<gfxProduct>::isTimestampWaitSupportedForEvents() const {
return false;
}
} // namespace NEO } // namespace NEO

2
shared/source/xe_hpc_core/hw_helper_xe_hpc_core.cpp
View File

@@ -450,7 +450,7 @@ bool HwHelperHw<Family>::isTimestampWaitSupportedForQueues() const {
} }
template <> template <>
bool HwHelperHw<Family>::isTimestampWaitSupportedForEvents() const { bool HwHelperHw<Family>::isTimestampWaitSupportedForEvents(const HardwareInfo &hwInfo) const {
return true; return true;
} }

5
shared/source/xe_hpg_core/dg2/os_agnostic_hw_info_config_dg2.inl
View File

@@ -175,3 +175,8 @@ template <>
bool HwInfoConfigHw<gfxProduct>::programAllStateComputeCommandFields() const { bool HwInfoConfigHw<gfxProduct>::programAllStateComputeCommandFields() const {
return true; return true;
} }
template <>
bool HwInfoConfigHw<gfxProduct>::isTimestampWaitSupportedForEvents() const {
return true;
}

5
shared/source/xe_hpg_core/hw_helper_xe_hpg_core.cpp
View File

@@ -131,8 +131,9 @@ inline bool HwHelperHw<Family>::isLinuxCompletionFenceSupported() const {
} }
template <> template <>
bool HwHelperHw<Family>::isTimestampWaitSupportedForEvents() const { bool HwHelperHw<Family>::isTimestampWaitSupportedForEvents(const HardwareInfo &hwInfo) const {
return true; auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
return hwInfoConfig.isTimestampWaitSupportedForEvents();
} }
template class HwHelperHw<Family>; template class HwHelperHw<Family>;

5
shared/test/common/mocks/mock_hw_info_config.cpp
View File

@@ -365,4 +365,9 @@ bool HwInfoConfigHw<IGFX_UNKNOWN>::isCooperativeEngineSupported(const HardwareIn
return false; return false;
} }
template <>
bool HwInfoConfigHw<IGFX_UNKNOWN>::isTimestampWaitSupportedForEvents() const {
return false;
}
} //namespace NEO } //namespace NEO

1
shared/test/common/test_macros/header/common_matchers.h
View File

@@ -16,6 +16,7 @@ using IsXeHpCore = IsGfxCore<IGFX_XE_HP_CORE>;
using IsXeHpgCore = IsGfxCore<IGFX_XE_HPG_CORE>; using IsXeHpgCore = IsGfxCore<IGFX_XE_HPG_CORE>;
using IsXeHpcCore = IsGfxCore<IGFX_XE_HPC_CORE>; using IsXeHpcCore = IsGfxCore<IGFX_XE_HPC_CORE>;
using IsNotXeHpcCore = IsNotGfxCore<IGFX_XE_HPC_CORE>; using IsNotXeHpcCore = IsNotGfxCore<IGFX_XE_HPC_CORE>;
using IsNotXeHpgCore = IsNotGfxCore<IGFX_XE_HPG_CORE>;
using IsAtMostGen11 = IsAtMostGfxCore<IGFX_GEN11LP_CORE>; using IsAtMostGen11 = IsAtMostGfxCore<IGFX_GEN11LP_CORE>;

2
shared/test/unit_test/xe_hpc_core/hw_helper_xe_hpc_core_tests.cpp
View File

@@ -62,7 +62,7 @@ XE_HPC_CORETEST_F(HwHelperXeHpcCoreTest, givenHwHelperWhenGettingIfRevisionSpeci
XE_HPC_CORETEST_F(HwHelperXeHpcCoreTest, givenHwHelperWhenCheckTimestampWaitSupportThenReturnTrue) { XE_HPC_CORETEST_F(HwHelperXeHpcCoreTest, givenHwHelperWhenCheckTimestampWaitSupportThenReturnTrue) {
auto &helper = HwHelper::get(renderCoreFamily); auto &helper = HwHelper::get(renderCoreFamily);
EXPECT_TRUE(helper.isTimestampWaitSupportedForQueues()); EXPECT_TRUE(helper.isTimestampWaitSupportedForQueues());
EXPECT_TRUE(helper.isTimestampWaitSupportedForEvents()); EXPECT_TRUE(helper.isTimestampWaitSupportedForEvents(*defaultHwInfo));
} }
XE_HPC_CORETEST_F(HwHelperXeHpcCoreTest, givenXeHPCPlatformWhenCheckAssignEngineRoundRobinSupportedThenReturnTrue) { XE_HPC_CORETEST_F(HwHelperXeHpcCoreTest, givenXeHPCPlatformWhenCheckAssignEngineRoundRobinSupportedThenReturnTrue) {

9
shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp
View File

@@ -378,6 +378,15 @@ DG2TEST_F(HwInfoConfigTestDg2, givenNotEnabledSliceWhenComputeUnitsUsedForScratc
EXPECT_THROW(hwHelper.getComputeUnitsUsedForScratch(&hwInfo), std::exception); EXPECT_THROW(hwHelper.getComputeUnitsUsedForScratch(&hwInfo), std::exception);
} }
HWTEST_EXCLUDE_PRODUCT(HwHelperTestXeHpgCore, givenHwHelperWhenCheckTimestampWaitSupportThenReturnFalse, IGFX_DG2);
DG2TEST_F(HwInfoConfigTestDg2, givenDG2WhenCheckingIsTimestampWaitSupportedForEventsThenReturnTrue) {
HardwareInfo hwInfo = *defaultHwInfo;
auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
auto &hwInfoConfig = *HwInfoConfig::get(productFamily);
EXPECT_TRUE(hwInfoConfig.isTimestampWaitSupportedForEvents());
EXPECT_TRUE(hwHelper.isTimestampWaitSupportedForEvents(hwInfo));
}
DG2TEST_F(ProductConfigTests, givenDg2G10DeviceIdsWhenConfigIsCheckedThenCorrectValueIsReturned) { DG2TEST_F(ProductConfigTests, givenDg2G10DeviceIdsWhenConfigIsCheckedThenCorrectValueIsReturned) {
for (const auto &deviceId : DG2_G10_IDS) { for (const auto &deviceId : DG2_G10_IDS) {
hwInfo.platform.usDeviceID = deviceId; hwInfo.platform.usDeviceID = deviceId;

4
shared/test/unit_test/xe_hpg_core/hw_helper_tests_xe_hpg_core.cpp
View File

@@ -127,10 +127,10 @@ XE_HPG_CORETEST_F(HwHelperTestXeHpgCore, givenXeHPAndLaterPlatformWhenCheckAssig
EXPECT_FALSE(hwHelper.isAssignEngineRoundRobinSupported()); EXPECT_FALSE(hwHelper.isAssignEngineRoundRobinSupported());
} }
XE_HPG_CORETEST_F(HwHelperTestXeHpgCore, givenHwHelperWhenCheckTimestampWaitSupportThenReturnFalseForQueuesButTrueForEvents) { XE_HPG_CORETEST_F(HwHelperTestXeHpgCore, givenHwHelperWhenCheckTimestampWaitSupportThenReturnFalse) {
auto &helper = HwHelper::get(renderCoreFamily); auto &helper = HwHelper::get(renderCoreFamily);
EXPECT_FALSE(helper.isTimestampWaitSupportedForQueues()); EXPECT_FALSE(helper.isTimestampWaitSupportedForQueues());
EXPECT_TRUE(helper.isTimestampWaitSupportedForEvents()); EXPECT_FALSE(helper.isTimestampWaitSupportedForEvents(*defaultHwInfo));
} }
XE_HPG_CORETEST_F(HwHelperTestXeHpgCore, givenDisablePipeControlFlagIsEnabledWhenLocalMemoryIsEnabledThenReturnTrueAndProgramPipeControl) { XE_HPG_CORETEST_F(HwHelperTestXeHpgCore, givenDisablePipeControlFlagIsEnabledWhenLocalMemoryIsEnabledThenReturnTrueAndProgramPipeControl) {