6 files changed, 3 insertions, 45 deletions
diff --git a/benchmark/benchmark.py b/benchmark/benchmark.py
index 85dc7fd3..b3d55f21 100644..100755
--- a/benchmark/benchmark.py
+++ b/benchmark/benchmark.py
@@ -64,7 +64,7 @@ env_vars = {
 parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter)
 parser.add_argument("-b", "--basedir", help="directory to use for temp files", type=str, default="/tmp/aflpp-benchmark")
 parser.add_argument("-d", "--debug", help="show verbose debugging output", action="store_true")
-parser.add_argument("-r", "--runs", help="how many runs to average results over", type=int, default=2)
+parser.add_argument("-r", "--runs", help="how many runs to average results over", type=int, default=3)
 parser.add_argument("-f", "--fuzzers", help="how many afl-fuzz workers to use", type=int, default=cpu_count)
 parser.add_argument("-m", "--mode", help="pick modes", action="append", default=modes, choices=modes)
 parser.add_argument("-c", "--comment", help="add a comment about your setup", type=str, default="")
diff --git a/benchmark/benchmark.sh b/benchmark/benchmark.sh
deleted file mode 100755
index 3318adce..00000000
--- a/benchmark/benchmark.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-test -x ../afl-fuzz -a -x ../afl-cc -a -e ../SanitizerCoveragePCGUARD.so || {
-  echo Error: you need to compile AFL++ first, we need afl-fuzz, afl-clang-fast and SanitizerCoveragePCGUARD.so built.
-  exit 1
-}
-
-echo Preparing environment
-
-env | grep AFL_ | sed 's/=.*//' | while read e; do
-  unset $e
-done
-
-AFL_PATH=`pwd`/..
-export PATH=$AFL_PATH:$PATH
-
-AFL_LLVM_INSTRUMENT=PCGUARD afl-cc -o test-instr ../test-instr.c > afl.log 2>&1 || {
-  echo Error: afl-cc is unable to compile
-  exit 1
-}
-
-{
-mkdir in
-dd if=/dev/zero of=in/in.txt bs=10K count=1
-} > /dev/null 2>&1
-
-echo Ready, starting benchmark - this will take approx 20-30 seconds ...
-
-AFL_DISABLE_TRIM=1 AFL_NO_UI=1 AFL_TRY_AFFINITY=1 AFL_I_DONT_CARE_ABOUT_MISSING_CRASHES=1 AFL_BENCH_JUST_ONE=1 time afl-fuzz -i in -o out -s 123 -D ./test-instr >> afl.log 2>&1
-
-echo Analysis:
-
-CPUID=$(grep 'try binding to' afl.log | tail -n 1 | sed 's/.*#//' | sed 's/\..*//')
-grep 'model name' /proc/cpuinfo | head -n 1 | sed 's/.*:/ CPU:/'
-test -n "$CPUID" && grep -E '^processor|^cpu MHz' /proc/cpuinfo | grep -A1 -w "$CPUID" | grep 'cpu MHz' | head -n 1 | sed 's/.*:/ Mhz:/'
-test -z "$CPUID" && grep 'cpu MHz' /proc/cpuinfo | head -n 1 | sed 's/.*:/ Mhz:/'
-grep execs_per_sec out/default/fuzzer_stats | sed 's/.*:/ execs\/s:/'
-
-echo
-echo "Comparison: (note that values can change by 10-15% per run)"
-cat COMPARISON
-
-rm -rf in out test-instr afl.log
diff --git a/nyx_mode/LIBNYX_VERSION b/nyx_mode/LIBNYX_VERSION
index a4ffd230..da3939ad 100644
--- a/nyx_mode/LIBNYX_VERSION
+++ b/nyx_mode/LIBNYX_VERSION
@@ -1 +1 @@
-8291ef4
+512058a
diff --git a/nyx_mode/QEMU-Nyx b/nyx_mode/QEMU-Nyx
-Subproject 874fa033d117a3e9931245cb9e82836a4abc042
+Subproject 02a6f2aed360cfe76bb3d788dafe517c350d74e
diff --git a/nyx_mode/QEMU_NYX_VERSION b/nyx_mode/QEMU_NYX_VERSION
index d0a435a4..4f58054c 100644
--- a/nyx_mode/QEMU_NYX_VERSION
+++ b/nyx_mode/QEMU_NYX_VERSION
@@ -1 +1 @@
-874fa033d1
+02a6f2aed3
diff --git a/nyx_mode/libnyx b/nyx_mode/libnyx
-Subproject 8291ef4cb4f1d4bfe3026fe198167fd5c98e3a1
+Subproject 512058a68d58b1a90a4e3971b526a955559735b