commit 894a2932f5dd7571f61261ad051e453a1d930aea
author Jason Macnak <natsu@google.com> Wed Mar 15 09:41:46 2023 -0700
committer Jason Macnak <natsu@google.com> Wed Mar 15 14:15:53 2023 -0700
tree ea563cab1943a161476094dece42aad487e70a07
parent a49dc0abb9ed17638b43669321a0a11f02e998e4

Move vkGetPhysicalDeviceMemoryProperties() to pre-VkEncoder

... to allow for caching the VkPhysicalDeviceMemoryProperties.

Bug: b/272079201
Test: cvd start --gpu_mode=gfxstream_guest_angle
Change-Id: Ifdcb70af53f08a683b509833af9711269aa7e146

system/vulkan_enc/ResourceTracker.cpp

diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index 5c1bd72..a5c04fc 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -1545,14 +1545,12 @@
     }
 
     void on_vkGetPhysicalDeviceMemoryProperties(
-        void*,
-        VkPhysicalDevice physdev,
+        void* context,
+        VkPhysicalDevice physicalDevice,
         VkPhysicalDeviceMemoryProperties* out) {
-
-        (void)physdev;
         // gfxstream decides which physical device to expose to the guest on startup.
         // Otherwise, we would need a physical device to properties mapping.
-        mMemoryProps = *out;
+        *out = getPhysicalDeviceMemoryProperties(context, VK_NULL_HANDLE, physicalDevice);
     }
 
     void on_vkGetPhysicalDeviceMemoryProperties2(
@@ -1652,15 +1650,17 @@
 
 #ifdef VK_USE_PLATFORM_ANDROID_KHR
     VkResult on_vkGetAndroidHardwareBufferPropertiesANDROID(
-        void*, VkResult,
-        VkDevice device,
-        const AHardwareBuffer* buffer,
-        VkAndroidHardwareBufferPropertiesANDROID* pProperties) {
+            void* context, VkResult,
+            VkDevice device,
+            const AHardwareBuffer* buffer,
+            VkAndroidHardwareBufferPropertiesANDROID* pProperties) {
+        const VkPhysicalDeviceMemoryProperties& memoryProperties =
+            getPhysicalDeviceMemoryProperties(context, device, VK_NULL_HANDLE);
         auto grallocHelper =
             ResourceTracker::threadingCallbacks.hostConnectionGetFunc()->grallocHelper();
         return getAndroidHardwareBufferPropertiesANDROID(
             grallocHelper,
-            &mMemoryProps,
+            &memoryProperties,
             device, buffer, pProperties);
     }
 
@@ -3222,13 +3222,18 @@
             !importVmoInfoPtr;
 
 #if defined(VK_USE_PLATFORM_ANDROID_KHR) || defined(__linux__)
-        shouldPassThroughDedicatedAllocInfo &=
-            !isHostVisible(&mMemoryProps, pAllocateInfo->memoryTypeIndex);
+        const VkPhysicalDeviceMemoryProperties& physicalDeviceMemoryProps
+            = getPhysicalDeviceMemoryProperties(context, device, VK_NULL_HANDLE);
+
+        const bool requestedMemoryIsHostVisible =
+            isHostVisible(&physicalDeviceMemoryProps, pAllocateInfo->memoryTypeIndex);
+
+        shouldPassThroughDedicatedAllocInfo &= !requestedMemoryIsHostVisible;
 
         if (!exportAllocateInfoPtr &&
-            ( importBufferCollectionInfoPtr || importVmoInfoPtr) &&
+            (importBufferCollectionInfoPtr || importVmoInfoPtr) &&
             dedicatedAllocInfoPtr &&
-            isHostVisible(&mMemoryProps, pAllocateInfo->memoryTypeIndex)) {
+            requestedMemoryIsHostVisible) {
             ALOGE(
                 "FATAL: It is not yet supported to import-allocate "
                 "external memory that is both host visible and dedicated.");
@@ -3687,7 +3692,7 @@
         }
 #endif
 
-        if (ahw || !isHostVisible(&mMemoryProps, finalAllocInfo.memoryTypeIndex)) {
+        if (ahw || !requestedMemoryIsHostVisible) {
             input_result =
                 enc->vkAllocateMemory(
                     device, &finalAllocInfo, pAllocator, pMemory, true /* do lock */);
@@ -3879,7 +3884,7 @@
         // no-op
     }
 
-    uint32_t transformNonExternalResourceMemoryTypeBitsForGuest(
+uint32_t transformNonExternalResourceMemoryTypeBitsForGuest(
         uint32_t hostBits) {
         uint32_t res = 0;
         for (uint32_t i = 0; i < VK_MAX_MEMORY_TYPES; ++i) {
@@ -7292,7 +7297,35 @@
 
 private:
     mutable RecursiveLock mLock;
-    VkPhysicalDeviceMemoryProperties mMemoryProps;
+
+    const VkPhysicalDeviceMemoryProperties& getPhysicalDeviceMemoryProperties(
+            void* context,
+            VkDevice device = VK_NULL_HANDLE,
+            VkPhysicalDevice physicalDevice = VK_NULL_HANDLE) {
+        if (!mCachedPhysicalDeviceMemoryProps) {
+            if (physicalDevice == VK_NULL_HANDLE) {
+                AutoLock<RecursiveLock> lock(mLock);
+
+                auto deviceInfoIt = info_VkDevice.find(device);
+                if (deviceInfoIt == info_VkDevice.end()) {
+                    ALOGE("Failed to pass device or physical device.");
+                    abort();
+                }
+                const auto& deviceInfo = deviceInfoIt->second;
+                physicalDevice = deviceInfo.physdev;
+            }
+
+            VkEncoder* enc = (VkEncoder*)context;
+
+            VkPhysicalDeviceMemoryProperties properties;
+            enc->vkGetPhysicalDeviceMemoryProperties(physicalDevice, &properties, true /* no lock */);
+
+            mCachedPhysicalDeviceMemoryProps.emplace(std::move(properties));
+        }
+        return *mCachedPhysicalDeviceMemoryProps;
+    }
+
+    std::optional<const VkPhysicalDeviceMemoryProperties> mCachedPhysicalDeviceMemoryProps;
     std::unique_ptr<EmulatorFeatureInfo> mFeatureInfo;
     std::unique_ptr<GoldfishAddressSpaceBlockProvider> mGoldfishAddressSpaceBlockProvider;