cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6732 from ethereum/splitStructuralSimplifier

Browse Source 
Split structural simplifier
This commit is contained in:
chriseth
2019-05-13 11:41:25 +02:00
committed by GitHub
parent 37375b4271 dd4f9bf1a6
commit 2d2f4943de
16 changed files with 241 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libyul/YulOptimizerTest.cpp
+6
View File
@@ -22,6 +22,7 @@
#include <libyul/optimiser/BlockFlattener.h>
#include <libyul/optimiser/VarDeclInitializer.h>
#include <libyul/optimiser/VarNameCleaner.h>
#include <libyul/optimiser/ControlFlowSimplifier.h>
#include <libyul/optimiser/DeadCodeEliminator.h>
#include <libyul/optimiser/Disambiguator.h>
#include <libyul/optimiser/CommonSubexpressionEliminator.h>
@@ -230,6 +231,11 @@ TestCase::TestResult YulOptimizerTest::run(ostream& _stream, string const& _line
SSATransform::run(*m_ast, nameDispenser);
RedundantAssignEliminator::run(*m_dialect, *m_ast);
}
else if (m_optimizerStep == "controlFlowSimplifier")
{
disambiguate();
ControlFlowSimplifier{}(*m_ast);
}
else if (m_optimizerStep == "structuralSimplifier")
{
disambiguate();
test/libyul/yulOptimizerTests/structuralSimplifier/empty_if_movable_condition.yul → test/libyul/yulOptimizerTests/controlFlowSimplifier/empty_if_movable_condition.yul
+1 -1
View File
@@ -1,6 +1,6 @@
{ let a := mload(0) if a {} }
// ====
// step: structuralSimplifier
// step: controlFlowSimplifier
// ----
// {
// let a := mload(0)
test/libyul/yulOptimizerTests/structuralSimplifier/empty_if_non_movable_condition.yul → test/libyul/yulOptimizerTests/controlFlowSimplifier/empty_if_non_movable_condition.yul
+1 -1
View File
@@ -1,5 +1,5 @@
{ if mload(0) {} }
// ====
// step: structuralSimplifier
// step: controlFlowSimplifier
// ----
// { pop(mload(0)) }
test/libyul/yulOptimizerTests/structuralSimplifier/switch_only_default.yul → test/libyul/yulOptimizerTests/controlFlowSimplifier/switch_only_default.yul
+1 -1
View File
@@ -2,7 +2,7 @@
switch mload(0) default { mstore(1, 2) }
}
// ====
// step: structuralSimplifier
// step: controlFlowSimplifier
// ----
// {
// pop(mload(0))
test/libyul/yulOptimizerTests/structuralSimplifier/switch_remove_empty_all.yul → test/libyul/yulOptimizerTests/controlFlowSimplifier/switch_remove_empty_all.yul
+1 -1
View File
@@ -11,7 +11,7 @@
default { }
}
// ====
// step: structuralSimplifier
// step: controlFlowSimplifier
// ----
// {
// let y := 200
test/libyul/yulOptimizerTests/structuralSimplifier/switch_remove_empty_case.yul → test/libyul/yulOptimizerTests/controlFlowSimplifier/switch_remove_empty_case.yul
+1 -1
View File
@@ -6,7 +6,7 @@
case 2 { y := 10 }
}
// ====
// step: structuralSimplifier
// step: controlFlowSimplifier
// ----
// {
// let y := 200
test/libyul/yulOptimizerTests/structuralSimplifier/switch_remove_empty_cases.yul → test/libyul/yulOptimizerTests/controlFlowSimplifier/switch_remove_empty_cases.yul
+1 -1
View File
@@ -6,7 +6,7 @@
default { }
}
// ====
// step: structuralSimplifier
// step: controlFlowSimplifier
// ----
// {
// let y := 200
test/libyul/yulOptimizerTests/structuralSimplifier/switch_remove_empty_default_case.yul → test/libyul/yulOptimizerTests/controlFlowSimplifier/switch_remove_empty_default_case.yul
+1 -1
View File
@@ -6,7 +6,7 @@
default { }
}
// ====
// step: structuralSimplifier
// step: controlFlowSimplifier
// ----
// {
// let y := 200
test/libyul/yulOptimizerTests/structuralSimplifier/switch_to_if.yul → test/libyul/yulOptimizerTests/controlFlowSimplifier/switch_to_if.yul
+1 -1
View File
@@ -2,7 +2,7 @@
switch calldataload(0) case 2 { mstore(0, 0) }
}
// ====
// step: structuralSimplifier
// step: controlFlowSimplifier
// ----
// {
// if eq(2, calldataload(0)) { mstore(0, 0) }
test/tools/yulopti.cpp
+5 -1
View File
@@ -32,6 +32,7 @@
#include <libyul/optimiser/BlockFlattener.h>
#include <libyul/optimiser/Disambiguator.h>
#include <libyul/optimiser/CommonSubexpressionEliminator.h>
#include <libyul/optimiser/ControlFlowSimplifier.h>
#include <libyul/optimiser/NameCollector.h>
#include <libyul/optimiser/EquivalentFunctionCombiner.h>
#include <libyul/optimiser/ExpressionSplitter.h>
@@ -130,7 +131,7 @@ public:
cout << " (e)xpr inline/(i)nline/(s)implify/varname c(l)eaner/(u)nusedprune/ss(a) transform/" << endl;
cout << " (r)edundant assign elim./re(m)aterializer/f(o)r-loop-pre-rewriter/" << endl;
cout << " s(t)ructural simplifier/equi(v)alent function combiner/ssa re(V)erser/? " << endl;
cout << " stack com(p)ressor/(D)ead code eliminator/? " << endl;
cout << " co(n)trol flow simplifier/stack com(p)ressor/(D)ead code eliminator/? " << endl;
cout.flush();
int option = readStandardInputChar();
cout << ' ' << char(option) << endl;
@@ -177,6 +178,9 @@ public:
case 't':
(StructuralSimplifier{*m_dialect})(*m_ast);
break;
case 'n':
(ControlFlowSimplifier{})(*m_ast);
break;
case 'u':
UnusedPruner::runUntilStabilised(*m_dialect, *m_ast);
break;