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 #6767 from ethereum/constantOptimiserForYul

Browse Source 
[Yul] Constant optimiser
This commit is contained in:
chriseth
2019-05-28 11:53:04 +02:00
committed by GitHub
parent b95eebee1c cee1340113
commit c3cdae908d
20 changed files with 609 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libyul/YulOptimizerTest.cpp
+11 -1
View File
@@ -23,6 +23,7 @@
#include <libyul/optimiser/VarDeclInitializer.h>
#include <libyul/optimiser/VarNameCleaner.h>
#include <libyul/optimiser/ControlFlowSimplifier.h>
#include <libyul/optimiser/ConstantOptimiser.h>
#include <libyul/optimiser/DeadCodeEliminator.h>
#include <libyul/optimiser/Disambiguator.h>
#include <libyul/optimiser/CommonSubexpressionEliminator.h>
@@ -46,6 +47,7 @@
#include <libyul/optimiser/StructuralSimplifier.h>
#include <libyul/optimiser/StackCompressor.h>
#include <libyul/optimiser/Suite.h>
#include <libyul/optimiser/Metrics.h>
#include <libyul/backends/evm/EVMDialect.h>
#include <libyul/backends/wasm/WordSizeTransform.h>
#include <libyul/AsmPrinter.h>
@@ -118,6 +120,11 @@ TestCase::TestResult YulOptimizerTest::run(ostream& _stream, string const& _line
disambiguate();
BlockFlattener{}(*m_ast);
}
else if (m_optimizerStep == "constantOptimiser")
{
GasMeter meter(dynamic_cast<EVMDialect const&>(*m_dialect), false, 200);
ConstantOptimiser{dynamic_cast<EVMDialect const&>(*m_dialect), meter}(*m_ast);
}
else if (m_optimizerStep == "varDeclInitializer")
VarDeclInitializer{}(*m_ast);
else if (m_optimizerStep == "varNameCleaner")
@@ -288,7 +295,10 @@ TestCase::TestResult YulOptimizerTest::run(ostream& _stream, string const& _line
WordSizeTransform::run(*m_ast, nameDispenser);
}
else if (m_optimizerStep == "fullSuite")
OptimiserSuite::run(*m_dialect, *m_ast, *m_analysisInfo, true);
{
GasMeter meter(dynamic_cast<EVMDialect const&>(*m_dialect), false, 200);
OptimiserSuite::run(*m_dialect, meter, *m_ast, *m_analysisInfo, true);
}
else
{
AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Invalid optimizer step: " << m_optimizerStep << endl;
test/libyul/yulOptimizerTests/constantOptimiser/difficult.yul
+15
View File
@@ -0,0 +1,15 @@
{
let x := 0xff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00
let y := 0x1100ff00ff00ff001100ff00ff001100ff00ff001100ff00ff001100ff001100
let z := 0xffff0000ffff0000ffff0000ffff0000ff00ff00ffff0000ffff0000ffff0000
let w := 0xffffffff000000ffffef000001feff000067ffefff0000ff230002ffee00fff7
}
// ====
// step: constantOptimiser
// ----
// {
// let x := 0xff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00
// let y := 0x1100ff00ff00ff001100ff00ff001100ff00ff001100ff00ff001100ff001100
// let z := 0xffff0000ffff0000ffff0000ffff0000ff00ff00ffff0000ffff0000ffff0000
// let w := 0xffffffff000000ffffef000001feff000067ffefff0000ff230002ffee00fff7
// }
test/libyul/yulOptimizerTests/constantOptimiser/gaps.yul
+20
View File
@@ -0,0 +1,20 @@
{
let a := 0x10000000000000000000000000000000000000000000
let x := 0x11000000000000000000000000000000000000ffffffffffffffffffffffff23
let y := 0xfffffffff00000000000000000000000000000000000000000000000000000ff
for { let i := 0xff00000000000 } lt(i, 873687623427364) { i := add(i, 3234234234234) } {
}
}
// ====
// EVMVersion: >=constantinople
// step: constantOptimiser
// ----
// {
// let a := shl(172, 1)
// let x := add(shl(248, 17), 0xffffffffffffffffffffffff23)
// let y := add(shl(220, 0x0fffffffff), 255)
// for { let i := 0xff00000000000 }
// lt(i, 873687623427364)
// { i := add(i, 3234234234234) }
// { }
// }
test/libyul/yulOptimizerTests/constantOptimiser/smallNumbers.yul
+15
View File
@@ -0,0 +1,15 @@
{
let x := 8
let y := 0xffff
for { let i := 0xff00 } lt(i, 2) { i := add(i, 3) } {
}
}
// ====
// step: constantOptimiser
// ----
// {
// let x := 8
// let y := 0xffff
// for { let i := 0xff00 } lt(i, 2) { i := add(i, 3) }
// { }
// }
test/libyul/yulOptimizerTests/fullSuite/abi2.yul
+5 -3
View File
@@ -1,3 +1,4 @@
// We require constantinople because numbers are represented using shifts.
{
// This ignores many of the encoding / decoding functions. Over time,
// we should add them all here.
@@ -1071,13 +1072,14 @@
}
// ====
// step: fullSuite
// EVMVersion: >=constantinople
// ----
// {
// {
// let _1 := mload(1)
// let _2 := mload(0)
// if slt(sub(_1, _2), 64) { revert(0, 0) }
// sstore(0, and(calldataload(_2), 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF))
// sstore(0, and(calldataload(_2), sub(shl(160, 1), 1)))
// let x0, x1, x2, x3, x4 := abi_decode_tuple_t_addresst_uint256t_bytes_calldata_ptrt_enum$_Operation_$1949(mload(7), mload(8))
// sstore(x1, x0)
// sstore(x3, x2)
@@ -1087,7 +1089,7 @@
// function abi_decode_tuple_t_addresst_uint256t_bytes_calldata_ptrt_enum$_Operation_$1949(headStart, dataEnd) -> value0, value1, value2, value3, value4
// {
// if slt(sub(dataEnd, headStart), 128) { revert(value4, value4) }
// value0 := and(calldataload(headStart), 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF)
// value0 := and(calldataload(headStart), sub(shl(160, 1), 1))
// value1 := calldataload(add(headStart, 32))
// let offset := calldataload(add(headStart, 64))
// let _1 := 0xffffffffffffffff
@@ -1107,7 +1109,7 @@
// {
// tail := add(headStart, 352)
// mstore(headStart, value0)
// let _1 := 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
// let _1 := sub(shl(160, 1), 1)
// mstore(add(headStart, 32), and(value1, _1))
// mstore(add(headStart, 64), value2)
// mstore(add(headStart, 96), value3)
test/libyul/yulOptimizerTests/fullSuite/abi_example1.yul
+3 -1
View File
@@ -1,3 +1,4 @@
// We require constantinople because numbers are represented using shifts.
{
let x := abi_encode_t_array$_t_array$_t_contract$_C_$55_$3_memory_$dyn_memory_ptr_to_t_array$_t_array$_t_address_$3_memory_$dyn_memory_ptr(mload(0), 0x20)
let a, b, c, d := abi_decode_tuple_t_uint256t_uint256t_array$_t_uint256_$dyn_memory_ptrt_array$_t_array$_t_uint256_$2_memory_$dyn_memory_ptr(mload(0x20), mload(0x40))
@@ -456,6 +457,7 @@
}
}
// ====
// EVMVersion: >=constantinople
// step: fullSuite
// ----
// {
@@ -546,7 +548,7 @@
// let i := 0
// for { } lt(i, 0x3) { i := add(i, 1) }
// {
// mstore(pos, and(mload(srcPtr), 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF))
// mstore(pos, and(mload(srcPtr), sub(shl(160, 1), 1)))
// srcPtr := add(srcPtr, 0x20)
// pos := add(pos, 0x20)
// }
test/libyul/yulOptimizerTests/fullSuite/aztec.yul
+2 -2
View File
@@ -245,7 +245,7 @@
// mstore(0x00, 404)
// revert(0x00, 0x20)
// }
// let kn := calldataload(add(calldatasize(), 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40))
// let kn := calldataload(add(calldatasize(), not(191)))
// mstore(0x2a0, caller())
// mstore(0x2c0, kn)
// mstore(0x2e0, m)
@@ -314,7 +314,7 @@
// b := add(b, _3)
// }
// if lt(m, n) { validatePairing(0x64) }
// if iszero(eq(mod(keccak256(0x2a0, add(b, 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd60)), gen_order), challenge))
// if iszero(eq(mod(keccak256(0x2a0, add(b, not(671))), gen_order), challenge))
// {
// mstore(i_1, 404)
// revert(i_1, 0x20)
test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
-14
View File
@@ -37,20 +37,6 @@ using namespace yul::test;
namespace
{
u256 exp256(u256 _base, u256 _exponent)
{
using boost::multiprecision::limb_type;
u256 result = 1;
while (_exponent)
{
if (boost::multiprecision::bit_test(_exponent, 0))
result *= _base;
_base *= _base;
_exponent >>= 1;
}
return result;
}
/// Reads 32 bytes from @a _data at position @a _offset bytes while
/// interpreting @a _data to be padded with an infinite number of zero
/// bytes beyond its end.