Skip to content

[MONO] Partially revert "Clean up in Number.Formatting.cs (#110955)" #118499

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 3 commits into from
Aug 15, 2025
Merged

[MONO] Partially revert "Clean up in Number.Formatting.cs (#110955)" #118499

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f876c84
Partially revert "Clean up in Number.Formatting.cs (#110955)"
EgorBo Aug 7, 2025
dc16950
ifdefs
EgorBo Aug 14, 2025
9200c3a
Update Number.Formatting.cs
EgorBo Aug 14, 2025
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
39 changes: 37 additions & 2 deletions src/libraries/System.Private.CoreLib/src/System/Number.Formatting.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,35 @@ internal static partial class Number

// Optimizations using "TwoDigits" inspired by:
// https://engineering.fb.com/2013/03/15/developer-tools/three-optimization-tips-for-c/
#if MONO
// Workaround for a performance regression on Mono: https://github.com/dotnet/runtime/issues/111932
private static readonly byte[] TwoDigitsCharsAsBytes =
MemoryMarshal.AsBytes<char>("00010203040506070809" +
"10111213141516171819" +
"20212223242526272829" +
"30313233343536373839" +
"40414243444546474849" +
"50515253545556575859" +
"60616263646566676869" +
"70717273747576777879" +
"80818283848586878889" +
"90919293949596979899").ToArray();
private static readonly byte[] TwoDigitsBytes =
("00010203040506070809"u8 +
"10111213141516171819"u8 +
"20212223242526272829"u8 +
"30313233343536373839"u8 +
"40414243444546474849"u8 +
"50515253545556575859"u8 +
"60616263646566676869"u8 +
"70717273747576777879"u8 +
"80818283848586878889"u8 +
"90919293949596979899"u8).ToArray();

[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static ref byte GetTwoDigitsBytesRef(bool useChars) =>
ref MemoryMarshal.GetArrayDataReference(useChars ? TwoDigitsCharsAsBytes : TwoDigitsBytes);
#else
private static ReadOnlySpan<byte> TwoDigitsCharsAsBytes =>
MemoryMarshal.AsBytes<char>("00010203040506070809" +
"10111213141516171819" +
Expand All @@ -295,6 +324,12 @@ internal static partial class Number
"80818283848586878889"u8 +
"90919293949596979899"u8;

[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static ref byte GetTwoDigitsBytesRef(bool useChars) =>
ref MemoryMarshal.GetReference(useChars ? TwoDigitsCharsAsBytes : TwoDigitsBytes);
#endif


public static unsafe string FormatDecimal(decimal value, ReadOnlySpan<char> format, NumberFormatInfo info)
{
char fmt = ParseFormatSpecifier(format, out int digits);
Expand Down Expand Up @@ -1572,7 +1607,7 @@ internal static unsafe void WriteTwoDigits<TChar>(uint value, TChar* ptr) where

Unsafe.CopyBlockUnaligned(
ref *(byte*)ptr,
ref Unsafe.Add(ref MemoryMarshal.GetReference(typeof(TChar) == typeof(char) ? TwoDigitsCharsAsBytes : TwoDigitsBytes), (uint)sizeof(TChar) * 2 * value),
ref Unsafe.Add(ref GetTwoDigitsBytesRef(typeof(TChar) == typeof(char)), (uint)sizeof(TChar) * 2 * value),
(uint)sizeof(TChar) * 2);
}

Expand All @@ -1588,7 +1623,7 @@ internal static unsafe void WriteFourDigits<TChar>(uint value, TChar* ptr) where

(value, uint remainder) = Math.DivRem(value, 100);

ref byte charsArray = ref MemoryMarshal.GetReference(typeof(TChar) == typeof(char) ? TwoDigitsCharsAsBytes : TwoDigitsBytes);
ref byte charsArray = ref GetTwoDigitsBytesRef(typeof(TChar) == typeof(char));

Unsafe.CopyBlockUnaligned(
ref *(byte*)ptr,
Expand Down
Loading