Merge pull request #479 from lambdaclass/sload-optimization

[EVM-Equivalence-YUL] Optimize sload
matter-labs · May 22, 2024 · b4788f6 · b4788f6
2 parents 83f8847 + fb88864
commit b4788f6
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
@@ -580,13 +580,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
@@ -1872,13 +1872,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)
                     }
 
@@ -4461,13 +4463,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)
                     }