cerc-io/solidity
16
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

Move expression inliner tests.

Browse Source
This commit is contained in:
chriseth 2018-10-11 16:58:21 +02:00
parent 7a34fc1291
commit 83ab8e7f78
9 changed files with 124 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
test/libjulia/Inliner.cpp
View File

@ -55,12 +55,6 @@ string inlinableFunctions(string const& _source)
);
}
string inlineFunctions(string const& _source, bool _yul = true)
{
auto ast = disambiguate(_source, _yul);
ExpressionInliner(ast).run();
return assembly::AsmPrinter(_yul)(ast);
}
string fullInline(string const& _source, bool _yul = true)
{
Block ast = disambiguate(_source, _yul);
@ -122,95 +116,6 @@ BOOST_AUTO_TEST_CASE(negative)
}
BOOST_AUTO_TEST_SUITE_END()
BOOST_AUTO_TEST_SUITE(YulFunctionInliner)
BOOST_AUTO_TEST_CASE(simple)
{
BOOST_CHECK_EQUAL(
inlineFunctions("{ function f() -> x:u256 { x := 2:u256 } let y:u256 := f() }"),
format("{ function f() -> x:u256 { x := 2:u256 } let y:u256 := 2:u256 }")
);
}
BOOST_AUTO_TEST_CASE(with_args)
{
BOOST_CHECK_EQUAL(
inlineFunctions("{ function f(a:u256) -> x:u256 { x := a } let y:u256 := f(7:u256) }"),
format("{ function f(a:u256) -> x:u256 { x := a } let y:u256 := 7:u256 }")
);
}
BOOST_AUTO_TEST_CASE(no_inline_with_mload)
{
// Does not inline because mload could be moved out of sequence
BOOST_CHECK_EQUAL(
inlineFunctions("{ function f(a) -> x { x := a } let y := f(mload(2)) }", false),
format("{ function f(a) -> x { x := a } let y := f(mload(2)) }", false)
);
}
BOOST_AUTO_TEST_CASE(no_move_with_side_effects)
{
// The calls to g and h cannot be moved because g and h are not movable. Therefore, the call
// to f is not inlined.
BOOST_CHECK_EQUAL(
inlineFunctions("{"
"function f(a, b) -> x { x := add(b, a) }"
"function g() -> y { y := mload(0) mstore(0, 4) }"
"function h() -> z { mstore(0, 4) z := mload(0) }"
"let r := f(g(), h())"
"}", false),
format("{"
"function f(a, b) -> x { x := add(b, a) }"
"function g() -> y { y := mload(0) mstore(0, 4) }"
"function h() -> z { mstore(0, 4) z := mload(0) }"
"let r := f(g(), h())"
"}", false)
);
}
BOOST_AUTO_TEST_CASE(complex_with_evm)
{
BOOST_CHECK_EQUAL(
inlineFunctions("{ function f(a) -> x { x := add(a, a) } let y := f(calldatasize()) }", false),
format("{ function f(a) -> x { x := add(a, a) } let y := add(calldatasize(), calldatasize()) }", false)
);
}
BOOST_AUTO_TEST_CASE(double_calls)
{
BOOST_CHECK_EQUAL(
inlineFunctions("{"
"function f(a) -> x { x := add(a, a) }"
"function g(b, c) -> y { y := mul(mload(c), f(b)) }"
"let y := g(calldatasize(), 7)"
"}", false),
format("{"
"function f(a) -> x { x := add(a, a) }"
"function g(b, c) -> y { y := mul(mload(c), add(b, b)) }"
"let y_1 := mul(mload(7), add(calldatasize(), calldatasize()))"
"}", false)
);
}
BOOST_AUTO_TEST_CASE(double_recursive_calls)
{
BOOST_CHECK_EQUAL(
inlineFunctions("{"
"function f(a, r) -> x { x := g(a, g(r, r)) }"
"function g(b, s) -> y { y := f(b, f(s, s)) }"
"let y := g(calldatasize(), 7)"
"}", false),
format("{"
"function f(a, r) -> x { x := g(a, f(r, f(r, r))) }"
"function g(b, s) -> y { y := f(b, g(s, f(s, f(s, s))))}"
"let y_1 := f(calldatasize(), g(7, f(7, f(7, 7))))"
"}", false)
);
}
BOOST_AUTO_TEST_SUITE_END()
BOOST_AUTO_TEST_SUITE(YulFullInliner)

6
test/libjulia/YulOptimizerTest.cpp
View File

@ -27,6 +27,7 @@
#include <libjulia/optimiser/ExpressionSplitter.h>
#include <libjulia/optimiser/FunctionGrouper.h>
#include <libjulia/optimiser/FunctionHoister.h>
#include <libjulia/optimiser/ExpressionInliner.h>
#include <libsolidity/parsing/Scanner.h>
#include <libsolidity/inlineasm/AsmPrinter.h>
@ -107,6 +108,11 @@ bool YulOptimizerTest::run(ostream& _stream, string const& _linePrefix, bool con
disambiguate();
(FunctionHoister{})(*m_ast);
}
else if (m_optimizerStep == "expressionInliner")
{
disambiguate();
ExpressionInliner(*m_ast).run();
}
else
{
FormattedScope(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Invalid optimizer step: " << m_optimizerStep << endl;

13
test/libjulia/yulOptimizerTests/expressionInliner/complex_with_evm.yul Normal file
View File

@ -0,0 +1,13 @@
{
function f(a) -> x { x := add(a, a) }
let y := f(calldatasize())
}
// ----
// expressionInliner
// {
// function f(a) -> x
// {
// x := add(a, a)
// }
// let y := add(calldatasize(), calldatasize())
// }

18
test/libjulia/yulOptimizerTests/expressionInliner/double_calls.yul Normal file
View File

@ -0,0 +1,18 @@
{
function f(a) -> x { x := add(a, a) }
function g(b, c) -> y { y := mul(mload(c), f(b)) }
let y := g(calldatasize(), 7)
}
// ----
// expressionInliner
// {
// function f(a) -> x
// {
// x := add(a, a)
// }
// function g(b, c) -> y
// {
// y := mul(mload(c), add(b, b))
// }
// let y_1 := mul(mload(7), add(calldatasize(), calldatasize()))
// }

18
test/libjulia/yulOptimizerTests/expressionInliner/double_recursive_calls.yul Normal file
View File

@ -0,0 +1,18 @@
{
function f(a, r) -> x { x := g(a, g(r, r)) }
function g(b, s) -> y { y := f(b, f(s, s)) }
let y := g(calldatasize(), 7)
}
// ----
// expressionInliner
// {
// function f(a, r) -> x
// {
// x := g(a, f(r, f(r, r)))
// }
// function g(b, s) -> y
// {
// y := f(b, g(s, f(s, f(s, s))))
// }
// let y_1 := f(calldatasize(), g(7, f(7, f(7, 7))))
// }

14
test/libjulia/yulOptimizerTests/expressionInliner/no_inline_mload.yul Normal file
View File

@ -0,0 +1,14 @@
// Does not inline because mload could be moved out of sequence
{
function f(a) -> x { x := a }
let y := f(mload(2))
}
// ----
// expressionInliner
// {
// function f(a) -> x
// {
// x := a
// }
// let y := f(mload(2))
// }

27
test/libjulia/yulOptimizerTests/expressionInliner/no_move_with_sideeffects.yul Normal file
View File

@ -0,0 +1,27 @@
// The calls to g and h cannot be moved because g and h are not movable. Therefore, the call
// to f is not inlined.
{
function f(a, b) -> x { x := add(b, a) }
function g() -> y { y := mload(0) mstore(0, 4) }
function h() -> z { mstore(0, 4) z := mload(0) }
let r := f(g(), h())
}
// ----
// expressionInliner
// {
// function f(a, b) -> x
// {
// x := add(b, a)
// }
// function g() -> y
// {
// y := mload(0)
// mstore(0, 4)
// }
// function h() -> z
// {
// mstore(0, 4)
// z := mload(0)
// }
// let r := f(g(), h())
// }

14
test/libjulia/yulOptimizerTests/expressionInliner/simple.yul Normal file
View File

@ -0,0 +1,14 @@
// yul
{
function f() -> x:u256 { x := 2:u256 }
let y:u256 := f()
}
// ----
// expressionInliner
// {
// function f() -> x:u256
// {
// x := 2:u256
// }
// let y:u256 := 2:u256
// }

14
test/libjulia/yulOptimizerTests/expressionInliner/with_args.yul Normal file
View File

@ -0,0 +1,14 @@
// yul
{
function f(a:u256) -> x:u256 { x := a }
let y:u256 := f(7:u256)
}
// ----
// expressionInliner
// {
// function f(a:u256) -> x:u256
// {
// x := a
// }
// let y:u256 := 7:u256
// }