From 644b497df17bae1790c31e23b04f20ff368d4e9e Mon Sep 17 00:00:00 2001 From: Berkan Diler Date: Tue, 22 Feb 2022 14:32:10 +0100 Subject: [PATCH] Collapse AsSpan().Slice(..) calls into AsSpan(..) (#3145) * Collapse AsSpan().Slice(..) calls into AsSpan(..) Less code and a bit faster * Collapse an Array.Clear(array, 0, array.Length) call to Array.Clear(array) --- ARMeilleure/Translation/SsaConstruction.cs | 2 +- Ryujinx.Audio/Renderer/Dsp/State/ReverbState.cs | 4 ++-- Ryujinx.Audio/Renderer/Server/Voice/VoiceState.cs | 2 +- Ryujinx.Graphics.Gpu/Shader/Cache/CacheHelper.cs | 6 +++--- Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs | 8 ++++---- Ryujinx.Graphics.OpenGL/Program.cs | 2 +- Ryujinx.HLE/HOS/Services/ServerBase.cs | 2 +- Ryujinx.HLE/Loaders/Executables/KipExecutable.cs | 8 ++++---- Ryujinx.HLE/Loaders/Executables/NroExecutable.cs | 6 +++--- Ryujinx.HLE/Loaders/Executables/NsoExecutable.cs | 8 ++++---- Ryujinx.HLE/Loaders/Mods/MemPatch.cs | 2 +- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/ARMeilleure/Translation/SsaConstruction.cs b/ARMeilleure/Translation/SsaConstruction.cs index 9ba7b8dfe..f74d6c712 100644 --- a/ARMeilleure/Translation/SsaConstruction.cs +++ b/ARMeilleure/Translation/SsaConstruction.cs @@ -113,7 +113,7 @@ namespace ARMeilleure.Translation } } - Array.Clear(localDefs, 0, localDefs.Length); + Array.Clear(localDefs); } // Second pass, rename variables with definitions on different blocks. diff --git a/Ryujinx.Audio/Renderer/Dsp/State/ReverbState.cs b/Ryujinx.Audio/Renderer/Dsp/State/ReverbState.cs index 6fd0a299c..c75bdce2d 100644 --- a/Ryujinx.Audio/Renderer/Dsp/State/ReverbState.cs +++ b/Ryujinx.Audio/Renderer/Dsp/State/ReverbState.cs @@ -112,12 +112,12 @@ namespace Ryujinx.Audio.Renderer.Dsp.State private ReadOnlySpan GetFdnDelayTimesByLateMode(ReverbLateMode lateMode) { - return FdnDelayTimes.AsSpan().Slice((int)lateMode * 4, 4); + return FdnDelayTimes.AsSpan((int)lateMode * 4, 4); } private ReadOnlySpan GetDecayDelayTimesByLateMode(ReverbLateMode lateMode) { - return DecayDelayTimes.AsSpan().Slice((int)lateMode * 4, 4); + return DecayDelayTimes.AsSpan((int)lateMode * 4, 4); } public ReverbState(ref ReverbParameter parameter, ulong workBuffer, bool isLongSizePreDelaySupported) diff --git a/Ryujinx.Audio/Renderer/Server/Voice/VoiceState.cs b/Ryujinx.Audio/Renderer/Server/Voice/VoiceState.cs index 89abe9aa9..3270ae6dd 100644 --- a/Ryujinx.Audio/Renderer/Server/Voice/VoiceState.cs +++ b/Ryujinx.Audio/Renderer/Server/Voice/VoiceState.cs @@ -459,7 +459,7 @@ namespace Ryujinx.Audio.Renderer.Server.Voice for (int i = 0; i < Constants.VoiceWaveBufferCount; i++) { - UpdateWaveBuffer(errorInfos.AsSpan().Slice(i * 2, 2), ref WaveBuffers[i], ref parameter.WaveBuffers[i], parameter.SampleFormat, voiceUpdateState.IsWaveBufferValid[i], ref mapper, ref behaviourContext); + UpdateWaveBuffer(errorInfos.AsSpan(i * 2, 2), ref WaveBuffers[i], ref parameter.WaveBuffers[i], parameter.SampleFormat, voiceUpdateState.IsWaveBufferValid[i], ref mapper, ref behaviourContext); } } diff --git a/Ryujinx.Graphics.Gpu/Shader/Cache/CacheHelper.cs b/Ryujinx.Graphics.Gpu/Shader/Cache/CacheHelper.cs index ee4e12657..464436ea0 100644 --- a/Ryujinx.Graphics.Gpu/Shader/Cache/CacheHelper.cs +++ b/Ryujinx.Graphics.Gpu/Shader/Cache/CacheHelper.cs @@ -113,7 +113,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.Cache dataSpan[i++] = hash; } - manifestHeader.UpdateChecksum(data.AsSpan().Slice(Unsafe.SizeOf())); + manifestHeader.UpdateChecksum(data.AsSpan(Unsafe.SizeOf())); MemoryMarshal.Write(data, ref manifestHeader); @@ -447,12 +447,12 @@ namespace Ryujinx.Graphics.Gpu.Shader.Cache if (cb1DataAddress != 0 && cb1DataSize != 0) { - memoryManager.Physical.GetSpan(cb1DataAddress, cb1DataSize).CopyTo(code.AsSpan().Slice(size, cb1DataSize)); + memoryManager.Physical.GetSpan(cb1DataAddress, cb1DataSize).CopyTo(code.AsSpan(size, cb1DataSize)); } if (translatorContext2 != null) { - memoryManager.GetSpan(translatorContext2.Address, sizeA).CopyTo(code.AsSpan().Slice(size + cb1DataSize, sizeA)); + memoryManager.GetSpan(translatorContext2.Address, sizeA).CopyTo(code.AsSpan(size + cb1DataSize, sizeA)); } GuestGpuAccessorHeader gpuAccessorHeader = CreateGuestGpuAccessorCache(context.GpuAccessor); diff --git a/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs b/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs index a0b3a326d..ae128ed43 100644 --- a/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs +++ b/Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs @@ -206,7 +206,7 @@ namespace Ryujinx.Graphics.Gpu.Shader program = new ShaderProgram(entry.Header.Stage, ""); shaderProgramInfo = hostShaderEntries[0].ToShaderProgramInfo(); - byte[] code = entry.Code.AsSpan().Slice(0, entry.Header.Size - entry.Header.Cb1DataSize).ToArray(); + byte[] code = entry.Code.AsSpan(0, entry.Header.Size - entry.Header.Cb1DataSize).ToArray(); ShaderCodeHolder shader = new ShaderCodeHolder(program, shaderProgramInfo, code); @@ -244,7 +244,7 @@ namespace Ryujinx.Graphics.Gpu.Shader return true; // Exit early, the decoding step failed. } - byte[] code = entry.Code.AsSpan().Slice(0, entry.Header.Size - entry.Header.Cb1DataSize).ToArray(); + byte[] code = entry.Code.AsSpan(0, entry.Header.Size - entry.Header.Cb1DataSize).ToArray(); ShaderCodeHolder shader = new ShaderCodeHolder(program, shaderProgramInfo, code); @@ -394,8 +394,8 @@ namespace Ryujinx.Graphics.Gpu.Shader } // NOTE: Vertex B comes first in the shader cache. - byte[] code = entry.Code.AsSpan().Slice(0, entry.Header.Size - entry.Header.Cb1DataSize).ToArray(); - byte[] code2 = entry.Header.SizeA != 0 ? entry.Code.AsSpan().Slice(entry.Header.Size, entry.Header.SizeA).ToArray() : null; + byte[] code = entry.Code.AsSpan(0, entry.Header.Size - entry.Header.Cb1DataSize).ToArray(); + byte[] code2 = entry.Header.SizeA != 0 ? entry.Code.AsSpan(entry.Header.Size, entry.Header.SizeA).ToArray() : null; shaders[i] = new ShaderCodeHolder(program, shaderProgramInfo, code, code2); diff --git a/Ryujinx.Graphics.OpenGL/Program.cs b/Ryujinx.Graphics.OpenGL/Program.cs index 838162ccd..d2b559a8c 100644 --- a/Ryujinx.Graphics.OpenGL/Program.cs +++ b/Ryujinx.Graphics.OpenGL/Program.cs @@ -124,7 +124,7 @@ namespace Ryujinx.Graphics.OpenGL GL.GetProgramBinary(Handle, size, out _, out BinaryFormat binFormat, data); - BinaryPrimitives.WriteInt32LittleEndian(data.AsSpan().Slice(size, 4), (int)binFormat); + BinaryPrimitives.WriteInt32LittleEndian(data.AsSpan(size, 4), (int)binFormat); return data; } diff --git a/Ryujinx.HLE/HOS/Services/ServerBase.cs b/Ryujinx.HLE/HOS/Services/ServerBase.cs index cf7da2f41..1a1e4a340 100644 --- a/Ryujinx.HLE/HOS/Services/ServerBase.cs +++ b/Ryujinx.HLE/HOS/Services/ServerBase.cs @@ -185,7 +185,7 @@ namespace Ryujinx.HLE.HOS.Services { for (int i = 0; i < request.RecvListBuff.Count; i++) { - ulong size = (ulong)BinaryPrimitives.ReadInt16LittleEndian(request.RawData.AsSpan().Slice(sizesOffset + i * 2, 2)); + ulong size = (ulong)BinaryPrimitives.ReadInt16LittleEndian(request.RawData.AsSpan(sizesOffset + i * 2, 2)); response.PtrBuff.Add(new IpcPtrBuffDesc(tempAddr, (uint)i, size)); diff --git a/Ryujinx.HLE/Loaders/Executables/KipExecutable.cs b/Ryujinx.HLE/Loaders/Executables/KipExecutable.cs index be5b61a29..2073a7e2d 100644 --- a/Ryujinx.HLE/Loaders/Executables/KipExecutable.cs +++ b/Ryujinx.HLE/Loaders/Executables/KipExecutable.cs @@ -8,9 +8,9 @@ namespace Ryujinx.HLE.Loaders.Executables class KipExecutable : IExecutable { public byte[] Program { get; } - public Span Text => Program.AsSpan().Slice((int)TextOffset, (int)TextSize); - public Span Ro => Program.AsSpan().Slice((int)RoOffset, (int)RoSize); - public Span Data => Program.AsSpan().Slice((int)DataOffset, (int)DataSize); + public Span Text => Program.AsSpan((int)TextOffset, (int)TextSize); + public Span Ro => Program.AsSpan((int)RoOffset, (int)RoSize); + public Span Data => Program.AsSpan((int)DataOffset, (int)DataSize); public uint TextOffset { get; } public uint RoOffset { get; } @@ -76,7 +76,7 @@ namespace Ryujinx.HLE.Loaders.Executables { reader.GetSegmentSize(segmentType, out int uncompressedSize).ThrowIfFailure(); - var span = program.AsSpan().Slice((int)offset, uncompressedSize); + var span = program.AsSpan((int)offset, uncompressedSize); reader.ReadSegment(segmentType, span).ThrowIfFailure(); diff --git a/Ryujinx.HLE/Loaders/Executables/NroExecutable.cs b/Ryujinx.HLE/Loaders/Executables/NroExecutable.cs index 5e8e4bd49..621ab43b3 100644 --- a/Ryujinx.HLE/Loaders/Executables/NroExecutable.cs +++ b/Ryujinx.HLE/Loaders/Executables/NroExecutable.cs @@ -7,9 +7,9 @@ namespace Ryujinx.HLE.Loaders.Executables class NroExecutable : Nro, IExecutable { public byte[] Program { get; } - public Span Text => Program.AsSpan().Slice((int)TextOffset, (int)Header.NroSegments[0].Size); - public Span Ro => Program.AsSpan().Slice((int)RoOffset, (int)Header.NroSegments[1].Size); - public Span Data => Program.AsSpan().Slice((int)DataOffset, (int)Header.NroSegments[2].Size); + public Span Text => Program.AsSpan((int)TextOffset, (int)Header.NroSegments[0].Size); + public Span Ro => Program.AsSpan((int)RoOffset, (int)Header.NroSegments[1].Size); + public Span Data => Program.AsSpan((int)DataOffset, (int)Header.NroSegments[2].Size); public uint TextOffset => Header.NroSegments[0].FileOffset; public uint RoOffset => Header.NroSegments[1].FileOffset; diff --git a/Ryujinx.HLE/Loaders/Executables/NsoExecutable.cs b/Ryujinx.HLE/Loaders/Executables/NsoExecutable.cs index 4f1c4ca18..f983536c7 100644 --- a/Ryujinx.HLE/Loaders/Executables/NsoExecutable.cs +++ b/Ryujinx.HLE/Loaders/Executables/NsoExecutable.cs @@ -12,9 +12,9 @@ namespace Ryujinx.HLE.Loaders.Executables class NsoExecutable : IExecutable { public byte[] Program { get; } - public Span Text => Program.AsSpan().Slice((int)TextOffset, (int)TextSize); - public Span Ro => Program.AsSpan().Slice((int)RoOffset, (int)RoSize); - public Span Data => Program.AsSpan().Slice((int)DataOffset, (int)DataSize); + public Span Text => Program.AsSpan((int)TextOffset, (int)TextSize); + public Span Ro => Program.AsSpan((int)RoOffset, (int)RoSize); + public Span Data => Program.AsSpan((int)DataOffset, (int)DataSize); public uint TextOffset { get; } public uint RoOffset { get; } @@ -58,7 +58,7 @@ namespace Ryujinx.HLE.Loaders.Executables { reader.GetSegmentSize(segmentType, out uint uncompressedSize).ThrowIfFailure(); - var span = Program.AsSpan().Slice((int)offset, (int)uncompressedSize); + var span = Program.AsSpan((int)offset, (int)uncompressedSize); reader.ReadSegment(segmentType, span).ThrowIfFailure(); diff --git a/Ryujinx.HLE/Loaders/Mods/MemPatch.cs b/Ryujinx.HLE/Loaders/Mods/MemPatch.cs index e224c3ef1..f9db7c699 100644 --- a/Ryujinx.HLE/Loaders/Mods/MemPatch.cs +++ b/Ryujinx.HLE/Loaders/Mods/MemPatch.cs @@ -85,7 +85,7 @@ namespace Ryujinx.HLE.Loaders.Mods Logger.Info?.Print(LogClass.ModLoader, $"Patching address offset {patchOffset:x} <= {BitConverter.ToString(patch).Replace('-', ' ')} len={patchSize}"); - patch.AsSpan().Slice(0, patchSize).CopyTo(memory.Slice(patchOffset, patchSize)); + patch.AsSpan(0, patchSize).CopyTo(memory.Slice(patchOffset, patchSize)); count++; }