From 5a39d3c4a13d9de67aa324a487af3756e4ce4930 Mon Sep 17 00:00:00 2001 From: riperiperi Date: Thu, 24 Nov 2022 01:41:16 +0000 Subject: [PATCH] GPU: Relax locking on Buffer Cache (#3883) I did this on ncbuffer2 when we were using it for LDN 3, but I noticed that it can apply to the current buffer manager too, and it's an easy performance win. The only buffer access that can come from another thread is the overlap search for buffers that have been unmapped. Everything else, including modifications, come from the main GPU thread. That means we only need to lock the range list when it's being modified, as that's the only time where we'll cause a race with the unmapped handler. This has a significant performance improvements in situations where FIFO is high, like the other two PRs. Joined together they give a nice boost (73.6 master -> 79 -> 83 fps in SMO). --- Ryujinx.Graphics.Gpu/Memory/BufferCache.cs | 28 +++++++--------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/Ryujinx.Graphics.Gpu/Memory/BufferCache.cs b/Ryujinx.Graphics.Gpu/Memory/BufferCache.cs index 85ed49d59..a523c76fb 100644 --- a/Ryujinx.Graphics.Gpu/Memory/BufferCache.cs +++ b/Ryujinx.Graphics.Gpu/Memory/BufferCache.cs @@ -22,6 +22,10 @@ namespace Ryujinx.Graphics.Gpu.Memory private readonly GpuContext _context; private readonly PhysicalMemory _physicalMemory; + /// + /// Only modified from the GPU thread. Must lock for add/remove. + /// Must lock for any access from other threads. + /// private readonly RangeList _buffers; private Buffer[] _bufferOverlaps; @@ -200,12 +204,7 @@ namespace Ryujinx.Graphics.Gpu.Memory /// Size in bytes of the buffer private void CreateBufferAligned(ulong address, ulong size) { - int overlapsCount; - - lock (_buffers) - { - overlapsCount = _buffers.FindOverlapsNonOverlapping(address, size, ref _bufferOverlaps); - } + int overlapsCount = _buffers.FindOverlapsNonOverlapping(address, size, ref _bufferOverlaps); if (overlapsCount != 0) { @@ -410,10 +409,7 @@ namespace Ryujinx.Graphics.Gpu.Memory if (size != 0) { - lock (_buffers) - { - buffer = _buffers.FindFirstOverlap(address, size); - } + buffer = _buffers.FindFirstOverlap(address, size); buffer.SynchronizeMemory(address, size); @@ -424,10 +420,7 @@ namespace Ryujinx.Graphics.Gpu.Memory } else { - lock (_buffers) - { - buffer = _buffers.FindFirstOverlap(address, 1); - } + buffer = _buffers.FindFirstOverlap(address, 1); } return buffer; @@ -442,12 +435,7 @@ namespace Ryujinx.Graphics.Gpu.Memory { if (size != 0) { - Buffer buffer; - - lock (_buffers) - { - buffer = _buffers.FindFirstOverlap(address, size); - } + Buffer buffer = _buffers.FindFirstOverlap(address, size); buffer.SynchronizeMemory(address, size); }