Optimize sload

matter-labs · May 17, 2024 · fb88864 · fb88864
1 parent 19b81f7
commit fb88864
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/system-contracts/contracts/EvmInterpreterLoop.template.yul b/system-contracts/contracts/EvmInterpreterLoop.template.yul
@@ -578,13 +578,15 @@ for { } true { } {
 
         key, sp := popStackItem(sp)
 
-        if iszero(isSlotWarm(key)) {
+        let wasWarm := isSlotWarm(key)
+
+        if iszero(wasWarm) {
             evmGasLeft := chargeGas(evmGasLeft, 2000)
         }
 
         value := sload(key)
 
-        if iszero(isSlotWarm(key)) {
+        if iszero(wasWarm) {
             let _wasW, _orgV := warmSlot(key, value)
         }
 

diff --git a/system-contracts/contracts/EvmInterpreterPreprocessed.yul b/system-contracts/contracts/EvmInterpreterPreprocessed.yul
@@ -1870,13 +1870,15 @@ object "EVMInterpreter" {
 
                     key, sp := popStackItem(sp)
 
-                    if iszero(isSlotWarm(key)) {
+                    let wasWarm := isSlotWarm(key)
+
+                    if iszero(wasWarm) {
                         evmGasLeft := chargeGas(evmGasLeft, 2000)
                     }
 
                     value := sload(key)
 
-                    if iszero(isSlotWarm(key)) {
+                    if iszero(wasWarm) {
                         let _wasW, _orgV := warmSlot(key, value)
                     }
 
@@ -4457,13 +4459,15 @@ object "EVMInterpreter" {
 
                     key, sp := popStackItem(sp)
 
-                    if iszero(isSlotWarm(key)) {
+                    let wasWarm := isSlotWarm(key)
+
+                    if iszero(wasWarm) {
                         evmGasLeft := chargeGas(evmGasLeft, 2000)
                     }
 
                     value := sload(key)
 
-                    if iszero(isSlotWarm(key)) {
+                    if iszero(wasWarm) {
                         let _wasW, _orgV := warmSlot(key, value)
                     }