Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

General code clean up of System.Memory #25958

Merged
merged 3 commits into from
Dec 16, 2017
Merged

General code clean up of System.Memory #25958

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c0bd30
Use explicit type instead of var where type can't be inferred easily.
ahsonkhan Dec 16, 2017
13e369f
Removing unnecessary use of 'unsafe' and generic type specifiers.
ahsonkhan Dec 16, 2017
87216ce
Remove leftover unnecessary generic specifiers.
ahsonkhan Dec 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Use explicit type instead of var where type can't be inferred easily.
  • Loading branch information
@ahsonkhan
ahsonkhan committed Dec 16, 2017
commit 0c0bd3048a33683f4c1cb5fb6e8f9b6ec1b7986c
8 changes: 4 additions & 4 deletions src/System.Memory/src/System/SpanHelpers.byte.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ public static unsafe int IndexOfAny(ref byte searchSpace, byte value0, byte valu

while ((byte*)nLength > (byte*)index)
{
var vData = Unsafe.ReadUnaligned<Vector<byte>>(ref Unsafe.AddByteOffset(ref searchSpace, index));
Vector<byte> vData = Unsafe.ReadUnaligned<Vector<byte>>(ref Unsafe.AddByteOffset(ref searchSpace, index));
var vMatches = Vector.BitwiseOr(
Vector.Equals(vData, values0),
Vector.Equals(vData, values1));
Expand Down Expand Up @@ -572,7 +572,7 @@ public static unsafe int IndexOfAny(ref byte searchSpace, byte value0, byte valu
Vector<byte> values2 = GetVector(value2);
while ((byte*)nLength > (byte*)index)
{
var vData = Unsafe.ReadUnaligned<Vector<byte>>(ref Unsafe.AddByteOffset(ref searchSpace, index));
Vector<byte> vData = Unsafe.ReadUnaligned<Vector<byte>>(ref Unsafe.AddByteOffset(ref searchSpace, index));

var vMatches = Vector.BitwiseOr(
Vector.BitwiseOr(
Expand Down Expand Up @@ -707,7 +707,7 @@ public static unsafe int LastIndexOfAny(ref byte searchSpace, byte value0, byte

while ((byte*)nLength > (byte*)(Vector<byte>.Count - 1))
{
var vData = Unsafe.ReadUnaligned<Vector<byte>>(ref Unsafe.AddByteOffset(ref searchSpace, index - Vector<byte>.Count));
Vector<byte> vData = Unsafe.ReadUnaligned<Vector<byte>>(ref Unsafe.AddByteOffset(ref searchSpace, index - Vector<byte>.Count));
var vMatches = Vector.BitwiseOr(
Vector.Equals(vData, values0),
Vector.Equals(vData, values1));
Expand Down Expand Up @@ -837,7 +837,7 @@ public static unsafe int LastIndexOfAny(ref byte searchSpace, byte value0, byte
Vector<byte> values2 = GetVector(value2);
while ((byte*)nLength > (byte*)(Vector<byte>.Count - 1))
{
var vData = Unsafe.ReadUnaligned<Vector<byte>>(ref Unsafe.AddByteOffset(ref searchSpace, index - Vector<byte>.Count));
Vector<byte> vData = Unsafe.ReadUnaligned<Vector<byte>>(ref Unsafe.AddByteOffset(ref searchSpace, index - Vector<byte>.Count));

var vMatches = Vector.BitwiseOr(
Vector.BitwiseOr(
Expand Down
4 changes: 2 additions & 2 deletions src/System.Memory/tests/Base64/Base64TestHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public static void InitalizeDecodableBytes(Span<byte> bytes, int seed = 100)
[Fact]
public static void GenerateEncodingMapAndVerify()
{
var data = new byte[64]; // Base64
byte[] data = new byte[64]; // Base64
for (int i = 0; i < s_characters.Length; i++)
{
data[i] = (byte)s_characters[i];
Expand All @@ -98,7 +98,7 @@ public static void GenerateEncodingMapAndVerify()
[Fact]
public static void GenerateDecodingMapAndVerify()
{
var data = new sbyte[256]; // 0 to byte.MaxValue (255)
sbyte[] data = new sbyte[256]; // 0 to byte.MaxValue (255)
for (int i = 0; i < data.Length; i++)
{
data[i] = s_invalidByte;
Expand Down
4 changes: 2 additions & 2 deletions src/System.Memory/tests/Binary/BinaryReaderUnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ public void ReadingStructFieldByFieldOrReadAndReverseEndianness()

ReadOnlySpan<byte> readOnlySpanBE = new ReadOnlySpan<byte>(spanBE.ToArray());

var readStructAndReverse = ReadMachineEndian<TestHelpers.TestStructExplicit>(spanBE);
TestHelpers.TestStructExplicit readStructAndReverse = ReadMachineEndian<TestHelpers.TestStructExplicit>(spanBE);
if (BitConverter.IsLittleEndian)
{
readStructAndReverse.S0 = ReverseEndianness(readStructAndReverse.S0);
Expand Down Expand Up @@ -408,7 +408,7 @@ public void ReadingStructFieldByFieldOrReadAndReverseEndianness()
UL1 = ReadUInt64BigEndian(spanBE.Slice(48))
};

var readStructAndReverseFromReadOnlySpan = ReadMachineEndian<TestHelpers.TestStructExplicit>(readOnlySpanBE);
TestHelpers.TestStructExplicit readStructAndReverseFromReadOnlySpan = ReadMachineEndian<TestHelpers.TestStructExplicit>(readOnlySpanBE);
if (BitConverter.IsLittleEndian)
{
readStructAndReverseFromReadOnlySpan.S0 = ReverseEndianness(readStructAndReverseFromReadOnlySpan.S0);
Expand Down
20 changes: 10 additions & 10 deletions src/System.Memory/tests/Performance/Perf.Base64EncodeDecode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ private static void Base64Encode(int numberOfBytes)
Base64TestHelper.InitalizeBytes(source);
Span<byte> destination = new byte[Base64.GetMaxEncodedToUtf8Length(numberOfBytes)];

foreach (var iteration in Benchmark.Iterations)
foreach (BenchmarkIteration iteration in Benchmark.Iterations)
{
using (iteration.StartMeasurement())
{
Expand All @@ -47,7 +47,7 @@ private static void Base64EncodeDestinationTooSmall(int numberOfBytes)
Base64TestHelper.InitalizeBytes(source);
Span<byte> destination = new byte[Base64.GetMaxEncodedToUtf8Length(numberOfBytes) - 1];

foreach (var iteration in Benchmark.Iterations)
foreach (BenchmarkIteration iteration in Benchmark.Iterations)
{
using (iteration.StartMeasurement())
{
Expand All @@ -68,7 +68,7 @@ private static void Base64EncodeBaseline(int numberOfBytes)
Base64TestHelper.InitalizeBytes(source.AsSpan());
var destination = new char[Base64.GetMaxEncodedToUtf8Length(numberOfBytes)];

foreach (var iteration in Benchmark.Iterations)
foreach (BenchmarkIteration iteration in Benchmark.Iterations)
{
using (iteration.StartMeasurement())
{
Expand All @@ -90,7 +90,7 @@ private static void Base64Decode(int numberOfBytes)
Span<byte> encoded = new byte[Base64.GetMaxEncodedToUtf8Length(numberOfBytes)];
Base64.EncodeToUtf8(source, encoded, out _, out _);

foreach (var iteration in Benchmark.Iterations)
foreach (BenchmarkIteration iteration in Benchmark.Iterations)
{
using (iteration.StartMeasurement())
{
Expand Down Expand Up @@ -118,7 +118,7 @@ private static void Base64DecodeDetinationTooSmall(int numberOfBytes)

source = source.Slice(0, source.Length - 1);

foreach (var iteration in Benchmark.Iterations)
foreach (BenchmarkIteration iteration in Benchmark.Iterations)
{
using (iteration.StartMeasurement())
{
Expand All @@ -139,7 +139,7 @@ private static void Base64DecodeBaseline(int numberOfBytes)
Base64TestHelper.InitalizeBytes(source);
ReadOnlySpan<char> encoded = Convert.ToBase64String(source.ToArray()).ToCharArray();

foreach (var iteration in Benchmark.Iterations)
foreach (BenchmarkIteration iteration in Benchmark.Iterations)
{
using (iteration.StartMeasurement())
{
Expand All @@ -164,7 +164,7 @@ private static void Base64EncodeInPlace(int numberOfBytes)
Span<byte> backupSpan = decodedSpan.ToArray();

int bytesWritten = 0;
foreach (var iteration in Benchmark.Iterations)
foreach (BenchmarkIteration iteration in Benchmark.Iterations)
{
using (iteration.StartMeasurement())
{
Expand Down Expand Up @@ -193,7 +193,7 @@ private static void Base64EncodeInPlaceOnce(int numberOfBytes)
Span<byte> backupSpan = decodedSpan.ToArray();

int bytesWritten = 0;
foreach (var iteration in Benchmark.Iterations)
foreach (BenchmarkIteration iteration in Benchmark.Iterations)
{
backupSpan.CopyTo(decodedSpan);
using (iteration.StartMeasurement())
Expand Down Expand Up @@ -223,7 +223,7 @@ private static void Base64DecodeInPlace(int numberOfBytes)
Span<byte> backupSpan = encodedSpan.ToArray();

int bytesWritten = 0;
foreach (var iteration in Benchmark.Iterations)
foreach (BenchmarkIteration iteration in Benchmark.Iterations)
{
using (iteration.StartMeasurement())
{
Expand All @@ -248,7 +248,7 @@ private static void Base64DecodeInPlaceOnce(int numberOfBytes)
Span<byte> encodedSpan = new byte[length];

int bytesWritten = 0;
foreach (var iteration in Benchmark.Iterations)
foreach (BenchmarkIteration iteration in Benchmark.Iterations)
{
Base64.EncodeToUtf8(source, encodedSpan, out _, out _);
using (iteration.StartMeasurement())
Expand Down
8 changes: 4 additions & 4 deletions src/System.Memory/tests/Performance/Perf.MemorySlice.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ private static void Memory_Byte_SliceThenGetSpan(int numberOfBytes)
{
for (int j = 0; j < numberOfSlices; j++)
{
var span = memory.Slice(10, 1).Span;
Span<byte> span = memory.Slice(10, 1).Span;
localInt ^= span[0];
}
}
Expand All @@ -56,7 +56,7 @@ private static void Memory_Byte_GetSpanThenSlice(int numberOfBytes)
{
for (int j = 0; j < numberOfSlices; j++)
{
var span = memory.Span.Slice(10, 1);
Span<byte> span = memory.Span.Slice(10, 1);
localInt ^= span[0];
}
}
Expand All @@ -83,7 +83,7 @@ private static void ReadOnlyMemory_Byte_GetSpanThenSlice(int numberOfBytes)
{
for (int j = 0; j < numberOfSlices; j++)
{
var span = memory.Span.Slice(10, 1);
ReadOnlySpan<byte> span = memory.Span.Slice(10, 1);
localInt ^= span[0];
}
}
Expand All @@ -110,7 +110,7 @@ private static void ReadOnlyMemory_Char_GetSpanThenSlice(int numberOfChars)
{
for (int j = 0; j < numberOfSlices; j++)
{
var span = memory.Span.Slice(10, 1);
ReadOnlySpan<char> span = memory.Span.Slice(10, 1);
localInt ^= span[0];
}
}
Expand Down
16 changes: 8 additions & 8 deletions src/System.Memory/tests/Performance/Perf.Span.BinaryReadAndWrite.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ private static void ReadStructAndReverseBE()
Span<byte> spanBE = TestHelpers.GetSpanBE();

var readStruct = new TestHelpers.TestStructExplicit();
foreach (var iteration in Benchmark.Iterations)
foreach (BenchmarkIteration iteration in Benchmark.Iterations)
{
using (iteration.StartMeasurement())
{
Expand Down Expand Up @@ -55,7 +55,7 @@ private static void ReadStructAndReverseLE()
Span<byte> spanLE = TestHelpers.GetSpanLE();

var readStruct = new TestHelpers.TestStructExplicit();
foreach (var iteration in Benchmark.Iterations)
foreach (BenchmarkIteration iteration in Benchmark.Iterations)
{
using (iteration.StartMeasurement())
{
Expand Down Expand Up @@ -90,7 +90,7 @@ private static void ReadStructFieldByFieldBE()
Span<byte> spanBE = TestHelpers.GetSpanBE();

var readStruct = new TestHelpers.TestStructExplicit();
foreach (var iteration in Benchmark.Iterations)
foreach (BenchmarkIteration iteration in Benchmark.Iterations)
{
using (iteration.StartMeasurement())
{
Expand Down Expand Up @@ -124,7 +124,7 @@ private static void ReadStructFieldByFieldLE()
Span<byte> spanLE = TestHelpers.GetSpanLE();

var readStruct = new TestHelpers.TestStructExplicit();
foreach (var iteration in Benchmark.Iterations)
foreach (BenchmarkIteration iteration in Benchmark.Iterations)
{
using (iteration.StartMeasurement())
{
Expand Down Expand Up @@ -159,7 +159,7 @@ private static void ReadStructFieldByFieldUsingBitConverterLE()
byte[] arrayLE = spanLE.ToArray();

var readStruct = new TestHelpers.TestStructExplicit();
foreach (var iteration in Benchmark.Iterations)
foreach (BenchmarkIteration iteration in Benchmark.Iterations)
{
using (iteration.StartMeasurement())
{
Expand Down Expand Up @@ -194,7 +194,7 @@ private static void ReadStructFieldByFieldUsingBitConverterBE()
byte[] arrayBE = spanBE.ToArray();

var readStruct = new TestHelpers.TestStructExplicit();
foreach (var iteration in Benchmark.Iterations)
foreach (BenchmarkIteration iteration in Benchmark.Iterations)
{
using (iteration.StartMeasurement())
{
Expand Down Expand Up @@ -242,7 +242,7 @@ private static void MeasureReverseEndianness()
{
var myArray = new int[1000];

foreach (var iteration in Benchmark.Iterations)
foreach (BenchmarkIteration iteration in Benchmark.Iterations)
{
using (iteration.StartMeasurement())
{
Expand All @@ -262,7 +262,7 @@ private static void MeasureReverseUsingNtoH()
{
var myArray = new int[1000];

foreach (var iteration in Benchmark.Iterations)
foreach (BenchmarkIteration iteration in Benchmark.Iterations)
{
using (iteration.StartMeasurement())
{
Expand Down
2 changes: 1 addition & 1 deletion src/System.Memory/tests/Performance/Perf.Span.Clear.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public void Int(int size)
{
var a = new int[size];
var span = new Span<int>(a);
foreach (var iteration in Benchmark.Iterations)
foreach (BenchmarkIteration iteration in Benchmark.Iterations)
{
using (iteration.StartMeasurement())
{
Expand Down
2 changes: 1 addition & 1 deletion src/System.Memory/tests/Performance/Perf.Span.Fill.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public void Int(int size)
{
var a = new int[size];
var span = new Span<int>(a);
foreach (var iteration in Benchmark.Iterations)
foreach (BenchmarkIteration iteration in Benchmark.Iterations)
{
using (iteration.StartMeasurement())
{
Expand Down
6 changes: 3 additions & 3 deletions src/System.Memory/tests/Performance/Perf.Span.StartsWith.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public void Int(int size, int valSize)
}
var span = new Span<int>(a);
var value = new Span<int>(b);
foreach (var iteration in Benchmark.Iterations)
foreach (BenchmarkIteration iteration in Benchmark.Iterations)
{
using (iteration.StartMeasurement())
{
Expand Down Expand Up @@ -87,7 +87,7 @@ public void Byte(int size, int valSize)
}
var span = new Span<byte>(a);
var value = new Span<byte>(b);
foreach (var iteration in Benchmark.Iterations)
foreach (BenchmarkIteration iteration in Benchmark.Iterations)
{
using (iteration.StartMeasurement())
{
Expand Down Expand Up @@ -132,7 +132,7 @@ public void String(int size, int valSize)
}
var span = new Span<string>(a);
var value = new Span<string>(b);
foreach (var iteration in Benchmark.Iterations)
foreach (BenchmarkIteration iteration in Benchmark.Iterations)
{
using (iteration.StartMeasurement())
{
Expand Down
3 changes: 3 additions & 0 deletions src/System.Memory/tests/Performance/System.Memory.Performance.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,8 @@
<Name>PerfRunner</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
4 changes: 2 additions & 2 deletions src/System.Memory/tests/ReadOnlySpan/CopyTo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ public static void CopyToLargeSizeTest(long bufferSize)

for (int count = 0; count < GuidCount; ++count)
{
var guidfirst = Unsafe.Add(ref memoryFirst, count);
var guidSecond = Unsafe.Add(ref memorySecond, count);
Guid guidfirst = Unsafe.Add(ref memoryFirst, count);
Guid guidSecond = Unsafe.Add(ref memorySecond, count);
Assert.Equal(guidfirst, guidSecond);
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/System.Memory/tests/ReadOnlySpan/IndexOf.byte.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,10 @@ public static void MakeSureNoChecksGoOutOfRange_Byte()
[InlineData("/localhost:5000/PATH/PATH2/ HTTP/1.1", " %?", ' ', 27)]
public static void IndexOfAnyStrings_Byte(string raw, string search, char expectResult, int expectIndex)
{
var buffers = Encoding.UTF8.GetBytes(raw);
byte[] buffers = Encoding.UTF8.GetBytes(raw);
var span = new ReadOnlySpan<byte>(buffers);
var searchFor = search.ToCharArray();
var searchForBytes = Encoding.UTF8.GetBytes(searchFor);
char[] searchFor = search.ToCharArray();
byte[] searchForBytes = Encoding.UTF8.GetBytes(searchFor);

var index = -1;
if (searchFor.Length == 1)
Expand Down
6 changes: 3 additions & 3 deletions src/System.Memory/tests/ReadOnlySpan/LastIndexOfAny.byte.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ public static partial class ReadOnlySpanTests
[InlineData("/localhost:5000/PATH/PATH2/ HTTP/1.1", " %?", ' ', 27)]
public static void LastIndexOfAnyStrings_Byte(string raw, string search, char expectResult, int expectIndex)
{
var buffers = Encoding.UTF8.GetBytes(raw);
byte[] buffers = Encoding.UTF8.GetBytes(raw);
var span = new ReadOnlySpan<byte>(buffers);
var searchFor = search.ToCharArray();
var searchForBytes = Encoding.UTF8.GetBytes(searchFor);
char[] searchFor = search.ToCharArray();
byte[] searchForBytes = Encoding.UTF8.GetBytes(searchFor);

var index = -1;
if (searchFor.Length == 1)
Expand Down
4 changes: 2 additions & 2 deletions src/System.Memory/tests/Span/CopyTo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,8 @@ public static void CopyToLargeSizeTest(long bufferSize)

for (int count = 0; count < GuidCount; ++count)
{
var guidfirst = Unsafe.Add(ref memoryFirst, count);
var guidSecond = Unsafe.Add(ref memorySecond, count);
Guid guidfirst = Unsafe.Add(ref memoryFirst, count);
Guid guidSecond = Unsafe.Add(ref memorySecond, count);
Assert.Equal(guidfirst, guidSecond);
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/System.Memory/tests/Span/IndexOf.byte.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,10 @@ public static void MakeSureNoChecksGoOutOfRange_Byte()
[InlineData("/localhost:5000/PATH/PATH2/ HTTP/1.1", " %?", ' ', 27)]
public static void IndexOfAnyStrings_Byte(string raw, string search, char expectResult, int expectIndex)
{
var buffers = Encoding.UTF8.GetBytes(raw);
byte[] buffers = Encoding.UTF8.GetBytes(raw);
var span = new Span<byte>(buffers);
var searchFor = search.ToCharArray();
var searchForBytes = Encoding.UTF8.GetBytes(searchFor);
char[] searchFor = search.ToCharArray();
byte[] searchForBytes = Encoding.UTF8.GetBytes(searchFor);

var index = -1;
if (searchFor.Length == 1)
Expand Down
Loading