fea(EVM): Optimize JUMP gas charge (#1025)

matter-labs · Oct 27, 2024 · 5d6830c · 5d6830c
1 parent 646a408
commit 5d6830c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/system-contracts/contracts/EvmEmulator.yul b/system-contracts/contracts/EvmEmulator.yul
@@ -1954,10 +1954,9 @@ object "EvmEmulator" {
                 // NOTE: We don't currently do full jumpdest validation
                 // (i.e. validating a jumpdest isn't in PUSH data)
                 case 0x56 { // OP_JUMP
-                    evmGasLeft := chargeGas(evmGasLeft, 8)
+                    evmGasLeft := chargeGas(evmGasLeft, 9) // charge for OP_JUMP (8) and OP_JUMPDEST (1) immediately
 
                     let counter
-
                     counter, sp, stackHead := popStackItem(sp, stackHead)
 
                     ip := add(add(BYTECODE_OFFSET(), 32), counter)
@@ -1969,7 +1968,6 @@ object "EvmEmulator" {
                     }
 
                     // execute JUMPDEST immediately
-                    evmGasLeft := chargeGas(evmGasLeft, 1)
                     ip := add(ip, 1)
                 }
                 case 0x57 { // OP_JUMPI
@@ -4973,10 +4971,9 @@ object "EvmEmulator" {
                     // NOTE: We don't currently do full jumpdest validation
                     // (i.e. validating a jumpdest isn't in PUSH data)
                     case 0x56 { // OP_JUMP
-                        evmGasLeft := chargeGas(evmGasLeft, 8)
+                        evmGasLeft := chargeGas(evmGasLeft, 9) // charge for OP_JUMP (8) and OP_JUMPDEST (1) immediately
 
                         let counter
-
                         counter, sp, stackHead := popStackItem(sp, stackHead)
 
                         ip := add(add(BYTECODE_OFFSET(), 32), counter)
@@ -4988,7 +4985,6 @@ object "EvmEmulator" {
                         }
 
                         // execute JUMPDEST immediately
-                        evmGasLeft := chargeGas(evmGasLeft, 1)
                         ip := add(ip, 1)
                     }
                     case 0x57 { // OP_JUMPI

diff --git a/system-contracts/evm-emulator/EvmEmulatorLoop.template.yul b/system-contracts/evm-emulator/EvmEmulatorLoop.template.yul
@@ -706,10 +706,9 @@ for { } true { } {
     // NOTE: We don't currently do full jumpdest validation
     // (i.e. validating a jumpdest isn't in PUSH data)
     case 0x56 { // OP_JUMP
-        evmGasLeft := chargeGas(evmGasLeft, 8)
+        evmGasLeft := chargeGas(evmGasLeft, 9) // charge for OP_JUMP (8) and OP_JUMPDEST (1) immediately
 
         let counter
-
         counter, sp, stackHead := popStackItem(sp, stackHead)
 
         ip := add(add(BYTECODE_OFFSET(), 32), counter)
@@ -721,7 +720,6 @@ for { } true { } {
         }
 
         // execute JUMPDEST immediately
-        evmGasLeft := chargeGas(evmGasLeft, 1)
         ip := add(ip, 1)
     }
     case 0x57 { // OP_JUMPI