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

fix: add missing call make resident for dummy blit allocation

Browse Source 
Resolves: HSD-18028732286
Signed-off-by: Katarzyna Cencelewska <katarzyna.cencelewska@intel.com>
This commit is contained in:
Katarzyna Cencelewska
2023-04-05 16:25:14 +00:00
committed by Compute-Runtime-Automation
parent 31983ec043
commit 1dc3b9b1e1
3 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
level_zero/core/source/cmdlist/cmdlist.cpp
View File

@@ -11,6 +11,7 @@
#include "shared/source/command_stream/preemption.h"
#include "shared/source/debug_settings/debug_settings_manager.h"
#include "shared/source/device/device_info.h"
#include "shared/source/execution_environment/root_device_environment.h"
#include "shared/source/memory_manager/graphics_allocation.h"
#include "shared/source/memory_manager/internal_allocation_storage.h"
#include "shared/source/memory_manager/memory_manager.h"
@@ -191,4 +192,12 @@ void CommandList::synchronizeEventList(uint32_t numWaitEvents, ze_event_handle_t
}
}
void CommandList::makeResidentDummyAllocation() {
if (isCopyOnly()) {
const auto &rootDeviceEnvironment = device->getNEODevice()->getRootDeviceEnvironment();
auto dummyAllocation = rootDeviceEnvironment.getDummyAllocation();
commandContainer.addToResidencyContainer(dummyAllocation);
}
}
} // namespace L0

1
level_zero/core/source/cmdlist/cmdlist.h
View File

@@ -350,6 +350,7 @@ struct CommandList : _ze_command_list_handle_t {
bool getDcFlushRequired(bool externalCondition) const {
return externalCondition ? dcFlushSupport : false;
}
void makeResidentDummyAllocation();
MOCKABLE_VIRTUAL void synchronizeEventList(uint32_t numWaitEvents, ze_event_handle_t *waitEventList);
std::map<const void *, NEO::GraphicsAllocation *> hostPtrMap;

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

@@ -1064,10 +1064,8 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendMemoryCopyBlit(uintptr_t
NEO::BlitPropertiesContainer blitPropertiesContainer{blitProperties};
auto &rootDeviceEnvironment = device->getNEODevice()->getExecutionEnvironment()->rootDeviceEnvironments[device->getRootDeviceIndex()];
NEO::BlitCommandsHelper<GfxFamily>::dispatchBlitCommandsForBufferPerRow(blitProperties, *commandContainer.getCommandStream(), this->dummyBlitWa);
auto dummyAllocation = rootDeviceEnvironment->getDummyAllocation();
commandContainer.addToResidencyContainer(dummyAllocation);
makeResidentDummyAllocation();
return ZE_RESULT_SUCCESS;
}
@@ -1113,8 +1111,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendMemoryCopyBlitRegion(Ali
} else {
NEO::BlitCommandsHelper<GfxFamily>::dispatchBlitCommandsForBufferPerRow(blitProperties, *commandContainer.getCommandStream(), this->dummyBlitWa);
}
auto dummyAllocation = rootDeviceEnvironment->getDummyAllocation();
commandContainer.addToResidencyContainer(dummyAllocation);
makeResidentDummyAllocation();
appendSignalEventPostWalker(signalEvent);
return ZE_RESULT_SUCCESS;
@@ -1142,10 +1139,9 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendCopyImageBlit(NEO::Graph
commandContainer.addToResidencyContainer(clearColorAllocation);
appendEventForProfiling(signalEvent, true);
auto &rootDeviceEnvironment = device->getNEODevice()->getExecutionEnvironment()->rootDeviceEnvironments[device->getRootDeviceIndex()];
NEO::BlitCommandsHelper<GfxFamily>::dispatchBlitCommandsForImageRegion(blitProperties, *commandContainer.getCommandStream(), dummyBlitWa);
auto dummyAllocation = rootDeviceEnvironment->getDummyAllocation();
commandContainer.addToResidencyContainer(dummyAllocation);
makeResidentDummyAllocation();
appendSignalEventPostWalker(signalEvent);
return ZE_RESULT_SUCCESS;
@@ -1873,6 +1869,8 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendBlitFill(void *ptr,
*commandContainer.getCommandStream(),
size,
this->dummyBlitWa);
makeResidentDummyAllocation();
appendSignalEventPostWalker(signalEvent);
}
return ZE_RESULT_SUCCESS;
@@ -1906,6 +1904,7 @@ void CommandListCoreFamily<gfxCoreFamily>::appendEventForProfilingCopyCommand(Ev
} else {
NEO::MiFlushArgs args{this->dummyBlitWa};
NEO::EncodeMiFlushDW<GfxFamily>::programWithWa(*commandContainer.getCommandStream(), 0, 0, args);
makeResidentDummyAllocation();
dispatchEventPostSyncOperation(event, Event::STATE_SIGNALED, true, false, false);
}
appendWriteKernelTimestamp(event, beforeWalker, false, false);
@@ -2133,6 +2132,8 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendWaitOnEvents(uint32_t nu
commandContainer.addToResidencyContainer(this->csr->getTagAllocation());
}
makeResidentDummyAllocation();
if (NEO::DebugManager.flags.EnableSWTags.get()) {
neoDevice->getRootDeviceEnvironment().tagsManager->insertTag<GfxFamily, NEO::SWTags::CallNameEndTag>(
*commandContainer.getCommandStream(),
@@ -2252,6 +2253,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendWriteGlobalTimestamp(
reinterpret_cast<uint64_t>(dstptr),
0,
args);
makeResidentDummyAllocation();
} else {
NEO::PipeControlArgs args;
@@ -2744,6 +2746,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendBarrier(ze_event_handle_
}
NEO::EncodeMiFlushDW<GfxFamily>::programWithWa(*commandContainer.getCommandStream(), gpuAddress, value, args);
makeResidentDummyAllocation();
} else {
appendComputeBarrierCommand();
}
@@ -2908,6 +2911,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendWriteToMemory(void *desc
args.commandWithPostSync = true;
NEO::EncodeMiFlushDW<GfxFamily>::programWithWa(*commandContainer.getCommandStream(), gpuAddress,
data, args);
makeResidentDummyAllocation();
} else {
NEO::PipeControlArgs args;
args.dcFlushEnable = getDcFlushRequired(!!descriptor->writeScope);
@@ -2959,6 +2963,7 @@ void CommandListCoreFamily<gfxCoreFamily>::dispatchPostSyncCopy(uint64_t gpuAddr
gpuAddress,
value,
miFlushArgs);
makeResidentDummyAllocation();
}
template <GFXCORE_FAMILY gfxCoreFamily>