Split residency task count and always resident flag

Related-To: NEO-5052

Change-Id: I1ae5f40a0e3ccc6fc269278f986709becccdaca6
Signed-off-by: Lukasz Jobczyk <[email protected]>

Author: LukaszJobczyk

opencl/source/os_interface/linux/drm_command_stream.inl

@@ -74,7 +74,7 @@ bool DrmCommandStreamReceiver<GfxFamily>::flush(BatchBuffer &batchBuffer, Reside
     memoryOperationsInterface->mergeWithResidencyContainer(this->osContext, allocationsForResidency);
 
     if (this->directSubmission.get()) {
-        memoryOperationsInterface->makeResidentWithinOsContext(this->osContext, ArrayRef<GraphicsAllocation *>(&batchBuffer.commandBufferAllocation, 1));
+        memoryOperationsInterface->makeResidentWithinOsContext(this->osContext, ArrayRef<GraphicsAllocation *>(&batchBuffer.commandBufferAllocation, 1), true);
         return this->directSubmission->dispatchCommandBuffer(batchBuffer, *this->flushStamp.get());
     }
 

shared/source/os_interface/linux/drm_memory_operations_handler.h

@@ -20,7 +20,7 @@ class DrmMemoryOperationsHandler : public MemoryOperationsHandler {
     DrmMemoryOperationsHandler() = default;
     ~DrmMemoryOperationsHandler() override = default;
 
-    virtual MemoryOperationsStatus makeResidentWithinOsContext(OsContext *osContext, ArrayRef<GraphicsAllocation *> gfxAllocations) = 0;
+    virtual MemoryOperationsStatus makeResidentWithinOsContext(OsContext *osContext, ArrayRef<GraphicsAllocation *> gfxAllocations, bool evictable) = 0;
     virtual MemoryOperationsStatus evictWithinOsContext(OsContext *osContext, GraphicsAllocation &gfxAllocation) = 0;
     virtual void mergeWithResidencyContainer(OsContext *osContext, ResidencyContainer &residencyContainer) = 0;
     virtual std::unique_lock<std::mutex> lockHandlerForExecWA() = 0;

shared/source/os_interface/linux/drm_memory_operations_handler_bind.cpp

@@ -24,20 +24,20 @@ DrmMemoryOperationsHandlerBind::~DrmMemoryOperationsHandlerBind() = default;
 MemoryOperationsStatus DrmMemoryOperationsHandlerBind::makeResident(Device *device, ArrayRef<GraphicsAllocation *> gfxAllocations) {
     auto engines = device->getEngines();
     for (const auto &engine : engines) {
-        this->makeResidentWithinOsContext(engine.osContext, gfxAllocations);
+        this->makeResidentWithinOsContext(engine.osContext, gfxAllocations, false);
     }
     return MemoryOperationsStatus::SUCCESS;
 }
 
-MemoryOperationsStatus DrmMemoryOperationsHandlerBind::makeResidentWithinOsContext(OsContext *osContext, ArrayRef<GraphicsAllocation *> gfxAllocations) {
+MemoryOperationsStatus DrmMemoryOperationsHandlerBind::makeResidentWithinOsContext(OsContext *osContext, ArrayRef<GraphicsAllocation *> gfxAllocations, bool evictable) {
     std::lock_guard<std::mutex> lock(mutex);
     for (auto gfxAllocation = gfxAllocations.begin(); gfxAllocation != gfxAllocations.end(); gfxAllocation++) {
-        if (!(*gfxAllocation)->isAlwaysResident(osContext->getContextId())) {
-            auto drmAllocation = static_cast<DrmAllocation *>(*gfxAllocation);
-            auto &drmContextIds = static_cast<const OsContextLinux *>(osContext)->getDrmContextIds();
-            for (uint32_t drmIterator = 0u; drmIterator < drmContextIds.size(); drmIterator++) {
-                drmAllocation->makeBOsResident(osContext, drmIterator, nullptr, true);
-            }
+        auto drmAllocation = static_cast<DrmAllocation *>(*gfxAllocation);
+        auto &drmContextIds = static_cast<const OsContextLinux *>(osContext)->getDrmContextIds();
+        for (uint32_t drmIterator = 0u; drmIterator < drmContextIds.size(); drmIterator++) {
+            drmAllocation->makeBOsResident(osContext, drmIterator, nullptr, true);
+        }
+        if (!evictable) {
             drmAllocation->updateResidencyTaskCount(GraphicsAllocation::objectAlwaysResident, osContext->getContextId());
         }
     }
@@ -58,14 +58,12 @@ MemoryOperationsStatus DrmMemoryOperationsHandlerBind::evict(Device *device, Gra
 
 MemoryOperationsStatus DrmMemoryOperationsHandlerBind::evictWithinOsContext(OsContext *osContext, GraphicsAllocation &gfxAllocation) {
     std::lock_guard<std::mutex> lock(mutex);
-    if (gfxAllocation.isAlwaysResident(osContext->getContextId())) {
-        auto drmAllocation = static_cast<DrmAllocation *>(&gfxAllocation);
-        auto &drmContextIds = static_cast<const OsContextLinux *>(osContext)->getDrmContextIds();
-        for (uint32_t drmIterator = 0u; drmIterator < drmContextIds.size(); drmIterator++) {
-            drmAllocation->makeBOsResident(osContext, drmIterator, nullptr, false);
-        }
-        drmAllocation->updateResidencyTaskCount(GraphicsAllocation::objectNotResident, osContext->getContextId());
+    auto drmAllocation = static_cast<DrmAllocation *>(&gfxAllocation);
+    auto &drmContextIds = static_cast<const OsContextLinux *>(osContext)->getDrmContextIds();
+    for (uint32_t drmIterator = 0u; drmIterator < drmContextIds.size(); drmIterator++) {
+        drmAllocation->makeBOsResident(osContext, drmIterator, nullptr, false);
     }
+    drmAllocation->updateResidencyTaskCount(GraphicsAllocation::objectNotResident, osContext->getContextId());
     return MemoryOperationsStatus::SUCCESS;
 }
 
@@ -84,7 +82,7 @@ MemoryOperationsStatus DrmMemoryOperationsHandlerBind::isResident(Device *device
 }
 
 void DrmMemoryOperationsHandlerBind::mergeWithResidencyContainer(OsContext *osContext, ResidencyContainer &residencyContainer) {
-    this->makeResidentWithinOsContext(osContext, ArrayRef<GraphicsAllocation *>(residencyContainer));
+    this->makeResidentWithinOsContext(osContext, ArrayRef<GraphicsAllocation *>(residencyContainer), true);
     residencyContainer.clear();
 }
 

shared/source/os_interface/linux/drm_memory_operations_handler_bind.h

@@ -14,7 +14,7 @@ class DrmMemoryOperationsHandlerBind : public DrmMemoryOperationsHandler {
     DrmMemoryOperationsHandlerBind();
     ~DrmMemoryOperationsHandlerBind() override;
 
-    MemoryOperationsStatus makeResidentWithinOsContext(OsContext *osContext, ArrayRef<GraphicsAllocation *> gfxAllocations) override;
+    MemoryOperationsStatus makeResidentWithinOsContext(OsContext *osContext, ArrayRef<GraphicsAllocation *> gfxAllocations, bool evictable) override;
     MemoryOperationsStatus makeResident(Device *device, ArrayRef<GraphicsAllocation *> gfxAllocations) override;
     MemoryOperationsStatus evict(Device *device, GraphicsAllocation &gfxAllocation) override;
     MemoryOperationsStatus evictWithinOsContext(OsContext *osContext, GraphicsAllocation &gfxAllocation) override;

shared/source/os_interface/linux/drm_memory_operations_handler_default.cpp

@@ -16,15 +16,15 @@ namespace NEO {
 DrmMemoryOperationsHandlerDefault::DrmMemoryOperationsHandlerDefault() = default;
 DrmMemoryOperationsHandlerDefault::~DrmMemoryOperationsHandlerDefault() = default;
 
-MemoryOperationsStatus DrmMemoryOperationsHandlerDefault::makeResidentWithinOsContext(OsContext *osContext, ArrayRef<GraphicsAllocation *> gfxAllocations) {
+MemoryOperationsStatus DrmMemoryOperationsHandlerDefault::makeResidentWithinOsContext(OsContext *osContext, ArrayRef<GraphicsAllocation *> gfxAllocations, bool evictable) {
     std::lock_guard<std::mutex> lock(mutex);
     this->residency.insert(gfxAllocations.begin(), gfxAllocations.end());
     return MemoryOperationsStatus::SUCCESS;
 }
 
 MemoryOperationsStatus DrmMemoryOperationsHandlerDefault::makeResident(Device *device, ArrayRef<GraphicsAllocation *> gfxAllocations) {
     OsContext *osContext = nullptr;
-    return this->makeResidentWithinOsContext(osContext, gfxAllocations);
+    return this->makeResidentWithinOsContext(osContext, gfxAllocations, false);
 }
 
 MemoryOperationsStatus DrmMemoryOperationsHandlerDefault::evictWithinOsContext(OsContext *osContext, GraphicsAllocation &gfxAllocation) {

shared/source/os_interface/linux/drm_memory_operations_handler_default.h

@@ -17,7 +17,7 @@ class DrmMemoryOperationsHandlerDefault : public DrmMemoryOperationsHandler {
     DrmMemoryOperationsHandlerDefault();
     ~DrmMemoryOperationsHandlerDefault() override;
 
-    MemoryOperationsStatus makeResidentWithinOsContext(OsContext *osContext, ArrayRef<GraphicsAllocation *> gfxAllocations) override;
+    MemoryOperationsStatus makeResidentWithinOsContext(OsContext *osContext, ArrayRef<GraphicsAllocation *> gfxAllocations, bool evictable) override;
     MemoryOperationsStatus makeResident(Device *device, ArrayRef<GraphicsAllocation *> gfxAllocations) override;
     MemoryOperationsStatus isResident(Device *device, GraphicsAllocation &gfxAllocation) override;
     MemoryOperationsStatus evictWithinOsContext(OsContext *osContext, GraphicsAllocation &gfxAllocation) override;