Revert "Fix for task count hang issue"

This reverts commit 340ba8bf56.

Signed-off-by: Jaime Arteaga <jaime.a.arteaga.molina@intel.com>
This commit is contained in:
Jaime Arteaga
2022-05-25 10:19:53 -07:00
committed by Compute-Runtime-Automation
parent 8812f6250b
commit 359e848dbe
8 changed files with 27 additions and 123 deletions

View File

@@ -103,10 +103,6 @@ SubmissionStatus CommandStreamReceiver::submitBatchBuffer(BatchBuffer &batchBuff
this->latestSentTaskCount = taskCount + 1;
SubmissionStatus retVal = this->flush(batchBuffer, allocationsForResidency);
if (retVal != NEO::SubmissionStatus::SUCCESS) {
return retVal;
}
if (!isUpdateTagFromWaitEnabled()) {
this->latestFlushedTaskCount = taskCount + 1;
}

View File

@@ -246,12 +246,9 @@ int DrmCommandStreamReceiver<GfxFamily>::exec(const BatchBuffer &batchBuffer, ui
template <typename GfxFamily>
void DrmCommandStreamReceiver<GfxFamily>::processResidency(const ResidencyContainer &inputAllocationsForResidency, uint32_t handleId) {
if ((!drm->isVmBindAvailable()) || (DebugManager.flags.PassBoundBOToExec.get() == 1)) {
for (auto &alloc : inputAllocationsForResidency) {
auto drmAlloc = static_cast<DrmAllocation *>(alloc);
drmAlloc->makeBOsResident(osContext, handleId, &this->residency, false);
}
for (auto &alloc : inputAllocationsForResidency) {
auto drmAlloc = static_cast<DrmAllocation *>(alloc);
drmAlloc->makeBOsResident(osContext, handleId, &this->residency, false);
}
}

View File

@@ -104,7 +104,6 @@ MemoryOperationsStatus DrmMemoryOperationsHandlerBind::isResident(Device *device
}
MemoryOperationsStatus DrmMemoryOperationsHandlerBind::mergeWithResidencyContainer(OsContext *osContext, ResidencyContainer &residencyContainer) {
if (DebugManager.flags.MakeEachAllocationResident.get() == 2) {
auto memoryManager = static_cast<DrmMemoryManager *>(this->rootDeviceEnvironment.executionEnvironment.memoryManager.get());
@@ -118,6 +117,15 @@ MemoryOperationsStatus DrmMemoryOperationsHandlerBind::mergeWithResidencyContain
return retVal;
}
auto clearContainer = true;
if (DebugManager.flags.PassBoundBOToExec.get() != -1) {
clearContainer = !DebugManager.flags.PassBoundBOToExec.get();
}
if (clearContainer) {
residencyContainer.clear();
}
return MemoryOperationsStatus::SUCCESS;
}