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

Revert: "compute events select device memory for xe hpg family"

Browse Source 
This reverts commit 072233d170.

Resolves: HSD-18028222329

Signed-off-by: Zbigniew Zdanowicz <zbigniew.zdanowicz@intel.com>
This commit is contained in:
Zbigniew Zdanowicz
2023-03-13 09:49:23 +00:00
committed by Compute-Runtime-Automation
parent faba16f657
commit b6d0a64638
5 changed files with 17 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
level_zero/core/source/xe_hpg_core/l0_gfx_core_helper_xe_hpg_core.cpp
View File

@@ -24,11 +24,6 @@ bool L0GfxCoreHelperHw<Family>::isResumeWARequired() {
return true;
}
template <>
bool L0GfxCoreHelperHw<Family>::alwaysAllocateEventInLocalMem() const {
return true;
}
template class L0GfxCoreHelperHw<Family>;
} // namespace L0

2
level_zero/core/test/unit_tests/sources/helper/l0_gfx_core_helper_tests.cpp
View File

@@ -697,7 +697,7 @@ HWTEST2_F(L0GfxCoreHelperTest, GivenNonMultiTilePlatformsWhenCheckingL0HelperFor
EXPECT_FALSE(l0GfxCoreHelper.multiTileCapablePlatform());
}
HWTEST2_F(L0GfxCoreHelperTest, whenAlwaysAllocateEventInLocalMemCalledThenReturnFalse, IsNotXeHpgOrXeHpcCore) {
HWTEST2_F(L0GfxCoreHelperTest, whenAlwaysAllocateEventInLocalMemCalledThenReturnFalse, IsNotXeHpcCore) {
MockExecutionEnvironment executionEnvironment;
auto &l0GfxCoreHelper = executionEnvironment.rootDeviceEnvironments[0]->getHelper<L0GfxCoreHelper>();

5
level_zero/core/test/unit_tests/xe_hpg_core/test_l0_gfx_core_helper_xe_hpg_core.cpp
View File

@@ -31,11 +31,6 @@ XE_HPG_CORETEST_F(L0GfxCoreHelperTestXeHpg, GivenXeHpgWhenCheckingL0HelperForMul
EXPECT_FALSE(l0GfxCoreHelper.multiTileCapablePlatform());
}
XE_HPG_CORETEST_F(L0GfxCoreHelperTestXeHpg, GivenXeHpgPlatformsWhenAlwaysAllocateEventInLocalMemCalledThenReturnTrue) {
auto &l0GfxCoreHelper = getHelper<L0GfxCoreHelper>();
EXPECT_TRUE(l0GfxCoreHelper.alwaysAllocateEventInLocalMem());
}
XE_HPG_CORETEST_F(L0GfxCoreHelperTestXeHpg, GivenXeHpgWhenCheckingL0HelperForCmdListHeapSharingSupportThenReturnTrue) {
auto &l0GfxCoreHelper = getHelper<L0GfxCoreHelper>();
EXPECT_TRUE(l0GfxCoreHelper.platformSupportsCmdListHeapSharing());

3
shared/source/helpers/extra_allocation_data_xehp_and_later.inl
View File

@@ -37,8 +37,7 @@ void GfxCoreHelperHw<Family>::setExtraAllocationData(AllocationData &allocationD
} else if (hwInfo.featureTable.flags.ftrLocalMemory &&
(properties.allocationType == AllocationType::COMMAND_BUFFER ||
properties.allocationType == AllocationType::RING_BUFFER ||
properties.allocationType == AllocationType::SEMAPHORE_BUFFER ||
properties.allocationType == AllocationType::TIMESTAMP_PACKET_TAG_BUFFER)) {
properties.allocationType == AllocationType::SEMAPHORE_BUFFER)) {
allocationData.flags.useSystemMemory = false;
allocationData.flags.requiresCpuAccess = true;
}

12
shared/test/unit_test/xe_hpg_core/gfx_core_helper_tests_xe_hpg_core.cpp
View File

@@ -101,13 +101,7 @@ XE_HPG_CORETEST_F(LriHelperTestsXeHpgCore, whenProgrammingLriCommandThenExpectMm
XE_HPG_CORETEST_F(GfxCoreHelperTestXeHpgCore, givenAllocDataWhenSetExtraAllocationDataThenSetLocalMemForProperTypes) {
auto &gfxCoreHelper = getHelper<GfxCoreHelper>();
auto &productHelper = getHelper<ProductHelper>();
auto hwInfo = pDevice->getRootDeviceEnvironment().getMutableHardwareInfo();
hwInfo->platform.usRevId = productHelper.getHwRevIdFromStepping(REVISION_B, *hwInfo);
for (int boolState = 0; boolState < 2; boolState++) {
hwInfo->featureTable.flags.ftrLocalMemory = !!boolState;
for (int type = 0; type < static_cast<int>(AllocationType::COUNT); type++) {
AllocationProperties allocProperties(0, 1, static_cast<AllocationType>(type), {});
AllocationData allocData{};
@@ -116,11 +110,10 @@ XE_HPG_CORETEST_F(GfxCoreHelperTestXeHpgCore, givenAllocDataWhenSetExtraAllocati
gfxCoreHelper.setExtraAllocationData(allocData, allocProperties, pDevice->getRootDeviceEnvironment());
if (hwInfo->featureTable.flags.ftrLocalMemory &&
if (defaultHwInfo->featureTable.flags.ftrLocalMemory &&
(allocProperties.allocationType == AllocationType::COMMAND_BUFFER ||
allocProperties.allocationType == AllocationType::RING_BUFFER ||
allocProperties.allocationType == AllocationType::SEMAPHORE_BUFFER ||
allocProperties.allocationType == AllocationType::TIMESTAMP_PACKET_TAG_BUFFER)) {
allocProperties.allocationType == AllocationType::SEMAPHORE_BUFFER)) {
EXPECT_FALSE(allocData.flags.useSystemMemory);
EXPECT_TRUE(allocData.flags.requiresCpuAccess);
} else {
@@ -129,7 +122,6 @@ XE_HPG_CORETEST_F(GfxCoreHelperTestXeHpgCore, givenAllocDataWhenSetExtraAllocati
}
}
}
}
XE_HPG_CORETEST_F(GfxCoreHelperTestXeHpgCore, GivenVariousValuesWhenAlignSlmSizeIsCalledThenCorrectValueIsReturned) {
auto &gfxCoreHelper = getHelper<GfxCoreHelper>();