mirror of
https://git.ryujinx.app/ryubing/ryujinx.git
synced 2026-07-03 01:29:05 +00:00
instanced jit cache (#152)
- jit caches are no longer static. - JitUnwindWindows now supports multiple jit caches. - Jit caches should no longer cause crashes due to entry offset collisions. - cpu tests now run concurrently. Co-authored-by: LotP1 <68976644+LotP1@users.noreply.github.com> Reviewed-on: https://git.ryujinx.app/projects/Ryubing/pulls/152
This commit is contained in:
@@ -22,12 +22,31 @@ namespace ARMeilleure.Translation.Cache
|
||||
return Offset.CompareTo(other.Offset);
|
||||
}
|
||||
}
|
||||
|
||||
private readonly int _regionSize;
|
||||
private int _regionCount;
|
||||
|
||||
private readonly List<MemoryBlock> _blocks = [];
|
||||
|
||||
public CacheMemoryAllocator(int capacity)
|
||||
public CacheMemoryAllocator(int regionSize, int initialRegionCount = 1)
|
||||
{
|
||||
_blocks.Add(new MemoryBlock(0, capacity));
|
||||
_regionCount = 0;
|
||||
_regionSize = regionSize;
|
||||
|
||||
for (; initialRegionCount > 0; initialRegionCount--)
|
||||
{
|
||||
_blocks.Add(new MemoryBlock(_regionSize * _regionCount, _regionSize));
|
||||
_regionCount++;
|
||||
}
|
||||
}
|
||||
|
||||
public void AddNewBlocks(int count)
|
||||
{
|
||||
for (; count > 0; count--)
|
||||
{
|
||||
_blocks.Add(new MemoryBlock(_regionSize * _regionCount, _regionSize));
|
||||
_regionCount++;
|
||||
}
|
||||
}
|
||||
|
||||
public int Allocate(int size)
|
||||
@@ -65,13 +84,14 @@ namespace ARMeilleure.Translation.Cache
|
||||
{
|
||||
index = ~index;
|
||||
}
|
||||
|
||||
int endOffs = block.Offset + block.Size;
|
||||
|
||||
if (index < _blocks.Count)
|
||||
// Don't merge blocks from different allocations
|
||||
if (index < _blocks.Count && endOffs % _regionSize != 0)
|
||||
{
|
||||
MemoryBlock next = _blocks[index];
|
||||
|
||||
int endOffs = block.Offset + block.Size;
|
||||
|
||||
if (next.Offset == endOffs)
|
||||
{
|
||||
block = new MemoryBlock(block.Offset, block.Size + next.Size);
|
||||
@@ -79,7 +99,8 @@ namespace ARMeilleure.Translation.Cache
|
||||
}
|
||||
}
|
||||
|
||||
if (index > 0)
|
||||
// Don't merge blocks from different allocations
|
||||
if (index > 0 && block.Offset % _regionSize != 0)
|
||||
{
|
||||
MemoryBlock prev = _blocks[index - 1];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user