aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Graphics.Gpu/Memory
diff options
context:
space:
mode:
authorgdkchan <gab.dark.100@gmail.com>2020-05-03 19:54:50 -0300
committerGitHub <noreply@github.com>2020-05-04 08:54:50 +1000
commitf77694e4f774c9391aad5344e70a7c8721cfedc6 (patch)
tree36bccaeb153bd5d921c751966b8a734a7b4b6ae1 /Ryujinx.Graphics.Gpu/Memory
parent1758424208335d1f4ff7c27c554e517c81bf72f6 (diff)
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
Diffstat (limited to 'Ryujinx.Graphics.Gpu/Memory')
-rw-r--r--Ryujinx.Graphics.Gpu/Memory/Buffer.cs12
-rw-r--r--Ryujinx.Graphics.Gpu/Memory/PhysicalMemory.cs29
2 files changed, 24 insertions, 17 deletions
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