From f77694e4f774c9391aad5344e70a7c8721cfedc6 Mon Sep 17 00:00:00 2001 From: gdkchan Date: Sun, 3 May 2020 19:54:50 -0300 Subject: Implement a new physical memory manager and replace DeviceMemory (#856) * Implement a new physical memory manager and replace DeviceMemory * Proper generic constraints * Fix debug build * Add memory tests * New CPU memory manager and general code cleanup * Remove host memory management from CPU project, use Ryujinx.Memory instead * Fix tests * Document exceptions on MemoryBlock * Fix leak on unix memory allocation * Proper disposal of some objects on tests * Fix JitCache not being set as initialized * GetRef without checks for 8-bits and 16-bits CAS * Add MemoryBlock destructor * Throw in separate method to improve codegen * Address PR feedback * QueryModified improvements * Fix memory write tracking not marking all pages as modified in some cases * Simplify MarkRegionAsModified * Remove XML doc for ghost param * Add back optimization to avoid useless buffer updates * Add Ryujinx.Cpu project, move MemoryManager there and remove MemoryBlockWrapper * Some nits * Do not perform address translation when size is 0 * Address PR feedback and format NativeInterface class * Remove ghost parameter description * Update Ryujinx.Cpu to .NET Core 3.1 * Address PR feedback * Fix build * Return a well defined value for GetPhysicalAddress with invalid VA, and do not return unmapped ranges as modified * Typo --- Ryujinx.Graphics.Gpu/Image/Pool.cs | 15 ++++++++++++--- Ryujinx.Graphics.Gpu/Image/Texture.cs | 12 ++++++++---- 2 files changed, 20 insertions(+), 7 deletions(-) (limited to 'Ryujinx.Graphics.Gpu/Image') diff --git a/Ryujinx.Graphics.Gpu/Image/Pool.cs b/Ryujinx.Graphics.Gpu/Image/Pool.cs index 7cf06d0b..8796894c 100644 --- a/Ryujinx.Graphics.Gpu/Image/Pool.cs +++ b/Ryujinx.Graphics.Gpu/Image/Pool.cs @@ -33,6 +33,8 @@ namespace Ryujinx.Graphics.Gpu.Image /// public ulong Size { get; } + private readonly (ulong, ulong)[] _modifiedRanges; + public Pool(GpuContext context, ulong address, int maximumId) { Context = context; @@ -46,6 +48,8 @@ namespace Ryujinx.Graphics.Gpu.Image Address = address; Size = size; + + _modifiedRanges = new (ulong, ulong)[size / PhysicalMemory.PageSize]; } /// @@ -62,11 +66,11 @@ namespace Ryujinx.Graphics.Gpu.Image /// public void SynchronizeMemory() { - (ulong, ulong)[] modifiedRanges = Context.PhysicalMemory.GetModifiedRanges(Address, Size, ResourceName.TexturePool); + int count = Context.PhysicalMemory.QueryModified(Address, Size, ResourceName.TexturePool, _modifiedRanges); - for (int index = 0; index < modifiedRanges.Length; index++) + for (int index = 0; index < count; index++) { - (ulong mAddress, ulong mSize) = modifiedRanges[index]; + (ulong mAddress, ulong mSize) = _modifiedRanges[index]; if (mAddress < Address) { @@ -84,6 +88,11 @@ namespace Ryujinx.Graphics.Gpu.Image } } + private void InvalidateRangeInternal(ulong offset, int size) + { + InvalidateRangeImpl(Address + offset, (ulong)size); + } + /// /// Invalidates a range of memory of the GPU resource pool. /// Entries that falls inside the speicified range will be invalidated, diff --git a/Ryujinx.Graphics.Gpu/Image/Texture.cs b/Ryujinx.Graphics.Gpu/Image/Texture.cs index d02c3665..9554bc6b 100644 --- a/Ryujinx.Graphics.Gpu/Image/Texture.cs +++ b/Ryujinx.Graphics.Gpu/Image/Texture.cs @@ -78,6 +78,8 @@ namespace Ryujinx.Graphics.Gpu.Image /// public ulong Size => (ulong)_sizeInfo.TotalSize; + private (ulong, ulong)[] _modifiedRanges; + private int _referenceCount; private int _sequenceNumber; @@ -133,6 +135,8 @@ namespace Ryujinx.Graphics.Gpu.Image _context = context; _sizeInfo = sizeInfo; + _modifiedRanges = new (ulong, ulong)[(sizeInfo.TotalSize / PhysicalMemory.PageSize) + 1]; + SetInfo(info); _viewStorage = this; @@ -304,9 +308,9 @@ namespace Ryujinx.Graphics.Gpu.Image _sequenceNumber = _context.SequenceNumber; - (ulong, ulong)[] modifiedRanges = _context.PhysicalMemory.GetModifiedRanges(Address, Size, ResourceName.Texture); + int modifiedCount = _context.PhysicalMemory.QueryModified(Address, Size, ResourceName.Texture, _modifiedRanges); - if (modifiedRanges.Length == 0 && _hasData) + if (modifiedCount == 0 && _hasData) { return; } @@ -325,9 +329,9 @@ namespace Ryujinx.Graphics.Gpu.Image ulong endAddress = Address + Size; - for (int i = 0; i < modifiedRanges.Length; i++) + for (int i = 0; i < modifiedCount; i++) { - (ulong modifiedAddress, ulong modifiedSize) = modifiedRanges[i]; + (ulong modifiedAddress, ulong modifiedSize) = _modifiedRanges[i]; ulong endModifiedAddress = modifiedAddress + modifiedSize; -- cgit v1.2.3