Simplify JIT logs

libevmjit/Compiler.cpp

@@ -2,6 +2,7 @@
 #include "Compiler.h"
 
 #include <fstream>
+#include <chrono>
 
 #include <boost/dynamic_bitset.hpp>
 
@@ -152,6 +153,7 @@ void Compiler::createBasicBlocks(bytes const& _bytecode)
 
 std::unique_ptr<llvm::Module> Compiler::compile(bytes const& _bytecode)
 {
+	auto compilationStartTime = std::chrono::high_resolution_clock::now();
 	auto module = std::unique_ptr<llvm::Module>(new llvm::Module("main", m_builder.getContext()));
 
 	// Create main function
@@ -242,6 +244,8 @@ std::unique_ptr<llvm::Module> Compiler::compile(bytes const& _bytecode)
 		fpManager.run(*m_mainFunc);
 	}
 
+	auto compilationEndTime = std::chrono::high_resolution_clock::now();
+	clog(JIT) << "JIT: " << std::chrono::duration_cast<std::chrono::milliseconds>(compilationEndTime - compilationStartTime).count();
 	return module;
 }
 

libevmjit/ExecutionEngine.cpp

@@ -69,11 +69,12 @@ int ExecutionEngine::run(std::unique_ptr<llvm::Module> _module, RuntimeData* _da
 		return -1; // FIXME: Handle internal errors
 	_module.release();  // Successfully created llvm::ExecutionEngine takes ownership of the module
 
-	auto finalizationStartTime = std::chrono::high_resolution_clock::now();
+	auto finalizationStartTime = std::chrono::high_resolution_clock::now(); // FIXME: It's not compilation time
 	exec->finalizeObject();
 	auto finalizationEndTime = std::chrono::high_resolution_clock::now();
-	clog(JIT) << "Module finalization time: "
+	clog(JIT) << " + " << std::chrono::duration_cast<std::chrono::milliseconds>(finalizationEndTime - finalizationStartTime).count();
-			  << std::chrono::duration_cast<std::chrono::microseconds>(finalizationEndTime - finalizationStartTime).count();
+
+	auto executionStartTime = std::chrono::high_resolution_clock::now();
 
 	auto entryFunc = module->getFunction("main");
 	if (!entryFunc)
@@ -85,21 +86,15 @@ int ExecutionEngine::run(std::unique_ptr<llvm::Module> _module, RuntimeData* _da
 	auto r = setjmp(buf);
 	if (r == 0)
 	{
-
-		auto executionStartTime = std::chrono::high_resolution_clock::now();
-
 		auto result = exec->runFunction(entryFunc, {{}, llvm::GenericValue(&runtime)});
 		returnCode = static_cast<ReturnCode>(result.IntVal.getZExtValue());
-
-		auto executionEndTime = std::chrono::high_resolution_clock::now();
-		clog(JIT) << "Execution time : "
-				  << std::chrono::duration_cast<std::chrono::microseconds>(executionEndTime - executionStartTime).count();
-
 	}
 	else
 		returnCode = static_cast<ReturnCode>(r);
 	
-	clog(JIT) << "Max stack size: " << Stack::maxStackSize;
+	auto executionEndTime = std::chrono::high_resolution_clock::now();
+	clog(JIT) << " + " << std::chrono::duration_cast<std::chrono::milliseconds>(executionEndTime - executionStartTime).count() << " ms ";
+	//clog(JIT) << "Max stack size: " << Stack::maxStackSize;
 
 	if (returnCode == ReturnCode::Return)
 	{
@@ -114,6 +109,8 @@ int ExecutionEngine::run(std::unique_ptr<llvm::Module> _module, RuntimeData* _da
 	else
 		clog(JIT) << "RETURN " << (int)returnCode;
 
+	clog(JIT) << "\n";
+
 	return static_cast<int>(returnCode);
 }
 

libevmjit/Utils.h

@@ -14,7 +14,7 @@ namespace jit
 
 struct JIT: public NoteChannel  { static const char* name() { return "JIT"; } };
 
-#define clog(CHANNEL) std::cerr << CHANNEL::name() << ": "
+#define clog(CHANNEL) std::cerr
 
 /// Representation of 256-bit value binary compatible with LLVM i256
 // TODO: Replace with h256