fbf425c4e2
* Add client-traits crate Move the BlockInfo trait to new crate * New crate `machine` Contains code extracted from ethcore that defines `Machine`, `Externalities` and other execution related code. * Use new machine and client-traits crates in ethcore * Use new crates machine and client-traits instead of ethcore where appropriate * Fix tests * Don't re-export so many types from ethcore::client * Fixing more fallout from removing re-export * fix test * More fallout from not re-exporting types * Add some docs * cleanup * import the macro edition style * Tweak docs * Add missing import * remove unused ethabi_derive imports * Use latest ethabi-contract * Move many traits from ethcore/client/traits to client-traits crate Initial version of extracted Engine trait * Move snapshot related traits to the engine crate (eew) * Move a few snapshot related types to common_types Cleanup Executed as exported from machine crate * fix warning * Gradually introduce new engine crate: snapshot * ethcore typechecks with new engine crate * Sort out types outside ethcore * Add an EpochVerifier to ethash and use that in Engine.epoch_verifier() Cleanup * Document pub members * Sort out tests Sort out default impls for EpochVerifier * Add test-helpers feature and move EngineSigner impl to the right place * Sort out tests * Sort out tests and refactor verification types * Fix missing traits * More missing traits Fix Histogram * Fix tests and cleanup * cleanup * Put back needed logger import * Don't rexport common_types from ethcore/src/client Don't export ethcore::client::* * Remove files no longer used Use types from the engine crate Explicit exports from engine::engine * Get rid of itertools * Move a few more traits from ethcore to client-traits: BlockChainReset, ScheduleInfo, StateClient * Move ProvingBlockChainClient to client-traits * Don't re-export ForkChoice and Transition from ethcore * Address grumbles: sort imports, remove commented out code * Fix merge resolution error * Extract the Clique engine to own crate * Extract NullEngine and the block_reward module from ethcore * Extract InstantSeal engine to own crate * Extract remaining engines * Extract executive_state to own crate so it can be used by engine crates * Remove snapshot stuff from the engine crate * Put snapshot traits back in ethcore * cleanup * Remove stuff from ethcore * Don't use itertools * itertools in aura is legit-ish * More post-merge fixes * Re-export less types in client * cleanup * Extract spec to own crate * Put back the test-helpers from basic-authority * Fix ethcore benchmarks * Reduce the public api of ethcore/verification * Update ethcore/block-reward/Cargo.toml Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * Update ethcore/engines/basic-authority/Cargo.toml Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * Update ethcore/engines/ethash/Cargo.toml Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * Update ethcore/engines/clique/src/lib.rs Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * signers is already a ref * Add an EngineType enum to tighten up Engine.name() * Introduce Snapshotting enum to distinguish the type of snapshots a chain uses * Rename supports_warp to snapshot_mode * Missing import * Update ethcore/src/snapshot/consensus/mod.rs Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * missing import * Fix import * double semi
145 lines
4.7 KiB
Rust
145 lines
4.7 KiB
Rust
// Copyright 2015-2019 Parity Technologies (UK) Ltd.
|
|
// This file is part of Parity Ethereum.
|
|
|
|
// Parity Ethereum 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.
|
|
|
|
// Parity Ethereum 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 Parity Ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
#[macro_use]
|
|
extern crate criterion;
|
|
extern crate ethash;
|
|
extern crate common_types;
|
|
|
|
use criterion::Criterion;
|
|
use ethash::NodeCacheBuilder;
|
|
use common_types::engines::OptimizeFor;
|
|
|
|
const HASH: [u8; 32] = [
|
|
0xf5, 0x7e, 0x6f, 0x3a, 0xcf, 0xc0, 0xdd, 0x4b,
|
|
0x5b, 0xf2, 0xbe, 0xe4, 0x0a, 0xb3, 0x35, 0x8a,
|
|
0xa6, 0x87, 0x73, 0xa8, 0xd0, 0x9f, 0x5e, 0x59,
|
|
0x5e, 0xab, 0x55, 0x94, 0x05, 0x52, 0x7d, 0x72,
|
|
];
|
|
const MIX_HASH: [u8; 32] = [
|
|
0x1f, 0xff, 0x04, 0xce, 0xc9, 0x41, 0x73, 0xfd,
|
|
0x59, 0x1e, 0x3d, 0x89, 0x60, 0xce, 0x6b, 0xdf,
|
|
0x8b, 0x19, 0x71, 0x04, 0x8c, 0x71, 0xff, 0x93,
|
|
0x7b, 0xb2, 0xd3, 0x2a, 0x64, 0x31, 0xab, 0x6d,
|
|
];
|
|
const NONCE: u64 = 0xd7b3ac70a301a249;
|
|
|
|
criterion_group! {
|
|
name = basic;
|
|
config = dont_take_an_eternity_to_run();
|
|
targets = bench_light_compute_memmap,
|
|
bench_light_compute_memory,
|
|
bench_light_new_round_trip_memmap,
|
|
bench_light_new_round_trip_memory,
|
|
bench_light_from_file_round_trip_memory,
|
|
bench_light_from_file_round_trip_memmap,
|
|
bench_quick_get_difficulty,
|
|
}
|
|
criterion_main!(basic);
|
|
|
|
fn dont_take_an_eternity_to_run() -> Criterion {
|
|
Criterion::default().nresamples(1_000)
|
|
.without_plots()
|
|
.sample_size(10)
|
|
}
|
|
|
|
fn bench_light_compute_memmap(b: &mut Criterion) {
|
|
use std::env;
|
|
|
|
let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
|
|
let light = builder.light(&env::temp_dir(), 486382);
|
|
|
|
b.bench_function("bench_light_compute_memmap", move |b| b.iter(|| light.compute(&HASH, NONCE, u64::max_value())));
|
|
}
|
|
|
|
fn bench_light_compute_memory(b: &mut Criterion) {
|
|
use std::env;
|
|
|
|
let builder = NodeCacheBuilder::new(OptimizeFor::Cpu, u64::max_value());
|
|
let light = builder.light(&env::temp_dir(), 486382);
|
|
|
|
b.bench_function("bench_light_compute_memory", move |b| b.iter(|| light.compute(&HASH, NONCE, u64::max_value())));
|
|
}
|
|
|
|
fn bench_light_new_round_trip_memmap(b: &mut Criterion) {
|
|
use std::env;
|
|
|
|
b.bench_function("bench_light_new_round_trip_memmap", move |b| b.iter(|| {
|
|
let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
|
|
let light = builder.light(&env::temp_dir(), 486382);
|
|
light.compute(&HASH, NONCE, u64::max_value());
|
|
}));
|
|
}
|
|
|
|
fn bench_light_new_round_trip_memory(b: &mut Criterion) {
|
|
use std::env;
|
|
|
|
b.bench_function("bench_light_new_round_trip_memory", move |b| b.iter(|| {
|
|
let builder = NodeCacheBuilder::new(OptimizeFor::Cpu, u64::max_value());
|
|
let light = builder.light(&env::temp_dir(), 486382);
|
|
light.compute(&HASH, NONCE, u64::max_value());
|
|
}));
|
|
}
|
|
|
|
fn bench_light_from_file_round_trip_memory(b: &mut Criterion) {
|
|
use std::env;
|
|
|
|
let dir = env::temp_dir();
|
|
let height = 486382;
|
|
{
|
|
let builder = NodeCacheBuilder::new(OptimizeFor::Cpu, u64::max_value());
|
|
let mut dummy = builder.light(&dir, height);
|
|
dummy.to_file().unwrap();
|
|
}
|
|
|
|
b.bench_function("bench_light_from_file_round_trip_memory", move |b| b.iter(|| {
|
|
let builder = NodeCacheBuilder::new(OptimizeFor::Cpu, u64::max_value());
|
|
let light = builder.light_from_file(&dir, 486382).unwrap();
|
|
light.compute(&HASH, NONCE, u64::max_value());
|
|
}));
|
|
}
|
|
|
|
fn bench_light_from_file_round_trip_memmap(b: &mut Criterion) {
|
|
use std::env;
|
|
|
|
let dir = env::temp_dir();
|
|
let height = 486382;
|
|
|
|
{
|
|
let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
|
|
let mut dummy = builder.light(&dir, height);
|
|
dummy.to_file().unwrap();
|
|
}
|
|
|
|
b.bench_function("bench_light_from_file_round_trip_memmap", move |b| b.iter(|| {
|
|
let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
|
|
let light = builder.light_from_file(&dir, 486382).unwrap();
|
|
light.compute(&HASH, NONCE, u64::max_value());
|
|
}));
|
|
}
|
|
|
|
fn bench_quick_get_difficulty(b: &mut Criterion) {
|
|
b.bench_function("bench_quick_get_difficulty", move |b| b.iter(|| {
|
|
let d = ethash::quick_get_difficulty(&HASH, NONCE, &MIX_HASH, false);
|
|
let boundary_good = [
|
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 0x9b, 0x6c, 0x69, 0xbc, 0x2c, 0xe2, 0xa2,
|
|
0x4a, 0x8e, 0x95, 0x69, 0xef, 0xc7, 0xd7, 0x1b, 0x33, 0x35, 0xdf, 0x36, 0x8c, 0x9a,
|
|
0xe9, 0x7e, 0x53, 0x84,
|
|
];
|
|
assert_eq!(d[..], boundary_good[..]);
|
|
}));
|
|
}
|