From 5cd84a630c2005a4b971130840bb7361560fd120 Mon Sep 17 00:00:00 2001 From: chriseth Date: Thu, 8 Feb 2018 15:16:43 +0100 Subject: Tests. --- test/libjulia/Inliner.cpp | 136 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 125 insertions(+), 11 deletions(-) (limited to 'test') diff --git a/test/libjulia/Inliner.cpp b/test/libjulia/Inliner.cpp index 88b51f28..7950941d 100644 --- a/test/libjulia/Inliner.cpp +++ b/test/libjulia/Inliner.cpp @@ -1,18 +1,18 @@ /* - This file is part of solidity. + 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 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. + 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 . + You should have received a copy of the GNU General Public License + along with solidity. If not, see . */ /** * @date 2017 @@ -23,6 +23,9 @@ #include #include +#include +#include +#include #include @@ -58,8 +61,17 @@ string inlineFunctions(string const& _source, bool _julia = true) ExpressionInliner(ast).run(); return assembly::AsmPrinter(_julia)(ast); } +string fullInline(string const& _source, bool _julia = true) +{ + Block ast = disambiguate(_source, _julia); + (FunctionHoister{})(ast); + (FunctionGrouper{})(ast);\ + FullInliner(ast).run(); + return assembly::AsmPrinter(_julia)(ast); +} } + BOOST_AUTO_TEST_SUITE(IuliaInlinableFunctionFilter) BOOST_AUTO_TEST_CASE(smoke_test) @@ -197,3 +209,105 @@ BOOST_AUTO_TEST_CASE(double_recursive_calls) } BOOST_AUTO_TEST_SUITE_END() + +BOOST_AUTO_TEST_SUITE(IuliaFullInliner) + +BOOST_AUTO_TEST_CASE(simple) +{ + BOOST_CHECK_EQUAL( + fullInline(R"({ + function f(a) -> x { let r := mul(a, a) x := add(r, r) } + let y := add(f(sload(mload(2))), mload(7)) + })", false), + format(R"({ + { + let _1 := mload(7) + let f_a := sload(mload(2)) + let f_x + { + let f_r := mul(f_a, f_a) + f_x := add(f_r, f_r) + } + let y := add(f_x, _1) + } + function f(a) -> x + { + let r := mul(a, a) + x := add(r, r) + } + })", false) + ); +} + +BOOST_AUTO_TEST_CASE(multi_fun) +{ + BOOST_CHECK_EQUAL( + fullInline(R"({ + function f(a) -> x { x := add(a, a) } + function g(b, c) -> y { y := mul(mload(c), f(b)) } + let y := g(f(3), 7) + })", false), + format(R"({ + { + let g_c := 7 + let f_a_1 := 3 + let f_x_1 + { f_x_1 := add(f_a_1, f_a_1) } + let g_y + { + let g_f_a := f_x_1 + let g_f_x + { + g_f_x := add(g_f_a, g_f_a) + } + g_y := mul(mload(g_c), g_f_x) + } + let y_1 := g_y + } + function f(a) -> x + { + x := add(a, a) + } + function g(b, c) -> y + { + let f_a := b + let f_x + { + f_x := add(f_a, f_a) + } + y := mul(mload(c), f_x) + } + })", false) + ); +} + +BOOST_AUTO_TEST_CASE(move_up_rightwards_arguments) +{ + BOOST_CHECK_EQUAL( + fullInline(R"({ + function f(a, b, c) -> x { x := add(a, b) x := mul(x, c) } + let y := add(mload(1), add(f(mload(2), mload(3), mload(4)), mload(5))) + })", false), + format(R"({ + { + let _1 := mload(5) + let f_c := mload(4) + let f_b := mload(3) + let f_a := mload(2) + let f_x + { + f_x := add(f_a, f_b) + f_x := mul(f_x, f_c) + } + let y := add(mload(1), add(f_x, _1)) + } + function f(a, b, c) -> x + { + x := add(a, b) + x := mul(x, c) + } + })", false) + ); +} + +BOOST_AUTO_TEST_SUITE_END() -- cgit From 78945e81e46ab12c864bdb8a2d8a03a80fbfdbdd Mon Sep 17 00:00:00 2001 From: chriseth Date: Tue, 6 Feb 2018 15:59:35 +0100 Subject: Test the removal of the result variable. --- test/libjulia/Inliner.cpp | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'test') diff --git a/test/libjulia/Inliner.cpp b/test/libjulia/Inliner.cpp index 7950941d..05515c57 100644 --- a/test/libjulia/Inliner.cpp +++ b/test/libjulia/Inliner.cpp @@ -310,4 +310,34 @@ BOOST_AUTO_TEST_CASE(move_up_rightwards_arguments) ); } +BOOST_AUTO_TEST_CASE(pop_result) +{ + // This tests that `pop(r)` is removed. + BOOST_CHECK_EQUAL( + fullInline(R"({ + function f(a) -> x { let r := mul(a, a) x := add(r, r) } + pop(add(f(7), 2)) + })", false), + format(R"({ + { + let _1 := 2 + let f_a := 7 + let f_x + { + let f_r := mul(f_a, f_a) + f_x := add(f_r, f_r) + } + { + } + } + function f(a) -> x + { + let r := mul(a, a) + x := add(r, r) + } + })", false) + ); +} + + BOOST_AUTO_TEST_SUITE_END() -- cgit From d2145428c5e6689b90ac39d1c3302a5d253a4788 Mon Sep 17 00:00:00 2001 From: chriseth Date: Fri, 6 Apr 2018 16:51:38 +0200 Subject: Fix test case strings. --- test/libjulia/Inliner.cpp | 204 +++++++++++++++++++++++----------------------- 1 file changed, 102 insertions(+), 102 deletions(-) (limited to 'test') diff --git a/test/libjulia/Inliner.cpp b/test/libjulia/Inliner.cpp index 05515c57..464dcd93 100644 --- a/test/libjulia/Inliner.cpp +++ b/test/libjulia/Inliner.cpp @@ -215,98 +215,98 @@ BOOST_AUTO_TEST_SUITE(IuliaFullInliner) BOOST_AUTO_TEST_CASE(simple) { BOOST_CHECK_EQUAL( - fullInline(R"({ - function f(a) -> x { let r := mul(a, a) x := add(r, r) } - let y := add(f(sload(mload(2))), mload(7)) - })", false), - format(R"({ - { - let _1 := mload(7) - let f_a := sload(mload(2)) - let f_x - { - let f_r := mul(f_a, f_a) - f_x := add(f_r, f_r) - } - let y := add(f_x, _1) - } - function f(a) -> x - { - let r := mul(a, a) - x := add(r, r) - } - })", false) + fullInline("{" + "function f(a) -> x { let r := mul(a, a) x := add(r, r) }" + "let y := add(f(sload(mload(2))), mload(7))" + "}", false), + format("{" + "{" + "let _1 := mload(7)" + "let f_a := sload(mload(2))" + "let f_x" + "{" + "let f_r := mul(f_a, f_a)" + "f_x := add(f_r, f_r)" + "}" + "let y := add(f_x, _1)" + "}" + "function f(a) -> x" + "{" + "let r := mul(a, a)" + "x := add(r, r)" + "}" + "}", false) ); } BOOST_AUTO_TEST_CASE(multi_fun) { BOOST_CHECK_EQUAL( - fullInline(R"({ - function f(a) -> x { x := add(a, a) } - function g(b, c) -> y { y := mul(mload(c), f(b)) } - let y := g(f(3), 7) - })", false), - format(R"({ - { - let g_c := 7 - let f_a_1 := 3 - let f_x_1 - { f_x_1 := add(f_a_1, f_a_1) } - let g_y - { - let g_f_a := f_x_1 - let g_f_x - { - g_f_x := add(g_f_a, g_f_a) - } - g_y := mul(mload(g_c), g_f_x) - } - let y_1 := g_y - } - function f(a) -> x - { - x := add(a, a) - } - function g(b, c) -> y - { - let f_a := b - let f_x - { - f_x := add(f_a, f_a) - } - y := mul(mload(c), f_x) - } - })", false) + fullInline("{" + "function f(a) -> x { x := add(a, a) }" + "function g(b, c) -> y { y := mul(mload(c), f(b)) }" + "let y := g(f(3), 7)" + "}", false), + format("{" + "{" + "let g_c := 7 " + "let f_a_1 := 3 " + "let f_x_1 " + "{ f_x_1 := add(f_a_1, f_a_1) } " + "let g_y " + "{" + "let g_f_a := f_x_1 " + "let g_f_x " + "{" + "g_f_x := add(g_f_a, g_f_a)" + "}" + "g_y := mul(mload(g_c), g_f_x)" + "}" + "let y_1 := g_y" + "}" + "function f(a) -> x" + "{" + "x := add(a, a)" + "}" + "function g(b, c) -> y" + "{" + "let f_a := b " + "let f_x " + "{" + "f_x := add(f_a, f_a)" + "}" + "y := mul(mload(c), f_x)" + "}" + "}", false) ); } BOOST_AUTO_TEST_CASE(move_up_rightwards_arguments) { BOOST_CHECK_EQUAL( - fullInline(R"({ - function f(a, b, c) -> x { x := add(a, b) x := mul(x, c) } - let y := add(mload(1), add(f(mload(2), mload(3), mload(4)), mload(5))) - })", false), - format(R"({ - { - let _1 := mload(5) - let f_c := mload(4) - let f_b := mload(3) - let f_a := mload(2) - let f_x - { - f_x := add(f_a, f_b) - f_x := mul(f_x, f_c) - } - let y := add(mload(1), add(f_x, _1)) - } - function f(a, b, c) -> x - { - x := add(a, b) - x := mul(x, c) - } - })", false) + fullInline("{" + "function f(a, b, c) -> x { x := add(a, b) x := mul(x, c) }" + "let y := add(mload(1), add(f(mload(2), mload(3), mload(4)), mload(5)))" + "}", false), + format("{" + "{" + "let _1 := mload(5)" + "let f_c := mload(4)" + "let f_b := mload(3)" + "let f_a := mload(2)" + "let f_x" + "{" + "f_x := add(f_a, f_b)" + "f_x := mul(f_x, f_c)" + "}" + "let y := add(mload(1), add(f_x, _1))" + "}" + "function f(a, b, c) -> x" + "{" + "x := add(a, b)" + "x := mul(x, c)" + "}" + "}", false) ); } @@ -314,28 +314,28 @@ BOOST_AUTO_TEST_CASE(pop_result) { // This tests that `pop(r)` is removed. BOOST_CHECK_EQUAL( - fullInline(R"({ - function f(a) -> x { let r := mul(a, a) x := add(r, r) } - pop(add(f(7), 2)) - })", false), - format(R"({ - { - let _1 := 2 - let f_a := 7 - let f_x - { - let f_r := mul(f_a, f_a) - f_x := add(f_r, f_r) - } - { - } - } - function f(a) -> x - { - let r := mul(a, a) - x := add(r, r) - } - })", false) + fullInline("{" + "function f(a) -> x { let r := mul(a, a) x := add(r, r) }" + "pop(add(f(7), 2))" + "}", false), + format("{" + "{" + "let _1 := 2 " + "let f_a := 7 " + "let f_x " + "{" + "let f_r := mul(f_a, f_a) " + "f_x := add(f_r, f_r)" + "}" + "{" + "}" + "}" + "function f(a) -> x" + "{" + "let r := mul(a, a) " + "x := add(r, r)" + "}" + "}", false) ); } -- cgit