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

Value Constraint Based Simplifier.

Browse Source
This commit is contained in:
chriseth
2019-03-25 15:32:54 +01:00
parent cb633c3a0c
commit 061276b28a
12 changed files with 598 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libyul/YulOptimizerTest.cpp
+6
View File
@@ -35,6 +35,7 @@
#include <libyul/optimiser/MainFunction.h>
#include <libyul/optimiser/Rematerialiser.h>
#include <libyul/optimiser/ExpressionSimplifier.h>
#include <libyul/optimiser/ValueConstraintBasedSimplifier.h>
#include <libyul/optimiser/UnusedPruner.h>
#include <libyul/optimiser/ExpressionJoiner.h>
#include <libyul/optimiser/SSAReverser.h>
@@ -182,6 +183,11 @@ bool YulOptimizerTest::run(ostream& _stream, string const& _linePrefix, bool con
disambiguate();
ExpressionSimplifier::run(*m_dialect, *m_ast);
}
else if (m_optimizerStep == "valueConstraintBasedSimplifier")
{
disambiguate();
ValueConstraintBasedSimplifier::run(*m_dialect, *m_ast);
}
else if (m_optimizerStep == "fullSimplify")
{
disambiguate();
test/libyul/yulOptimizerTests/valueConstraintBasedSimplifier/lt.yul
+38
View File
@@ -0,0 +1,38 @@
{
let x := 2
if lt(x, 9) { sstore(0, 1) }
if lt(x, 2) { sstore(0, 1) }
if gt(x, 0) { sstore(0, 1) }
if lt(9, x) { sstore(0, 1) }
if lt(2, x) { sstore(0, 1) }
if gt(0, x) { sstore(0, 1) }
}
// ----
// valueConstraintBasedSimplifier
// {
// let x := 2
// if 1
// {
// sstore(0, 1)
// }
// if 0
// {
// sstore(0, 1)
// }
// if 1
// {
// sstore(0, 1)
// }
// if 0
// {
// sstore(0, 1)
// }
// if 0
// {
// sstore(0, 1)
// }
// if 0
// {
// sstore(0, 1)
// }
// }
test/libyul/yulOptimizerTests/valueConstraintBasedSimplifier/lt_bits_combined.yul
+18
View File
@@ -0,0 +1,18 @@
{
let x := and(callvalue(), 0xff)
if lt(x, 0x100) { sstore(0, 1) }
if lt(x, 0xff) { sstore(0, 1) }
}
// ----
// valueConstraintBasedSimplifier
// {
// let x := and(callvalue(), 0xff)
// if 1
// {
// sstore(0, 1)
// }
// if lt(x, 0xff)
// {
// sstore(0, 1)
// }
// }
test/libyul/yulOptimizerTests/valueConstraintBasedSimplifier/smoke.yul
+6
View File
@@ -0,0 +1,6 @@
{
}
// ----
// valueConstraintBasedSimplifier
// {
// }
test/tools/yulopti.cpp
+8 -4
View File
@@ -43,6 +43,7 @@
#include <libyul/optimiser/MainFunction.h>
#include <libyul/optimiser/Rematerialiser.h>
#include <libyul/optimiser/ExpressionSimplifier.h>
#include <libyul/optimiser/ValueConstraintBasedSimplifier.h>
#include <libyul/optimiser/UnusedPruner.h>
#include <libyul/optimiser/ExpressionJoiner.h>
#include <libyul/optimiser/RedundantAssignEliminator.h>
@@ -129,10 +130,10 @@ public:
disambiguated = true;
}
cout << "(q)quit/(f)flatten/(c)se/initialize var(d)ecls/(x)plit/(j)oin/(g)rouper/(h)oister/" << endl;
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? " << endl;
cout << " (e)xpr inline/(i)nline/(s)implify/(C)onstraint simplify/varname c(l)eaner/" << endl;
cout << " (u)nusedprune/ss(a) transform/(r)edundant assign elim./re(m)aterializer/" << endl;
cout << " f(o)r-loop-pre-rewriter/s(t)ructural simplifier/equi(v)alent function combiner/" << endl;
cout << " ssa re(V)erser/stack com(p)ressor? " << endl;
cout.flush();
int option = readStandardInputChar();
cout << ' ' << char(option) << endl;
@@ -176,6 +177,9 @@ public:
case 's':
ExpressionSimplifier::run(*m_dialect, *m_ast);
break;
case 'C':
ValueConstraintBasedSimplifier::run(*m_dialect, *m_ast);
break;
case 't':
(StructuralSimplifier{*m_dialect})(*m_ast);
break;