Merge pull request #3358 from chfast/exp-tests

EXP tests

Author: chfast

test/Stats.cpp

@@ -43,9 +43,9 @@ void Stats::testStarted(std::string const& _name)
 	m_tp = clock::now();
 }
 
-void Stats::testFinished()
+void Stats::testFinished(int64_t _gasUsed)
 {
-	m_stats.push_back({clock::now() - m_tp, m_currentSuite + "/" + m_currentTest});
+	m_stats.push_back({clock::now() - m_tp, _gasUsed, m_currentSuite + "/" + m_currentTest});
 }
 
 std::ostream& operator<<(std::ostream& out, Stats::clock::duration const& d)
@@ -78,15 +78,35 @@ Stats::~Stats()
 	if (Options::get().statsOutFile == "out")
 	{
 		for (auto&& s: m_stats)
-			out << "  " << std::setw(40) << std::left << s.name.substr(0, 40) << s.duration << " \n";
+		{
+			auto usecs = std::chrono::duration_cast<std::chrono::microseconds>(s.duration).count();
+			out << "  " << std::setw(40) << std::left << s.name.substr(0, 40) << s.duration;
+			if (s.gasUsed >= 0)
+			{
+				auto gasRate = uint64_t(double(s.gasUsed) * 1000 / usecs);
+				out << "\t" << std::setw(10) << std::right  << gasRate << " gas/ms\n";
+			}
+			else
+				out << "\tOOG\n";
+		}
 		out << "\n";
 	}
 	else if (!Options::get().statsOutFile.empty())
 	{
 		// Output stats to file
 		std::ofstream file{Options::get().statsOutFile};
 		for (auto&& s: m_stats)
-			file << s.name << "\t" << std::chrono::duration_cast<std::chrono::microseconds>(s.duration).count() << "\n";
+		{
+			auto usecs = std::chrono::duration_cast<std::chrono::microseconds>(s.duration).count();
+			file << s.name << "\t" << usecs;
+			if (s.gasUsed >= 0)
+			{
+				auto gasRate = s.gasUsed / usecs;
+				file << "\t" << gasRate << " gas/us\n";
+			}
+			else
+				file << "\tOOG\n";
+		}
 	}
 
 	out	<< "  tot: " << tot << "\n"

test/Stats.h

@@ -35,7 +35,8 @@ class Stats: public Listener
 	struct Item
 	{
 		clock::duration duration;
-		std::string 	name;
+		int64_t gasUsed;
+		std::string name;
 	};
 
 	static Stats& get();
@@ -44,7 +45,7 @@ class Stats: public Listener
 
 	void suiteStarted(std::string const& _name) override;
 	void testStarted(std::string const& _name) override;
-	void testFinished() override;
+	void testFinished(int64_t _gasUsed) override;
 
 private:
 	clock::time_point m_tp;

test/TestHelper.cpp

@@ -248,7 +248,7 @@ void replaceLLLinState(json_spirit::mObject& _o)
 }
 
 void ImportTest::importState(json_spirit::mObject const& _o, State& _state, AccountMaskMap& o_mask)
-{		
+{
 	//Compile LLL code of the test Fillers using external call to lllc
 	json_spirit::mObject o = _o;
 	replaceLLLinState(o);
@@ -323,7 +323,7 @@ void ImportTest::importTransaction (json_spirit::mObject const& _o, eth::Transac
 }
 
 void ImportTest::importTransaction(json_spirit::mObject const& o_tr)
-{	
+{
 	importTransaction(o_tr, m_transaction);
 }
 
@@ -372,7 +372,7 @@ int ImportTest::compareStates(State const& _stateExpect, State const& _statePost
 		}
 
 		if (_statePost.addressInUse(a.first))
-		{			
+		{
 
 			if (addressOptions.hasBalance())
 				CHECK((_stateExpect.balance(a.first) == _statePost.balance(a.first)),
@@ -428,7 +428,7 @@ int ImportTest::exportTest(bytes const& _output)
 		m_testObject.erase(m_testObject.find("expectOut"));
 	}
 
-	// export logs	
+	// export logs
 	m_testObject["logs"] = exportLog(m_logs);
 
 	// compare expected state with post state
@@ -600,7 +600,7 @@ LogEntries importLog(json_spirit::mArray& _a)
 	LogEntries logEntries;
 	for (auto const& l: _a)
 	{
-		json_spirit::mObject o = l.get_obj();		
+		json_spirit::mObject o = l.get_obj();
 		BOOST_REQUIRE(o.count("address") > 0);
 		BOOST_REQUIRE(o.count("topics") > 0);
 		BOOST_REQUIRE(o.count("data") > 0);
@@ -836,7 +836,7 @@ RLPStream createRLPStreamFromTransactionFields(json_spirit::mObject const& _tObj
 }
 
 Options::Options(int argc, char** argv)
-{	
+{
 	for (auto i = 0; i < argc; ++i)
 	{
 		auto arg = std::string{argv[i]};
@@ -1030,10 +1030,10 @@ void Listener::notifyTestStarted(std::string const& _name)
 		g_listener->testStarted(_name);
 }
 
-void Listener::notifyTestFinished()
+void Listener::notifyTestFinished(int64_t _gasUsed)
 {
 	if (g_listener)
-		g_listener->testFinished();
+		g_listener->testFinished(_gasUsed);
 }
 
 size_t TestOutputHelper::m_currTest = 0;
@@ -1062,12 +1062,12 @@ void TestOutputHelper::initTest(json_spirit::mValue& _v)
 	m_currentTestCaseName = boost::unit_test::framework::current_test_case().p_name;
 	std::cout << "Test Case \"" + m_currentTestCaseName + "\": " << std::endl;
 	m_maxTests = _v.get_obj().size();
-	m_currTest = 0;	
+	m_currTest = 0;
 }
 
 bool TestOutputHelper::passTest(json_spirit::mObject& _o, std::string& _testName)
 {
-	m_currTest++;	
+	m_currTest++;
 	int m_testsPerProgs = std::max(1, (int)(m_maxTests / 4));
 	if (m_currTest % m_testsPerProgs == 0 || m_currTest ==  m_maxTests)
 	{

test/TestHelper.h

@@ -133,7 +133,7 @@ class ImportTest
 	eth::State m_statePre;
 	eth::State m_statePost;
 	eth::EnvInfo m_envInfo;
-	eth::Transaction m_transaction;	
+	eth::Transaction m_transaction;
 	eth::LogEntries m_logs;
 	eth::LogEntries m_logsExpected;
 
@@ -245,7 +245,7 @@ class TestOutputHelper
 	TestOutputHelper() { TestOutputHelper::initTest(); }
 	static void initTest(int _maxTests = 1);
 	static void initTest(json_spirit::mValue& _v);
-	static bool passTest(json_spirit::mObject& _o, std::string& _testName);		
+	static bool passTest(json_spirit::mObject& _o, std::string& _testName);
 	static void setMaxTests(int _count) { m_maxTests = _count; }
 	static void setCurrentTestFileName(std::string _name) { m_currentTestFileName = _name; }
 	static std::string const& testName() { return m_currentTestName; }
@@ -268,21 +268,23 @@ class Listener
 
 	virtual void suiteStarted(std::string const&) {}
 	virtual void testStarted(std::string const& _name) = 0;
-	virtual void testFinished() = 0;
+	virtual void testFinished(int64_t _gasUsed) = 0;
 
 	static void registerListener(Listener& _listener);
 	static void notifySuiteStarted(std::string const& _name);
 	static void notifyTestStarted(std::string const& _name);
-	static void notifyTestFinished();
+	static void notifyTestFinished(int64_t _gasUsed);
 
 	/// Test started/finished notification RAII helper
 	class ExecTimeGuard
 	{
+		int64_t m_gasUsed = -1;
 	public:
 		ExecTimeGuard(std::string const& _testName) { notifyTestStarted(_testName);	}
-		~ExecTimeGuard() { notifyTestFinished(); }
+		~ExecTimeGuard() { notifyTestFinished(m_gasUsed); }
 		ExecTimeGuard(ExecTimeGuard const&) = delete;
 		ExecTimeGuard& operator=(ExecTimeGuard) = delete;
+		void setGasUsed(int64_t _gas) { m_gasUsed = _gas; }
 	};
 };
 

test/libevm/VMTestsFiller/loop-exp.sol

@@ -0,0 +1,45 @@
+pragma solidity ^0.4;
+
+contract ExpPerformanceTester {
+
+    function testExp(int exponent, int seed, uint n) external returns (int) {
+        int e = seed;
+        for (uint i = 0; i < n; i += 1) {
+            e = e ** exponent;
+        }
+        return e;
+    }
+
+    function testExpUnroll16(int exponent, int seed, uint n) external returns (int) {
+        int e = seed;
+        for (uint i = 0; i < n; i += 16) {
+            e = e ** exponent;
+            e = e ** exponent;
+            e = e ** exponent;
+            e = e ** exponent;
+            e = e ** exponent;
+            e = e ** exponent;
+            e = e ** exponent;
+            e = e ** exponent;
+            e = e ** exponent;
+            e = e ** exponent;
+            e = e ** exponent;
+            e = e ** exponent;
+            e = e ** exponent;
+            e = e ** exponent;
+            e = e ** exponent;
+            e = e ** exponent;
+        }
+        return e;
+    }
+
+    function testNop(int exponent, int seed, uint n) external returns (int) {
+        for (uint i = 0; i < n; i += 1) {}
+        return seed;
+    }
+
+    function testNopUnroll16(int exponent, int seed, uint n) external returns (int) {
+        for (uint i = 0; i < n; i += 16) {}
+        return seed;
+    }
+}