Add opcode benchmarking

ethereum · Jun 5, 2019 · 932fdd9 · 932fdd9
1 parent 25372c6
commit 932fdd9
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 1 deletion.
diff --git a/libethereum/BlockChain.cpp b/libethereum/BlockChain.cpp
@@ -34,6 +34,7 @@
 #include <libdevcore/TrieHash.h>
 #include <libethcore/BlockHeader.h>
 #include <libethcore/Exceptions.h>
+#include <libevm/LegacyVM.h>
 
 #include <boost/exception/errinfo_nested_exception.hpp>
 #include <boost/filesystem.hpp>
@@ -707,6 +708,18 @@ ImportRoute BlockChain::import(VerifiedBlockRef const& _block, OverlayDB const&
 
         performanceLogger.onStageFinished("enactment");
 
+        if (_block.info.number() % 10000 == 0)
+        {
+            std::string filename = "metrics_to_" + toString(_block.info.number());
+            std::ofstream f(filename);
+            f << "[";
+            for (auto const& meter : g_measurements)
+                f << "{\"Num\":" << meter.count << ",\"Time\":" << meter.time.count() << "},";
+            f.seekp(-1, ios_base::cur);
+            f << "]";
+            clog(VerbosityInfo, "chain") << "Dumped stats to " << filename;
+        }
+
 #if ETH_PARANOIA
         checkConsistency();
 #endif // ETH_PARANOIA

diff --git a/libethereum/State.cpp b/libethereum/State.cpp
@@ -29,6 +29,7 @@
 #include <libdevcore/DBFactory.h>
 #include <libdevcore/TrieHash.h>
 #include <libevm/VMFactory.h>
+#include <libevm/LegacyVM.h>
 #include <boost/filesystem.hpp>
 #include <boost/timer.hpp>
 
@@ -610,6 +611,7 @@ std::pair<ExecutionResult, TransactionReceipt> State::execute(EnvInfo const& _en
 #endif
     u256 const startGasUsed = _envInfo.gasUsed();
     bool const statusCode = executeTransaction(e, _t, onOp);
+    g_currentOp = 0;
 
     bool removeEmptyAccounts = false;
     switch (_p)

diff --git a/libevm/LegacyVM.cpp b/libevm/LegacyVM.cpp
@@ -21,6 +21,10 @@ using namespace std;
 using namespace dev;
 using namespace dev::eth;
 
+std::array<OpcodeMeter, 256> dev::eth::g_measurements{};
+std::chrono::high_resolution_clock::time_point dev::eth::g_startTime;
+int dev::eth::g_currentOp = 0;
+
 uint64_t LegacyVM::memNeed(u256 const& _offset, u256 const& _size)
 {
     return toInt63(_size ? u512(_offset) + _size : u512(0));

diff --git a/libevm/LegacyVM.h b/libevm/LegacyVM.h
@@ -217,5 +217,16 @@ class LegacyVM: public VMFace
 #endif
 };
 
+struct OpcodeMeter
+{
+    uint64_t count = 0;
+    std::chrono::high_resolution_clock::duration time{0};
+};
+
+extern std::array<OpcodeMeter, 256> g_measurements;
+
+extern std::chrono::high_resolution_clock::time_point g_startTime;
+extern int g_currentOp;
+
 }
 }
diff --git a/libevm/LegacyVMConfig.h b/libevm/LegacyVMConfig.h
@@ -425,7 +425,12 @@ namespace dev
     fetchInstruction(); \
     goto* jumpTable[(int)m_OP];
 #define CASE(name) \
-    name:
+    name: \
+    if (g_currentOp != 0) { \
+        g_measurements[g_currentOp].time += std::chrono::high_resolution_clock::now() - g_startTime; \
+        ++g_measurements[g_currentOp].count; }\
+    g_currentOp = (int)m_OP; \
+    g_startTime = std::chrono::high_resolution_clock::now();
 #define NEXT            \
     ++m_PC;             \
     fetchInstruction(); \