From 4bd9bcbc774cd1e9bf9f5db385ea82dd1dd54c2e Mon Sep 17 00:00:00 2001 From: chriseth Date: Thu, 23 Nov 2017 17:42:42 +0100 Subject: Tests for inlinable function filter. --- test/libjulia/Inliner.cpp | 102 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 test/libjulia/Inliner.cpp (limited to 'test') diff --git a/test/libjulia/Inliner.cpp b/test/libjulia/Inliner.cpp new file mode 100644 index 00000000..b583fafc --- /dev/null +++ b/test/libjulia/Inliner.cpp @@ -0,0 +1,102 @@ +/* + This file is part of solidity. + + solidity is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + solidity is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with solidity. If not, see . +*/ +/** + * @date 2017 + * Unit tests for the iulia function inliner. + */ + +#include + +#include +#include + +#include + +#include +#include + +using namespace std; +using namespace dev; +using namespace dev::julia; +using namespace dev::julia::test; +using namespace dev::solidity::assembly; + +namespace +{ +string inlinableFunctions(string const& _source) +{ + auto ast = disambiguate(_source); + + InlinableFunctionFilter filter; + filter(*ast); + + return boost::algorithm::join( + filter.inlinableFunctions() | boost::adaptors::map_keys, + "," + ); +} + +} + +BOOST_AUTO_TEST_SUITE(IuliaInliner) + +BOOST_AUTO_TEST_CASE(smoke_test) +{ + BOOST_CHECK_EQUAL(inlinableFunctions("{ }"), ""); +} + +BOOST_AUTO_TEST_CASE(simple) +{ + BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x:u256 { x := 2:u256 } }"), "f"); + BOOST_CHECK_EQUAL(inlinableFunctions(R"({ + function g(a:u256) -> b:u256 { b := a } + function f() -> x:u256 { x := g(2:u256) } + })"), "f,g"); +} + +BOOST_AUTO_TEST_CASE(simple_inside_structures) +{ + BOOST_CHECK_EQUAL(inlinableFunctions(R"({ + switch 2:u256 + case 2:u256 { + function g(a:u256) -> b:u256 { b := a } + function f() -> x:u256 { x := g(2:u256) } + } + })"), "f,g"); + BOOST_CHECK_EQUAL(inlinableFunctions(R"({ + for { + function g(a:u256) -> b:u256 { b := a } + } 1:u256 { + function f() -> x:u256 { x := g(2:u256) } + } + { + function h() -> y:u256 { y := 2:u256 } + } + })"), "f,g,h"); +} + +BOOST_AUTO_TEST_CASE(negative) +{ + BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x:u256 { } }"), ""); + BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x:u256 { x := 2:u256 {} } }"), ""); + BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x:u256 { x := f() } }"), ""); + BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x:u256 { x := x } }"), ""); + BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x:u256, y:u256 { x := 2:u256 } }"), ""); +} + + +BOOST_AUTO_TEST_SUITE_END() -- cgit v1.2.3 From e7ef227226fb3548ecea59d44108a5923afeffc6 Mon Sep 17 00:00:00 2001 From: chriseth Date: Wed, 22 Nov 2017 11:11:48 +0100 Subject: Function inliner. --- test/libjulia/Inliner.cpp | 67 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/libjulia/Inliner.cpp b/test/libjulia/Inliner.cpp index b583fafc..53776acf 100644 --- a/test/libjulia/Inliner.cpp +++ b/test/libjulia/Inliner.cpp @@ -24,6 +24,8 @@ #include #include +#include + #include #include @@ -42,7 +44,7 @@ string inlinableFunctions(string const& _source) auto ast = disambiguate(_source); InlinableFunctionFilter filter; - filter(*ast); + filter(ast); return boost::algorithm::join( filter.inlinableFunctions() | boost::adaptors::map_keys, @@ -50,9 +52,15 @@ string inlinableFunctions(string const& _source) ); } +string inlineFunctions(string const& _source, bool _julia = true) +{ + auto ast = disambiguate(_source, _julia); + FunctionalInliner(ast).run(); + return AsmPrinter(_julia)(ast); +} } -BOOST_AUTO_TEST_SUITE(IuliaInliner) +BOOST_AUTO_TEST_SUITE(IuliaInlinableFunctionFilter) BOOST_AUTO_TEST_CASE(smoke_test) { @@ -99,4 +107,59 @@ BOOST_AUTO_TEST_CASE(negative) } +BOOST_AUTO_TEST_SUITE_END() + +BOOST_AUTO_TEST_SUITE(IuliaFunctionInliner) + +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(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(R"({ + 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(R"({ + 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) + ); +} + +// TODO test double recursive calls + BOOST_AUTO_TEST_SUITE_END() -- cgit v1.2.3 From a7ae7c6d04c77f3cdc51644f929d9dbaaa687220 Mon Sep 17 00:00:00 2001 From: chriseth Date: Tue, 5 Dec 2017 18:41:26 +0100 Subject: Tests for functional inliner. --- test/libjulia/Inliner.cpp | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/libjulia/Inliner.cpp b/test/libjulia/Inliner.cpp index 53776acf..93444500 100644 --- a/test/libjulia/Inliner.cpp +++ b/test/libjulia/Inliner.cpp @@ -35,7 +35,7 @@ using namespace std; using namespace dev; using namespace dev::julia; using namespace dev::julia::test; -using namespace dev::solidity::assembly; +using namespace dev::solidity; namespace { @@ -56,7 +56,7 @@ string inlineFunctions(string const& _source, bool _julia = true) { auto ast = disambiguate(_source, _julia); FunctionalInliner(ast).run(); - return AsmPrinter(_julia)(ast); + return assembly::AsmPrinter(_julia)(ast); } } @@ -136,6 +136,26 @@ BOOST_AUTO_TEST_CASE(no_inline_with_mload) ); } +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(R"({ + 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(R"({ + 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( -- cgit v1.2.3 From d7863e2054fe5617aa1de93bb9410b487d1af5d4 Mon Sep 17 00:00:00 2001 From: chriseth Date: Tue, 6 Feb 2018 15:30:43 +0100 Subject: Test about recursively calling functions. --- test/libjulia/Inliner.cpp | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) (limited to 'test') diff --git a/test/libjulia/Inliner.cpp b/test/libjulia/Inliner.cpp index 93444500..b6a7b921 100644 --- a/test/libjulia/Inliner.cpp +++ b/test/libjulia/Inliner.cpp @@ -21,8 +21,8 @@ #include -#include -#include +#include +#include #include @@ -43,11 +43,11 @@ string inlinableFunctions(string const& _source) { auto ast = disambiguate(_source); - InlinableFunctionFilter filter; - filter(ast); + InlinableExpressionFunctionFinder funFinder; + funFinder(ast); return boost::algorithm::join( - filter.inlinableFunctions() | boost::adaptors::map_keys, + funFinder.inlinableFunctions() | boost::adaptors::map_keys, "," ); } @@ -55,7 +55,7 @@ string inlinableFunctions(string const& _source) string inlineFunctions(string const& _source, bool _julia = true) { auto ast = disambiguate(_source, _julia); - FunctionalInliner(ast).run(); + ExpressionInliner(ast).run(); return assembly::AsmPrinter(_julia)(ast); } } @@ -180,6 +180,20 @@ BOOST_AUTO_TEST_CASE(double_calls) ); } -// TODO test double recursive calls +BOOST_AUTO_TEST_CASE(double_recursive_calls) +{ + BOOST_CHECK_EQUAL( + inlineFunctions(R"({ + 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(R"({ + 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() -- cgit v1.2.3 From 9429e18dda7d65bea0c3e67756b5b3a6405664c7 Mon Sep 17 00:00:00 2001 From: chriseth Date: Tue, 6 Feb 2018 23:00:33 +0100 Subject: Fix tests for old precompiler. --- test/libjulia/Inliner.cpp | 106 +++++++++++++++++++++++----------------------- 1 file changed, 53 insertions(+), 53 deletions(-) (limited to 'test') diff --git a/test/libjulia/Inliner.cpp b/test/libjulia/Inliner.cpp index b6a7b921..88b51f28 100644 --- a/test/libjulia/Inliner.cpp +++ b/test/libjulia/Inliner.cpp @@ -70,31 +70,31 @@ BOOST_AUTO_TEST_CASE(smoke_test) BOOST_AUTO_TEST_CASE(simple) { BOOST_CHECK_EQUAL(inlinableFunctions("{ function f() -> x:u256 { x := 2:u256 } }"), "f"); - BOOST_CHECK_EQUAL(inlinableFunctions(R"({ - function g(a:u256) -> b:u256 { b := a } - function f() -> x:u256 { x := g(2:u256) } - })"), "f,g"); + BOOST_CHECK_EQUAL(inlinableFunctions("{" + "function g(a:u256) -> b:u256 { b := a }" + "function f() -> x:u256 { x := g(2:u256) }" + "}"), "f,g"); } BOOST_AUTO_TEST_CASE(simple_inside_structures) { - BOOST_CHECK_EQUAL(inlinableFunctions(R"({ - switch 2:u256 - case 2:u256 { - function g(a:u256) -> b:u256 { b := a } - function f() -> x:u256 { x := g(2:u256) } - } - })"), "f,g"); - BOOST_CHECK_EQUAL(inlinableFunctions(R"({ - for { - function g(a:u256) -> b:u256 { b := a } - } 1:u256 { - function f() -> x:u256 { x := g(2:u256) } - } - { - function h() -> y:u256 { y := 2:u256 } - } - })"), "f,g,h"); + BOOST_CHECK_EQUAL(inlinableFunctions("{" + "switch 2:u256 " + "case 2:u256 {" + "function g(a:u256) -> b:u256 { b := a }" + "function f() -> x:u256 { x := g(2:u256) }" + "}" + "}"), "f,g"); + BOOST_CHECK_EQUAL(inlinableFunctions("{" + "for {" + "function g(a:u256) -> b:u256 { b := a }" + "} 1:u256 {" + "function f() -> x:u256 { x := g(2:u256) }" + "}" + "{" + "function h() -> y:u256 { y := 2:u256 }" + "}" + "}"), "f,g,h"); } BOOST_AUTO_TEST_CASE(negative) @@ -141,18 +141,18 @@ 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(R"({ - 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(R"({ - 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) + 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) ); } @@ -167,32 +167,32 @@ BOOST_AUTO_TEST_CASE(complex_with_evm) BOOST_AUTO_TEST_CASE(double_calls) { BOOST_CHECK_EQUAL( - inlineFunctions(R"({ - 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(R"({ - 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) + 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(R"({ - 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(R"({ - 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) + 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) ); } -- cgit v1.2.3