mirror of
https://git.naxdy.org/Mirror/Ryujinx.git
synced 2024-11-15 01:25:25 +00:00
b4d8d893a4
* WIP Range Tracking - Texture invalidation seems to have large problems - Buffer/Pool invalidation may have problems - Mirror memory tracking puts an additional `add` in compiled code, we likely just want to make HLE access slower if this is the final solution. - Native project is in the messiest possible location. - [HACK] JIT memory access always uses native "fast" path - [HACK] Trying some things with texture invalidation and views. It works :) Still a few hacks, messy things, slow things More work in progress stuff (also move to memory project) Quite a bit faster now. - Unmapping GPU VA and CPU VA will now correctly update write tracking regions, and invalidate textures for the former. - The Virtual range list is now non-overlapping like the physical one. - Fixed some bugs where regions could leak. - Introduced a weird bug that I still need to track down (consistent invalid buffer in MK8 ribbon road) Move some stuff. I think we'll eventually just put the dll and so for this in a nuget package. Fix rebase. [WIP] MultiRegionHandle variable size ranges - Avoid reprotecting regions that change often (needs some tweaking) - There's still a bug in buffers, somehow. - Might want different api for minimum granularity Fix rebase issue Commit everything needed for software only tracking. Remove native components. Remove more native stuff. Cleanup Use a separate window for the background context, update opentk. (fixes linux) Some experimental changes Should get things working up to scratch - still need to try some things with flush/modification and res scale. Include address with the region action. Initial work to make range tracking work Still a ton of bugs Fix some issues with the new stuff. * Fix texture flush instability There's still some weird behaviour, but it's much improved without this. (textures with cpu modified data were flushing over it) * Find the destination texture for Buffer->Texture full copy Greatly improves performance for nvdec videos (with range tracking) * Further improve texture tracking * Disable Memory Tracking for view parents This is a temporary approach to better match behaviour on master (where invalidations would be soaked up by views, rather than trigger twice) The assumption is that when views are created to a texture, they will cover all of its data anyways. Of course, this can easily be improved in future. * Introduce some tracking tests. WIP * Complete base tests. * Add more tests for multiregion, fix existing test. * Cleanup Part 1 * Remove unnecessary code from memory tracking * Fix some inconsistencies with 3D texture rule. * Add dispose tests. * Use a background thread for the background context. Rather than setting and unsetting a context as current, doing the work on a dedicated thread with signals seems to be a bit faster. Also nerf the multithreading test a bit. * Copy to texture with matching alignment This extends the copy to work for some videos with unusual size, such as tutorial videos in SMO. It will only occur if the destination texture already exists at XCount size. * Track reads for buffer copies. Synchronize new buffers before copying overlaps. * Remove old texture flushing mechanisms. Range tracking all the way, baby. * Wake the background thread when disposing. Avoids a deadlock when games are closed. * Address Feedback 1 * Separate TextureCopy instance for background thread Also `BackgroundContextWorker.InBackground` for a more sensible idenfifier for if we're in a background thread. * Add missing XML docs. * Address Feedback * Maybe I should start drinking coffee. * Some more feedback. * Remove flush warning, Refocus window after making background context
408 lines
14 KiB
C#
408 lines
14 KiB
C#
using Ryujinx.Cpu;
|
|
using System;
|
|
using System.Runtime.CompilerServices;
|
|
using System.Runtime.InteropServices;
|
|
|
|
namespace Ryujinx.Graphics.Gpu.Memory
|
|
{
|
|
/// <summary>
|
|
/// GPU memory manager.
|
|
/// </summary>
|
|
public class MemoryManager
|
|
{
|
|
private const ulong AddressSpaceSize = 1UL << 40;
|
|
|
|
public const ulong BadAddress = ulong.MaxValue;
|
|
|
|
private const int PtLvl0Bits = 14;
|
|
private const int PtLvl1Bits = 14;
|
|
public const int PtPageBits = 12;
|
|
|
|
private const ulong PtLvl0Size = 1UL << PtLvl0Bits;
|
|
private const ulong PtLvl1Size = 1UL << PtLvl1Bits;
|
|
public const ulong PageSize = 1UL << PtPageBits;
|
|
|
|
private const ulong PtLvl0Mask = PtLvl0Size - 1;
|
|
private const ulong PtLvl1Mask = PtLvl1Size - 1;
|
|
public const ulong PageMask = PageSize - 1;
|
|
|
|
private const int PtLvl0Bit = PtPageBits + PtLvl1Bits;
|
|
private const int PtLvl1Bit = PtPageBits;
|
|
|
|
private const ulong PteUnmapped = 0xffffffff_ffffffff;
|
|
private const ulong PteReserved = 0xffffffff_fffffffe;
|
|
|
|
private readonly ulong[][] _pageTable;
|
|
|
|
public event EventHandler<UnmapEventArgs> MemoryUnmapped;
|
|
|
|
private GpuContext _context;
|
|
|
|
/// <summary>
|
|
/// Creates a new instance of the GPU memory manager.
|
|
/// </summary>
|
|
public MemoryManager(GpuContext context)
|
|
{
|
|
_context = context;
|
|
_pageTable = new ulong[PtLvl0Size][];
|
|
}
|
|
|
|
/// <summary>
|
|
/// Reads data from GPU mapped memory.
|
|
/// </summary>
|
|
/// <typeparam name="T">Type of the data</typeparam>
|
|
/// <param name="gpuVa">GPU virtual address where the data is located</param>
|
|
/// <returns>The data at the specified memory location</returns>
|
|
public T Read<T>(ulong gpuVa) where T : unmanaged
|
|
{
|
|
ulong processVa = Translate(gpuVa);
|
|
|
|
return MemoryMarshal.Cast<byte, T>(_context.PhysicalMemory.GetSpan(processVa, Unsafe.SizeOf<T>()))[0];
|
|
}
|
|
|
|
/// <summary>
|
|
/// Gets a read-only span of data from GPU mapped memory.
|
|
/// </summary>
|
|
/// <param name="gpuVa">GPU virtual address where the data is located</param>
|
|
/// <param name="size">Size of the data</param>
|
|
/// <returns>The span of the data at the specified memory location</returns>
|
|
public ReadOnlySpan<byte> GetSpan(ulong gpuVa, int size)
|
|
{
|
|
ulong processVa = Translate(gpuVa);
|
|
|
|
return _context.PhysicalMemory.GetSpan(processVa, size);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Gets a writable region from GPU mapped memory.
|
|
/// </summary>
|
|
/// <param name="address">Start address of the range</param>
|
|
/// <param name="size">Size in bytes to be range</param>
|
|
/// <returns>A writable region with the data at the specified memory location</returns>
|
|
public WritableRegion GetWritableRegion(ulong gpuVa, int size)
|
|
{
|
|
ulong processVa = Translate(gpuVa);
|
|
|
|
return _context.PhysicalMemory.GetWritableRegion(processVa, size);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Writes data to GPU mapped memory.
|
|
/// </summary>
|
|
/// <typeparam name="T">Type of the data</typeparam>
|
|
/// <param name="gpuVa">GPU virtual address to write the value into</param>
|
|
/// <param name="value">The value to be written</param>
|
|
public void Write<T>(ulong gpuVa, T value) where T : unmanaged
|
|
{
|
|
ulong processVa = Translate(gpuVa);
|
|
|
|
_context.PhysicalMemory.Write(processVa, MemoryMarshal.Cast<T, byte>(MemoryMarshal.CreateSpan(ref value, 1)));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Writes data to GPU mapped memory.
|
|
/// </summary>
|
|
/// <param name="gpuVa">GPU virtual address to write the data into</param>
|
|
/// <param name="data">The data to be written</param>
|
|
public void Write(ulong gpuVa, ReadOnlySpan<byte> data)
|
|
{
|
|
ulong processVa = Translate(gpuVa);
|
|
|
|
_context.PhysicalMemory.Write(processVa, data);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Maps a given range of pages to the specified CPU virtual address.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// All addresses and sizes must be page aligned.
|
|
/// </remarks>
|
|
/// <param name="pa">CPU virtual address to map into</param>
|
|
/// <param name="va">GPU virtual address to be mapped</param>
|
|
/// <param name="size">Size in bytes of the mapping</param>
|
|
/// <returns>GPU virtual address of the mapping</returns>
|
|
public ulong Map(ulong pa, ulong va, ulong size)
|
|
{
|
|
lock (_pageTable)
|
|
{
|
|
MemoryUnmapped?.Invoke(this, new UnmapEventArgs(va, size));
|
|
|
|
for (ulong offset = 0; offset < size; offset += PageSize)
|
|
{
|
|
SetPte(va + offset, pa + offset);
|
|
}
|
|
}
|
|
|
|
return va;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Maps a given range of pages to an allocated GPU virtual address.
|
|
/// The memory is automatically allocated by the memory manager.
|
|
/// </summary>
|
|
/// <param name="pa">CPU virtual address to map into</param>
|
|
/// <param name="size">Size in bytes of the mapping</param>
|
|
/// <param name="alignment">Required alignment of the GPU virtual address in bytes</param>
|
|
/// <returns>GPU virtual address where the range was mapped, or an all ones mask in case of failure</returns>
|
|
public ulong MapAllocate(ulong pa, ulong size, ulong alignment)
|
|
{
|
|
lock (_pageTable)
|
|
{
|
|
ulong va = GetFreePosition(size, alignment);
|
|
|
|
if (va != PteUnmapped)
|
|
{
|
|
for (ulong offset = 0; offset < size; offset += PageSize)
|
|
{
|
|
SetPte(va + offset, pa + offset);
|
|
}
|
|
}
|
|
|
|
return va;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Maps a given range of pages to an allocated GPU virtual address.
|
|
/// The memory is automatically allocated by the memory manager.
|
|
/// This also ensures that the mapping is always done in the first 4GB of GPU address space.
|
|
/// </summary>
|
|
/// <param name="pa">CPU virtual address to map into</param>
|
|
/// <param name="size">Size in bytes of the mapping</param>
|
|
/// <returns>GPU virtual address where the range was mapped, or an all ones mask in case of failure</returns>
|
|
public ulong MapLow(ulong pa, ulong size)
|
|
{
|
|
lock (_pageTable)
|
|
{
|
|
ulong va = GetFreePosition(size, 1, PageSize);
|
|
|
|
if (va != PteUnmapped && va <= uint.MaxValue && (va + size) <= uint.MaxValue)
|
|
{
|
|
for (ulong offset = 0; offset < size; offset += PageSize)
|
|
{
|
|
SetPte(va + offset, pa + offset);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
va = PteUnmapped;
|
|
}
|
|
|
|
return va;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Reserves memory at a fixed GPU memory location.
|
|
/// This prevents the reserved region from being used for memory allocation for map.
|
|
/// </summary>
|
|
/// <param name="va">GPU virtual address to reserve</param>
|
|
/// <param name="size">Size in bytes of the reservation</param>
|
|
/// <returns>GPU virtual address of the reservation, or an all ones mask in case of failure</returns>
|
|
public ulong ReserveFixed(ulong va, ulong size)
|
|
{
|
|
lock (_pageTable)
|
|
{
|
|
MemoryUnmapped?.Invoke(this, new UnmapEventArgs(va, size));
|
|
|
|
for (ulong offset = 0; offset < size; offset += PageSize)
|
|
{
|
|
if (IsPageInUse(va + offset))
|
|
{
|
|
return PteUnmapped;
|
|
}
|
|
}
|
|
|
|
for (ulong offset = 0; offset < size; offset += PageSize)
|
|
{
|
|
SetPte(va + offset, PteReserved);
|
|
}
|
|
}
|
|
|
|
return va;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Reserves memory at any GPU memory location.
|
|
/// </summary>
|
|
/// <param name="size">Size in bytes of the reservation</param>
|
|
/// <param name="alignment">Reservation address alignment in bytes</param>
|
|
/// <returns>GPU virtual address of the reservation, or an all ones mask in case of failure</returns>
|
|
public ulong Reserve(ulong size, ulong alignment)
|
|
{
|
|
lock (_pageTable)
|
|
{
|
|
ulong address = GetFreePosition(size, alignment);
|
|
|
|
if (address != PteUnmapped)
|
|
{
|
|
for (ulong offset = 0; offset < size; offset += PageSize)
|
|
{
|
|
SetPte(address + offset, PteReserved);
|
|
}
|
|
}
|
|
|
|
return address;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Frees memory that was previously allocated by a map or reserved.
|
|
/// </summary>
|
|
/// <param name="va">GPU virtual address to free</param>
|
|
/// <param name="size">Size in bytes of the region being freed</param>
|
|
public void Free(ulong va, ulong size)
|
|
{
|
|
lock (_pageTable)
|
|
{
|
|
// Event handlers are not expected to be thread safe.
|
|
MemoryUnmapped?.Invoke(this, new UnmapEventArgs(va, size));
|
|
|
|
for (ulong offset = 0; offset < size; offset += PageSize)
|
|
{
|
|
SetPte(va + offset, PteUnmapped);
|
|
}
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Gets the address of an unused (free) region of the specified size.
|
|
/// </summary>
|
|
/// <param name="size">Size of the region in bytes</param>
|
|
/// <param name="alignment">Required alignment of the region address in bytes</param>
|
|
/// <param name="start">Start address of the search on the address space</param>
|
|
/// <returns>GPU virtual address of the allocation, or an all ones mask in case of failure</returns>
|
|
private ulong GetFreePosition(ulong size, ulong alignment = 1, ulong start = 1UL << 32)
|
|
{
|
|
// Note: Address 0 is not considered valid by the driver,
|
|
// when 0 is returned it's considered a mapping error.
|
|
ulong address = start;
|
|
ulong freeSize = 0;
|
|
|
|
if (alignment == 0)
|
|
{
|
|
alignment = 1;
|
|
}
|
|
|
|
alignment = (alignment + PageMask) & ~PageMask;
|
|
|
|
while (address + freeSize < AddressSpaceSize)
|
|
{
|
|
if (!IsPageInUse(address + freeSize))
|
|
{
|
|
freeSize += PageSize;
|
|
|
|
if (freeSize >= size)
|
|
{
|
|
return address;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
address += freeSize + PageSize;
|
|
freeSize = 0;
|
|
|
|
ulong remainder = address % alignment;
|
|
|
|
if (remainder != 0)
|
|
{
|
|
address = (address - remainder) + alignment;
|
|
}
|
|
}
|
|
}
|
|
|
|
return PteUnmapped;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Checks if a given page is mapped.
|
|
/// </summary>
|
|
/// <param name="gpuVa">GPU virtual address of the page to check</param>
|
|
/// <returns>True if the page is mapped, false otherwise</returns>
|
|
public bool IsMapped(ulong gpuVa)
|
|
{
|
|
return Translate(gpuVa) != PteUnmapped;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Translates a GPU virtual address to a CPU virtual address.
|
|
/// </summary>
|
|
/// <param name="gpuVa">GPU virtual address to be translated</param>
|
|
/// <returns>CPU virtual address</returns>
|
|
public ulong Translate(ulong gpuVa)
|
|
{
|
|
ulong baseAddress = GetPte(gpuVa);
|
|
|
|
if (baseAddress == PteUnmapped || baseAddress == PteReserved)
|
|
{
|
|
return PteUnmapped;
|
|
}
|
|
|
|
return baseAddress + (gpuVa & PageMask);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Checks if a given memory page is mapped or reserved.
|
|
/// </summary>
|
|
/// <param name="gpuVa">GPU virtual address of the page</param>
|
|
/// <returns>True if the page is mapped or reserved, false otherwise</returns>
|
|
private bool IsPageInUse(ulong gpuVa)
|
|
{
|
|
if (gpuVa >> PtLvl0Bits + PtLvl1Bits + PtPageBits != 0)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
ulong l0 = (gpuVa >> PtLvl0Bit) & PtLvl0Mask;
|
|
ulong l1 = (gpuVa >> PtLvl1Bit) & PtLvl1Mask;
|
|
|
|
if (_pageTable[l0] == null)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
return _pageTable[l0][l1] != PteUnmapped;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Gets the Page Table entry for a given GPU virtual address.
|
|
/// </summary>
|
|
/// <param name="gpuVa">GPU virtual address</param>
|
|
/// <returns>Page table entry (CPU virtual address)</returns>
|
|
private ulong GetPte(ulong gpuVa)
|
|
{
|
|
ulong l0 = (gpuVa >> PtLvl0Bit) & PtLvl0Mask;
|
|
ulong l1 = (gpuVa >> PtLvl1Bit) & PtLvl1Mask;
|
|
|
|
if (_pageTable[l0] == null)
|
|
{
|
|
return PteUnmapped;
|
|
}
|
|
|
|
return _pageTable[l0][l1];
|
|
}
|
|
|
|
/// <summary>
|
|
/// Sets a Page Table entry at a given GPU virtual address.
|
|
/// </summary>
|
|
/// <param name="gpuVa">GPU virtual address</param>
|
|
/// <param name="pte">Page table entry (CPU virtual address)</param>
|
|
private void SetPte(ulong gpuVa, ulong pte)
|
|
{
|
|
ulong l0 = (gpuVa >> PtLvl0Bit) & PtLvl0Mask;
|
|
ulong l1 = (gpuVa >> PtLvl1Bit) & PtLvl1Mask;
|
|
|
|
if (_pageTable[l0] == null)
|
|
{
|
|
_pageTable[l0] = new ulong[PtLvl1Size];
|
|
|
|
for (ulong index = 0; index < PtLvl1Size; index++)
|
|
{
|
|
_pageTable[l0][index] = PteUnmapped;
|
|
}
|
|
}
|
|
|
|
_pageTable[l0][l1] = pte;
|
|
}
|
|
}
|
|
} |