From 363c6c1b7babf10babeac7d0996d222829e79d7d Mon Sep 17 00:00:00 2001
From: IndecisiveTurtle <47210458+raphaelthegreat@users.noreply.github.com>
Date: Tue, 10 Dec 2024 14:27:10 +0200
Subject: [PATCH] vk_shader_hle: Make more efficient

---
 .../renderer_vulkan/vk_shader_hle.cpp         | 61 ++++++++++---------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/src/video_core/renderer_vulkan/vk_shader_hle.cpp b/src/video_core/renderer_vulkan/vk_shader_hle.cpp
index 7c6b25e7..df9d40f0 100644
--- a/src/video_core/renderer_vulkan/vk_shader_hle.cpp
+++ b/src/video_core/renderer_vulkan/vk_shader_hle.cpp
@@ -30,16 +30,18 @@ bool ExecuteCopyShaderHLE(const Shader::Info& info, const AmdGpu::Liverpool::Reg
     };
     static_assert(sizeof(CopyShaderControl) == 12);
     ASSERT(ctl_buf_sharp.GetStride() == sizeof(CopyShaderControl));
-    const auto ctl_buf = reinterpret_cast<CopyShaderControl*>(ctl_buf_sharp.base_address);
+    const auto ctl_buf = reinterpret_cast<const CopyShaderControl*>(ctl_buf_sharp.base_address);
+
+    static std::vector<vk::BufferCopy> copies;
+    copies.clear();
+    copies.reserve(regs.cs_program.dim_x);
 
-    // Add list of copies
-    boost::container::set<vk::BufferCopy> copies;
     for (u32 i = 0; i < regs.cs_program.dim_x; i++) {
         const auto& [dst_idx, src_idx, end] = ctl_buf[i];
         const u32 local_dst_offset = dst_idx * buf_stride;
         const u32 local_src_offset = src_idx * buf_stride;
         const u32 local_size = (end + 1) * buf_stride;
-        copies.emplace(local_src_offset, local_dst_offset, local_size);
+        copies.emplace_back(local_src_offset, local_dst_offset, local_size);
     }
 
     scheduler.EndRendering();
@@ -57,30 +59,29 @@ bool ExecuteCopyShaderHLE(const Shader::Info& info, const AmdGpu::Liverpool::Reg
         vk::DependencyFlagBits::eByRegion, READ_BARRIER, {}, {});
 
     static constexpr vk::DeviceSize MaxDistanceForMerge = 64_MB;
-    boost::container::small_vector<vk::BufferCopy, 32> batch_copies;
-    while (!copies.empty()) {
-        // Place first copy into the current batch
-        auto it = copies.begin();
-        auto src_offset_min = it->srcOffset;
-        auto src_offset_max = it->srcOffset + it->size;
-        auto dst_offset_min = it->dstOffset;
-        auto dst_offset_max = it->dstOffset + it->size;
-        batch_copies.emplace_back(*it);
-        it = copies.erase(it);
+    u32 batch_start = 0;
+    u32 batch_end = 1;
 
-        while (it != copies.end()) {
+    while (batch_end < copies.size()) {
+        // Place first copy into the current batch
+        const auto& copy = copies[batch_start];
+        auto src_offset_min = copy.srcOffset;
+        auto src_offset_max = copy.srcOffset + copy.size;
+        auto dst_offset_min = copy.dstOffset;
+        auto dst_offset_max = copy.dstOffset + copy.size;
+
+        for (int i = batch_start + 1; i < copies.size(); i++) {
             // Compute new src and dst bounds if we were to batch this copy
-            auto new_src_offset_min = std::min(src_offset_min, it->srcOffset);
-            auto new_src_offset_max = std::max(src_offset_max, it->srcOffset + it->size);
+            const auto [src_offset, dst_offset, size] = copies[i];
+            auto new_src_offset_min = std::min(src_offset_min, src_offset);
+            auto new_src_offset_max = std::max(src_offset_max, src_offset + size);
             if (new_src_offset_max - new_src_offset_min > MaxDistanceForMerge) {
-                ++it;
                 continue;
             }
 
-            auto new_dst_offset_min = std::min(dst_offset_min, it->dstOffset);
-            auto new_dst_offset_max = std::max(dst_offset_max, it->dstOffset + it->size);
+            auto new_dst_offset_min = std::min(dst_offset_min, dst_offset);
+            auto new_dst_offset_max = std::max(dst_offset_max, dst_offset + size);
             if (new_dst_offset_max - new_dst_offset_min > MaxDistanceForMerge) {
-                ++it;
                 continue;
             }
 
@@ -89,8 +90,10 @@ bool ExecuteCopyShaderHLE(const Shader::Info& info, const AmdGpu::Liverpool::Reg
             src_offset_max = new_src_offset_max;
             dst_offset_min = new_dst_offset_min;
             dst_offset_max = new_dst_offset_max;
-            batch_copies.emplace_back(*it);
-            it = copies.erase(it);
+            if (i != batch_end) {
+                std::swap(copies[i], copies[batch_end]);
+            }
+            ++batch_end;
         }
 
         // Obtain buffers for the total source and destination ranges.
@@ -102,16 +105,18 @@ bool ExecuteCopyShaderHLE(const Shader::Info& info, const AmdGpu::Liverpool::Reg
                                       dst_offset_max - dst_offset_min, true, false);
 
         // Apply found buffer base.
-        for (auto& vk_copy : batch_copies) {
-            vk_copy.srcOffset = vk_copy.srcOffset - src_offset_min + src_buf_offset;
-            vk_copy.dstOffset = vk_copy.dstOffset - dst_offset_min + dst_buf_offset;
+        const auto vk_copies = std::span{copies}.subspan(batch_start, batch_end - batch_start);
+        for (auto& copy : vk_copies) {
+            copy.srcOffset = copy.srcOffset - src_offset_min + src_buf_offset;
+            copy.dstOffset = copy.dstOffset - dst_offset_min + dst_buf_offset;
         }
 
         // Execute buffer copies.
         LOG_TRACE(Render_Vulkan, "HLE buffer copy: src_size = {}, dst_size = {}",
                   src_offset_max - src_offset_min, dst_offset_max - dst_offset_min);
-        scheduler.CommandBuffer().copyBuffer(src_buf->Handle(), dst_buf->Handle(), batch_copies);
-        batch_copies.clear();
+        scheduler.CommandBuffer().copyBuffer(src_buf->Handle(), dst_buf->Handle(), vk_copies);
+        batch_start = batch_end;
+        ++batch_end;
     }
 
     scheduler.CommandBuffer().pipelineBarrier(