From d71e19fd753b58981c7b28af887f0fe1166d2973 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 24 Jul 2018 11:19:51 -0400 Subject: [PATCH] video_core/memory_manager: Avoid repeated unnecessary page slot lookups We don't need to keep calling the same function over and over again in a loop, especially when the behavior is slightly non-trivial. We can just keep a reference to the looked up location and do all the checking and assignments based off it instead. --- src/video_core/memory_manager.cpp | 32 ++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp index 2f814a1842..98a6ca0401 100644 --- a/src/video_core/memory_manager.cpp +++ b/src/video_core/memory_manager.cpp @@ -13,8 +13,10 @@ GPUVAddr MemoryManager::AllocateSpace(u64 size, u64 align) { ASSERT(gpu_addr); for (u64 offset = 0; offset < size; offset += PAGE_SIZE) { - ASSERT(PageSlot(*gpu_addr + offset) == static_cast(PageStatus::Unmapped)); - PageSlot(*gpu_addr + offset) = static_cast(PageStatus::Allocated); + VAddr& slot = PageSlot(*gpu_addr + offset); + + ASSERT(slot == static_cast(PageStatus::Unmapped)); + slot = static_cast(PageStatus::Allocated); } return *gpu_addr; @@ -22,8 +24,10 @@ GPUVAddr MemoryManager::AllocateSpace(u64 size, u64 align) { GPUVAddr MemoryManager::AllocateSpace(GPUVAddr gpu_addr, u64 size, u64 align) { for (u64 offset = 0; offset < size; offset += PAGE_SIZE) { - ASSERT(PageSlot(gpu_addr + offset) == static_cast(PageStatus::Unmapped)); - PageSlot(gpu_addr + offset) = static_cast(PageStatus::Allocated); + VAddr& slot = PageSlot(gpu_addr + offset); + + ASSERT(slot == static_cast(PageStatus::Unmapped)); + slot = static_cast(PageStatus::Allocated); } return gpu_addr; @@ -34,8 +38,10 @@ GPUVAddr MemoryManager::MapBufferEx(VAddr cpu_addr, u64 size) { ASSERT(gpu_addr); for (u64 offset = 0; offset < size; offset += PAGE_SIZE) { - ASSERT(PageSlot(*gpu_addr + offset) == static_cast(PageStatus::Unmapped)); - PageSlot(*gpu_addr + offset) = cpu_addr + offset; + VAddr& slot = PageSlot(*gpu_addr + offset); + + ASSERT(slot == static_cast(PageStatus::Unmapped)); + slot = cpu_addr + offset; } MappedRegion region{cpu_addr, *gpu_addr, size}; @@ -48,8 +54,10 @@ GPUVAddr MemoryManager::MapBufferEx(VAddr cpu_addr, GPUVAddr gpu_addr, u64 size) ASSERT((gpu_addr & PAGE_MASK) == 0); for (u64 offset = 0; offset < size; offset += PAGE_SIZE) { - ASSERT(PageSlot(gpu_addr + offset) == static_cast(PageStatus::Allocated)); - PageSlot(gpu_addr + offset) = cpu_addr + offset; + VAddr& slot = PageSlot(gpu_addr + offset); + + ASSERT(slot == static_cast(PageStatus::Allocated)); + slot = cpu_addr + offset; } MappedRegion region{cpu_addr, gpu_addr, size}; @@ -62,9 +70,11 @@ GPUVAddr MemoryManager::UnmapBuffer(GPUVAddr gpu_addr, u64 size) { ASSERT((gpu_addr & PAGE_MASK) == 0); for (u64 offset = 0; offset < size; offset += PAGE_SIZE) { - ASSERT(PageSlot(gpu_addr + offset) != static_cast(PageStatus::Allocated) && - PageSlot(gpu_addr + offset) != static_cast(PageStatus::Unmapped)); - PageSlot(gpu_addr + offset) = static_cast(PageStatus::Unmapped); + VAddr& slot = PageSlot(gpu_addr + offset); + + ASSERT(slot != static_cast(PageStatus::Allocated) && + slot != static_cast(PageStatus::Unmapped)); + slot = static_cast(PageStatus::Unmapped); } // Delete the region mappings that are contained within the unmapped region