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

6 files changed, 46 insertions, 26 deletions

diff --git a/Ryujinx.Graphics.Gpu/GpuContext.cs b/Ryujinx.Graphics.Gpu/GpuContext.cs
index f2a0d5e5..5e117831 100644
--- a/Ryujinx.Graphics.Gpu/GpuContext.cs
+++ b/Ryujinx.Graphics.Gpu/GpuContext.cs
@@ -108,7 +108,7 @@ namespace Ryujinx.Graphics.Gpu
         /// This is required for any GPU memory access.
         /// </summary>
         /// <param name="cpuMemory">CPU memory manager</param>
-        public void SetVmm(ARMeilleure.Memory.MemoryManager cpuMemory)
+        public void SetVmm(Cpu.MemoryManager cpuMemory)
         {
             PhysicalMemory = new PhysicalMemory(cpuMemory);
         }
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
         /// </summary>
         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];
         }
 
         /// <summary>
@@ -62,11 +66,11 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// </summary>
         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);
+        }
+
         /// <summary>
         /// 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
         /// </summary>
         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;
 
diff --git a/Ryujinx.Graphics.Gpu/Memory/Buffer.cs b/Ryujinx.Graphics.Gpu/Memory/Buffer.cs
index e4bc161f..959e1a10 100644
--- a/Ryujinx.Graphics.Gpu/Memory/Buffer.cs
+++ b/Ryujinx.Graphics.Gpu/Memory/Buffer.cs
@@ -30,7 +30,9 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// </summary>
         public ulong EndAddress => Address + Size;
 
-        private int[] _sequenceNumbers;
+        private readonly (ulong, ulong)[] _modifiedRanges;
+
+        private readonly int[] _sequenceNumbers;
 
         /// <summary>
         /// Creates a new instance of the buffer.
@@ -46,6 +48,8 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
             HostBuffer = context.Renderer.CreateBuffer((int)size);
 
+            _modifiedRanges = new (ulong, ulong)[size / PhysicalMemory.PageSize];
+
             _sequenceNumbers = new int[size / MemoryManager.PageSize];
         }
 
@@ -113,11 +117,11 @@ namespace Ryujinx.Graphics.Gpu.Memory
                 return;
             }
 
-            (ulong, ulong)[] modifiedRanges = _context.PhysicalMemory.GetModifiedRanges(address, size, ResourceName.Buffer);
+            int count = _context.PhysicalMemory.QueryModified(address, size, ResourceName.Buffer, _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];
 
                 int offset = (int)(mAddress - Address);
 
diff --git a/Ryujinx.Graphics.Gpu/Memory/PhysicalMemory.cs b/Ryujinx.Graphics.Gpu/Memory/PhysicalMemory.cs
index ca28f31d..a787305d 100644
--- a/Ryujinx.Graphics.Gpu/Memory/PhysicalMemory.cs
+++ b/Ryujinx.Graphics.Gpu/Memory/PhysicalMemory.cs
@@ -1,22 +1,23 @@
 using System;
+using System.Runtime.CompilerServices;
 
 namespace Ryujinx.Graphics.Gpu.Memory
 {
-    using CpuMemoryManager = ARMeilleure.Memory.MemoryManager;
-
     /// <summary>
     /// Represents physical memory, accessible from the GPU.
     /// This is actually working CPU virtual addresses, of memory mapped on the application process.
     /// </summary>
     class PhysicalMemory
     {
-        private readonly CpuMemoryManager _cpuMemory;
+        public const int PageSize = Cpu.MemoryManager.PageSize;
+
+        private readonly Cpu.MemoryManager _cpuMemory;
 
         /// <summary>
         /// Creates a new instance of the physical memory.
         /// </summary>
         /// <param name="cpuMemory">CPU memory manager of the application process</param>
-        public PhysicalMemory(CpuMemoryManager cpuMemory)
+        public PhysicalMemory(Cpu.MemoryManager cpuMemory)
         {
             _cpuMemory = cpuMemory;
         }
@@ -29,7 +30,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <returns>A read only span of the data at the specified memory location</returns>
         public ReadOnlySpan<byte> GetSpan(ulong address, ulong size)
         {
-            return _cpuMemory.GetSpan(address, size);
+            return _cpuMemory.GetSpan(address, (int)size);
         }
 
         /// <summary>
@@ -39,19 +40,21 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="data">Data to be written</param>
         public void Write(ulong address, ReadOnlySpan<byte> data)
         {
-            _cpuMemory.WriteBytes((long)address, data.ToArray());
+            _cpuMemory.Write(address, data);
         }
 
         /// <summary>
-        /// Gets the modified ranges for a given range of the application process mapped memory.
+        /// Checks if a specified virtual memory region has been modified by the CPU since the last call.
         /// </summary>
-        /// <param name="address">Start address of the range</param>
-        /// <param name="size">Size, in bytes, of the range</param>
-        /// <param name="name">Name of the GPU resource being checked</param>
-        /// <returns>Ranges, composed of address and size, modified by the application process, form the CPU</returns>
-        public (ulong, ulong)[] GetModifiedRanges(ulong address, ulong size, ResourceName name)
+        /// <param name="address">CPU virtual address of the region</param>
+        /// <param name="size">Size of the region</param>
+        /// <param name="name">Resource name</param>
+        /// <param name="modifiedRanges">Optional array where the modified ranges should be written</param>
+        /// <returns>The number of modified ranges</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public int QueryModified(ulong address, ulong size, ResourceName name, (ulong, ulong)[] modifiedRanges = null)
         {
-            return _cpuMemory.GetModifiedRanges(address, size, (int)name);
+            return _cpuMemory.QueryModified(address, size, (int)name, modifiedRanges);
         }
     }
 }
\ No newline at end of file
diff --git a/Ryujinx.Graphics.Gpu/Ryujinx.Graphics.Gpu.csproj b/Ryujinx.Graphics.Gpu/Ryujinx.Graphics.Gpu.csproj
index 49e93aa1..d846b64c 100644
--- a/Ryujinx.Graphics.Gpu/Ryujinx.Graphics.Gpu.csproj
+++ b/Ryujinx.Graphics.Gpu/Ryujinx.Graphics.Gpu.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <ProjectReference Include="..\ARMeilleure\ARMeilleure.csproj" />
+    <ProjectReference Include="..\Ryujinx.Cpu\Ryujinx.Cpu.csproj" />
     <ProjectReference Include="..\Ryujinx.Graphics.GAL\Ryujinx.Graphics.GAL.csproj" />
     <ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />
     <ProjectReference Include="..\Ryujinx.Graphics.Texture\Ryujinx.Graphics.Texture.csproj" />