From b8e3909d800ff5947683bb169d8efda2ef63d697 Mon Sep 17 00:00:00 2001 From: gdkchan Date: Sun, 12 Jan 2020 20:27:50 -0300 Subject: [PATCH] Add a GetSpan method to the memory manager and use it on GPU (#877) --- ARMeilleure/Memory/MemoryManager.cs | 45 +++++++++++++++++++ Ryujinx.Graphics.GAL/IBuffer.cs | 4 +- Ryujinx.Graphics.GAL/ITexture.cs | 2 +- Ryujinx.Graphics.Gpu/Engine/Compute.cs | 2 +- .../Engine/MethodCopyBuffer.cs | 2 +- Ryujinx.Graphics.Gpu/Engine/Methods.cs | 2 +- Ryujinx.Graphics.Gpu/Image/SamplerPool.cs | 2 +- Ryujinx.Graphics.Gpu/Image/Texture.cs | 2 +- .../Image/TextureBindingsManager.cs | 4 +- Ryujinx.Graphics.Gpu/Image/TexturePool.cs | 4 +- Ryujinx.Graphics.Gpu/Memory/Buffer.cs | 4 +- Ryujinx.Graphics.Gpu/Memory/MemoryAccessor.cs | 16 +++---- Ryujinx.Graphics.Gpu/Memory/PhysicalMemory.cs | 14 +++--- Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs | 8 ++-- Ryujinx.Graphics.Gpu/Shader/ShaderDumper.cs | 2 +- Ryujinx.Graphics.OpenGL/Buffer.cs | 4 +- Ryujinx.Graphics.OpenGL/TextureView.cs | 2 +- Ryujinx.Graphics.Shader/Decoders/Decoder.cs | 10 ++--- .../Translation/ShaderHeader.cs | 4 +- .../Translation/Translator.cs | 8 ++-- 20 files changed, 93 insertions(+), 48 deletions(-) diff --git a/ARMeilleure/Memory/MemoryManager.cs b/ARMeilleure/Memory/MemoryManager.cs index f813bd7e7..e4e8b2d26 100644 --- a/ARMeilleure/Memory/MemoryManager.cs +++ b/ARMeilleure/Memory/MemoryManager.cs @@ -1,6 +1,7 @@ using ARMeilleure.State; using System; using System.Collections.Generic; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Threading; @@ -552,6 +553,50 @@ namespace ARMeilleure.Memory return data; } + public ReadOnlySpan GetSpan(ulong address, ulong size) + { + if (IsContiguous(address, size)) + { + return new ReadOnlySpan((void*)Translate((long)address), (int)size); + } + else + { + return ReadBytes((long)address, (long)size); + } + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private bool IsContiguous(ulong address, ulong size) + { + if (!IsValidPosition((long)address)) + { + return false; + } + + ulong endVa = (address + size + PageMask) & ~(ulong)PageMask; + + address &= ~(ulong)PageMask; + + int pages = (int)((endVa - address) / PageSize); + + for (int page = 0; page < pages - 1; page++) + { + if (!IsValidPosition((long)address + PageSize)) + { + return false; + } + + if (GetPtEntry((long)address) + PageSize != GetPtEntry((long)address + PageSize)) + { + return false; + } + + address += PageSize; + } + + return true; + } + public void WriteSByte(long position, sbyte value) { WriteByte(position, (byte)value); diff --git a/Ryujinx.Graphics.GAL/IBuffer.cs b/Ryujinx.Graphics.GAL/IBuffer.cs index 000efd67a..43e376918 100644 --- a/Ryujinx.Graphics.GAL/IBuffer.cs +++ b/Ryujinx.Graphics.GAL/IBuffer.cs @@ -8,8 +8,8 @@ namespace Ryujinx.Graphics.GAL byte[] GetData(int offset, int size); - void SetData(Span data); + void SetData(ReadOnlySpan data); - void SetData(int offset, Span data); + void SetData(int offset, ReadOnlySpan data); } } \ No newline at end of file diff --git a/Ryujinx.Graphics.GAL/ITexture.cs b/Ryujinx.Graphics.GAL/ITexture.cs index f5bc1b470..5278e3b74 100644 --- a/Ryujinx.Graphics.GAL/ITexture.cs +++ b/Ryujinx.Graphics.GAL/ITexture.cs @@ -11,6 +11,6 @@ namespace Ryujinx.Graphics.GAL byte[] GetData(); - void SetData(Span data); + void SetData(ReadOnlySpan data); } } \ No newline at end of file diff --git a/Ryujinx.Graphics.Gpu/Engine/Compute.cs b/Ryujinx.Graphics.Gpu/Engine/Compute.cs index 1f5246712..d24d2d8d7 100644 --- a/Ryujinx.Graphics.Gpu/Engine/Compute.cs +++ b/Ryujinx.Graphics.Gpu/Engine/Compute.cs @@ -77,7 +77,7 @@ namespace Ryujinx.Graphics.Gpu.Engine sbDescAddress += (ulong)sbDescOffset; - Span sbDescriptorData = _context.PhysicalMemory.Read(sbDescAddress, 0x10); + ReadOnlySpan sbDescriptorData = _context.PhysicalMemory.GetSpan(sbDescAddress, 0x10); SbDescriptor sbDescriptor = MemoryMarshal.Cast(sbDescriptorData)[0]; diff --git a/Ryujinx.Graphics.Gpu/Engine/MethodCopyBuffer.cs b/Ryujinx.Graphics.Gpu/Engine/MethodCopyBuffer.cs index 6b6742ff1..9f638f504 100644 --- a/Ryujinx.Graphics.Gpu/Engine/MethodCopyBuffer.cs +++ b/Ryujinx.Graphics.Gpu/Engine/MethodCopyBuffer.cs @@ -65,7 +65,7 @@ namespace Ryujinx.Graphics.Gpu.Engine ulong srcAddress = srcBaseAddress + (ulong)srcOffset; ulong dstAddress = dstBaseAddress + (ulong)dstOffset; - Span pixel = _context.PhysicalMemory.Read(srcAddress, (ulong)srcBpp); + ReadOnlySpan pixel = _context.PhysicalMemory.GetSpan(srcAddress, (ulong)srcBpp); _context.PhysicalMemory.Write(dstAddress, pixel); } diff --git a/Ryujinx.Graphics.Gpu/Engine/Methods.cs b/Ryujinx.Graphics.Gpu/Engine/Methods.cs index 90935b34c..823ac878a 100644 --- a/Ryujinx.Graphics.Gpu/Engine/Methods.cs +++ b/Ryujinx.Graphics.Gpu/Engine/Methods.cs @@ -235,7 +235,7 @@ namespace Ryujinx.Graphics.Gpu.Engine sbDescAddress += (ulong)sbDescOffset; - Span sbDescriptorData = _context.PhysicalMemory.Read(sbDescAddress, 0x10); + ReadOnlySpan sbDescriptorData = _context.PhysicalMemory.GetSpan(sbDescAddress, 0x10); SbDescriptor sbDescriptor = MemoryMarshal.Cast(sbDescriptorData)[0]; diff --git a/Ryujinx.Graphics.Gpu/Image/SamplerPool.cs b/Ryujinx.Graphics.Gpu/Image/SamplerPool.cs index f10f800cd..2abf96de9 100644 --- a/Ryujinx.Graphics.Gpu/Image/SamplerPool.cs +++ b/Ryujinx.Graphics.Gpu/Image/SamplerPool.cs @@ -43,7 +43,7 @@ namespace Ryujinx.Graphics.Gpu.Image { ulong address = Address + (ulong)(uint)id * DescriptorSize; - Span data = Context.PhysicalMemory.Read(address, DescriptorSize); + ReadOnlySpan data = Context.PhysicalMemory.GetSpan(address, DescriptorSize); SamplerDescriptor descriptor = MemoryMarshal.Cast(data)[0]; diff --git a/Ryujinx.Graphics.Gpu/Image/Texture.cs b/Ryujinx.Graphics.Gpu/Image/Texture.cs index e33de1fa4..7d5e9079d 100644 --- a/Ryujinx.Graphics.Gpu/Image/Texture.cs +++ b/Ryujinx.Graphics.Gpu/Image/Texture.cs @@ -304,7 +304,7 @@ namespace Ryujinx.Graphics.Gpu.Image return; } - Span data = _context.PhysicalMemory.Read(Address, Size); + ReadOnlySpan data = _context.PhysicalMemory.GetSpan(Address, Size); if (Info.IsLinear) { diff --git a/Ryujinx.Graphics.Gpu/Image/TextureBindingsManager.cs b/Ryujinx.Graphics.Gpu/Image/TextureBindingsManager.cs index 984d45a95..7cc7f0468 100644 --- a/Ryujinx.Graphics.Gpu/Image/TextureBindingsManager.cs +++ b/Ryujinx.Graphics.Gpu/Image/TextureBindingsManager.cs @@ -197,7 +197,7 @@ namespace Ryujinx.Graphics.Gpu.Image address = bufferManager.GetGraphicsUniformBufferAddress(stageIndex, binding.CbufSlot); } - packedId = MemoryMarshal.Cast(_context.PhysicalMemory.Read(address + (ulong)binding.CbufOffset * 4, 4))[0]; + packedId = MemoryMarshal.Cast(_context.PhysicalMemory.GetSpan(address + (ulong)binding.CbufOffset * 4, 4))[0]; } else { @@ -321,7 +321,7 @@ namespace Ryujinx.Graphics.Gpu.Image address += (uint)wordOffset * 4; - return BitConverter.ToInt32(_context.PhysicalMemory.Read(address, 4)); + return BitConverter.ToInt32(_context.PhysicalMemory.GetSpan(address, 4)); } /// diff --git a/Ryujinx.Graphics.Gpu/Image/TexturePool.cs b/Ryujinx.Graphics.Gpu/Image/TexturePool.cs index f6aede797..a4f54c520 100644 --- a/Ryujinx.Graphics.Gpu/Image/TexturePool.cs +++ b/Ryujinx.Graphics.Gpu/Image/TexturePool.cs @@ -85,7 +85,7 @@ namespace Ryujinx.Graphics.Gpu.Image { ulong address = Address + (ulong)(uint)id * DescriptorSize; - Span data = Context.PhysicalMemory.Read(address, DescriptorSize); + ReadOnlySpan data = Context.PhysicalMemory.GetSpan(address, DescriptorSize); return MemoryMarshal.Cast(data)[0]; } @@ -107,7 +107,7 @@ namespace Ryujinx.Graphics.Gpu.Image if (texture != null) { - Span data = Context.PhysicalMemory.Read(address, DescriptorSize); + ReadOnlySpan data = Context.PhysicalMemory.GetSpan(address, DescriptorSize); TextureDescriptor descriptor = MemoryMarshal.Cast(data)[0]; diff --git a/Ryujinx.Graphics.Gpu/Memory/Buffer.cs b/Ryujinx.Graphics.Gpu/Memory/Buffer.cs index 4210ecb98..a0339cce6 100644 --- a/Ryujinx.Graphics.Gpu/Memory/Buffer.cs +++ b/Ryujinx.Graphics.Gpu/Memory/Buffer.cs @@ -123,7 +123,7 @@ namespace Ryujinx.Graphics.Gpu.Memory int offset = (int)(mAddress - Address); - HostBuffer.SetData(offset, _context.PhysicalMemory.Read(mAddress, mSize)); + HostBuffer.SetData(offset, _context.PhysicalMemory.GetSpan(mAddress, mSize)); } } @@ -157,7 +157,7 @@ namespace Ryujinx.Graphics.Gpu.Memory /// public void Invalidate() { - HostBuffer.SetData(0, _context.PhysicalMemory.Read(Address, Size)); + HostBuffer.SetData(0, _context.PhysicalMemory.GetSpan(Address, Size)); } /// diff --git a/Ryujinx.Graphics.Gpu/Memory/MemoryAccessor.cs b/Ryujinx.Graphics.Gpu/Memory/MemoryAccessor.cs index 187793331..17c000628 100644 --- a/Ryujinx.Graphics.Gpu/Memory/MemoryAccessor.cs +++ b/Ryujinx.Graphics.Gpu/Memory/MemoryAccessor.cs @@ -27,23 +27,23 @@ namespace Ryujinx.Graphics.Gpu.Memory /// Byte array with the data public byte[] ReadBytes(ulong gpuVa, ulong size) { - return Read(gpuVa, size).ToArray(); + return GetSpan(gpuVa, size).ToArray(); } /// - /// Reads data from GPU mapped memory. + /// Gets a read-only span of data from GPU mapped memory. /// This reads as much data as possible, up to the specified maximum size. /// /// GPU virtual address where the data is located /// Maximum size of the data - /// The data at the specified memory location - public Span Read(ulong gpuVa, ulong maxSize) + /// The span of the data at the specified memory location + public ReadOnlySpan GetSpan(ulong gpuVa, ulong maxSize) { ulong processVa = _context.MemoryManager.Translate(gpuVa); ulong size = Math.Min(_context.MemoryManager.GetSubSize(gpuVa), maxSize); - return _context.PhysicalMemory.Read(processVa, size); + return _context.PhysicalMemory.GetSpan(processVa, size); } /// @@ -58,7 +58,7 @@ namespace Ryujinx.Graphics.Gpu.Memory ulong size = (uint)Marshal.SizeOf(); - return MemoryMarshal.Cast(_context.PhysicalMemory.Read(processVa, size))[0]; + return MemoryMarshal.Cast(_context.PhysicalMemory.GetSpan(processVa, size))[0]; } /// @@ -70,7 +70,7 @@ namespace Ryujinx.Graphics.Gpu.Memory { ulong processVa = _context.MemoryManager.Translate(gpuVa); - return BitConverter.ToInt32(_context.PhysicalMemory.Read(processVa, 4)); + return BitConverter.ToInt32(_context.PhysicalMemory.GetSpan(processVa, 4)); } /// @@ -82,7 +82,7 @@ namespace Ryujinx.Graphics.Gpu.Memory { ulong processVa = _context.MemoryManager.Translate(gpuVa); - return BitConverter.ToUInt64(_context.PhysicalMemory.Read(processVa, 8)); + return BitConverter.ToUInt64(_context.PhysicalMemory.GetSpan(processVa, 8)); } /// diff --git a/Ryujinx.Graphics.Gpu/Memory/PhysicalMemory.cs b/Ryujinx.Graphics.Gpu/Memory/PhysicalMemory.cs index 71384df23..ca28f31d1 100644 --- a/Ryujinx.Graphics.Gpu/Memory/PhysicalMemory.cs +++ b/Ryujinx.Graphics.Gpu/Memory/PhysicalMemory.cs @@ -22,14 +22,14 @@ namespace Ryujinx.Graphics.Gpu.Memory } /// - /// Reads data from the application process. + /// Gets a span of data from the application process. /// - /// Address to be read - /// Size in bytes to be read - /// The data at the specified memory location - public Span Read(ulong address, ulong size) + /// Start address of the range + /// Size in bytes to be range + /// A read only span of the data at the specified memory location + public ReadOnlySpan GetSpan(ulong address, ulong size) { - return _cpuMemory.ReadBytes((long)address, (long)size); + return _cpuMemory.GetSpan(address, size); } /// @@ -37,7 +37,7 @@ namespace Ryujinx.Graphics.Gpu.Memory /// /// Address to write into /// Data to be written - public void Write(ulong address, Span data) + public void Write(ulong address, ReadOnlySpan data) { _cpuMemory.WriteBytes((long)address, data.ToArray()); } diff --git a/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs b/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs index 548a7e07a..dad1b0ac2 100644 --- a/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs +++ b/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs @@ -265,7 +265,7 @@ namespace Ryujinx.Graphics.Gpu.Shader ShaderProgram program; - Span code = _context.MemoryAccessor.Read(gpuVa, MaxProgramSize); + ReadOnlySpan code = _context.MemoryAccessor.GetSpan(gpuVa, MaxProgramSize); program = Translator.Translate(code, callbacks, DefaultFlags | TranslationFlags.Compute); @@ -319,8 +319,8 @@ namespace Ryujinx.Graphics.Gpu.Shader if (gpuVaA != 0) { - Span codeA = _context.MemoryAccessor.Read(gpuVaA, MaxProgramSize); - Span codeB = _context.MemoryAccessor.Read(gpuVa, MaxProgramSize); + ReadOnlySpan codeA = _context.MemoryAccessor.GetSpan(gpuVaA, MaxProgramSize); + ReadOnlySpan codeB = _context.MemoryAccessor.GetSpan(gpuVa, MaxProgramSize); program = Translator.Translate(codeA, codeB, callbacks, DefaultFlags); @@ -340,7 +340,7 @@ namespace Ryujinx.Graphics.Gpu.Shader } else { - Span code = _context.MemoryAccessor.Read(gpuVa, MaxProgramSize); + ReadOnlySpan code = _context.MemoryAccessor.GetSpan(gpuVa, MaxProgramSize); program = Translator.Translate(code, callbacks, DefaultFlags); diff --git a/Ryujinx.Graphics.Gpu/Shader/ShaderDumper.cs b/Ryujinx.Graphics.Gpu/Shader/ShaderDumper.cs index 3be75564b..0e22b07e3 100644 --- a/Ryujinx.Graphics.Gpu/Shader/ShaderDumper.cs +++ b/Ryujinx.Graphics.Gpu/Shader/ShaderDumper.cs @@ -27,7 +27,7 @@ namespace Ryujinx.Graphics.Gpu.Shader /// True for compute shader code, false for graphics shader code /// Output path for the shader code with header included /// Output path for the shader code without header - public void Dump(Span code, bool compute, out string fullPath, out string codePath) + public void Dump(ReadOnlySpan code, bool compute, out string fullPath, out string codePath) { _dumpPath = GraphicsConfig.ShadersDumpPath; diff --git a/Ryujinx.Graphics.OpenGL/Buffer.cs b/Ryujinx.Graphics.OpenGL/Buffer.cs index b86719ceb..db3e94ba5 100644 --- a/Ryujinx.Graphics.OpenGL/Buffer.cs +++ b/Ryujinx.Graphics.OpenGL/Buffer.cs @@ -40,7 +40,7 @@ namespace Ryujinx.Graphics.OpenGL return data; } - public void SetData(Span data) + public void SetData(ReadOnlySpan data) { unsafe { @@ -53,7 +53,7 @@ namespace Ryujinx.Graphics.OpenGL } } - public void SetData(int offset, Span data) + public void SetData(int offset, ReadOnlySpan data) { GL.BindBuffer(BufferTarget.CopyWriteBuffer, Handle); diff --git a/Ryujinx.Graphics.OpenGL/TextureView.cs b/Ryujinx.Graphics.OpenGL/TextureView.cs index 91f1865d3..2efaf7c0a 100644 --- a/Ryujinx.Graphics.OpenGL/TextureView.cs +++ b/Ryujinx.Graphics.OpenGL/TextureView.cs @@ -217,7 +217,7 @@ namespace Ryujinx.Graphics.OpenGL } } - public void SetData(Span data) + public void SetData(ReadOnlySpan data) { unsafe { diff --git a/Ryujinx.Graphics.Shader/Decoders/Decoder.cs b/Ryujinx.Graphics.Shader/Decoders/Decoder.cs index db63712bf..8a502e3c6 100644 --- a/Ryujinx.Graphics.Shader/Decoders/Decoder.cs +++ b/Ryujinx.Graphics.Shader/Decoders/Decoder.cs @@ -21,7 +21,7 @@ namespace Ryujinx.Graphics.Shader.Decoders _opActivators = new ConcurrentDictionary(); } - public static Block[] Decode(Span code, ulong headerSize) + public static Block[] Decode(ReadOnlySpan code, ulong headerSize) { List blocks = new List(); @@ -214,10 +214,10 @@ namespace Ryujinx.Graphics.Shader.Decoders } private static void FillBlock( - Span code, - Block block, - ulong limitAddress, - ulong startAddress) + ReadOnlySpan code, + Block block, + ulong limitAddress, + ulong startAddress) { ulong address = block.Address; diff --git a/Ryujinx.Graphics.Shader/Translation/ShaderHeader.cs b/Ryujinx.Graphics.Shader/Translation/ShaderHeader.cs index 0c56132d9..42701fbdc 100644 --- a/Ryujinx.Graphics.Shader/Translation/ShaderHeader.cs +++ b/Ryujinx.Graphics.Shader/Translation/ShaderHeader.cs @@ -76,9 +76,9 @@ namespace Ryujinx.Graphics.Shader.Translation public bool OmapSampleMask { get; } public bool OmapDepth { get; } - public ShaderHeader(Span code) + public ShaderHeader(ReadOnlySpan code) { - Span header = MemoryMarshal.Cast(code); + ReadOnlySpan header = MemoryMarshal.Cast(code); int commonWord0 = header[0]; int commonWord1 = header[1]; diff --git a/Ryujinx.Graphics.Shader/Translation/Translator.cs b/Ryujinx.Graphics.Shader/Translation/Translator.cs index 760d616f6..a333db952 100644 --- a/Ryujinx.Graphics.Shader/Translation/Translator.cs +++ b/Ryujinx.Graphics.Shader/Translation/Translator.cs @@ -14,7 +14,7 @@ namespace Ryujinx.Graphics.Shader.Translation { private const int HeaderSize = 0x50; - public static Span ExtractCode(Span code, bool compute, out int headerSize) + public static ReadOnlySpan ExtractCode(ReadOnlySpan code, bool compute, out int headerSize) { headerSize = compute ? 0 : HeaderSize; @@ -38,14 +38,14 @@ namespace Ryujinx.Graphics.Shader.Translation return code.Slice(0, headerSize + (int)endAddress); } - public static ShaderProgram Translate(Span code, TranslatorCallbacks callbacks, TranslationFlags flags) + public static ShaderProgram Translate(ReadOnlySpan code, TranslatorCallbacks callbacks, TranslationFlags flags) { Operation[] ops = DecodeShader(code, callbacks, flags, out ShaderConfig config, out int size); return Translate(ops, config, size); } - public static ShaderProgram Translate(Span vpACode, Span vpBCode, TranslatorCallbacks callbacks, TranslationFlags flags) + public static ShaderProgram Translate(ReadOnlySpan vpACode, ReadOnlySpan vpBCode, TranslatorCallbacks callbacks, TranslationFlags flags) { Operation[] vpAOps = DecodeShader(vpACode, callbacks, flags, out _, out _); Operation[] vpBOps = DecodeShader(vpBCode, callbacks, flags, out ShaderConfig config, out int sizeB); @@ -88,7 +88,7 @@ namespace Ryujinx.Graphics.Shader.Translation } private static Operation[] DecodeShader( - Span code, + ReadOnlySpan code, TranslatorCallbacks callbacks, TranslationFlags flags, out ShaderConfig config,