Vulkan: Call into vulkan directly for big size allocation.
When size is big, if we go down suballocation path, we end up with big
size allocation and stuck with it (because some other allocation also
suballocate from it). This CL force it down to vulkan driver to allocate
VkBuffer and VkDeviceMemory directly for big size allocations, bypassing
suballocator.
Bug: b/223428306
Change-Id: Idd9f551322331f899036f73bab0489f8249eaadf
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3550039
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Amirali Abdolrashidi <abdolrashidi@google.com>
Commit-Queue: Charlie Lao <cclao@google.com>
diff --git a/src/libANGLE/renderer/vulkan/vk_helpers.cpp b/src/libANGLE/renderer/vulkan/vk_helpers.cpp
index 3ce3d49..159f811 100644
--- a/src/libANGLE/renderer/vulkan/vk_helpers.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_helpers.cpp
@@ -2885,6 +2885,47 @@
VkDeviceSize offset;
VkDeviceSize alignedSize = roundUp(sizeInBytes, alignment);
+ if (alignedSize >= kMaxBufferSizeForSuballocation)
+ {
+ VkDeviceSize heapSize =
+ context->getRenderer()->getMemoryProperties().getHeapSizeForMemoryType(
+ mMemoryTypeIndex);
+ // First ensure we are not exceeding the heapSize to avoid the validation error.
+ ANGLE_VK_CHECK(context, sizeInBytes <= heapSize, VK_ERROR_OUT_OF_DEVICE_MEMORY);
+
+ // Allocate buffer
+ VkBufferCreateInfo createInfo = {};
+ createInfo.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
+ createInfo.flags = 0;
+ createInfo.size = alignedSize;
+ createInfo.usage = mUsage;
+ createInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
+ createInfo.queueFamilyIndexCount = 0;
+ createInfo.pQueueFamilyIndices = nullptr;
+
+ VkMemoryPropertyFlags memoryPropertyFlags;
+ const Allocator &allocator = context->getRenderer()->getAllocator();
+ allocator.getMemoryTypeProperties(mMemoryTypeIndex, &memoryPropertyFlags);
+
+ DeviceScoped<Buffer> buffer(context->getDevice());
+ ANGLE_VK_TRY(context, buffer.get().init(context->getDevice(), createInfo));
+
+ DeviceScoped<DeviceMemory> deviceMemory(context->getDevice());
+ VkMemoryPropertyFlags memoryPropertyFlagsOut;
+ VkDeviceSize sizeOut;
+ ANGLE_TRY(AllocateBufferMemory(context, memoryPropertyFlags, &memoryPropertyFlagsOut,
+ nullptr, &buffer.get(), &deviceMemory.get(), &sizeOut));
+ ASSERT(sizeOut >= alignedSize);
+
+ suballocation->initWithEntireBuffer(context, buffer.get(), deviceMemory.get(),
+ memoryPropertyFlagsOut, alignedSize);
+ if (mHostVisible)
+ {
+ ANGLE_VK_TRY(context, suballocation->map(context));
+ }
+ return angle::Result::Continue;
+ }
+
// We always allocate from reverse order so that older buffers have a chance to age out. The
// assumption is that to allocate from new buffers first may have a better chance to leave the
// older buffers completely empty and we may able to free it.
diff --git a/src/libANGLE/renderer/vulkan/vk_helpers.h b/src/libANGLE/renderer/vulkan/vk_helpers.h
index 62e08f7..f6fc14f 100644
--- a/src/libANGLE/renderer/vulkan/vk_helpers.h
+++ b/src/libANGLE/renderer/vulkan/vk_helpers.h
@@ -871,6 +871,9 @@
// and only to find out that we have to allocate a new one next frame.
static constexpr int32_t kMaxCountRemainsEmpty = 4;
static constexpr int32_t kMaxEmptyBufferCount = 16;
+ // max size to go down the suballocation code path. Any allocation greater or equal this size
+ // will call into vulkan directly to allocate a dedicated VkDeviceMemory.
+ static constexpr size_t kMaxBufferSizeForSuballocation = 4 * 1024 * 1024;
};
enum class BufferAccess
