From 8ee76bcea018af2cb089adfa2494423452529a65 Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Mon, 19 Mar 2018 16:39:01 -0600 Subject: [PATCH 1/2] Fix benchmark build --- src/ledger.rs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/ledger.rs b/src/ledger.rs index 21dfd7827..bb216ff30 100644 --- a/src/ledger.rs +++ b/src/ledger.rs @@ -70,13 +70,4 @@ mod bench { assert!(verify_slice(&events, &start_hash)); }); } - - #[bench] - fn event_bench_seq(bencher: &mut Bencher) { - let start_hash = Default::default(); - let events = next_ticks(&start_hash, 10_000, 8); - bencher.iter(|| { - assert!(verify_slice_seq(&events, &start_hash)); - }); - } } From caa9a846ed225dc5d50076836fb3d49a31684f70 Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Mon, 19 Mar 2018 16:42:28 -0600 Subject: [PATCH 2/2] Boot sha2-asm Stick with pure Rust until someone can write a benchmark that demonstrates that sha2-asm adds value. If we go with a GPU implementation first, we may never need to do that. --- .travis.yml | 2 +- Cargo.toml | 2 -- README.md | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index da4cd01db..9ee3205fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ matrix: - rust: stable - rust: nightly env: - - FEATURES='asm,unstable' + - FEATURES='unstable' before_script: | export PATH="$PATH:$HOME/.cargo/bin" rustup component add rustfmt-preview diff --git a/Cargo.toml b/Cargo.toml index 9afbb6822..a89bd7864 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,12 +41,10 @@ codecov = { repository = "loomprotocol/silk", branch = "master", service = "gith [features] unstable = [] ipv6 = [] -asm = ["sha2-asm"] [dependencies] rayon = "1.0.0" sha2 = "0.7.0" -sha2-asm = {version="0.3", optional=true} generic-array = { version = "0.9.0", default-features = false, features = ["serde"] } serde = "1.0.27" serde_derive = "1.0.27" diff --git a/README.md b/README.md index cde984d1e..1e4869bcb 100644 --- a/README.md +++ b/README.md @@ -128,5 +128,5 @@ $ rustup install nightly Run the benchmarks: ```bash -$ cargo +nightly bench --features="asm,unstable" +$ cargo +nightly bench --features="unstable" ```