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

refactor: remove not needed code

Browse Source 
Signed-off-by: Michal Mrozek <michal.mrozek@intel.com>
This commit is contained in:
Michal Mrozek
2025-03-19 12:12:45 +00:00
committed by Compute-Runtime-Automation
parent 724ba20e41
commit 6a9716b81c
6 changed files with 5 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
level_zero/core/source/cmdlist/cmdlist_hw.inl
View File

@@ -2031,20 +2031,6 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendMemoryPrefetch(const voi
}
}
if (NEO::debugManager.flags.AddStatePrefetchCmdToMemoryPrefetchAPI.get() != 1) {
return ZE_RESULT_SUCCESS;
}
auto gpuAlloc = allocData->gpuAllocations.getGraphicsAllocation(device->getRootDeviceIndex());
commandContainer.addToResidencyContainer(gpuAlloc);
size_t offset = ptrDiff(ptr, gpuAlloc->getGpuAddress());
NEO::LinearStream &cmdStream = *commandContainer.getCommandStream();
NEO::EncodeMemoryPrefetch<GfxFamily>::programMemoryPrefetch(cmdStream, *gpuAlloc, static_cast<uint32_t>(size), offset, device->getNEODevice()->getRootDeviceEnvironment());
return ZE_RESULT_SUCCESS;
}

21
level_zero/core/test/unit_tests/xe_hpc_core/pvc/test_cmdlist_pvc.cpp
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2022-2024 Intel Corporation
* Copyright (C) 2022-2025 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -18,25 +18,6 @@
namespace L0 {
namespace ult {
using CommandListStatePrefetchPvcXt = Test<CommandListStatePrefetchXeHpcCore>;
PVCTEST_F(CommandListStatePrefetchPvcXt, givenCommandBufferIsExhaustedWhenPrefetchApiCalledAndIsPvcXtNotBaseDieA0ThenProgramStatePrefetch) {
auto hwInfo = device->getNEODevice()->getRootDeviceEnvironment().getMutableHardwareInfo();
auto &productHelper = device->getProductHelper();
hwInfo->platform.usDeviceID = pvcXtDeviceIds.front();
hwInfo->platform.usRevId = productHelper.getHwRevIdFromStepping(REVISION_B, *hwInfo); // not BD A0
checkIfCommandBufferIsExhaustedWhenPrefetchApiCalledThenStatePrefetchProgrammed(hwInfo);
}
PVCTEST_F(CommandListStatePrefetchPvcXt, givenDebugFlagSetWhenPrefetchApiCalledAndIsPvcXtNotBaseDieA0ThenProgramStatePrefetch) {
auto hwInfo = device->getNEODevice()->getRootDeviceEnvironment().getMutableHardwareInfo();
auto &productHelper = device->getProductHelper();
hwInfo = device->getNEODevice()->getRootDeviceEnvironment().getMutableHardwareInfo();
hwInfo->platform.usDeviceID = pvcXtDeviceIds.front();
hwInfo->platform.usRevId = productHelper.getHwRevIdFromStepping(REVISION_B, *hwInfo); // not BD A0
checkIfDebugFlagSetWhenPrefetchApiCalledAThenStatePrefetchProgrammed(hwInfo);
}
using CommandListEventFenceTestsPvc = Test<ModuleFixture>;
PVCTEST_F(CommandListEventFenceTestsPvc, givenCommandListWithProfilingEventAfterCommandOnPvcRev00ThenMiFenceIsNotAdded) {

102
level_zero/core/test/unit_tests/xe_hpc_core/xe_hpc_core_test_l0_fixtures.cpp
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2022-2023 Intel Corporation
* Copyright (C) 2022-2025 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -26,102 +26,4 @@ void DeviceFixtureXeHpcTests::checkIfCallingGetMemoryPropertiesWithNonNullPtrThe
EXPECT_EQ(1u, count);
EXPECT_EQ(memProperties.maxClockRate, 0u);
}
void CommandListStatePrefetchXeHpcCore::checkIfDebugFlagSetWhenPrefetchApiCalledAThenStatePrefetchProgrammed(HardwareInfo *hwInfo) {
using STATE_PREFETCH = typename XeHpcCoreFamily::STATE_PREFETCH;
DebugManagerStateRestore restore;
auto pCommandList = std::make_unique<WhiteBox<::L0::CommandListCoreFamily<IGFX_XE_HPC_CORE>>>();
auto result = pCommandList->initialize(device, NEO::EngineGroupType::compute, 0u);
ASSERT_EQ(ZE_RESULT_SUCCESS, result);
constexpr size_t size = MemoryConstants::cacheLineSize * 2;
constexpr size_t alignment = MemoryConstants::pageSize64k;
constexpr size_t offset = MemoryConstants::cacheLineSize;
constexpr uint32_t mocsIndexForL3 = (2 << 1);
void *ptr = nullptr;
ze_device_mem_alloc_desc_t deviceDesc = {};
context->allocDeviceMem(device->toHandle(), &deviceDesc, size + offset, alignment, &ptr);
EXPECT_NE(nullptr, ptr);
auto cmdListBaseOffset = pCommandList->commandContainer.getCommandStream()->getUsed();
{
auto ret = pCommandList->appendMemoryPrefetch(ptrOffset(ptr, offset), size);
EXPECT_EQ(ZE_RESULT_SUCCESS, ret);
EXPECT_EQ(cmdListBaseOffset, pCommandList->commandContainer.getCommandStream()->getUsed());
}
{
debugManager.flags.AddStatePrefetchCmdToMemoryPrefetchAPI.set(1);
auto ret = pCommandList->appendMemoryPrefetch(ptrOffset(ptr, offset), size);
EXPECT_EQ(ZE_RESULT_SUCCESS, ret);
EXPECT_EQ(cmdListBaseOffset + sizeof(STATE_PREFETCH), pCommandList->commandContainer.getCommandStream()->getUsed());
auto statePrefetchCmd = reinterpret_cast<STATE_PREFETCH *>(ptrOffset(pCommandList->commandContainer.getCommandStream()->getCpuBase(), cmdListBaseOffset));
EXPECT_EQ(statePrefetchCmd->getAddress(), reinterpret_cast<uint64_t>(ptrOffset(ptr, offset)));
EXPECT_FALSE(statePrefetchCmd->getKernelInstructionPrefetch());
EXPECT_EQ(mocsIndexForL3, statePrefetchCmd->getMemoryObjectControlState());
EXPECT_EQ(1u, statePrefetchCmd->getPrefetchSize());
EXPECT_EQ(reinterpret_cast<uint64_t>(ptr), pCommandList->commandContainer.getResidencyContainer().back()->getGpuAddress());
}
context->freeMem(ptr);
}
void CommandListStatePrefetchXeHpcCore::checkIfCommandBufferIsExhaustedWhenPrefetchApiCalledThenStatePrefetchProgrammed(HardwareInfo *hwInfo) {
using STATE_PREFETCH = typename XeHpcCoreFamily::STATE_PREFETCH;
using MI_BATCH_BUFFER_END = typename XeHpcCoreFamily::MI_BATCH_BUFFER_END;
DebugManagerStateRestore restore;
debugManager.flags.DispatchCmdlistCmdBufferPrimary.set(0);
auto pCommandList = std::make_unique<WhiteBox<::L0::CommandListCoreFamily<IGFX_XE_HPC_CORE>>>();
auto result = pCommandList->initialize(device, NEO::EngineGroupType::compute, 0u);
ASSERT_EQ(ZE_RESULT_SUCCESS, result);
constexpr size_t size = MemoryConstants::cacheLineSize * 2;
constexpr size_t alignment = MemoryConstants::pageSize64k;
constexpr size_t offset = MemoryConstants::cacheLineSize;
constexpr uint32_t mocsIndexForL3 = (2 << 1);
void *ptr = nullptr;
ze_device_mem_alloc_desc_t deviceDesc = {};
context->allocDeviceMem(device->toHandle(), &deviceDesc, size + offset, alignment, &ptr);
EXPECT_NE(nullptr, ptr);
auto firstBatchBufferAllocation = pCommandList->commandContainer.getCommandStream()->getGraphicsAllocation();
auto useSize = pCommandList->commandContainer.getCommandStream()->getAvailableSpace();
useSize -= sizeof(MI_BATCH_BUFFER_END);
pCommandList->commandContainer.getCommandStream()->getSpace(useSize);
debugManager.flags.AddStatePrefetchCmdToMemoryPrefetchAPI.set(1);
auto ret = pCommandList->appendMemoryPrefetch(ptrOffset(ptr, offset), size);
EXPECT_EQ(ZE_RESULT_SUCCESS, ret);
auto secondBatchBufferAllocation = pCommandList->commandContainer.getCommandStream()->getGraphicsAllocation();
EXPECT_NE(firstBatchBufferAllocation, secondBatchBufferAllocation);
auto statePrefetchCmd = reinterpret_cast<STATE_PREFETCH *>(pCommandList->commandContainer.getCommandStream()->getCpuBase());
EXPECT_EQ(statePrefetchCmd->getAddress(), reinterpret_cast<uint64_t>(ptrOffset(ptr, offset)));
EXPECT_FALSE(statePrefetchCmd->getKernelInstructionPrefetch());
EXPECT_EQ(mocsIndexForL3, statePrefetchCmd->getMemoryObjectControlState());
EXPECT_EQ(1u, statePrefetchCmd->getPrefetchSize());
NEO::ResidencyContainer::iterator it = pCommandList->commandContainer.getResidencyContainer().end();
it--;
EXPECT_EQ(secondBatchBufferAllocation->getGpuAddress(), (*it)->getGpuAddress());
it--;
EXPECT_EQ(reinterpret_cast<uint64_t>(ptr), (*it)->getGpuAddress());
context->freeMem(ptr);
}
}

7
level_zero/core/test/unit_tests/xe_hpc_core/xe_hpc_core_test_l0_fixtures.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2022 Intel Corporation
* Copyright (C) 2022-2025 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -19,9 +19,6 @@ struct DeviceFixtureXeHpcTests : public DeviceFixture {
DebugManagerStateRestore restorer;
};
struct CommandListStatePrefetchXeHpcCore : public ModuleFixture {
void checkIfDebugFlagSetWhenPrefetchApiCalledAThenStatePrefetchProgrammed(HardwareInfo *hwInfo);
void checkIfCommandBufferIsExhaustedWhenPrefetchApiCalledThenStatePrefetchProgrammed(HardwareInfo *hwInfo);
};
struct CommandListStatePrefetchXeHpcCore : public ModuleFixture {};
} // namespace ult
} // namespace L0