Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions lib/evmone/baseline.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,7 @@ CodeAnalysis::JumpdestMap analyze_jumpdests(bytes_view code)
// static_cast<int8_t>(op) <= OP_PUSH32 is always true and can be skipped.
static_assert(OP_PUSH32 == std::numeric_limits<int8_t>::max());

CodeAnalysis::JumpdestMap map(code.size()); // Allocate and init bitmap with zeros.
for (size_t i = 0; i < code.size(); ++i)
{
const auto op = code[i];
if (static_cast<int8_t>(op) >= OP_PUSH1) // If any PUSH opcode (see explanation above).
i += op - size_t{OP_PUSH1 - 1}; // Skip PUSH data.
else if (INTX_UNLIKELY(op == OP_JUMPDEST))
map[i] = true;
}
CodeAnalysis::JumpdestMap map(code.size(), true); // Allocate and init bitmap with ones.

return map;
}
Expand Down
18 changes: 18 additions & 0 deletions test/statetest/statetest_runner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,13 @@ void run_state_test(const StateTransitionTest& test, evmc::VM& vm, bool trace_su
const auto tx = test.multi_tx.get(expected.indexes);
auto state = test.pre_state;

const auto start_time = std::chrono::steady_clock::now();

const auto res = state::transition(state, test.block, tx, rev, vm, test.block.gas_limit,
state::BlockInfo::MAX_BLOB_GAS_PER_BLOCK);

const auto exec_duration = std::chrono::steady_clock::now() - start_time;

// Finalize block with reward 0.
state::finalize(state, rev, test.block.coinbase, 0, {}, {});

Expand All @@ -46,8 +50,22 @@ void run_state_test(const StateTransitionTest& test, evmc::VM& vm, bool trace_su
else
std::clog << R"("pass":false,"error":")" << r.status << '"';
std::clog << R"(,"gasUsed":"0x)" << std::hex << r.gas_used << R"(",)";

if (r.status == EVMC_SUCCESS)
{
std::clog << "LOGS:\n";
for (const auto& log : r.logs)
{
std::clog << log.addr << ": " << hex(log.data) << "\n";
}
}
}
std::clog << R"("stateRoot":"0x)" << hex(state_root) << "\"}\n";

std::clog
<< "time: " << std::dec
<< std::chrono::duration_cast<std::chrono::microseconds>(exec_duration).count()
<< "us\n";
}

if (expected.exception)
Expand Down