Revert "Change residency vector to set"

This reverts commit 29c3c71.

Change-Id: I68e80e0f23b1f2deda4cc94d3cf17ea215fe1c9e

Author: LukaszJobczyk

opencl/source/os_interface/linux/drm_command_stream.h

@@ -11,7 +11,6 @@
 
 #include "drm/i915_drm.h"
 
-#include <unordered_set>
 #include <vector>
 
 namespace NEO {
@@ -56,7 +55,7 @@ class DrmCommandStreamReceiver : public DeviceCommandStreamReceiver<GfxFamily> {
     void flushInternal(const BatchBuffer &batchBuffer, const ResidencyContainer &allocationsForResidency);
     void exec(const BatchBuffer &batchBuffer, uint32_t drmContextId);
 
-    std::unordered_set<BufferObject *> residency;
+    std::vector<BufferObject *> residency;
     std::vector<drm_i915_gem_exec_object2> execObjectsStorage;
     Drm *drm;
     gemCloseWorkerMode gemCloseWorkerOperationMode;

opencl/source/os_interface/linux/drm_command_stream.inl

@@ -80,12 +80,10 @@ void DrmCommandStreamReceiver<GfxFamily>::exec(const BatchBuffer &batchBuffer, u
     }
 
     int err = bb->exec(static_cast<uint32_t>(alignUp(batchBuffer.usedSize - batchBuffer.startOffset, 8)),
-                       batchBuffer.startOffset,
-                       engineFlag | I915_EXEC_NO_RELOC,
+                       batchBuffer.startOffset, engineFlag | I915_EXEC_NO_RELOC,
                        batchBuffer.requiresCoherency,
                        drmContextId,
-                       this->residency.begin(),
-                       this->residency.size(),
+                       this->residency.data(), this->residency.size(),
                        this->execObjectsStorage.data());
     UNRECOVERABLE_IF(err != 0);
 
@@ -95,7 +93,15 @@ void DrmCommandStreamReceiver<GfxFamily>::exec(const BatchBuffer &batchBuffer, u
 template <typename GfxFamily>
 void DrmCommandStreamReceiver<GfxFamily>::makeResident(BufferObject *bo) {
     if (bo) {
-        residency.insert(bo);
+        if (bo->peekIsReusableAllocation()) {
+            for (auto bufferObject : this->residency) {
+                if (bufferObject == bo) {
+                    return;
+                }
+            }
+        }
+
+        residency.push_back(bo);
     }
 }
 

opencl/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp

@@ -65,8 +65,7 @@ TEST_F(DrmBufferObjectTest, exec) {
     mock->ioctl_res = 0;
 
     drm_i915_gem_exec_object2 execObjectsStorage = {};
-    BufferObject *residencyBo;
-    auto ret = bo->exec(0, 0, 0, false, 1, &residencyBo, 0u, &execObjectsStorage);
+    auto ret = bo->exec(0, 0, 0, false, 1, nullptr, 0u, &execObjectsStorage);
     EXPECT_EQ(mock->ioctl_res, ret);
     EXPECT_EQ(0u, mock->execBuffer.flags);
 }
@@ -76,8 +75,7 @@ TEST_F(DrmBufferObjectTest, exec_ioctlFailed) {
     mock->ioctl_res = -1;
     mock->errnoValue = EFAULT;
     drm_i915_gem_exec_object2 execObjectsStorage = {};
-    BufferObject *residencyBo;
-    EXPECT_EQ(EFAULT, bo->exec(0, 0, 0, false, 1, &residencyBo, 0u, &execObjectsStorage));
+    EXPECT_EQ(EFAULT, bo->exec(0, 0, 0, false, 1, nullptr, 0u, &execObjectsStorage));
 }
 
 TEST_F(DrmBufferObjectTest, setTiling_success) {

opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h

@@ -133,7 +133,7 @@ class DrmCommandStreamEnhancedTest : public ::testing::Test {
     }
 
     template <typename GfxFamily>
-    const std::unordered_set<BufferObject *> &getResidencyVector() const {
+    const std::vector<BufferObject *> &getResidencyVector() const {
         return static_cast<const TestedDrmCommandStreamReceiver<GfxFamily> *>(csr)->residency;
     }
 

shared/source/os_interface/linux/drm_buffer_object.cpp

@@ -7,14 +7,20 @@
 
 #include "shared/source/os_interface/linux/drm_buffer_object.h"
 
+#include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/os_interface/linux/drm_memory_manager.h"
+#include "shared/source/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/linux/os_time_linux.h"
 #include "shared/source/utilities/stackvec.h"
 
+#include "drm/i915_drm.h"
+
 #include <errno.h>
 #include <fcntl.h>
+#include <map>
 #include <stdarg.h>
+#include <string.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/syscall.h>
@@ -94,6 +100,30 @@ void BufferObject::fillExecObject(drm_i915_gem_exec_object2 &execObject, uint32_
     execObject.rsvd2 = 0;
 }
 
+int BufferObject::exec(uint32_t used, size_t startOffset, unsigned int flags, bool requiresCoherency, uint32_t drmContextId, BufferObject *const residency[], size_t residencyCount, drm_i915_gem_exec_object2 *execObjectsStorage) {
+    for (size_t i = 0; i < residencyCount; i++) {
+        residency[i]->fillExecObject(execObjectsStorage[i], drmContextId);
+    }
+    this->fillExecObject(execObjectsStorage[residencyCount], drmContextId);
+
+    drm_i915_gem_execbuffer2 execbuf{};
+    execbuf.buffers_ptr = reinterpret_cast<uintptr_t>(execObjectsStorage);
+    execbuf.buffer_count = static_cast<uint32_t>(residencyCount + 1u);
+    execbuf.batch_start_offset = static_cast<uint32_t>(startOffset);
+    execbuf.batch_len = alignUp(used, 8);
+    execbuf.flags = flags;
+    execbuf.rsvd1 = drmContextId;
+
+    int ret = this->drm->ioctl(DRM_IOCTL_I915_GEM_EXECBUFFER2, &execbuf);
+    if (ret == 0) {
+        return 0;
+    }
+
+    int err = this->drm->getErrno();
+    printDebugString(DebugManager.flags.PrintDebugMessages.get(), stderr, "ioctl(I915_GEM_EXECBUFFER2) failed with %d. errno=%d(%s)\n", ret, err, strerror(err));
+    return err;
+}
+
 int BufferObject::pin(BufferObject *const boToPin[], size_t numberOfBos, uint32_t drmContextId) {
     reinterpret_cast<uint32_t *>(this->gpuAddress)[0] = 0x05000000;
     reinterpret_cast<uint32_t *>(this->gpuAddress)[1] = 0x00000000;

shared/source/os_interface/linux/drm_buffer_object.h

@@ -6,18 +6,12 @@
  */
 
 #pragma once
-#include "shared/source/debug_settings/debug_settings_manager.h"
-#include "shared/source/helpers/aligned_memory.h"
-#include "shared/source/os_interface/linux/drm_neo.h"
-
-#include "drm/i915_drm.h"
-
 #include <atomic>
 #include <cstddef>
-#include <cstdio>
 #include <stdint.h>
-#include <string.h>
-#include <sys/ioctl.h>
+
+struct drm_i915_gem_exec_object2;
+struct drm_i915_gem_relocation_entry;
 
 namespace NEO {
 
@@ -35,8 +29,7 @@ class BufferObject {
 
     MOCKABLE_VIRTUAL int pin(BufferObject *const boToPin[], size_t numberOfBos, uint32_t drmContextId);
 
-    template <typename Iterator>
-    int exec(uint32_t used, size_t startOffset, unsigned int flags, bool requiresCoherency, uint32_t drmContextId, Iterator begin, size_t residencyCount, drm_i915_gem_exec_object2 *execObjectsStorage);
+    int exec(uint32_t used, size_t startOffset, unsigned int flags, bool requiresCoherency, uint32_t drmContextId, BufferObject *const residency[], size_t residencyCount, drm_i915_gem_exec_object2 *execObjectsStorage);
 
     int wait(int64_t timeoutNs);
     bool close();
@@ -54,6 +47,7 @@ class BufferObject {
     void setLockedAddress(void *cpuAddress) { this->lockedAddress = cpuAddress; }
     void setUnmapSize(uint64_t unmapSize) { this->unmapSize = unmapSize; }
     uint64_t peekUnmapSize() const { return unmapSize; }
+    bool peekIsReusableAllocation() const { return this->isReused; }
 
   protected:
     Drm *drm = nullptr;
@@ -75,29 +69,4 @@ class BufferObject {
 
     uint64_t unmapSize = 0;
 };
-
-template <typename Iterator>
-inline int BufferObject::exec(uint32_t used, size_t startOffset, unsigned int flags, bool requiresCoherency, uint32_t drmContextId, Iterator begin, size_t residencyCount, drm_i915_gem_exec_object2 *execObjectsStorage) {
-    for (size_t i = 0; i < residencyCount; ++i) {
-        (*begin++)->fillExecObject(execObjectsStorage[i], drmContextId);
-    }
-    this->fillExecObject(execObjectsStorage[residencyCount], drmContextId);
-
-    drm_i915_gem_execbuffer2 execbuf{};
-    execbuf.buffers_ptr = reinterpret_cast<uintptr_t>(execObjectsStorage);
-    execbuf.buffer_count = static_cast<uint32_t>(residencyCount + 1u);
-    execbuf.batch_start_offset = static_cast<uint32_t>(startOffset);
-    execbuf.batch_len = alignUp(used, 8);
-    execbuf.flags = flags;
-    execbuf.rsvd1 = drmContextId;
-
-    int ret = this->drm->ioctl(DRM_IOCTL_I915_GEM_EXECBUFFER2, &execbuf);
-    if (ret == 0) {
-        return 0;
-    }
-
-    int err = this->drm->getErrno();
-    printDebugString(DebugManager.flags.PrintDebugMessages.get(), stderr, "ioctl(I915_GEM_EXECBUFFER2) failed with %d. errno=%d(%s)\n", ret, err, strerror(err));
-    return err;
-}
 } // namespace NEO