Skip to content

perf: refactor interpreter internals (take 2) #582

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
rakita merged 12 commits into from
Sep 20, 2023
Merged

perf: refactor interpreter internals (take 2) #582

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9dae08e
perf: refactor interpreter internals (take 2)
DaniPopes Aug 3, 2023
7a9c5d6
perf: cast instruction functions to `fn`
DaniPopes Aug 4, 2023
6eaa0e7
chore: remove prelude
DaniPopes Aug 4, 2023
2d4818e
perf: remove stack and memory bound checks on release
DaniPopes Aug 16, 2023
2510ae9
chore: re-add and deprecate `Memory::get_slice`
DaniPopes Aug 22, 2023
7366887
Merge branch 'main' into refactor-interpreter
DaniPopes Aug 27, 2023
24f9378
Merge branch 'main' into refactor-interpreter
DaniPopes Sep 16, 2023
ff1c0c3
readd BLOBHASH
DaniPopes Sep 16, 2023
8f82eb8
fix: TSTORE and TLOAD order
DaniPopes Sep 16, 2023
eba8bfb
some cleanup
rakita Sep 19, 2023
0f2fdf9
nits
rakita Sep 20, 2023
3ee1755
Merge remote-tracking branch 'origin/main' into perf2
rakita Sep 20, 2023
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
169 changes: 0 additions & 169 deletions crates/interpreter/src/instructions.rs
View file
Open in desktop
Copy link
Collaborator Author

@DaniPopes DaniPopes Aug 25, 2023

Choose a reason for hiding this comment

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

moved to eval to opcode.rs, and the return instructions to control

Original file line number Diff line number Diff line change
Expand Up @@ -12,173 +12,4 @@ pub mod opcode;
mod stack;
mod system;

use crate::{interpreter::Interpreter, primitives::Spec, Host};
pub use opcode::{OpCode, OPCODE_JUMPMAP};

pub use crate::{return_ok, return_revert, InstructionResult};
pub fn return_stop(interpreter: &mut Interpreter, _host: &mut dyn Host) {
interpreter.instruction_result = InstructionResult::Stop;
}
pub fn return_invalid(interpreter: &mut Interpreter, _host: &mut dyn Host) {
interpreter.instruction_result = InstructionResult::InvalidFEOpcode;
}

pub fn return_not_found(interpreter: &mut Interpreter, _host: &mut dyn Host) {
interpreter.instruction_result = InstructionResult::OpcodeNotFound;
}

#[inline(always)]
pub fn eval<H: Host, S: Spec>(opcode: u8, interp: &mut Interpreter, host: &mut H) {
match opcode {
opcode::STOP => return_stop(interp, host),
opcode::ADD => arithmetic::wrapped_add(interp, host),
opcode::MUL => arithmetic::wrapping_mul(interp, host),
opcode::SUB => arithmetic::wrapping_sub(interp, host),
opcode::DIV => arithmetic::div(interp, host),
opcode::SDIV => arithmetic::sdiv(interp, host),
opcode::MOD => arithmetic::rem(interp, host),
opcode::SMOD => arithmetic::smod(interp, host),
opcode::ADDMOD => arithmetic::addmod(interp, host),
opcode::MULMOD => arithmetic::mulmod(interp, host),
opcode::EXP => arithmetic::eval_exp::<S>(interp, host),
opcode::SIGNEXTEND => arithmetic::signextend(interp, host),
opcode::LT => bitwise::lt(interp, host),
opcode::GT => bitwise::gt(interp, host),
opcode::SLT => bitwise::slt(interp, host),
opcode::SGT => bitwise::sgt(interp, host),
opcode::EQ => bitwise::eq(interp, host),
opcode::ISZERO => bitwise::iszero(interp, host),
opcode::AND => bitwise::bitand(interp, host),
opcode::OR => bitwise::bitor(interp, host),
opcode::XOR => bitwise::bitxor(interp, host),
opcode::NOT => bitwise::not(interp, host),
opcode::BYTE => bitwise::byte(interp, host),
opcode::SHL => bitwise::shl::<S>(interp, host),
opcode::SHR => bitwise::shr::<S>(interp, host),
opcode::SAR => bitwise::sar::<S>(interp, host),
opcode::KECCAK256 => system::calculate_keccak256(interp, host),
opcode::ADDRESS => system::address(interp, host),
opcode::BALANCE => host::balance::<S>(interp, host),
opcode::SELFBALANCE => host::selfbalance::<S>(interp, host),
opcode::CODESIZE => system::codesize(interp, host),
opcode::CODECOPY => system::codecopy(interp, host),
opcode::CALLDATALOAD => system::calldataload(interp, host),
opcode::CALLDATASIZE => system::calldatasize(interp, host),
opcode::CALLDATACOPY => system::calldatacopy(interp, host),
opcode::POP => stack::pop(interp, host),
opcode::MLOAD => memory::mload(interp, host),
opcode::MSTORE => memory::mstore(interp, host),
opcode::MSTORE8 => memory::mstore8(interp, host),
opcode::JUMP => control::jump(interp, host),
opcode::JUMPI => control::jumpi(interp, host),
opcode::PC => control::pc(interp, host),
opcode::MSIZE => memory::msize(interp, host),
opcode::JUMPDEST => control::jumpdest(interp, host),
opcode::PUSH0 => stack::push0::<S>(interp, host),
opcode::PUSH1 => stack::push::<1>(interp, host),
opcode::PUSH2 => stack::push::<2>(interp, host),
opcode::PUSH3 => stack::push::<3>(interp, host),
opcode::PUSH4 => stack::push::<4>(interp, host),
opcode::PUSH5 => stack::push::<5>(interp, host),
opcode::PUSH6 => stack::push::<6>(interp, host),
opcode::PUSH7 => stack::push::<7>(interp, host),
opcode::PUSH8 => stack::push::<8>(interp, host),
opcode::PUSH9 => stack::push::<9>(interp, host),
opcode::PUSH10 => stack::push::<10>(interp, host),
opcode::PUSH11 => stack::push::<11>(interp, host),
opcode::PUSH12 => stack::push::<12>(interp, host),
opcode::PUSH13 => stack::push::<13>(interp, host),
opcode::PUSH14 => stack::push::<14>(interp, host),
opcode::PUSH15 => stack::push::<15>(interp, host),
opcode::PUSH16 => stack::push::<16>(interp, host),
opcode::PUSH17 => stack::push::<17>(interp, host),
opcode::PUSH18 => stack::push::<18>(interp, host),
opcode::PUSH19 => stack::push::<19>(interp, host),
opcode::PUSH20 => stack::push::<20>(interp, host),
opcode::PUSH21 => stack::push::<21>(interp, host),
opcode::PUSH22 => stack::push::<22>(interp, host),
opcode::PUSH23 => stack::push::<23>(interp, host),
opcode::PUSH24 => stack::push::<24>(interp, host),
opcode::PUSH25 => stack::push::<25>(interp, host),
opcode::PUSH26 => stack::push::<26>(interp, host),
opcode::PUSH27 => stack::push::<27>(interp, host),
opcode::PUSH28 => stack::push::<28>(interp, host),
opcode::PUSH29 => stack::push::<29>(interp, host),
opcode::PUSH30 => stack::push::<30>(interp, host),
opcode::PUSH31 => stack::push::<31>(interp, host),
opcode::PUSH32 => stack::push::<32>(interp, host),
opcode::DUP1 => stack::dup::<1>(interp, host),
opcode::DUP2 => stack::dup::<2>(interp, host),
opcode::DUP3 => stack::dup::<3>(interp, host),
opcode::DUP4 => stack::dup::<4>(interp, host),
opcode::DUP5 => stack::dup::<5>(interp, host),
opcode::DUP6 => stack::dup::<6>(interp, host),
opcode::DUP7 => stack::dup::<7>(interp, host),
opcode::DUP8 => stack::dup::<8>(interp, host),
opcode::DUP9 => stack::dup::<9>(interp, host),
opcode::DUP10 => stack::dup::<10>(interp, host),
opcode::DUP11 => stack::dup::<11>(interp, host),
opcode::DUP12 => stack::dup::<12>(interp, host),
opcode::DUP13 => stack::dup::<13>(interp, host),
opcode::DUP14 => stack::dup::<14>(interp, host),
opcode::DUP15 => stack::dup::<15>(interp, host),
opcode::DUP16 => stack::dup::<16>(interp, host),

opcode::SWAP1 => stack::swap::<1>(interp, host),
opcode::SWAP2 => stack::swap::<2>(interp, host),
opcode::SWAP3 => stack::swap::<3>(interp, host),
opcode::SWAP4 => stack::swap::<4>(interp, host),
opcode::SWAP5 => stack::swap::<5>(interp, host),
opcode::SWAP6 => stack::swap::<6>(interp, host),
opcode::SWAP7 => stack::swap::<7>(interp, host),
opcode::SWAP8 => stack::swap::<8>(interp, host),
opcode::SWAP9 => stack::swap::<9>(interp, host),
opcode::SWAP10 => stack::swap::<10>(interp, host),
opcode::SWAP11 => stack::swap::<11>(interp, host),
opcode::SWAP12 => stack::swap::<12>(interp, host),
opcode::SWAP13 => stack::swap::<13>(interp, host),
opcode::SWAP14 => stack::swap::<14>(interp, host),
opcode::SWAP15 => stack::swap::<15>(interp, host),
opcode::SWAP16 => stack::swap::<16>(interp, host),

opcode::RETURN => control::ret(interp, host),
opcode::REVERT => control::revert::<S>(interp, host),
opcode::INVALID => return_invalid(interp, host),
opcode::BASEFEE => host_env::basefee::<S>(interp, host),
opcode::ORIGIN => host_env::origin(interp, host),
opcode::CALLER => system::caller(interp, host),
opcode::CALLVALUE => system::callvalue(interp, host),
opcode::GASPRICE => host_env::gasprice(interp, host),
opcode::EXTCODESIZE => host::extcodesize::<S>(interp, host),
opcode::EXTCODEHASH => host::extcodehash::<S>(interp, host),
opcode::EXTCODECOPY => host::extcodecopy::<S>(interp, host),
opcode::RETURNDATASIZE => system::returndatasize::<S>(interp, host),
opcode::RETURNDATACOPY => system::returndatacopy::<S>(interp, host),
opcode::BLOCKHASH => host::blockhash(interp, host),
opcode::COINBASE => host_env::coinbase(interp, host),
opcode::TIMESTAMP => host_env::timestamp(interp, host),
opcode::NUMBER => host_env::number(interp, host),
opcode::DIFFICULTY => host_env::difficulty::<H, S>(interp, host),
opcode::GASLIMIT => host_env::gaslimit(interp, host),
opcode::SLOAD => host::sload::<S>(interp, host),
opcode::SSTORE => host::sstore::<S>(interp, host),
opcode::TSTORE => host::tstore::<H, S>(interp, host),
opcode::TLOAD => host::tload::<H, S>(interp, host),
opcode::GAS => system::gas(interp, host),
opcode::LOG0 => host::log::<0>(interp, host),
opcode::LOG1 => host::log::<1>(interp, host),
opcode::LOG2 => host::log::<2>(interp, host),
opcode::LOG3 => host::log::<3>(interp, host),
opcode::LOG4 => host::log::<4>(interp, host),
opcode::SELFDESTRUCT => host::selfdestruct::<S>(interp, host),
opcode::CREATE => host::create::<false, S>(interp, host), //check
opcode::CREATE2 => host::create::<true, S>(interp, host), //check
opcode::CALL => host::call::<S>(interp, host), //check
opcode::CALLCODE => host::call_code::<S>(interp, host), //check
opcode::DELEGATECALL => host::delegate_call::<S>(interp, host), //check
opcode::STATICCALL => host::static_call::<S>(interp, host), //check
opcode::CHAINID => host_env::chainid::<S>(interp, host),
opcode::MCOPY => memory::mcopy::<S>(interp, host),
_ => return_not_found(interp, host),
}
}
32 changes: 18 additions & 14 deletions crates/interpreter/src/instructions/arithmetic.rs
View file
Open in desktop
Copy link
Collaborator Author

@DaniPopes DaniPopes Aug 25, 2023

Choose a reason for hiding this comment

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

  • avoid reassigning to 0 when already 0 in div and rem

Original file line number Diff line number Diff line change
Expand Up @@ -5,63 +5,67 @@ use crate::{
Host, InstructionResult, Interpreter,
};

pub fn wrapped_add(interpreter: &mut Interpreter, _host: &mut dyn Host) {
pub(super) fn wrapped_add(interpreter: &mut Interpreter, _host: &mut dyn Host) {
gas!(interpreter, gas::VERYLOW);
pop_top!(interpreter, op1, op2);
*op2 = op1.wrapping_add(*op2);
}

pub fn wrapping_mul(interpreter: &mut Interpreter, _host: &mut dyn Host) {
pub(super) fn wrapping_mul(interpreter: &mut Interpreter, _host: &mut dyn Host) {
gas!(interpreter, gas::LOW);
pop_top!(interpreter, op1, op2);
*op2 = op1.wrapping_mul(*op2);
}

pub fn wrapping_sub(interpreter: &mut Interpreter, _host: &mut dyn Host) {
pub(super) fn wrapping_sub(interpreter: &mut Interpreter, _host: &mut dyn Host) {
gas!(interpreter, gas::VERYLOW);
pop_top!(interpreter, op1, op2);
*op2 = op1.wrapping_sub(*op2);
}

pub fn div(interpreter: &mut Interpreter, _host: &mut dyn Host) {
pub(super) fn div(interpreter: &mut Interpreter, _host: &mut dyn Host) {
gas!(interpreter, gas::LOW);
pop_top!(interpreter, op1, op2);
*op2 = op1.checked_div(*op2).unwrap_or_default()
if *op2 != U256::ZERO {
*op2 = op1.wrapping_div(*op2);
}
}

pub fn sdiv(interpreter: &mut Interpreter, _host: &mut dyn Host) {
pub(super) fn sdiv(interpreter: &mut Interpreter, _host: &mut dyn Host) {
gas!(interpreter, gas::LOW);
pop_top!(interpreter, op1, op2);
*op2 = i256_div(op1, *op2);
}

pub fn rem(interpreter: &mut Interpreter, _host: &mut dyn Host) {
pub(super) fn rem(interpreter: &mut Interpreter, _host: &mut dyn Host) {
gas!(interpreter, gas::LOW);
pop_top!(interpreter, op1, op2);
*op2 = op1.checked_rem(*op2).unwrap_or_default()
if *op2 != U256::ZERO {
*op2 = op1.wrapping_rem(*op2);
}
}

pub fn smod(interpreter: &mut Interpreter, _host: &mut dyn Host) {
pub(super) fn smod(interpreter: &mut Interpreter, _host: &mut dyn Host) {
gas!(interpreter, gas::LOW);
pop_top!(interpreter, op1, op2);
if *op2 != U256::ZERO {
*op2 = i256_mod(op1, *op2)
};
}
}

pub fn addmod(interpreter: &mut Interpreter, _host: &mut dyn Host) {
pub(super) fn addmod(interpreter: &mut Interpreter, _host: &mut dyn Host) {
gas!(interpreter, gas::MID);
pop_top!(interpreter, op1, op2, op3);
*op3 = op1.add_mod(op2, *op3)
}

pub fn mulmod(interpreter: &mut Interpreter, _host: &mut dyn Host) {
pub(super) fn mulmod(interpreter: &mut Interpreter, _host: &mut dyn Host) {
gas!(interpreter, gas::MID);
pop_top!(interpreter, op1, op2, op3);
*op3 = op1.mul_mod(op2, *op3)
}

pub fn eval_exp<SPEC: Spec>(interpreter: &mut Interpreter, _host: &mut dyn Host) {
pub(super) fn exp<SPEC: Spec>(interpreter: &mut Interpreter, _host: &mut dyn Host) {
pop_top!(interpreter, op1, op2);
gas_or_fail!(interpreter, gas::exp_cost::<SPEC>(*op2));
*op2 = op1.pow(*op2);
Expand All @@ -82,7 +86,7 @@ pub fn eval_exp<SPEC: Spec>(interpreter: &mut Interpreter, _host: &mut dyn Host)
/// `y | !mask` where `|` is the bitwise `OR` and `!` is bitwise negation. Similarly, if
/// `b == 0` then the yellow paper says the output should start with all zeros, then end with
/// bits from `b`; this is equal to `y & mask` where `&` is bitwise `AND`.
pub fn signextend(interpreter: &mut Interpreter, _host: &mut dyn Host) {
pub(super) fn signextend(interpreter: &mut Interpreter, _host: &mut dyn Host) {
gas!(interpreter, gas::LOW);
pop_top!(interpreter, op1, op2);
if op1 < U256::from(32) {
Expand Down
Loading