kc3-lang/angle/src/libANGLE/renderer/vulkan/vk_mem_alloc_wrapper.cpp

• Show log

  Commit

• Hash : 421dbf20
  Author :
  Date : 2021-10-26T19:06:19
  

  Revert "Vulkan: Use different strategy for buffer memory allocation"
  
  This reverts commit 0dbe308d91a3526e28fecd9014d873c649f4ef71.
  
  Reason for revert: crbug.com/1253325
  
  Original change's description:
  > Vulkan: Use different strategy for buffer memory allocation
  >
  > This CL uses different memory allocation strategy based on the requested
  > size. If the requested size exceeds 1M, we use dedicated memory
  > allocation to avoid memory waste associated with the sub-allocator.
  > Otherwise we uses VMA's sub-allocator pool.  This CL creates two sets of
  > customized pool so that we uses different allocation strategy for each
  > set of pool: the small pool uses buddy algorithm which favors speed over
  > memory and large pool uses default algorithm that favors memory saving
  > over speed. This CL also replaces vmaFindMemoryTypeIndexForBufferInfo
  > with vmaFindMemoryTypeIndex to avoid create and destroy VkBuffer object
  > just try to find memoryTypeIndex.
  >
  > Bug: b/195588159
  > Change-Id: I2bddbfffd77ba2ce6b9389d83a31051c4b748c4d
  > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2939490
  > Commit-Queue: Charlie Lao <cclao@google.com>
  > Reviewed-by: Jamie Madill <jmadill@chromium.org>
  > Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
  > Reviewed-by: Tim Van Patten <timvp@google.com>
  
  Bug: b/195588159
  Change-Id: I2c8fe8cb2930d16f5212570d32be68e7c6a6e5f3
  No-Presubmit: true
  No-Tree-Checks: true
  No-Try: true
  Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3244258
  Reviewed-by: Charlie Lao <cclao@google.com>
  Commit-Queue: Charlie Lao <cclao@google.com>
  Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
  

Download

• src/libANGLE/renderer/vulkan/vk_mem_alloc_wrapper.cpp

• //
  // Copyright 2020 The ANGLE Project Authors. All rights reserved.
  // Use of this source code is governed by a BSD-style license that can be
  // found in the LICENSE file.
  //
  // vma_allocator_wrapper.cpp:
  //    Hides VMA functions so we can use separate warning sets.
  //
  
  #include "vk_mem_alloc_wrapper.h"
  
  #include <vk_mem_alloc.h>
  
  namespace vma
  {
  VkResult InitAllocator(VkPhysicalDevice physicalDevice,
                         VkDevice device,
                         VkInstance instance,
                         uint32_t apiVersion,
                         VkDeviceSize preferredLargeHeapBlockSize,
                         VmaAllocator *pAllocator)
  {
      VmaVulkanFunctions funcs                  = {};
      funcs.vkGetPhysicalDeviceProperties       = vkGetPhysicalDeviceProperties;
      funcs.vkGetPhysicalDeviceMemoryProperties = vkGetPhysicalDeviceMemoryProperties;
      funcs.vkAllocateMemory                    = vkAllocateMemory;
      funcs.vkFreeMemory                        = vkFreeMemory;
      funcs.vkMapMemory                         = vkMapMemory;
      funcs.vkUnmapMemory                       = vkUnmapMemory;
      funcs.vkFlushMappedMemoryRanges           = vkFlushMappedMemoryRanges;
      funcs.vkInvalidateMappedMemoryRanges      = vkInvalidateMappedMemoryRanges;
      funcs.vkBindBufferMemory                  = vkBindBufferMemory;
      funcs.vkBindImageMemory                   = vkBindImageMemory;
      funcs.vkGetBufferMemoryRequirements       = vkGetBufferMemoryRequirements;
      funcs.vkGetImageMemoryRequirements        = vkGetImageMemoryRequirements;
      funcs.vkCreateBuffer                      = vkCreateBuffer;
      funcs.vkDestroyBuffer                     = vkDestroyBuffer;
      funcs.vkCreateImage                       = vkCreateImage;
      funcs.vkDestroyImage                      = vkDestroyImage;
      funcs.vkCmdCopyBuffer                     = vkCmdCopyBuffer;
      {
  #if !defined(ANGLE_SHARED_LIBVULKAN)
          // When the vulkan-loader is statically linked, we need to use the extension
          // functions defined in ANGLE's rx namespace. When it's dynamically linked
          // with volk, this will default to the function definitions with no namespace
          using rx::vkBindBufferMemory2KHR;
          using rx::vkBindImageMemory2KHR;
          using rx::vkGetBufferMemoryRequirements2KHR;
          using rx::vkGetImageMemoryRequirements2KHR;
          using rx::vkGetPhysicalDeviceMemoryProperties2KHR;
  #endif  // !defined(ANGLE_SHARED_LIBVULKAN)
          funcs.vkGetBufferMemoryRequirements2KHR       = vkGetBufferMemoryRequirements2KHR;
          funcs.vkGetImageMemoryRequirements2KHR        = vkGetImageMemoryRequirements2KHR;
          funcs.vkBindBufferMemory2KHR                  = vkBindBufferMemory2KHR;
          funcs.vkBindImageMemory2KHR                   = vkBindImageMemory2KHR;
          funcs.vkGetPhysicalDeviceMemoryProperties2KHR = vkGetPhysicalDeviceMemoryProperties2KHR;
      }
  
      VmaAllocatorCreateInfo allocatorInfo      = {};
      allocatorInfo.physicalDevice              = physicalDevice;
      allocatorInfo.device                      = device;
      allocatorInfo.instance                    = instance;
      allocatorInfo.pVulkanFunctions            = &funcs;
      allocatorInfo.vulkanApiVersion            = apiVersion;
      allocatorInfo.preferredLargeHeapBlockSize = preferredLargeHeapBlockSize;
  
      return vmaCreateAllocator(&allocatorInfo, pAllocator);
  }
  
  void DestroyAllocator(VmaAllocator allocator)
  {
      vmaDestroyAllocator(allocator);
  }
  
  VkResult CreatePool(VmaAllocator allocator,
                      uint32_t memoryTypeIndex,
                      bool buddyAlgorithm,
                      VkDeviceSize blockSize,
                      VmaPool *pPool)
  {
      VmaPoolCreateInfo poolCreateInfo = {};
      poolCreateInfo.memoryTypeIndex   = memoryTypeIndex;
      poolCreateInfo.flags             = VMA_POOL_CREATE_IGNORE_BUFFER_IMAGE_GRANULARITY_BIT;
      if (buddyAlgorithm)
      {
          poolCreateInfo.flags |= VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT;
      }
      poolCreateInfo.blockSize     = blockSize;
      poolCreateInfo.maxBlockCount = -1;  // unlimited
      return vmaCreatePool(allocator, &poolCreateInfo, pPool);
  }
  
  void DestroyPool(VmaAllocator allocator, VmaPool pool)
  {
      vmaDestroyPool(allocator, pool);
  }
  
  void FreeMemory(VmaAllocator allocator, VmaAllocation allocation)
  {
      vmaFreeMemory(allocator, allocation);
  }
  
  VkResult CreateBuffer(VmaAllocator allocator,
                        const VkBufferCreateInfo *pBufferCreateInfo,
                        VkMemoryPropertyFlags requiredFlags,
                        VkMemoryPropertyFlags preferredFlags,
                        bool persistentlyMapped,
                        uint32_t *pMemoryTypeIndexOut,
                        VkBuffer *pBuffer,
                        VmaAllocation *pAllocation)
  {
      VkResult result;
      VmaAllocationCreateInfo allocationCreateInfo = {};
      allocationCreateInfo.requiredFlags           = requiredFlags;
      allocationCreateInfo.preferredFlags          = preferredFlags;
      allocationCreateInfo.flags       = (persistentlyMapped) ? VMA_ALLOCATION_CREATE_MAPPED_BIT : 0;
      VmaAllocationInfo allocationInfo = {};
  
      result = vmaCreateBuffer(allocator, pBufferCreateInfo, &allocationCreateInfo, pBuffer,
                               pAllocation, &allocationInfo);
      *pMemoryTypeIndexOut = allocationInfo.memoryType;
  
      return result;
  }
  
  VkResult FindMemoryTypeIndexForBufferInfo(VmaAllocator allocator,
                                            const VkBufferCreateInfo *pBufferCreateInfo,
                                            VkMemoryPropertyFlags requiredFlags,
                                            VkMemoryPropertyFlags preferredFlags,
                                            bool persistentlyMappedBuffers,
                                            uint32_t *pMemoryTypeIndexOut)
  {
      VmaAllocationCreateInfo allocationCreateInfo = {};
      allocationCreateInfo.requiredFlags           = requiredFlags;
      allocationCreateInfo.preferredFlags          = preferredFlags;
      allocationCreateInfo.flags = (persistentlyMappedBuffers) ? VMA_ALLOCATION_CREATE_MAPPED_BIT : 0;
  
      return vmaFindMemoryTypeIndexForBufferInfo(allocator, pBufferCreateInfo, &allocationCreateInfo,
                                                 pMemoryTypeIndexOut);
  }
  
  void GetMemoryTypeProperties(VmaAllocator allocator,
                               uint32_t memoryTypeIndex,
                               VkMemoryPropertyFlags *pFlags)
  {
      vmaGetMemoryTypeProperties(allocator, memoryTypeIndex, pFlags);
  }
  
  VkResult MapMemory(VmaAllocator allocator, VmaAllocation allocation, void **ppData)
  {
      return vmaMapMemory(allocator, allocation, ppData);
  }
  
  void UnmapMemory(VmaAllocator allocator, VmaAllocation allocation)
  {
      return vmaUnmapMemory(allocator, allocation);
  }
  
  void FlushAllocation(VmaAllocator allocator,
                       VmaAllocation allocation,
                       VkDeviceSize offset,
                       VkDeviceSize size)
  {
      vmaFlushAllocation(allocator, allocation, offset, size);
  }
  
  void InvalidateAllocation(VmaAllocator allocator,
                            VmaAllocation allocation,
                            VkDeviceSize offset,
                            VkDeviceSize size)
  {
      vmaInvalidateAllocation(allocator, allocation, offset, size);
  }
  
  void BuildStatsString(VmaAllocator allocator, char **statsString, VkBool32 detailedMap)
  {
      vmaBuildStatsString(allocator, statsString, detailedMap);
  }
  
  void FreeStatsString(VmaAllocator allocator, char *statsString)
  {
      vmaFreeStatsString(allocator, statsString);
  }
  }  // namespace vma
  

Download