Vulkan: Acquire a new BufferHelper from the pool based on a threshold

src/libANGLE/renderer/vulkan/BufferVk.cpp

@@ -9,6 +9,7 @@
 
 #include "libANGLE/renderer/vulkan/BufferVk.h"
 
+#include "common/FixedVector.h"
 #include "common/debug.h"
 #include "common/mathutil.h"
 #include "common/utilities.h"
@@ -103,6 +104,13 @@ ANGLE_INLINE VkMemoryPropertyFlags GetPreferredMemoryType(gl::BufferBinding targ
             return kHostCachedFlags;
     }
 }
+
+ANGLE_INLINE bool SubDataSizeMeetsThreshold(size_t subDataSize, size_t bufferSize)
+{
+    // A sub data update with size > 50% of buffer size meets the threshold
+    // to acquire a new BufferHelper from the pool.
+    return subDataSize > (bufferSize / 2);
+}
 }  // namespace
 
 // ConversionBuffer implementation.
@@ -506,12 +514,56 @@ angle::Result BufferVk::stagedUpdate(ContextVk *contextVk,
 
     // Enqueue a copy command on the GPU.
     VkBufferCopy copyRegion = {stagingBufferOffset, offset, size};
-    ANGLE_TRY(mBuffer->copyFromBuffer(contextVk, mStagingBuffer.getCurrentBuffer(), copyRegion));
+    ANGLE_TRY(
+        mBuffer->copyFromBuffer(contextVk, mStagingBuffer.getCurrentBuffer(), 1, &copyRegion));
     mStagingBuffer.getCurrentBuffer()->retain(&contextVk->getResourceUseList());
 
     return angle::Result::Continue;
 }
 
+angle::Result BufferVk::acquireAndUpdate(ContextVk *contextVk,
+                                         const uint8_t *data,
+                                         size_t size,
+                                         size_t offset)
+{
+    // Here we acquire a new BufferHelper and directUpdate() the new buffer.
+    // If the subData size was less than the buffer's size we additionally enqueue
+    // a GPU copy of the remaining regions from the old mBuffer to the new one.
+    vk::BufferHelper *src          = mBuffer;
+    size_t offsetAfterSubdata      = (offset + size);
+    bool updateRegionBeforeSubData = (offset > 0);
+    bool updateRegionAfterSubData  = (offsetAfterSubdata < static_cast<size_t>(mState.getSize()));
+
+    if (updateRegionBeforeSubData || updateRegionAfterSubData)
+    {
+        src->retain(&contextVk->getResourceUseList());
+    }
+
+    ANGLE_TRY(acquireBufferHelper(contextVk, size, &mBuffer));
+    ANGLE_TRY(directUpdate(contextVk, data, size, offset));
+
+    constexpr int kMaxCopyRegions = 2;
+    angle::FixedVector<VkBufferCopy, kMaxCopyRegions> copyRegions;
+
+    if (updateRegionBeforeSubData)
+    {
+        copyRegions.push_back({0, 0, offset});
+    }
+    if (updateRegionAfterSubData)
+    {
+        copyRegions.push_back({offsetAfterSubdata, offsetAfterSubdata,
+                               (static_cast<size_t>(mState.getSize()) - offsetAfterSubdata)});
+    }
+
+    if (!copyRegions.empty())
+    {
+        ANGLE_TRY(mBuffer->copyFromBuffer(contextVk, src, static_cast<uint32_t>(copyRegions.size()),
+                                          copyRegions.data()));
+    }
+
+    return angle::Result::Continue;
+}
+
 angle::Result BufferVk::setDataImpl(ContextVk *contextVk,
                                     const uint8_t *data,
                                     size_t size,
@@ -521,15 +573,14 @@ angle::Result BufferVk::setDataImpl(ContextVk *contextVk,
     updateShadowBuffer(data, size, offset);
 
     // if the buffer is currently in use
-    //     if size matches mBuffer's size, acquire a new BufferHelper from the pool
+    //     if sub data size meets threshold, acquire a new BufferHelper from the pool
     //     else stage an update
     // else update the buffer directly
     if (mBuffer->isCurrentlyInUse(contextVk->getLastCompletedQueueSerial()))
     {
-        if (size == static_cast<size_t>(mState.getSize()))
+        if (SubDataSizeMeetsThreshold(size, static_cast<size_t>(mState.getSize())))
         {
-            ANGLE_TRY(acquireBufferHelper(contextVk, size, &mBuffer));
-            ANGLE_TRY(directUpdate(contextVk, data, size, offset));
+            ANGLE_TRY(acquireAndUpdate(contextVk, data, size, offset));
         }
         else
         {

src/libANGLE/renderer/vulkan/BufferVk.h

@@ -139,6 +139,10 @@ class BufferVk : public BufferImpl
                                const uint8_t *data,
                                size_t size,
                                size_t offset);
+    angle::Result acquireAndUpdate(ContextVk *contextVk,
+                                   const uint8_t *data,
+                                   size_t size,
+                                   size_t offset);
     angle::Result setDataImpl(ContextVk *contextVk,
                               const uint8_t *data,
                               size_t size,

src/libANGLE/renderer/vulkan/vk_helpers.cpp

@@ -2224,14 +2224,15 @@ void BufferHelper::release(RendererVk *renderer)
 
 angle::Result BufferHelper::copyFromBuffer(ContextVk *contextVk,
                                            BufferHelper *srcBuffer,
-                                           const VkBufferCopy &copyRegion)
+                                           uint32_t regionCount,
+                                           const VkBufferCopy *copyRegions)
 {
     CommandBuffer *commandBuffer = nullptr;
     ANGLE_TRY(contextVk->onBufferTransferRead(srcBuffer));
     ANGLE_TRY(contextVk->onBufferTransferWrite(this));
     ANGLE_TRY(contextVk->endRenderPassAndGetCommandBuffer(&commandBuffer));
 
-    commandBuffer->copyBuffer(srcBuffer->getBuffer(), mBuffer, 1, &copyRegion);
+    commandBuffer->copyBuffer(srcBuffer->getBuffer(), mBuffer, regionCount, copyRegions);
 
     return angle::Result::Continue;
 }

src/libANGLE/renderer/vulkan/vk_helpers.h

@@ -716,7 +716,8 @@ class BufferHelper final : public Resource
     // Also implicitly sets up the correct barriers.
     angle::Result copyFromBuffer(ContextVk *contextVk,
                                  BufferHelper *srcBuffer,
-                                 const VkBufferCopy &copyRegion);
+                                 uint32_t regionCount,
+                                 const VkBufferCopy *copyRegions);
 
     // Note: currently only one view is allowed.  If needs be, multiple views can be created
     // based on format.

src/tests/perf_tests/BufferSubData.cpp

@@ -27,8 +27,8 @@ struct BufferSubDataParams final : public RenderTestParams
         minorVersion      = 0;
         windowWidth       = 512;
         windowHeight      = 512;
-        updateSize        = 3000;
-        bufferSize        = 40000000;
+        updateSize        = 32000;
+        bufferSize        = 40000;
         iterationsPerStep = kIterationsPerStep;
         updateRate        = 1;
     }