mirror of
https://github.com/ryujinx-mirror/ryujinx.git
synced 2024-11-30 05:53:01 +00:00
d92fff541b
* Replace CacheResourceWrite with more general "precise" write The goal of CacheResourceWrite was to notify GPU resources when they were modified directly, by looking up the modified address/size in a structure and calling a method on each resource. The downside of this is that each resource cache has to be queried individually, they all have to implement their own way to do this, and it can only signal to resources using the same PhysicalMemory instance. This PR adds the ability to signal a write as "precise" on the tracking, which signals a special handler (if present) which can be used to avoid unnecessary flush actions, or maybe even more. For buffers, precise writes specifically do not flush, and instead punch a hole in the modified range list to indicate that the data on GPU has been replaced. The downside is that precise actions must ignore the page protection bits and always signal - as they need to notify the target resource to ignore the sequence number optimization. I had to reintroduce the sequence number increment after I2M, as removing it was causing issues in rabbids kingdom battle. However - all resources modified by I2M are notified directly to lower their sequence number, so the problem is likely that another unrelated resource is not being properly updated. Thankfully, doing this does not affect performance in the games I tested. This should fix regressions from #2624. Test any games that were broken by that. (RF4, rabbids kingdom battle) I've also added a sequence number increment to ThreedClass.IncrementSyncpoint, as it seems to fix buffer corruption in OpenGL homebrew. (this was a regression from removing sequence number increment from constant buffer update - another unrelated resource thing) * Add tests. * Add XML docs for GpuRegionHandle * Skip UpdateProtection if only precise actions were called This allows precise actions to skip reprotection costs.
228 lines
7.5 KiB
C#
228 lines
7.5 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
|
|
namespace Ryujinx.Memory.Tracking
|
|
{
|
|
/// <summary>
|
|
/// A region handle that tracks a large region using many smaller handles, to provide
|
|
/// granular tracking that can be used to track partial updates.
|
|
/// </summary>
|
|
public class MultiRegionHandle : IMultiRegionHandle
|
|
{
|
|
/// <summary>
|
|
/// A list of region handles for each granularity sized chunk of the whole region.
|
|
/// </summary>
|
|
private readonly RegionHandle[] _handles;
|
|
private readonly ulong Address;
|
|
private readonly ulong Granularity;
|
|
private readonly ulong Size;
|
|
|
|
public bool Dirty { get; private set; } = true;
|
|
|
|
internal MultiRegionHandle(MemoryTracking tracking, ulong address, ulong size, IEnumerable<IRegionHandle> handles, ulong granularity)
|
|
{
|
|
_handles = new RegionHandle[size / granularity];
|
|
Granularity = granularity;
|
|
|
|
int i = 0;
|
|
|
|
if (handles != null)
|
|
{
|
|
// Inherit from the handles we were given. Any gaps must be filled with new handles,
|
|
// and old handles larger than our granularity must copy their state onto new granular handles and dispose.
|
|
// It is assumed that the provided handles do not overlap, in order, are on page boundaries,
|
|
// and don't extend past the requested range.
|
|
|
|
foreach (RegionHandle handle in handles)
|
|
{
|
|
int startIndex = (int)((handle.Address - address) / granularity);
|
|
|
|
// Fill any gap left before this handle.
|
|
while (i < startIndex)
|
|
{
|
|
RegionHandle fillHandle = tracking.BeginTracking(address + (ulong)i * granularity, granularity);
|
|
fillHandle.Parent = this;
|
|
_handles[i++] = fillHandle;
|
|
}
|
|
|
|
if (handle.Size == granularity)
|
|
{
|
|
handle.Parent = this;
|
|
_handles[i++] = handle;
|
|
}
|
|
else
|
|
{
|
|
int endIndex = (int)((handle.EndAddress - address) / granularity);
|
|
|
|
while (i < endIndex)
|
|
{
|
|
RegionHandle splitHandle = tracking.BeginTracking(address + (ulong)i * granularity, granularity);
|
|
splitHandle.Parent = this;
|
|
|
|
splitHandle.Reprotect(handle.Dirty);
|
|
|
|
RegionSignal signal = handle.PreAction;
|
|
if (signal != null)
|
|
{
|
|
splitHandle.RegisterAction(signal);
|
|
}
|
|
|
|
_handles[i++] = splitHandle;
|
|
}
|
|
|
|
handle.Dispose();
|
|
}
|
|
}
|
|
}
|
|
|
|
// Fill any remaining space with new handles.
|
|
while (i < _handles.Length)
|
|
{
|
|
RegionHandle handle = tracking.BeginTracking(address + (ulong)i * granularity, granularity);
|
|
handle.Parent = this;
|
|
_handles[i++] = handle;
|
|
}
|
|
|
|
Address = address;
|
|
Size = size;
|
|
}
|
|
|
|
public void ForceDirty(ulong address, ulong size)
|
|
{
|
|
Dirty = true;
|
|
|
|
int startHandle = (int)((address - Address) / Granularity);
|
|
int lastHandle = (int)((address + (size - 1) - Address) / Granularity);
|
|
|
|
for (int i = startHandle; i <= lastHandle; i++)
|
|
{
|
|
_handles[i].SequenceNumber--;
|
|
_handles[i].ForceDirty();
|
|
}
|
|
}
|
|
|
|
public IEnumerable<RegionHandle> GetHandles()
|
|
{
|
|
return _handles;
|
|
}
|
|
|
|
public void SignalWrite()
|
|
{
|
|
Dirty = true;
|
|
}
|
|
|
|
public void QueryModified(Action<ulong, ulong> modifiedAction)
|
|
{
|
|
if (!Dirty)
|
|
{
|
|
return;
|
|
}
|
|
|
|
Dirty = false;
|
|
|
|
QueryModified(Address, Size, modifiedAction);
|
|
}
|
|
|
|
public void QueryModified(ulong address, ulong size, Action<ulong, ulong> modifiedAction)
|
|
{
|
|
int startHandle = (int)((address - Address) / Granularity);
|
|
int lastHandle = (int)((address + (size - 1) - Address) / Granularity);
|
|
|
|
ulong rgStart = _handles[startHandle].Address;
|
|
ulong rgSize = 0;
|
|
|
|
for (int i = startHandle; i <= lastHandle; i++)
|
|
{
|
|
RegionHandle handle = _handles[i];
|
|
|
|
if (handle.Dirty)
|
|
{
|
|
rgSize += handle.Size;
|
|
handle.Reprotect();
|
|
}
|
|
else
|
|
{
|
|
// Submit the region scanned so far as dirty
|
|
if (rgSize != 0)
|
|
{
|
|
modifiedAction(rgStart, rgSize);
|
|
rgSize = 0;
|
|
}
|
|
rgStart = handle.EndAddress;
|
|
}
|
|
}
|
|
|
|
if (rgSize != 0)
|
|
{
|
|
modifiedAction(rgStart, rgSize);
|
|
}
|
|
}
|
|
|
|
public void QueryModified(ulong address, ulong size, Action<ulong, ulong> modifiedAction, int sequenceNumber)
|
|
{
|
|
int startHandle = (int)((address - Address) / Granularity);
|
|
int lastHandle = (int)((address + (size - 1) - Address) / Granularity);
|
|
|
|
ulong rgStart = _handles[startHandle].Address;
|
|
ulong rgSize = 0;
|
|
|
|
for (int i = startHandle; i <= lastHandle; i++)
|
|
{
|
|
RegionHandle handle = _handles[i];
|
|
|
|
if (sequenceNumber != handle.SequenceNumber && handle.DirtyOrVolatile())
|
|
{
|
|
rgSize += handle.Size;
|
|
handle.Reprotect();
|
|
}
|
|
else
|
|
{
|
|
// Submit the region scanned so far as dirty
|
|
if (rgSize != 0)
|
|
{
|
|
modifiedAction(rgStart, rgSize);
|
|
rgSize = 0;
|
|
}
|
|
rgStart = handle.EndAddress;
|
|
}
|
|
|
|
handle.SequenceNumber = sequenceNumber;
|
|
}
|
|
|
|
if (rgSize != 0)
|
|
{
|
|
modifiedAction(rgStart, rgSize);
|
|
}
|
|
}
|
|
|
|
public void RegisterAction(ulong address, ulong size, RegionSignal action)
|
|
{
|
|
int startHandle = (int)((address - Address) / Granularity);
|
|
int lastHandle = (int)((address + (size - 1) - Address) / Granularity);
|
|
|
|
for (int i = startHandle; i <= lastHandle; i++)
|
|
{
|
|
_handles[i].RegisterAction(action);
|
|
}
|
|
}
|
|
|
|
public void RegisterPreciseAction(ulong address, ulong size, PreciseRegionSignal action)
|
|
{
|
|
int startHandle = (int)((address - Address) / Granularity);
|
|
int lastHandle = (int)((address + (size - 1) - Address) / Granularity);
|
|
|
|
for (int i = startHandle; i <= lastHandle; i++)
|
|
{
|
|
_handles[i].RegisterPreciseAction(action);
|
|
}
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
foreach (var handle in _handles)
|
|
{
|
|
handle.Dispose();
|
|
}
|
|
}
|
|
}
|
|
}
|