fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 22:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

venus: extend image cache to vkGetDeviceImageMemoryRequirements

Browse source 
Signed-off-by: Juston Li <justonli@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28887>
This commit is contained in:
Juston Li 2024-04-18 17:33:02 -07:00 • committed by Marge Bot
parent f4f8f2ecbb
commit ce1bbd241e
1 changed files with 72 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
src/virtio/vulkan/vn_image.c
View file

@ -246,6 +246,31 @@ vn_image_init_reqs_from_cache(struct vn_device *dev,
return !!hash_entry;
}
static struct vn_image_memory_requirements *
vn_image_get_reqs_from_cache(struct vn_device *dev,
uint8_t *key,
uint32_t plane)
{
struct vn_image_memory_requirements *requirements = NULL;
struct vn_image_reqs_cache *cache = &dev->image_reqs_cache;
assert(cache->ht);
simple_mtx_lock(&cache->mutex);
struct hash_entry *hash_entry = _mesa_hash_table_search(cache->ht, key);
if (hash_entry) {
struct vn_image_reqs_cache_entry *cache_entry = hash_entry->data;
requirements = &cache_entry->requirements[plane];
list_move_to(&cache_entry->head, &dev->image_reqs_cache.lru);
p_atomic_inc(&cache->debug.cache_hit_count);
} else {
p_atomic_inc(&cache->debug.cache_miss_count);
}
simple_mtx_unlock(&cache->mutex);
return requirements;
}
static void
vn_image_store_reqs_in_cache(struct vn_device *dev,
uint8_t *key,
@ -1050,9 +1075,53 @@ vn_GetDeviceImageMemoryRequirements(
{
struct vn_device *dev = vn_device_from_handle(device);
/* TODO integrate image memory requirements cache */
vn_call_vkGetDeviceImageMemoryRequirements(dev->primary_ring, device,
pInfo, pMemoryRequirements);
uint8_t key[SHA1_DIGEST_LENGTH] = { 0 };
const bool cacheable =
vn_image_get_image_reqs_key(dev, pInfo->pCreateInfo, key);
if (cacheable) {
uint32_t plane = 0;
if (pInfo->pCreateInfo->flags & VK_IMAGE_CREATE_DISJOINT_BIT)
vn_image_get_plane(pInfo->planeAspect);
const struct vn_image_memory_requirements *cached_reqs =
vn_image_get_reqs_from_cache(dev, key, plane);
if (cached_reqs) {
vn_image_fill_reqs(cached_reqs, pMemoryRequirements);
return;
}
const uint32_t plane_count =
vn_image_get_plane_count(pInfo->pCreateInfo);
STACK_ARRAY(VkDeviceImageMemoryRequirements, req_info, plane_count);
STACK_ARRAY(struct vn_image_memory_requirements, reqs, plane_count);
/* Retrieve reqs for all planes so the cache entry is complete */
for (uint32_t i = 0; i < plane_count; i++) {
req_info[i].sType =
VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS;
req_info[i].pNext = NULL;
req_info[i].pCreateInfo = pInfo->pCreateInfo;
req_info[i].planeAspect = VK_IMAGE_ASPECT_PLANE_0_BIT << i;
reqs[i].memory.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2;
reqs[i].memory.pNext = &reqs[i].dedicated;
reqs[i].dedicated.sType =
VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS;
reqs[i].dedicated.pNext = NULL;
vn_call_vkGetDeviceImageMemoryRequirements(
dev->primary_ring, device, &req_info[i], &reqs[i].memory);
}
vn_image_fill_reqs(&reqs[plane], pMemoryRequirements);
vn_image_store_reqs_in_cache(dev, key, plane_count, reqs);
STACK_ARRAY_FINISH(req_info);
STACK_ARRAY_FINISH(reqs);
} else {
vn_call_vkGetDeviceImageMemoryRequirements(dev->primary_ring, device,
pInfo, pMemoryRequirements);
}
}
void