Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Optimize BigInteger formatting #100181

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 12 commits into from
Apr 22, 2024
Merged

Optimize BigInteger formatting #100181

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
aa13d99
Cleanup DecStr formatting
huoyaoyuan May 13, 2023
b490bc3
Cleanup ToNumber portion
huoyaoyuan May 13, 2023
6d13487
Clean and pool base1E9 buffer
huoyaoyuan May 13, 2023
5dd1f2b
Split leaf span and array path
huoyaoyuan May 13, 2023
b5e8833
Post cherry-pick update
huoyaoyuan Dec 5, 2023
e1255a8
Remove unworthy positive/negative span/string split
huoyaoyuan Dec 5, 2023
ec1a714
Use stackalloc for buffers
huoyaoyuan Dec 5, 2023
adf6a6f
Update constant usage
huoyaoyuan Dec 5, 2023
cdbe415
Use UInt32ToDecChars
huoyaoyuan Dec 6, 2023
2bd21dc
Fix type assert
huoyaoyuan Mar 23, 2024
45973b4
Fix strLength
huoyaoyuan Mar 23, 2024
367de9e
Merge branch 'main' into numerics-format-3
tannergooding Apr 18, 2024
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
Prev Previous commit
Next Next commit
Use UInt32ToDecChars
  • Loading branch information
@huoyaoyuan
huoyaoyuan committed Mar 23, 2024
commit cdbe4159d3afe2d168a204781f3933ac33bb4e5d
26 changes: 6 additions & 20 deletions src/libraries/System.Runtime.Numerics/src/System/Number.BigInteger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,7 @@ internal static bool TryFormatBigInteger(BigInteger value, ReadOnlySpan<char> fo
sNegative?.CopyTo(destination);
fixed (char* ptr = &MemoryMarshal.GetReference(destination))
{
BigIntegerToDecChars(ptr + strLength, base1E9Value, digits);
BigIntegerToDecChars((Utf16Char*)ptr + strLength, base1E9Value, digits);
}
charsWritten = strLength;
spanSuccess = true;
Expand All @@ -970,7 +970,7 @@ internal static bool TryFormatBigInteger(BigInteger value, ReadOnlySpan<char> fo
state.sNegative?.CopyTo(span);
fixed (char* ptr = &MemoryMarshal.GetReference(span))
{
BigIntegerToDecChars(ptr + span.Length, new ReadOnlySpan<uint>((void*)state.ptr, state.Length), state.digits);
BigIntegerToDecChars((Utf16Char*)ptr + span.Length, new ReadOnlySpan<uint>((void*)state.ptr, state.Length), state.digits);
}
});
}
Expand All @@ -985,7 +985,7 @@ internal static bool TryFormatBigInteger(BigInteger value, ReadOnlySpan<char> fo
fixed (byte* ptr = numberBuffer) // NumberBuffer expects pinned Digits
{
scoped NumberBuffer number = new NumberBuffer(NumberBufferKind.Integer, ptr, valueDigits + 1);
BigIntegerToDecChars(ptr + valueDigits, base1E9Value, valueDigits);
BigIntegerToDecChars((Utf8Char*)ptr + valueDigits, base1E9Value, valueDigits);
number.Digits[^1] = 0;
number.DigitsCount = valueDigits;
number.Scale = valueDigits;
Expand Down Expand Up @@ -1031,33 +1031,19 @@ internal static bool TryFormatBigInteger(BigInteger value, ReadOnlySpan<char> fo
}

private static unsafe TChar* BigIntegerToDecChars<TChar>(TChar* bufferEnd, ReadOnlySpan<uint> base1E9Value, int digits)
where TChar : unmanaged, IBinaryInteger<TChar> // CoreLib uses IUtfChar<TChar>
where TChar : unmanaged, IUtfChar<TChar>
{
Debug.Assert(typeof(TChar) == typeof(char) || typeof(TChar) == typeof(byte));
Debug.Assert(base1E9Value[^1] != 0, "Leading zeros should be trimmed by caller.");

// The base 10^9 value is in reverse order
for (int i = 0; i < base1E9Value.Length - 1; i++)
{
// TODO: is it worthy to introduce optimized UInt32ToDecChars from CoreLib?
bufferEnd = UInt32ToDecChars(bufferEnd, base1E9Value[i], kcchBase);
digits -= kcchBase;
uint value = base1E9Value[i];
for (int j = 0; j < kcchBase; j++)
{
(value, uint digit) = Math.DivRem(value, 10);
*(--bufferEnd) = TChar.CreateTruncating('0' + digit);
}
}

Debug.Assert(digits >= FormattingHelpers.CountDigits(base1E9Value[^1]));
for (uint value = base1E9Value[^1]; value > 0 || digits > 0;)
{
digits--;
(value, uint digit) = Math.DivRem(value, 10);
*(--bufferEnd) = TChar.CreateTruncating('0' + digit);
}

return bufferEnd;
return UInt32ToDecChars(bufferEnd, base1E9Value[^1], digits);
}
}

Expand Down
15 changes: 15 additions & 0 deletions src/libraries/System.Runtime.Numerics/src/System/Number.Polyfill.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,21 @@ internal readonly struct Utf16Char(char ch) : IUtfChar<Utf16Char>
public bool Equals(Utf16Char other) => value == other.value;
}

#pragma warning disable CA1067 // Polyfill only type
internal readonly struct Utf8Char(byte ch) : IUtfChar<Utf8Char>
#pragma warning restore CA1067
{
private readonly byte value = ch;

public static Utf8Char CastFrom(byte value) => new(value);
public static Utf8Char CastFrom(char value) => new((byte)value);
public static Utf8Char CastFrom(int value) => new((byte)value);
public static Utf8Char CastFrom(uint value) => new((byte)value);
public static Utf8Char CastFrom(ulong value) => new((byte)value);
public static uint CastToUInt32(Utf8Char value) => value.value;
public bool Equals(Utf8Char other) => value == other.value;
}

internal static partial class Number
{
internal static bool AllowHyphenDuringParsing(this NumberFormatInfo info)
Expand Down