From 0cda3792d14ae2a20f28fccd8a95ad9034edcb6b Mon Sep 17 00:00:00 2001
From: Dominik Maier <domenukk@gmail.com>
Date: Fri, 27 Nov 2020 22:32:50 +0100
Subject: [PATCH] added xoshiro rand bench

---
 afl/Cargo.toml               |  4 ++++
 afl/benches/rand_speeds.rs   | 13 +++++++++++++
 afl/src/events/llmp.rs       |  2 +-
 afl/src/events/mod.rs        |  7 -------
 afl/src/lib.rs               |  1 -
 fuzzers/libfuzzer/src/lib.rs |  1 -
 6 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100644 afl/benches/rand_speeds.rs

diff --git a/afl/Cargo.toml b/afl/Cargo.toml
index 7fd34a1dce..89b498d3fa 100644
--- a/afl/Cargo.toml
+++ b/afl/Cargo.toml
@@ -9,6 +9,10 @@ edition = "2018"
 [dev-dependencies]
 criterion = "0.3" # Benchmarking
 
+[[bench]]
+name = "rand_speeds"
+harness = false
+
 [features]
 default = ["std"]
 std = []
diff --git a/afl/benches/rand_speeds.rs b/afl/benches/rand_speeds.rs
new file mode 100644
index 0000000000..67c6ac7d10
--- /dev/null
+++ b/afl/benches/rand_speeds.rs
@@ -0,0 +1,13 @@
+use afl::utils::{Rand, XorShift64Rand, Xoshiro256StarRand};
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
+
+fn criterion_benchmark(c: &mut Criterion) {
+    let mut xorshift = XorShift64Rand::new(0);
+    let mut xoshiro = Xoshiro256StarRand::new(0);
+
+    c.bench_function("xorshift", |b| b.iter(|| black_box(xorshift.next())));
+    c.bench_function("xoshiro", |b| b.iter(|| black_box(xoshiro.next())));
+}
+
+criterion_group!(benches, criterion_benchmark);
+criterion_main!(benches);
diff --git a/afl/src/events/llmp.rs b/afl/src/events/llmp.rs
index ae828d664a..3d14aa7a45 100644
--- a/afl/src/events/llmp.rs
+++ b/afl/src/events/llmp.rs
@@ -22,7 +22,7 @@ where
     //CE: CustomEvent<S, C, E, I, R>,
 {
     // TODO...
-    _marker: PhantomData<(S, C, E, I, R)>,
+    phantom: PhantomData<(S, C, E, I, R)>,
     is_broker: bool,
 }
 
diff --git a/afl/src/events/mod.rs b/afl/src/events/mod.rs
index bea579f838..487be3ad1c 100644
--- a/afl/src/events/mod.rs
+++ b/afl/src/events/mod.rs
@@ -328,13 +328,6 @@ where
         dbg!("Handled {} events", count);
         self.events.clear();
 
-        /*
-        let num = self.events.len();
-        for event in &self.events {}
-
-        self.events.clear();
-        */
-
         Ok(count)
     }
 }
diff --git a/afl/src/lib.rs b/afl/src/lib.rs
index 814b896820..da4070ae12 100644
--- a/afl/src/lib.rs
+++ b/afl/src/lib.rs
@@ -19,7 +19,6 @@ use alloc::string::String;
 use core::fmt;
 #[cfg(feature = "std")]
 use std::io;
-use xxhash_rust::const_xxh3::xxh3_64_with_seed;
 
 /// Main error struct for AFL
 #[derive(Debug)]
diff --git a/fuzzers/libfuzzer/src/lib.rs b/fuzzers/libfuzzer/src/lib.rs
index 50111bfe95..389c88b2f5 100644
--- a/fuzzers/libfuzzer/src/lib.rs
+++ b/fuzzers/libfuzzer/src/lib.rs
@@ -1,6 +1,5 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[macro_use]
 extern crate alloc;
 
 use alloc::boxed::Box;