Skip to content
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

Only need single stack for stacks #7375

Merged
merged 1 commit into from
Sep 2, 2024
Merged

Only need single stack for stacks #7375

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 18 additions & 33 deletions src/Nethermind/Nethermind.Evm/EvmState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,21 @@ public class EvmState : IDisposable // TODO: rename to CallState
private class StackPool
{
private readonly int _maxCallStackDepth;
private readonly struct StackItem(byte[] dataStack, int[] returnStack)
{
public readonly byte[] DataStack = dataStack;
public readonly int[] ReturnStack = returnStack;
}

// TODO: we have wrong call depth calculation somewhere
public StackPool(int maxCallStackDepth = VirtualMachine.MaxCallDepth * 2)
{
_maxCallStackDepth = maxCallStackDepth;
}

private readonly Stack<byte[]> _dataStackPool = new(32);
private readonly Stack<int[]> _returnStackPool = new(32);
private readonly Stack<StackItem> _stackPool = new(32);

private int _dataStackPoolDepth;
private int _returnStackPoolDepth;
private int _stackPoolDepth;

/// <summary>
/// The word 'return' acts here once as a verb 'to return stack to the pool' and once as a part of the
Expand All @@ -44,45 +47,27 @@ public StackPool(int maxCallStackDepth = VirtualMachine.MaxCallDepth * 2)
/// <param name="returnStack"></param>
public void ReturnStacks(byte[] dataStack, int[] returnStack)
{
_dataStackPool.Push(dataStack);
_returnStackPool.Push(returnStack);
_stackPool.Push(new(dataStack, returnStack));
}

private byte[] RentDataStack()
{
if (_dataStackPool.TryPop(out byte[] result))
{
return result;
}

_dataStackPoolDepth++;
if (_dataStackPoolDepth > _maxCallStackDepth)
{
EvmStack.ThrowEvmStackOverflowException();
}

return new byte[(EvmStack.MaxStackSize + EvmStack.RegisterLength) * 32];
}

private int[] RentReturnStack()
public (byte[], int[]) RentStacks()
{
if (_returnStackPool.TryPop(out int[] result))
if (_stackPool.TryPop(out StackItem result))
{
return result;
return (result.DataStack, result.ReturnStack);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lets avoid returning new tuple here, return StackItem directly and add deconstructor to StackItem.

}

_returnStackPoolDepth++;
if (_returnStackPoolDepth > _maxCallStackDepth)
_stackPoolDepth++;
if (_stackPoolDepth > _maxCallStackDepth)
{
EvmStack.ThrowEvmStackOverflowException();
}

return new int[EvmStack.ReturnStackSize];
}

public (byte[], int[]) RentStacks()
{
return (RentDataStack(), RentReturnStack());
return
(
new byte[(EvmStack.MaxStackSize + EvmStack.RegisterLength) * 32],
new int[EvmStack.ReturnStackSize]
);
}
}
private static readonly ThreadLocal<StackPool> _stackPool = new(() => new StackPool());
Expand Down