From fff48bb45a197e4c1307340112cfed7fd45f5a83 Mon Sep 17 00:00:00 2001 From: riperiperi Date: Mon, 4 Oct 2021 19:38:59 +0100 Subject: [PATCH] Smaller initial size for ModifiedRangeList & directly inherit range list (#2663) This fixes a potential regression with the new range list changes, where the cost for creating new ones would be rather large due to creating a 1024 size array. Also reduces cost for range list inheritance by using the first existing range list as a base, rather than creating a new one then adding both lists to it. The growth size for the RangeList is now identical to its initial size. Every 32 elements was probably a little too common - now it is 1024 for most things and 8 for the buffer modified range list. The Unmapped and SyncMethod methods have been changed to ensure that they behave properly if the range list is set null. Cleaned up a few calls to use the null-conditional operator. --- Ryujinx.Graphics.Gpu/Memory/Buffer.cs | 43 ++++++++++--------- .../Memory/BufferModifiedRangeList.cs | 4 +- Ryujinx.Memory/Range/RangeList.cs | 12 ++++-- 3 files changed, 34 insertions(+), 25 deletions(-) diff --git a/Ryujinx.Graphics.Gpu/Memory/Buffer.cs b/Ryujinx.Graphics.Gpu/Memory/Buffer.cs index 76125e31a..0eaf01235 100644 --- a/Ryujinx.Graphics.Gpu/Memory/Buffer.cs +++ b/Ryujinx.Graphics.Gpu/Memory/Buffer.cs @@ -259,10 +259,7 @@ namespace Ryujinx.Graphics.Gpu.Memory /// The size of the region public void ClearModified(ulong address, ulong size) { - if (_modifiedRanges != null) - { - _modifiedRanges.Clear(address, size); - } + _modifiedRanges?.Clear(address, size); } /// @@ -275,7 +272,7 @@ namespace Ryujinx.Graphics.Gpu.Memory if (_useGranular) { - _modifiedRanges.GetRanges(Address, Size, (address, size) => + _modifiedRanges?.GetRanges(Address, Size, (address, size) => { _memoryTrackingGranular.RegisterAction(address, size, _externalFlushDelegate); SynchronizeMemory(address, size); @@ -302,18 +299,25 @@ namespace Ryujinx.Graphics.Gpu.Memory _syncActionRegistered = true; } - EnsureRangeList(); - _modifiedRanges.InheritRanges(from._modifiedRanges, (ulong address, ulong size) => + if (_modifiedRanges == null) { - if (_useGranular) + _modifiedRanges = from._modifiedRanges; + from._modifiedRanges = null; + } + else + { + _modifiedRanges.InheritRanges(from._modifiedRanges, (ulong address, ulong size) => { - _memoryTrackingGranular.RegisterAction(address, size, _externalFlushDelegate); - } - else - { - _memoryTracking.RegisterAction(_externalFlushDelegate); - } - }); + if (_useGranular) + { + _memoryTrackingGranular.RegisterAction(address, size, _externalFlushDelegate); + } + else + { + _memoryTracking.RegisterAction(_externalFlushDelegate); + } + }); + } } } @@ -381,10 +385,7 @@ namespace Ryujinx.Graphics.Gpu.Memory /// Size of the region to force dirty public void ForceDirty(ulong mAddress, ulong mSize) { - if (_modifiedRanges != null) - { - _modifiedRanges.Clear(mAddress, mSize); - } + _modifiedRanges?.Clear(mAddress, mSize); if (_useGranular) { @@ -497,7 +498,9 @@ namespace Ryujinx.Graphics.Gpu.Memory /// Size of the unmapped region public void Unmapped(ulong address, ulong size) { - _modifiedRanges?.Clear(address, size); + BufferModifiedRangeList modifiedRanges = _modifiedRanges; + + modifiedRanges?.Clear(address, size); UnmappedSequence++; } diff --git a/Ryujinx.Graphics.Gpu/Memory/BufferModifiedRangeList.cs b/Ryujinx.Graphics.Gpu/Memory/BufferModifiedRangeList.cs index 632274316..84cf0dd8b 100644 --- a/Ryujinx.Graphics.Gpu/Memory/BufferModifiedRangeList.cs +++ b/Ryujinx.Graphics.Gpu/Memory/BufferModifiedRangeList.cs @@ -60,6 +60,8 @@ namespace Ryujinx.Graphics.Gpu.Memory /// class BufferModifiedRangeList : RangeList { + private const int BackingInitialSize = 8; + private GpuContext _context; private object _lock = new object(); @@ -68,7 +70,7 @@ namespace Ryujinx.Graphics.Gpu.Memory /// Creates a new instance of a modified range list. /// /// GPU context that the buffer range list belongs to - public BufferModifiedRangeList(GpuContext context) + public BufferModifiedRangeList(GpuContext context) : base(BackingInitialSize) { _context = context; } diff --git a/Ryujinx.Memory/Range/RangeList.cs b/Ryujinx.Memory/Range/RangeList.cs index d82a05c5e..7278e7eb4 100644 --- a/Ryujinx.Memory/Range/RangeList.cs +++ b/Ryujinx.Memory/Range/RangeList.cs @@ -33,18 +33,22 @@ namespace Ryujinx.Memory.Range } } + private const int BackingInitialSize = 1024; private const int ArrayGrowthSize = 32; - private const int BackingGrowthSize = 1024; private RangeItem[] _items; + private readonly int _backingGrowthSize; + public int Count { get; protected set; } /// /// Creates a new range list. /// - public RangeList() + /// The initial size of the backing array + public RangeList(int backingInitialSize = BackingInitialSize) { - _items = new RangeItem[BackingGrowthSize]; + _backingGrowthSize = backingInitialSize; + _items = new RangeItem[backingInitialSize]; } /// @@ -68,7 +72,7 @@ namespace Ryujinx.Memory.Range { if (Count + 1 > _items.Length) { - Array.Resize(ref _items, _items.Length + ArrayGrowthSize); + Array.Resize(ref _items, _items.Length + _backingGrowthSize); } if (index >= Count)