Mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid buffer allocations in CodeGenContext.GetCode(). Avoid stream allocations in PTC.PtcInfo.

Browse source 
Refactoring/nits.
This commit is contained in:
LDj3SNuD 2021-01-30 04:32:53 +01:00
parent b767d1a6b0
commit f44271a617
6 changed files with 78 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

70
ARMeilleure/Translation/PTC/Ptc.cs
View file

@ -198,31 +198,31 @@ namespace ARMeilleure.Translation.PTC
using (FileStream compressedStream = new FileStream(fileName, FileMode.Open))
using (DeflateStream deflateStream = new DeflateStream(compressedStream, CompressionMode.Decompress, true))
{
using MD5 md5 = MD5.Create();
int hashSize = md5.HashSize / 8;
byte[] currentSizeHash = new byte[hashSize];
compressedStream.Read(currentSizeHash, 0, hashSize);
byte[] sizeBytes = new byte[sizeof(int)];
compressedStream.Read(sizeBytes, 0, sizeBytes.Length);
byte[] expectedSizeHash = md5.ComputeHash(sizeBytes);
if (!CompareHash(currentSizeHash, expectedSizeHash))
{
InvalidateCompressedStream(compressedStream);
return false;
}
int size = BitConverter.ToInt32(sizeBytes, 0);
IntPtr intPtr = IntPtr.Zero;
try
{
MD5 md5 = MD5.Create();
int hashSize = md5.HashSize / 8;
byte[] currentSizeHash = new byte[hashSize];
compressedStream.Read(currentSizeHash, 0, hashSize);
byte[] sizeBytes = new byte[sizeof(int)];
compressedStream.Read(sizeBytes, 0, sizeBytes.Length);
byte[] expectedSizeHash = md5.ComputeHash(sizeBytes);
if (!CompareHash(currentSizeHash, expectedSizeHash))
{
InvalidateCompressedStream(compressedStream);
return false;
}
int size = BitConverter.ToInt32(sizeBytes, 0);
intPtr = Marshal.AllocHGlobal(size);
using (UnmanagedMemoryStream stream = new UnmanagedMemoryStream((byte*)intPtr.ToPointer(), size, size, FileAccess.ReadWrite))
@ -245,8 +245,6 @@ namespace ARMeilleure.Translation.PTC
byte[] expectedHash = md5.ComputeHash(stream);
md5.Dispose();
if (!CompareHash(currentHash, expectedHash))
{
InvalidateCompressedStream(compressedStream);
@ -413,20 +411,20 @@ namespace ARMeilleure.Translation.PTC
{
int translatedFuncsCount;
using MD5 md5 = MD5.Create();
int hashSize = md5.HashSize / 8;
int size = hashSize + Header.Size + GetMemoryStreamsLength() + PtcJumpTable.GetSerializeSize(PtcJumpTable);
byte[] sizeBytes = BitConverter.GetBytes(size);
Debug.Assert(sizeBytes.Length == sizeof(int));
byte[] sizeHash = md5.ComputeHash(sizeBytes);
IntPtr intPtr = IntPtr.Zero;
try
{
MD5 md5 = MD5.Create();
int hashSize = md5.HashSize / 8;
int size = hashSize + Header.Size + GetMemoryStreamsLength() + PtcJumpTable.GetSerializeSize(PtcJumpTable);
byte[] sizeBytes = BitConverter.GetBytes(size);
Debug.Assert(sizeBytes.Length == sizeof(int));
byte[] sizeHash = md5.ComputeHash(sizeBytes);
intPtr = Marshal.AllocHGlobal(size);
using (UnmanagedMemoryStream stream = new UnmanagedMemoryStream((byte*)intPtr.ToPointer(), size, size, FileAccess.ReadWrite))
@ -445,8 +443,6 @@ namespace ARMeilleure.Translation.PTC
stream.Seek((long)hashSize, SeekOrigin.Begin);
byte[] hash = md5.ComputeHash(stream);
md5.Dispose();
stream.Seek(0L, SeekOrigin.Begin);
stream.Write(hash, 0, hashSize);
@ -860,11 +856,11 @@ namespace ARMeilleure.Translation.PTC
_infosWriter.Write((ulong)guestSize); // InfoEntry.GuestSize
_infosWriter.Write((bool)highCq); // InfoEntry.HighCq
_infosWriter.Write((bool)false); // InfoEntry.Stubbed
_infosWriter.Write((int)ptcInfo.CodeStream.Length); // InfoEntry.CodeLen
_infosWriter.Write((int)ptcInfo.Code.Length); // InfoEntry.CodeLen
_infosWriter.Write((int)ptcInfo.RelocEntriesCount); // InfoEntry.RelocEntriesCount
// WriteCode.
ptcInfo.CodeStream.WriteTo(_codesStream);
_codesStream.Write(ptcInfo.Code, 0, ptcInfo.Code.Length);
// WriteReloc.
ptcInfo.RelocStream.WriteTo(_relocsStream);

10
ARMeilleure/Translation/PTC/PtcInfo.cs
View file

@ -9,7 +9,8 @@ namespace ARMeilleure.Translation.PTC
private readonly BinaryWriter _relocWriter;
private readonly BinaryWriter _unwindInfoWriter;
public MemoryStream CodeStream { get; }
public byte[] Code { get; set; }
public MemoryStream RelocStream { get; }
public MemoryStream UnwindInfoStream { get; }
@ -17,7 +18,6 @@ namespace ARMeilleure.Translation.PTC
public PtcInfo()
{
CodeStream = new MemoryStream();
RelocStream = new MemoryStream();
UnwindInfoStream = new MemoryStream();
@ -27,11 +27,6 @@ namespace ARMeilleure.Translation.PTC
RelocEntriesCount = 0;
}
public void WriteCode(MemoryStream codeStream)
{
codeStream.WriteTo(CodeStream);
}
public void WriteRelocEntry(RelocEntry relocEntry)
{
_relocWriter.Write((int)relocEntry.Position);
@ -60,7 +55,6 @@ namespace ARMeilleure.Translation.PTC
_relocWriter.Dispose();
_unwindInfoWriter.Dispose();
CodeStream.Dispose();
RelocStream.Dispose();
UnwindInfoStream.Dispose();
}

4
ARMeilleure/Translation/Translator.cs
View file

@ -246,8 +246,10 @@ namespace ARMeilleure.Translation
ResetPool(highCq ? 1 : 0);
}
else using (PtcInfo ptcInfo = new PtcInfo())
else
{
using PtcInfo ptcInfo = new PtcInfo();
func = Compiler.Compile<GuestFunction>(cfg, argTypes, OperandType.I64, options, ptcInfo);
ResetPool(highCq ? 1 : 0);