mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-08-20 07:38:42 +02:00
* 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
342 lines
11 KiB
C#
342 lines
11 KiB
C#
using System;
|
|
using System.Collections;
|
|
using System.Collections.Generic;
|
|
|
|
namespace Ryujinx.Memory.Range
|
|
{
|
|
/// <summary>
|
|
/// Sorted list of ranges that supports binary search.
|
|
/// </summary>
|
|
/// <typeparam name="T">Type of the range.</typeparam>
|
|
public class RangeList<T> : IEnumerable<T> where T : IRange
|
|
{
|
|
private const int ArrayGrowthSize = 32;
|
|
|
|
private readonly List<T> _items;
|
|
|
|
public int Count => _items.Count;
|
|
|
|
/// <summary>
|
|
/// Creates a new range list.
|
|
/// </summary>
|
|
public RangeList()
|
|
{
|
|
_items = new List<T>();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Adds a new item to the list.
|
|
/// </summary>
|
|
/// <param name="item">The item to be added</param>
|
|
public void Add(T item)
|
|
{
|
|
int index = BinarySearch(item.Address);
|
|
|
|
if (index < 0)
|
|
{
|
|
index = ~index;
|
|
}
|
|
|
|
_items.Insert(index, item);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Removes an item from the list.
|
|
/// </summary>
|
|
/// <param name="item">The item to be removed</param>
|
|
/// <returns>True if the item was removed, or false if it was not found</returns>
|
|
public bool Remove(T item)
|
|
{
|
|
int index = BinarySearch(item.Address);
|
|
|
|
if (index >= 0)
|
|
{
|
|
while (index > 0 && _items[index - 1].Address == item.Address)
|
|
{
|
|
index--;
|
|
}
|
|
|
|
while (index < _items.Count)
|
|
{
|
|
if (_items[index].Equals(item))
|
|
{
|
|
_items.RemoveAt(index);
|
|
|
|
return true;
|
|
}
|
|
|
|
if (_items[index].Address > item.Address)
|
|
{
|
|
break;
|
|
}
|
|
|
|
index++;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Gets the first item on the list overlapping in memory with the specified item.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// Despite the name, this has no ordering guarantees of the returned item.
|
|
/// It only ensures that the item returned overlaps the specified item.
|
|
/// </remarks>
|
|
/// <param name="item">Item to check for overlaps</param>
|
|
/// <returns>The overlapping item, or the default value for the type if none found</returns>
|
|
public T FindFirstOverlap(T item)
|
|
{
|
|
return FindFirstOverlap(item.Address, item.Size);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Gets the first item on the list overlapping the specified memory range.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// Despite the name, this has no ordering guarantees of the returned item.
|
|
/// It only ensures that the item returned overlaps the specified memory range.
|
|
/// </remarks>
|
|
/// <param name="address">Start address of the range</param>
|
|
/// <param name="size">Size in bytes of the range</param>
|
|
/// <returns>The overlapping item, or the default value for the type if none found</returns>
|
|
public T FindFirstOverlap(ulong address, ulong size)
|
|
{
|
|
int index = BinarySearch(address, size);
|
|
|
|
if (index < 0)
|
|
{
|
|
return default(T);
|
|
}
|
|
|
|
return _items[index];
|
|
}
|
|
|
|
/// <summary>
|
|
/// Gets all items overlapping with the specified item in memory.
|
|
/// </summary>
|
|
/// <param name="item">Item to check for overlaps</param>
|
|
/// <param name="output">Output array where matches will be written. It is automatically resized to fit the results</param>
|
|
/// <returns>The number of overlapping items found</returns>
|
|
public int FindOverlaps(T item, ref T[] output)
|
|
{
|
|
return FindOverlaps(item.Address, item.Size, ref output);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Gets all items on the list overlapping the specified memory range.
|
|
/// </summary>
|
|
/// <param name="address">Start address of the range</param>
|
|
/// <param name="size">Size in bytes of the range</param>
|
|
/// <param name="output">Output array where matches will be written. It is automatically resized to fit the results</param>
|
|
/// <returns>The number of overlapping items found</returns>
|
|
public int FindOverlaps(ulong address, ulong size, ref T[] output)
|
|
{
|
|
int outputIndex = 0;
|
|
|
|
ulong endAddress = address + size;
|
|
|
|
foreach (T item in _items)
|
|
{
|
|
if (item.Address >= endAddress)
|
|
{
|
|
break;
|
|
}
|
|
|
|
if (item.OverlapsWith(address, size))
|
|
{
|
|
if (outputIndex == output.Length)
|
|
{
|
|
Array.Resize(ref output, outputIndex + ArrayGrowthSize);
|
|
}
|
|
|
|
output[outputIndex++] = item;
|
|
}
|
|
}
|
|
|
|
return outputIndex;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Gets all items overlapping with the specified item in memory.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// This method only returns correct results if none of the items on the list overlaps with
|
|
/// each other. If that is not the case, this method should not be used.
|
|
/// This method is faster than the regular method to find all overlaps.
|
|
/// </remarks>
|
|
/// <param name="item">Item to check for overlaps</param>
|
|
/// <param name="output">Output array where matches will be written. It is automatically resized to fit the results</param>
|
|
/// <returns>The number of overlapping items found</returns>
|
|
public int FindOverlapsNonOverlapping(T item, ref T[] output)
|
|
{
|
|
return FindOverlapsNonOverlapping(item.Address, item.Size, ref output);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Gets all items on the list overlapping the specified memory range.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// This method only returns correct results if none of the items on the list overlaps with
|
|
/// each other. If that is not the case, this method should not be used.
|
|
/// This method is faster than the regular method to find all overlaps.
|
|
/// </remarks>
|
|
/// <param name="address">Start address of the range</param>
|
|
/// <param name="size">Size in bytes of the range</param>
|
|
/// <param name="output">Output array where matches will be written. It is automatically resized to fit the results</param>
|
|
/// <returns>The number of overlapping items found</returns>
|
|
public int FindOverlapsNonOverlapping(ulong address, ulong size, ref T[] output)
|
|
{
|
|
// This is a bit faster than FindOverlaps, but only works
|
|
// when none of the items on the list overlaps with each other.
|
|
int outputIndex = 0;
|
|
|
|
int index = BinarySearch(address, size);
|
|
|
|
if (index >= 0)
|
|
{
|
|
while (index > 0 && _items[index - 1].OverlapsWith(address, size))
|
|
{
|
|
index--;
|
|
}
|
|
|
|
do
|
|
{
|
|
if (outputIndex == output.Length)
|
|
{
|
|
Array.Resize(ref output, outputIndex + ArrayGrowthSize);
|
|
}
|
|
|
|
output[outputIndex++] = _items[index++];
|
|
}
|
|
while (index < _items.Count && _items[index].OverlapsWith(address, size));
|
|
}
|
|
|
|
return outputIndex;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Gets all items on the list with the specified memory address.
|
|
/// </summary>
|
|
/// <param name="address">Address to find</param>
|
|
/// <param name="output">Output array where matches will be written. It is automatically resized to fit the results</param>
|
|
/// <returns>The number of matches found</returns>
|
|
public int FindOverlaps(ulong address, ref T[] output)
|
|
{
|
|
int index = BinarySearch(address);
|
|
|
|
int outputIndex = 0;
|
|
|
|
if (index >= 0)
|
|
{
|
|
while (index > 0 && _items[index - 1].Address == address)
|
|
{
|
|
index--;
|
|
}
|
|
|
|
while (index < _items.Count)
|
|
{
|
|
T overlap = _items[index++];
|
|
|
|
if (overlap.Address != address)
|
|
{
|
|
break;
|
|
}
|
|
|
|
if (outputIndex == output.Length)
|
|
{
|
|
Array.Resize(ref output, outputIndex + ArrayGrowthSize);
|
|
}
|
|
|
|
output[outputIndex++] = overlap;
|
|
}
|
|
}
|
|
|
|
return outputIndex;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Performs binary search on the internal list of items.
|
|
/// </summary>
|
|
/// <param name="address">Address to find</param>
|
|
/// <returns>List index of the item, or complement index of nearest item with lower value on the list</returns>
|
|
private int BinarySearch(ulong address)
|
|
{
|
|
int left = 0;
|
|
int right = _items.Count - 1;
|
|
|
|
while (left <= right)
|
|
{
|
|
int range = right - left;
|
|
|
|
int middle = left + (range >> 1);
|
|
|
|
T item = _items[middle];
|
|
|
|
if (item.Address == address)
|
|
{
|
|
return middle;
|
|
}
|
|
|
|
if (address < item.Address)
|
|
{
|
|
right = middle - 1;
|
|
}
|
|
else
|
|
{
|
|
left = middle + 1;
|
|
}
|
|
}
|
|
|
|
return ~left;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Performs binary search for items overlapping a given memory range.
|
|
/// </summary>
|
|
/// <param name="address">Start address of the range</param>
|
|
/// <param name="size">Size in bytes of the range</param>
|
|
/// <returns>List index of the item, or complement index of nearest item with lower value on the list</returns>
|
|
private int BinarySearch(ulong address, ulong size)
|
|
{
|
|
int left = 0;
|
|
int right = _items.Count - 1;
|
|
|
|
while (left <= right)
|
|
{
|
|
int range = right - left;
|
|
|
|
int middle = left + (range >> 1);
|
|
|
|
T item = _items[middle];
|
|
|
|
if (item.OverlapsWith(address, size))
|
|
{
|
|
return middle;
|
|
}
|
|
|
|
if (address < item.Address)
|
|
{
|
|
right = middle - 1;
|
|
}
|
|
else
|
|
{
|
|
left = middle + 1;
|
|
}
|
|
}
|
|
|
|
return ~left;
|
|
}
|
|
|
|
public IEnumerator<T> GetEnumerator()
|
|
{
|
|
return _items.GetEnumerator();
|
|
}
|
|
|
|
IEnumerator IEnumerable.GetEnumerator()
|
|
{
|
|
return _items.GetEnumerator();
|
|
}
|
|
}
|
|
} |