Use stack buffers for small composite collections
This commit is contained in:
1 parent
3e7bffc812
commit
9c474fc241
1 file changed
+182
-9
@@ -799,8 +799,8 @@ internal static partial class PrimeOrderCalculator
|
|||||||
gpuFactored = PrimeOrderGpuHeuristics.TryPartialFactor(value, limit, primeSlots, exponentSlots, out factorCount, out remaining, out _);
|
gpuFactored = PrimeOrderGpuHeuristics.TryPartialFactor(value, limit, primeSlots, exponentSlots, out factorCount, out remaining, out _);
|
||||||
}
|
}
|
||||||
|
|
||||||
List<ulong> pending = ThreadStaticPools.RentUlongList(2);
|
Span<ulong> pendingStorage = stackalloc ulong[4];
|
||||||
Stack<ulong>? compositeStack = null;
|
PendingBuffer pending = new PendingBuffer(pendingStorage);
|
||||||
PartialFactorResult result;
|
PartialFactorResult result;
|
||||||
|
|
||||||
if (!gpuFactored)
|
if (!gpuFactored)
|
||||||
@@ -822,8 +822,10 @@ internal static partial class PrimeOrderCalculator
|
|||||||
|
|
||||||
if (config.PollardRhoMilliseconds > 0 && pending.Count > 0)
|
if (config.PollardRhoMilliseconds > 0 && pending.Count > 0)
|
||||||
{
|
{
|
||||||
|
Span<ulong> compositeStorage = stackalloc ulong[8];
|
||||||
|
CompositeStack compositeStack = new CompositeStack(compositeStorage);
|
||||||
|
|
||||||
long deadlineTimestamp = CreateDeadlineTimestamp(config.PollardRhoMilliseconds);
|
long deadlineTimestamp = CreateDeadlineTimestamp(config.PollardRhoMilliseconds);
|
||||||
compositeStack = ThreadStaticPools.RentUlongStack(Math.Max(pending.Count * 2, 4));
|
|
||||||
compositeStack.Push(remaining);
|
compositeStack.Push(remaining);
|
||||||
pending.Clear();
|
pending.Clear();
|
||||||
|
|
||||||
@@ -860,13 +862,16 @@ internal static partial class PrimeOrderCalculator
|
|||||||
compositeStack.Push(factor);
|
compositeStack.Push(factor);
|
||||||
compositeStack.Push(quotient);
|
compositeStack.Push(quotient);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
compositeStack.Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
ulong cofactor = 1UL;
|
ulong cofactor = 1UL;
|
||||||
int pendingCount = pending.Count;
|
ReadOnlySpan<ulong> pendingSpan = pending.AsSpan();
|
||||||
|
int pendingCount = pendingSpan.Length;
|
||||||
for (int i = 0; i < pendingCount; i++)
|
for (int i = 0; i < pendingCount; i++)
|
||||||
{
|
{
|
||||||
ulong composite = pending[i];
|
ulong composite = pendingSpan[i];
|
||||||
bool isPrime = Open.Numeric.Primes.Prime.Numbers.IsPrime(composite);
|
bool isPrime = Open.Numeric.Primes.Prime.Numbers.IsPrime(composite);
|
||||||
if (isPrime)
|
if (isPrime)
|
||||||
{
|
{
|
||||||
@@ -956,13 +961,181 @@ internal static partial class PrimeOrderCalculator
|
|||||||
ThreadStaticPools.ReturnUlongIntDictionary(counts);
|
ThreadStaticPools.ReturnUlongIntDictionary(counts);
|
||||||
}
|
}
|
||||||
|
|
||||||
ThreadStaticPools.ReturnUlongList(pending);
|
pending.Dispose();
|
||||||
if (compositeStack is not null)
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ref struct PendingBuffer
|
||||||
|
{
|
||||||
|
private Span<ulong> _stack;
|
||||||
|
private ulong[]? _pooled;
|
||||||
|
private int _count;
|
||||||
|
|
||||||
|
public PendingBuffer(Span<ulong> stack)
|
||||||
{
|
{
|
||||||
ThreadStaticPools.ReturnUlongStack(compositeStack);
|
_stack = stack;
|
||||||
|
_pooled = null;
|
||||||
|
_count = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
public int Count => _count;
|
||||||
|
|
||||||
|
public void Add(ulong value)
|
||||||
|
{
|
||||||
|
if (_pooled is null)
|
||||||
|
{
|
||||||
|
if (_count < _stack.Length)
|
||||||
|
{
|
||||||
|
_stack[_count] = value;
|
||||||
|
_count++;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int initialCapacity = _stack.Length == 0 ? 4 : _stack.Length * 2;
|
||||||
|
ulong[] newArray = ArrayPool<ulong>.Shared.Rent(initialCapacity);
|
||||||
|
for (int i = 0; i < _count; i++)
|
||||||
|
{
|
||||||
|
newArray[i] = _stack[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
_pooled = newArray;
|
||||||
|
}
|
||||||
|
|
||||||
|
EnsurePooledCapacity(_count + 1);
|
||||||
|
_pooled![_count] = value;
|
||||||
|
_count++;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void EnsurePooledCapacity(int required)
|
||||||
|
{
|
||||||
|
ulong[] array = _pooled!;
|
||||||
|
if (required <= array.Length)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int newCapacity = array.Length * 2;
|
||||||
|
if (newCapacity < required)
|
||||||
|
{
|
||||||
|
newCapacity = required;
|
||||||
|
}
|
||||||
|
|
||||||
|
ulong[] newArray = ArrayPool<ulong>.Shared.Rent(newCapacity);
|
||||||
|
Array.Copy(array, 0, newArray, 0, _count);
|
||||||
|
ArrayPool<ulong>.Shared.Return(array, clearArray: false);
|
||||||
|
_pooled = newArray;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Clear()
|
||||||
|
{
|
||||||
|
_count = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ReadOnlySpan<ulong> AsSpan()
|
||||||
|
{
|
||||||
|
if (_pooled is null)
|
||||||
|
{
|
||||||
|
return _stack.Slice(0, _count);
|
||||||
|
}
|
||||||
|
|
||||||
|
return new ReadOnlySpan<ulong>(_pooled, 0, _count);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
if (_pooled is not null)
|
||||||
|
{
|
||||||
|
ArrayPool<ulong>.Shared.Return(_pooled, clearArray: false);
|
||||||
|
_pooled = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
_count = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private ref struct CompositeStack
|
||||||
|
{
|
||||||
|
private Span<ulong> _stack;
|
||||||
|
private ulong[]? _pooled;
|
||||||
|
private int _count;
|
||||||
|
|
||||||
|
public CompositeStack(Span<ulong> stack)
|
||||||
|
{
|
||||||
|
_stack = stack;
|
||||||
|
_pooled = null;
|
||||||
|
_count = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int Count => _count;
|
||||||
|
|
||||||
|
public void Push(ulong value)
|
||||||
|
{
|
||||||
|
if (_pooled is null)
|
||||||
|
{
|
||||||
|
if (_count < _stack.Length)
|
||||||
|
{
|
||||||
|
_stack[_count] = value;
|
||||||
|
_count++;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int initialCapacity = _stack.Length == 0 ? 4 : _stack.Length * 2;
|
||||||
|
ulong[] newArray = ArrayPool<ulong>.Shared.Rent(initialCapacity);
|
||||||
|
for (int i = 0; i < _count; i++)
|
||||||
|
{
|
||||||
|
newArray[i] = _stack[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
_pooled = newArray;
|
||||||
|
}
|
||||||
|
|
||||||
|
EnsurePooledCapacity(_count + 1);
|
||||||
|
_pooled![_count] = value;
|
||||||
|
_count++;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void EnsurePooledCapacity(int required)
|
||||||
|
{
|
||||||
|
ulong[] array = _pooled!;
|
||||||
|
if (required <= array.Length)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int newCapacity = array.Length * 2;
|
||||||
|
if (newCapacity < required)
|
||||||
|
{
|
||||||
|
newCapacity = required;
|
||||||
|
}
|
||||||
|
|
||||||
|
ulong[] newArray = ArrayPool<ulong>.Shared.Rent(newCapacity);
|
||||||
|
Array.Copy(array, 0, newArray, 0, _count);
|
||||||
|
ArrayPool<ulong>.Shared.Return(array, clearArray: false);
|
||||||
|
_pooled = newArray;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ulong Pop()
|
||||||
|
{
|
||||||
|
int index = _count - 1;
|
||||||
|
_count = index;
|
||||||
|
if (_pooled is null)
|
||||||
|
{
|
||||||
|
return _stack[index];
|
||||||
|
}
|
||||||
|
|
||||||
|
return _pooled[index];
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
if (_pooled is not null)
|
||||||
|
{
|
||||||
|
ArrayPool<ulong>.Shared.Return(_pooled, clearArray: false);
|
||||||
|
_pooled = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
_count = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private const int GpuSmallPrimeFactorSlots = 64;
|
private const int GpuSmallPrimeFactorSlots = 64;
|
||||||
|
|||||||
Reference in new issue
Block a user