Skip to content

Remove mono specific SpanHelpers #79215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Dec 18, 2022
Merged

Remove mono specific SpanHelpers #79215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c3cbacd
Revert "[Mono] Restore old code to solve the recent SpanHelpers regre…
BrzVlad Nov 1, 2022
76d56b2
[System.Span] Refactor hot loop code
BrzVlad Nov 1, 2022
c7d817f
[mono][interp] Replace compare + brfalse/brtrue with single condition…
BrzVlad Nov 1, 2022
300afdb
[mono][interp] Dump in/out links for bblocks during verbose logging
BrzVlad Nov 1, 2022
e9f50e2
[mono][interp] Improve detection of dead bblocks
BrzVlad Nov 1, 2022
17c8da0
[mono][interp] Reorder bblocks to facilitate propagation of values
BrzVlad Nov 3, 2022
83b2d05
[mono][interp] Don't optimize out bblocks that are tiering patchpoint…
BrzVlad Nov 15, 2022
fe8288a
[mono][interp] Make bblock reordering more conservative
BrzVlad Nov 15, 2022
65feed0
[mono][interp] Add basic removal of unused defines
BrzVlad Nov 3, 2022
3f7bd3d
[mono][interp] Clear unused defines of local only vars
BrzVlad Nov 3, 2022
7b41739
[mono][interp] Propagate target branches
BrzVlad Nov 3, 2022
3558b6d
[mono][interp] Add super instruction for (var + ct1) * ct2
BrzVlad Dec 3, 2022
32b8723
[mono][interp] Add new ldind super instruction
BrzVlad Dec 4, 2022
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
3 changes: 0 additions & 3 deletions src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2526,7 +2526,4 @@
<Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnaryPlusOperators.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnsignedNumber.cs" />
</ItemGroup>
<ItemGroup Condition="'$(FeatureMono)' == 'true'">
<Compile Include="$(MSBuildThisFileDirectory)System\SpanHelpers.Mono.cs" />
</ItemGroup>
</Project>
7 changes: 1 addition & 6 deletions src/libraries/System.Private.CoreLib/src/System/MemoryExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1750,7 +1750,6 @@ public static unsafe int IndexOfAny<T>(this ReadOnlySpan<T> span, ReadOnlySpan<T
Unsafe.Add(ref valueRef, 2),
span.Length);

#if !MONO // We don't have a mono overload for 4 values
case 4:
return SpanHelpers.IndexOfAnyValueType(
ref spanRef,
Expand All @@ -1759,7 +1758,7 @@ public static unsafe int IndexOfAny<T>(this ReadOnlySpan<T> span, ReadOnlySpan<T
Unsafe.Add(ref valueRef, 2),
Unsafe.Add(ref valueRef, 3),
span.Length);
#endif

case 5:
return SpanHelpers.IndexOfAnyValueType(
ref spanRef,
Expand Down Expand Up @@ -2025,7 +2024,6 @@ public static unsafe int LastIndexOfAny<T>(this ReadOnlySpan<T> span, ReadOnlySp
Unsafe.Add(ref valueRef, 2),
span.Length);

#if !MONO // We don't have a mono overload for 4 values
case 4:
return SpanHelpers.LastIndexOfAnyValueType(
ref spanRef,
Expand All @@ -2034,7 +2032,6 @@ public static unsafe int LastIndexOfAny<T>(this ReadOnlySpan<T> span, ReadOnlySp
Unsafe.Add(ref valueRef, 2),
Unsafe.Add(ref valueRef, 3),
span.Length);
#endif

case 5:
return SpanHelpers.LastIndexOfAnyValueType(
Expand Down Expand Up @@ -2075,7 +2072,6 @@ public static unsafe int LastIndexOfAny<T>(this ReadOnlySpan<T> span, ReadOnlySp
Unsafe.Add(ref valueRef, 2),
span.Length);

#if !MONO // We don't have a mono overload for 4 values
case 4:
return SpanHelpers.LastIndexOfAnyValueType(
ref spanRef,
Expand All @@ -2084,7 +2080,6 @@ public static unsafe int LastIndexOfAny<T>(this ReadOnlySpan<T> span, ReadOnlySp
Unsafe.Add(ref valueRef, 2),
Unsafe.Add(ref valueRef, 3),
span.Length);
#endif

case 5:
return SpanHelpers.LastIndexOfAnyValueType(
Expand Down
16 changes: 12 additions & 4 deletions src/libraries/System.Private.CoreLib/src/System/SpanHelpers.Byte.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,13 +986,21 @@ public static nuint CommonPrefixLength(ref byte first, ref byte second, nuint le

for (; (nint)i <= (nint)length - 4; i += 4)
{
if (Unsafe.Add(ref first, i + 0) != Unsafe.Add(ref second, i + 0)) return i + 0;
if (Unsafe.Add(ref first, i + 1) != Unsafe.Add(ref second, i + 1)) return i + 1;
if (Unsafe.Add(ref first, i + 2) != Unsafe.Add(ref second, i + 2)) return i + 2;
if (Unsafe.Add(ref first, i + 3) != Unsafe.Add(ref second, i + 3)) return i + 3;
if (Unsafe.Add(ref first, i + 0) != Unsafe.Add(ref second, i + 0)) goto Found0;
if (Unsafe.Add(ref first, i + 1) != Unsafe.Add(ref second, i + 1)) goto Found1;
if (Unsafe.Add(ref first, i + 2) != Unsafe.Add(ref second, i + 2)) goto Found2;
if (Unsafe.Add(ref first, i + 3) != Unsafe.Add(ref second, i + 3)) goto Found3;
}

return length;
Found0:
return i;
Found1:
return i + 1;
Found2:
return i + 2;
Found3:
return i + 3;
}

Debug.Assert(length >= (uint)Vector128<byte>.Count);
Expand Down
Loading