Added more tests. Updated chromosome. Remove unused header.

ethereum · Jan 3, 2022 · a88709c · a88709c
1 parent b354c81
commit a88709c
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 3 deletions.
diff --git a/libyul/optimiser/UnusedStoreBase.cpp b/libyul/optimiser/UnusedStoreBase.cpp
@@ -23,7 +23,6 @@
 
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/optimiser/OptimizerUtilities.h>
 #include <libyul/AST.h>
 
 #include <libsolutil/CommonData.h>

diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -178,7 +178,7 @@ contract DepositContract is IDepositContract, ERC165 {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 1558001
+// gas irOptimized: 1557137
 // gas legacy: 2436584
 // gas legacyOptimized: 1776483
 // supportsInterface(bytes4): 0x0 -> 0

diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/branching.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/branching.yul
@@ -0,0 +1,25 @@
+{
+    let a := calldataload(0)
+    let b := 20
+    sstore(a, b)
+    if calldataload(32) {
+        sstore(a, b)
+        pop(staticcall(0, 0, 0, 0, 0, 0))
+        sstore(a, b)
+    }
+    sstore(a, b)
+}
+// ====
+// EVMVersion: >=byzantium
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     let a := calldataload(0)
+//     let b := 20
+//     sstore(a, b)
+//     if calldataload(32)
+//     {
+//         pop(staticcall(0, 0, 0, 0, 0, 0))
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/indirect_inferrence.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/indirect_inferrence.yul
@@ -0,0 +1,22 @@
+{
+    let x := calldataload(0)
+    let y := sload(x)
+    // both of these can be removed
+    sstore(x, y)
+    sstore(x, y)
+
+    let a := x
+    let b := mload(a)
+    // both of these can be removed
+    mstore(a, b)
+    mstore(a, b)
+}
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     let x := calldataload(0)
+//     let y := sload(x)
+//     let a := x
+//     let b := mload(a)
+// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/value_change.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/value_change.yul
@@ -0,0 +1,18 @@
+{
+    let x := calldataload(0)
+    let y := calldataload(32)
+    sstore(x, y)
+    y := calldataload(64)
+    // cannot be removed
+    sstore(x, y)
+}
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     let x := calldataload(0)
+//     let y := calldataload(32)
+//     sstore(x, y)
+//     y := calldataload(64)
+//     sstore(x, y)
+// }
diff --git a/test/yulPhaser/Chromosome.cpp b/test/yulPhaser/Chromosome.cpp
@@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE(output_operator_should_create_concise_and_unambiguous_strin
 
 	BOOST_TEST(chromosome.length() == allSteps.size());
 	BOOST_TEST(chromosome.optimisationSteps() == allSteps);
-	BOOST_TEST(toString(chromosome) == "flcCUnDEvejsxIOoighFTLMRrmVatpud");
+	BOOST_TEST(toString(chromosome) == "flcCUnDEvejsxIOoighFTLMRmVatrpud");
 }
 
 BOOST_AUTO_TEST_CASE(optimisationSteps_should_translate_chromosomes_genes_to_optimisation_step_names)