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

• Show log

  Commit

• Hash : 4963febf
  Author :
  Date : 2023-08-02T16:52:52
  

  Vulkan: Remove type indices with host-visible bit
  
    Currently, the memory type index for VMA image allocations are
  selected and returned by the API. However, it could potentially
  choose a type index with more flags than required or preferred,
  and ignore the index with exactly the flags we want. For example,
  it could pick a type index with the host-visible property flag,
  even if is unnecessary and a type index with a device-local flag
  would suffice.
  
    Using memoryTypeBits during the allocation allows us to filter
  the unwanted type indices out and use the other indices initially.
  
  * Added a new function to RendererVk.cpp to try to remove the memory
    type indices with the host-visible bit for VMA image allocations
    if they should be device-local.
  
    * GetMemoryTypeBitsExcludingHostVisible()
  
      * It also removes the indices with the protected bit if it is not
        required.
  
    * If the allocation is unsuccessful, the fallback resets the field
    for memoryTypeBits, allowing all available type indices to be used
    for the allocation.
  
  * Added memory type index to the pending allocation log during OOM.
  
  Bug: b/294085818
  Change-Id: Icc1b218df075170a6baa7ec57c837ed59cd4fa96
  Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4743604
  Reviewed-by: Kaiyi Li <kaiyili@google.com>
  Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
  Commit-Queue: Amirali Abdolrashidi <abdolrashidi@google.com>
  Reviewed-by: Charlie Lao <cclao@google.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
  {
  #define VALIDATE_BLOCK_CREATE_FLAG_BITS(x)                                                 \
      static_assert(static_cast<uint32_t>(x) ==                                              \
                        static_cast<uint32_t>(VMA_VIRTUAL_BLOCK_CREATE_##x##_ALGORITHM_BIT), \
                    "VMA enum mismatch")
  VALIDATE_BLOCK_CREATE_FLAG_BITS(LINEAR);
  #if ANGLE_VMA_VERSION < 3000000
  VALIDATE_BLOCK_CREATE_FLAG_BITS(BUDDY);
  #endif  // ANGLE_VMA_VERSION < 3000000
  
  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,
  #if ANGLE_VMA_VERSION < 3000000
                      bool buddyAlgorithm,
  #endif  // ANGLE_VMA_VERSION < 3000000
                      VkDeviceSize blockSize,
                      VmaPool *pPool)
  {
      VmaPoolCreateInfo poolCreateInfo = {};
      poolCreateInfo.memoryTypeIndex   = memoryTypeIndex;
      poolCreateInfo.flags             = VMA_POOL_CREATE_IGNORE_BUFFER_IMAGE_GRANULARITY_BIT;
  #if ANGLE_VMA_VERSION < 3000000
      if (buddyAlgorithm)
      {
          poolCreateInfo.flags |= VMA_POOL_CREATE_BUDDY_ALGORITHM_BIT;
      }
  #endif
      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 AllocateAndBindMemoryForImage(VmaAllocator allocator,
                                         VkImage *pImage,
                                         VkMemoryPropertyFlags requiredFlags,
                                         VkMemoryPropertyFlags preferredFlags,
                                         uint32_t memoryTypeBits,
                                         bool allocateDedicatedMemory,
                                         VmaAllocation *pAllocationOut,
                                         uint32_t *pMemoryTypeIndexOut,
                                         VkDeviceSize *sizeOut)
  {
      VkResult result;
      VmaAllocationCreateInfo allocationCreateInfo = {};
      allocationCreateInfo.requiredFlags           = requiredFlags;
      allocationCreateInfo.preferredFlags          = preferredFlags;
      allocationCreateInfo.memoryTypeBits          = memoryTypeBits;
      allocationCreateInfo.flags =
          allocateDedicatedMemory ? VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT : 0;
      VmaAllocationInfo allocationInfo = {};
  
      result = vmaAllocateMemoryForImage(allocator, *pImage, &allocationCreateInfo, pAllocationOut,
                                         &allocationInfo);
      if (result == VK_SUCCESS)
      {
          // If binding was unsuccessful, we should free the allocation.
          result = vmaBindImageMemory(allocator, *pAllocationOut, *pImage);
          if (result != VK_SUCCESS)
          {
              vmaFreeMemory(allocator, *pAllocationOut);
              *pAllocationOut = VK_NULL_HANDLE;
              return result;
          }
  
          *pMemoryTypeIndexOut = allocationInfo.memoryType;
          *sizeOut             = allocationInfo.size;
      }
  
      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);
  }
  
  VkResult FindMemoryTypeIndexForImageInfo(VmaAllocator allocator,
                                           const VkImageCreateInfo *pImageCreateInfo,
                                           VkMemoryPropertyFlags requiredFlags,
                                           VkMemoryPropertyFlags preferredFlags,
                                           bool allocateDedicatedMemory,
                                           uint32_t *pMemoryTypeIndexOut)
  {
      VmaAllocationCreateInfo allocationCreateInfo = {};
      allocationCreateInfo.requiredFlags           = requiredFlags;
      allocationCreateInfo.preferredFlags          = preferredFlags;
      allocationCreateInfo.flags =
          allocateDedicatedMemory ? VMA_ALLOCATION_CREATE_DEDICATED_MEMORY_BIT : 0;
  
      return vmaFindMemoryTypeIndexForImageInfo(allocator, pImageCreateInfo, &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);
  }
  
  // VmaVirtualBlock implementation
  VkResult CreateVirtualBlock(VkDeviceSize size,
                              VirtualBlockCreateFlags flags,
                              VmaVirtualBlock *pVirtualBlock)
  {
      VmaVirtualBlockCreateInfo virtualBlockCreateInfo = {};
      virtualBlockCreateInfo.size                      = size;
      virtualBlockCreateInfo.flags                     = (VmaVirtualBlockCreateFlagBits)flags;
      return vmaCreateVirtualBlock(&virtualBlockCreateInfo, pVirtualBlock);
  }
  
  void DestroyVirtualBlock(VmaVirtualBlock virtualBlock)
  {
      vmaDestroyVirtualBlock(virtualBlock);
  }
  
  VkResult VirtualAllocate(VmaVirtualBlock virtualBlock,
                           VkDeviceSize size,
                           VkDeviceSize alignment,
                           VmaVirtualAllocation *pAllocation,
                           VkDeviceSize *pOffset)
  {
      VmaVirtualAllocationCreateInfo createInfo = {};
      createInfo.size                           = size;
      createInfo.alignment                      = alignment;
      createInfo.flags                          = 0;
  #if ANGLE_VMA_VERSION < 3000000
      return vmaVirtualAllocate(virtualBlock, &createInfo, pOffset);
  #else
      return vmaVirtualAllocate(virtualBlock, &createInfo, pAllocation, pOffset);
  #endif  // ANGLE_VMA_VERSION < 3000000
  }
  
  void VirtualFree(VmaVirtualBlock virtualBlock, VmaVirtualAllocation allocation, VkDeviceSize offset)
  {
  #if ANGLE_VMA_VERSION < 3000000
      vmaVirtualFree(virtualBlock, offset);
  #else
      vmaVirtualFree(virtualBlock, allocation);
  #endif  // ANGLE_VMA_VERSION < 3000000
  }
  
  VkBool32 IsVirtualBlockEmpty(VmaVirtualBlock virtualBlock)
  {
      return vmaIsVirtualBlockEmpty(virtualBlock);
  }
  
  void GetVirtualAllocationInfo(VmaVirtualBlock virtualBlock,
                                VmaVirtualAllocation allocation,
                                VkDeviceSize offset,
                                VkDeviceSize *sizeOut,
                                void **pUserDataOut)
  {
      VmaVirtualAllocationInfo virtualAllocInfo = {};
  #if ANGLE_VMA_VERSION < 3000000
      vmaGetVirtualAllocationInfo(virtualBlock, offset, &virtualAllocInfo);
  #else
      vmaGetVirtualAllocationInfo(virtualBlock, allocation, &virtualAllocInfo);
  #endif  // ANGLE_VMA_VERSION < 3000000
      *sizeOut      = virtualAllocInfo.size;
      *pUserDataOut = virtualAllocInfo.pUserData;
  }
  
  void ClearVirtualBlock(VmaVirtualBlock virtualBlock)
  {
      vmaClearVirtualBlock(virtualBlock);
  }
  
  void SetVirtualAllocationUserData(VmaVirtualBlock virtualBlock,
                                    VmaVirtualAllocation allocation,
                                    VkDeviceSize offset,
                                    void *pUserData)
  {
  #if ANGLE_VMA_VERSION < 3000000
      vmaSetVirtualAllocationUserData(virtualBlock, offset, pUserData);
  #else
      vmaSetVirtualAllocationUserData(virtualBlock, allocation, pUserData);
  #endif  // ANGLE_VMA_VERSION < 3000000
  }
  
  void CalculateVirtualBlockStats(VmaVirtualBlock virtualBlock, StatInfo *pStatInfo)
  {
  #if ANGLE_VMA_VERSION < 3000000
      vmaCalculateVirtualBlockStats(virtualBlock, reinterpret_cast<VmaStatInfo *>(pStatInfo));
  #else
      vmaCalculateVirtualBlockStatistics(virtualBlock,
                                         reinterpret_cast<VmaDetailedStatistics *>(pStatInfo));
  #endif  // ANGLE_VMA_VERSION < 3000000
  }
  
  void BuildVirtualBlockStatsString(VmaVirtualBlock virtualBlock,
                                    char **ppStatsString,
                                    VkBool32 detailedMap)
  {
      vmaBuildVirtualBlockStatsString(virtualBlock, ppStatsString, detailedMap);
  }
  
  void FreeVirtualBlockStatsString(VmaVirtualBlock virtualBlock, char *pStatsString)
  {
      vmaFreeVirtualBlockStatsString(virtualBlock, pStatsString);
  }
  }  // namespace vma
  

Download