From 3445a825677b79caa2c91a3ccadfa2a7b556b6d3 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sun, 18 Feb 2018 11:25:44 -0800
Subject: [PATCH] Vulkan: Allow reusing memory more aggressively.

This causes allocated slabs to get reused more, which means more smaller
slabs are kept around.  However, it also reduces fragmentation.
---
 Common/Vulkan/VulkanMemory.cpp | 29 +++++++++++++++++++++++++++--
 Common/Vulkan/VulkanMemory.h   |  1 +
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/Common/Vulkan/VulkanMemory.cpp b/Common/Vulkan/VulkanMemory.cpp
index 9bd3d36452..4df48e5b04 100644
--- a/Common/Vulkan/VulkanMemory.cpp
+++ b/Common/Vulkan/VulkanMemory.cpp
@@ -279,6 +279,7 @@ bool VulkanDeviceAllocator::AllocateFromSlab(Slab &slab, size_t &start, size_t b
 	// Remember the size so we can free.
 	slab.allocSizes[start] = blocks;
 	slab.tags[start] = { tag, time_now(), 0.0f };
+	slab.totalUsage += blocks;
 	return true;
 }
 
@@ -377,6 +378,12 @@ void VulkanDeviceAllocator::ExecuteFree(FreeInfo *userdata) {
 				slab.usage[start + i] = 0;
 			}
 			slab.allocSizes.erase(it);
+			slab.totalUsage -= size;
+
+			// Allow reusing.
+			if (slab.nextFree > start) {
+				slab.nextFree = start;
+			}
 		} else {
 			// Ack, a double free?
 			_assert_msg_(G3D, false, "Double free? Block missing at offset %d", (int)userdata->offset);
@@ -434,8 +441,26 @@ void VulkanDeviceAllocator::Decimate() {
 		// Go backwards.  This way, we keep the largest free slab.
 		// We do this here (instead of the for) since size_t is unsigned.
 		size_t index = slabs_.size() - i - 1;
+		auto &slab = slabs_[index];
 
-		if (!slabs_[index].allocSizes.empty()) {
+		if (!slab.allocSizes.empty()) {
+			size_t usagePercent = 100 * slab.totalUsage / slab.usage.size();
+			size_t freeNextPercent = 100 * slab.nextFree / slab.usage.size();
+
+			// This may mean we're going to leave an allocation hanging.  Reset nextFree instead.
+			if (freeNextPercent >= 100 - usagePercent) {
+				size_t newFree = 0;
+				while (newFree < slab.usage.size()) {
+					auto it = slab.allocSizes.find(newFree);
+					if (it == slab.allocSizes.end()) {
+						break;
+					}
+
+					newFree += it->second;
+				}
+
+				slab.nextFree = newFree;
+			}
 			continue;
 		}
 
@@ -446,7 +471,7 @@ void VulkanDeviceAllocator::Decimate() {
 		}
 
 		// Okay, let's free this one up.
-		vulkan_->Delete().QueueDeleteDeviceMemory(slabs_[index].deviceMemory);
+		vulkan_->Delete().QueueDeleteDeviceMemory(slab.deviceMemory);
 		slabs_.erase(slabs_.begin() + index);
 
 		// Let's check the next one, which is now in this same slot.
diff --git a/Common/Vulkan/VulkanMemory.h b/Common/Vulkan/VulkanMemory.h
index 1a53c28504..e560a2ff10 100644
--- a/Common/Vulkan/VulkanMemory.h
+++ b/Common/Vulkan/VulkanMemory.h
@@ -178,6 +178,7 @@ private:
 		std::unordered_map<size_t, size_t> allocSizes;
 		std::unordered_map<size_t, UsageInfo> tags;
 		size_t nextFree;
+		size_t totalUsage;
 
 		size_t Size() {
 			return usage.size() * SLAB_GRAIN_SIZE;