Move unused pruner tests.

12 files changed, 113 insertions, 129 deletions

diff --git a/test/libjulia/UnusedPruner.cpp b/test/libjulia/UnusedPruner.cpp
deleted file mode 100644
index 649ee149..00000000
--- a/test/libjulia/UnusedPruner.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-    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 <http://www.gnu.org/licenses/>.
-*/
-/**
- * @date 2017
- * Unit tests for the pruning of unused variables and functions.
- */
-
-#include <test/libjulia/Common.h>
-
-#include <libjulia/optimiser/UnusedPruner.h>
-
-#include <libsolidity/inlineasm/AsmPrinter.h>
-
-#include <boost/test/unit_test.hpp>
-
-#include <boost/range/adaptors.hpp>
-#include <boost/algorithm/string/join.hpp>
-
-using namespace std;
-using namespace dev;
-using namespace dev::julia;
-using namespace dev::julia::test;
-using namespace dev::solidity;
-
-
-#define CHECK(_original, _expectation)\
-do\
-{\
-	assembly::AsmPrinter p;\
-	Block b = disambiguate(_original, false);\
-	UnusedPruner::runUntilStabilised(b);\
-	string result = p(b);\
-	BOOST_CHECK_EQUAL(result, format(_expectation, false));\
-}\
-while(false)
-
-BOOST_AUTO_TEST_SUITE(YulUnusedPruner)
-
-BOOST_AUTO_TEST_CASE(smoke_test)
-{
-	CHECK("{ }", "{ }");
-}
-
-BOOST_AUTO_TEST_CASE(trivial)
-{
-	CHECK(
-		"{ let a := 1 let b := 1 mstore(0, 1) }",
-		"{ mstore(0, 1) }"
-	);
-}
-
-BOOST_AUTO_TEST_CASE(multi_declarations)
-{
-	CHECK(
-		"{ let x, y }",
-		"{ }"
-	);
-}
-
-BOOST_AUTO_TEST_CASE(multi_assignments)
-{
-	CHECK(
-		"{ let x, y x := 1 y := 2 }",
-		"{ let x, y x := 1 y := 2 }"
-	);
-}
-
-BOOST_AUTO_TEST_CASE(multi_partial_assignments)
-{
-	CHECK(
-		"{ let x, y x := 1 }",
-		"{ let x, y x := 1 }"
-	);
-}
-
-BOOST_AUTO_TEST_CASE(functions)
-{
-	CHECK(
-		"{ function f() { let a := 1 } function g() { f() } }",
-		"{ }"
-	);
-}
-
-BOOST_AUTO_TEST_CASE(intermediate_assignment)
-{
-	CHECK(
-		"{ let a := 1 a := 4 let b := 1 }",
-		"{ let a := 1 a := 4 }"
-	);
-}
-
-BOOST_AUTO_TEST_CASE(intermediate_multi_assignment){
-	CHECK(
-		"{ let a, b function f() -> x { } a := f() b := 1 }",
-		"{ let a, b function f() -> x { } a := f() b := 1 }"
-	);
-}
-
-BOOST_AUTO_TEST_CASE(multi_declare)
-{
-	CHECK(
-		"{ function f() -> x, y { } let a, b := f() }",
-		"{ function f() -> x, y { } let a, b := f() }"
-	);
-}
-
-BOOST_AUTO_TEST_CASE(multi_assign)
-{
-	CHECK(
-		"{ let a let b function f() -> x, y { } a, b := f() }",
-		"{ let a let b function f() -> x, y { } a, b := f() }"
-	);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/test/libjulia/YulOptimizerTest.cpp b/test/libjulia/YulOptimizerTest.cpp
index 2d79674b..96e36a5b 100644
--- a/test/libjulia/YulOptimizerTest.cpp
+++ b/test/libjulia/YulOptimizerTest.cpp
@@ -32,6 +32,7 @@
 #include <libjulia/optimiser/MainFunction.h>
 #include <libjulia/optimiser/Rematerialiser.h>
 #include <libjulia/optimiser/ExpressionSimplifier.h>
+#include <libjulia/optimiser/UnusedPruner.h>
 
 #include <libsolidity/parsing/Scanner.h>
 #include <libsolidity/inlineasm/AsmPrinter.h>
@@ -140,6 +141,11 @@ bool YulOptimizerTest::run(ostream& _stream, string const& _linePrefix, bool con
 		disambiguate();
 		(ExpressionSimplifier{})(*m_ast);
 	}
+	else if (m_optimizerStep == "unusedPruner")
+	{
+		disambiguate();
+		UnusedPruner::runUntilStabilised(*m_ast);
+	}
 	else
 	{
 		FormattedScope(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Invalid optimizer step: " << m_optimizerStep << endl;
diff --git a/test/libjulia/yulOptimizerTests/unusedPruner/functions.yul b/test/libjulia/yulOptimizerTests/unusedPruner/functions.yul
new file mode 100644
index 00000000..ec9cdda8
--- /dev/null
+++ b/test/libjulia/yulOptimizerTests/unusedPruner/functions.yul
@@ -0,0 +1,8 @@
+{
+    function f() { let a := 1 }
+    function g() { f() }
+}
+// ----
+// unusedPruner
+// {
+// }
diff --git a/test/libjulia/yulOptimizerTests/unusedPruner/intermediate_assignment.yul b/test/libjulia/yulOptimizerTests/unusedPruner/intermediate_assignment.yul
new file mode 100644
index 00000000..4ed6dd2c
--- /dev/null
+++ b/test/libjulia/yulOptimizerTests/unusedPruner/intermediate_assignment.yul
@@ -0,0 +1,11 @@
+{
+    let a := 1
+    a := 4
+    let b := 1
+}
+// ----
+// unusedPruner
+// {
+//     let a := 1
+//     a := 4
+// }
diff --git a/test/libjulia/yulOptimizerTests/unusedPruner/intermediate_multi_assignment.yul b/test/libjulia/yulOptimizerTests/unusedPruner/intermediate_multi_assignment.yul
new file mode 100644
index 00000000..94d101e9
--- /dev/null
+++ b/test/libjulia/yulOptimizerTests/unusedPruner/intermediate_multi_assignment.yul
@@ -0,0 +1,16 @@
+{
+    let a, b
+    function f() -> x { }
+    a := f()
+    b := 1
+}
+// ----
+// unusedPruner
+// {
+//     let a, b
+//     function f() -> x
+//     {
+//     }
+//     a := f()
+//     b := 1
+// }
diff --git a/test/libjulia/yulOptimizerTests/unusedPruner/multi_assign.yul b/test/libjulia/yulOptimizerTests/unusedPruner/multi_assign.yul
new file mode 100644
index 00000000..a14dc28c
--- /dev/null
+++ b/test/libjulia/yulOptimizerTests/unusedPruner/multi_assign.yul
@@ -0,0 +1,16 @@
+{
+    let a
+    let b
+    function f() -> x, y { }
+    a, b := f()
+}
+// ----
+// unusedPruner
+// {
+//     let a
+//     let b
+//     function f() -> x, y
+//     {
+//     }
+//     a, b := f()
+// }
diff --git a/test/libjulia/yulOptimizerTests/unusedPruner/multi_assignments.yul b/test/libjulia/yulOptimizerTests/unusedPruner/multi_assignments.yul
new file mode 100644
index 00000000..fe94edb8
--- /dev/null
+++ b/test/libjulia/yulOptimizerTests/unusedPruner/multi_assignments.yul
@@ -0,0 +1,12 @@
+{
+    let x, y
+    x := 1
+    y := 2
+}
+// ----
+// unusedPruner
+// {
+//     let x, y
+//     x := 1
+//     y := 2
+// }
diff --git a/test/libjulia/yulOptimizerTests/unusedPruner/multi_declarations.yul b/test/libjulia/yulOptimizerTests/unusedPruner/multi_declarations.yul
new file mode 100644
index 00000000..3cf35007
--- /dev/null
+++ b/test/libjulia/yulOptimizerTests/unusedPruner/multi_declarations.yul
@@ -0,0 +1,7 @@
+{
+    let x, y
+}
+// ----
+// unusedPruner
+// {
+// }
diff --git a/test/libjulia/yulOptimizerTests/unusedPruner/multi_declare.yul b/test/libjulia/yulOptimizerTests/unusedPruner/multi_declare.yul
new file mode 100644
index 00000000..adabac87
--- /dev/null
+++ b/test/libjulia/yulOptimizerTests/unusedPruner/multi_declare.yul
@@ -0,0 +1,12 @@
+{
+    function f() -> x, y { }
+    let a, b := f()
+}
+// ----
+// unusedPruner
+// {
+//     function f() -> x, y
+//     {
+//     }
+//     let a, b := f()
+// }
diff --git a/test/libjulia/yulOptimizerTests/unusedPruner/multi_partial_assignments.yul b/test/libjulia/yulOptimizerTests/unusedPruner/multi_partial_assignments.yul
new file mode 100644
index 00000000..5db0ade9
--- /dev/null
+++ b/test/libjulia/yulOptimizerTests/unusedPruner/multi_partial_assignments.yul
@@ -0,0 +1,10 @@
+{
+    let x, y
+    x := 1
+}
+// ----
+// unusedPruner
+// {
+//     let x, y
+//     x := 1
+// }
diff --git a/test/libjulia/yulOptimizerTests/unusedPruner/smoke.yul b/test/libjulia/yulOptimizerTests/unusedPruner/smoke.yul
new file mode 100644
index 00000000..ca2ed942
--- /dev/null
+++ b/test/libjulia/yulOptimizerTests/unusedPruner/smoke.yul
@@ -0,0 +1,5 @@
+{ }
+// ----
+// unusedPruner
+// {
+// }
diff --git a/test/libjulia/yulOptimizerTests/unusedPruner/trivial.yul b/test/libjulia/yulOptimizerTests/unusedPruner/trivial.yul
new file mode 100644
index 00000000..9b4cf9fd
--- /dev/null
+++ b/test/libjulia/yulOptimizerTests/unusedPruner/trivial.yul
@@ -0,0 +1,10 @@
+{
+    let a := 1
+    let b := 1
+    mstore(0, 1)
+}
+// ----
+// unusedPruner
+// {
+//     mstore(0, 1)
+// }