Change fuzzing configs for changes to AFL++

Signed-off-by: Gavin D. Howard <gavin@gavinhoward.com>

3 files changed, 32 insertions, 30 deletions

diff --git a/scripts/fuzz_prep.sh b/scripts/fuzz_prep.sh
index ce3c9a13..9c4e91d9 100755
--- a/scripts/fuzz_prep.sh
+++ b/scripts/fuzz_prep.sh
@@ -87,6 +87,8 @@ fi
 export AFL_LLVM_LAF_SPLIT_SWITCHES=1
 export AFL_LLVM_LAF_TRANSFORM_COMPARES=1
 export AFL_LLVM_LAF_SPLIT_COMPARES=1
+export AFL_LLVM_LTO_CALLER=1
+export AFL_LLVM_LTO_CALLER_DEPTH=5
 
 # We want a debug build because asserts are counted as crashes too.
 CC="$CC" CFLAGS="$CFLAGS" ./configure.sh -gO3 -z
diff --git a/tests/fuzzing/bc_afl.yaml b/tests/fuzzing/bc_afl.yaml
index 7df0270e..91c5b96b 100644
--- a/tests/fuzzing/bc_afl.yaml
+++ b/tests/fuzzing/bc_afl.yaml
@@ -25,7 +25,7 @@ windows:
         - unset BC_EXPR_EXIT
         - unset BC_DIGIT_CLAMP
         - sleep 15
-        - afl-fuzz -i tests/fuzzing/bc_inputs1 -o tests/fuzzing/bc_outputs1 -p fast -D -M bc11 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
+        - afl-fuzz -i tests/fuzzing/bc_inputs1 -o tests/fuzzing/bc_outputs1 -p fast -M bc11 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
   - window_name: bc12
     layout: even-horizontal
     panes:
@@ -41,7 +41,7 @@ windows:
         - unset BC_EXPR_EXIT
         - unset BC_DIGIT_CLAMP
         - sleep 16
-        - afl-fuzz -i tests/fuzzing/bc_inputs1 -o tests/fuzzing/bc_outputs1 -p coe -S bc12 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
+        - afl-fuzz -i tests/fuzzing/bc_inputs1 -o tests/fuzzing/bc_outputs1 -p coe -z -S bc12 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
   - window_name: bc13
     layout: even-horizontal
     panes:
@@ -57,7 +57,7 @@ windows:
         - unset BC_EXPR_EXIT
         - unset BC_DIGIT_CLAMP
         - sleep 17
-        - afl-fuzz -i tests/fuzzing/bc_inputs1 -o tests/fuzzing/bc_outputs1 -p exploit -S bc13 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
+        - afl-fuzz -i tests/fuzzing/bc_inputs1 -o tests/fuzzing/bc_outputs1 -p exploit -z -S bc13 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
   - window_name: bc14
     layout: even-horizontal
     panes:
@@ -73,7 +73,7 @@ windows:
         - unset BC_EXPR_EXIT
         - unset BC_DIGIT_CLAMP
         - sleep 18
-        - afl-fuzz -i tests/fuzzing/bc_inputs1 -o tests/fuzzing/bc_outputs1 -p explore -S bc14 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
+        - afl-fuzz -i tests/fuzzing/bc_inputs1 -o tests/fuzzing/bc_outputs1 -p explore -z -S bc14 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
   - window_name: bc15
     layout: even-horizontal
     panes:
@@ -89,7 +89,7 @@ windows:
         - unset BC_EXPR_EXIT
         - unset BC_DIGIT_CLAMP
         - sleep 19
-        - afl-fuzz -i tests/fuzzing/bc_inputs1 -o tests/fuzzing/bc_outputs1 -p exploit -D -S bc15 bin/bc -lqC -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
+        - afl-fuzz -i tests/fuzzing/bc_inputs1 -o tests/fuzzing/bc_outputs1 -p exploit -S bc15 bin/bc -lqC -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
   - window_name: bc21
     layout: even-horizontal
     panes:
@@ -105,7 +105,7 @@ windows:
         - unset BC_EXPR_EXIT
         - unset BC_DIGIT_CLAMP
         - sleep 23
-        - afl-fuzz -i tests/fuzzing/bc_inputs2 -o tests/fuzzing/bc_outputs2 -p fast -D -M bc21 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
+        - afl-fuzz -i tests/fuzzing/bc_inputs2 -o tests/fuzzing/bc_outputs2 -p fast -M bc21 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
   - window_name: bc22
     layout: even-horizontal
     panes:
@@ -121,7 +121,7 @@ windows:
         - unset BC_EXPR_EXIT
         - unset BC_DIGIT_CLAMP
         - sleep 24
-        - afl-fuzz -i tests/fuzzing/bc_inputs2 -o tests/fuzzing/bc_outputs2 -p coe -S bc22 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
+        - afl-fuzz -i tests/fuzzing/bc_inputs2 -o tests/fuzzing/bc_outputs2 -p coe -z -S bc22 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
   - window_name: bc23
     layout: even-horizontal
     panes:
@@ -137,7 +137,7 @@ windows:
         - unset BC_EXPR_EXIT
         - unset BC_DIGIT_CLAMP
         - sleep 25
-        - afl-fuzz -i tests/fuzzing/bc_inputs2 -o tests/fuzzing/bc_outputs2 -p exploit -S bc23 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
+        - afl-fuzz -i tests/fuzzing/bc_inputs2 -o tests/fuzzing/bc_outputs2 -p exploit -z -S bc23 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
   - window_name: bc24
     layout: even-horizontal
     panes:
@@ -153,7 +153,7 @@ windows:
         - unset BC_EXPR_EXIT
         - unset BC_DIGIT_CLAMP
         - sleep 26
-        - afl-fuzz -i tests/fuzzing/bc_inputs2 -o tests/fuzzing/bc_outputs2 -p explore -S bc24 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
+        - afl-fuzz -i tests/fuzzing/bc_inputs2 -o tests/fuzzing/bc_outputs2 -p explore -z -S bc24 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
   - window_name: bc25
     layout: even-horizontal
     panes:
@@ -169,7 +169,7 @@ windows:
         - unset BC_EXPR_EXIT
         - unset BC_DIGIT_CLAMP
         - sleep 27
-        - afl-fuzz -i tests/fuzzing/bc_inputs2 -o tests/fuzzing/bc_outputs2 -p exploit -D -S bc25 bin/bc -lqC -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
+        - afl-fuzz -i tests/fuzzing/bc_inputs2 -o tests/fuzzing/bc_outputs2 -p exploit -S bc25 bin/bc -lqC -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
   - window_name: dc11
     layout: even-horizontal
     panes:
@@ -183,7 +183,7 @@ windows:
         - unset DC_EXPR_EXIT
         - unset DC_DIGIT_CLAMP
         - sleep 28
-        - afl-fuzz -i tests/fuzzing/dc_inputs -o tests/fuzzing/dc_outputs -p fast -D -M dc11 bin/dc -xc -e "1280937142.20981723890730892738902938071028973408912703984712093j" -f-
+        - afl-fuzz -i tests/fuzzing/dc_inputs -o tests/fuzzing/dc_outputs -p fast -M dc11 bin/dc -xc -e "1280937142.20981723890730892738902938071028973408912703984712093j" -f-
   - window_name: dc12
     layout: even-horizontal
     panes:
@@ -197,7 +197,7 @@ windows:
         - unset DC_EXPR_EXIT
         - unset DC_DIGIT_CLAMP
         - sleep 29
-        - afl-fuzz -i tests/fuzzing/dc_inputs -o tests/fuzzing/dc_outputs -p coe -S dc12 bin/dc -xc -e "1280937142.20981723890730892738902938071028973408912703984712093j" -f-
+        - afl-fuzz -i tests/fuzzing/dc_inputs -o tests/fuzzing/dc_outputs -p coe -z -S dc12 bin/dc -xc -e "1280937142.20981723890730892738902938071028973408912703984712093j" -f-
   - window_name: dc13
     layout: even-horizontal
     panes:
@@ -211,7 +211,7 @@ windows:
         - unset DC_EXPR_EXIT
         - unset DC_DIGIT_CLAMP
         - sleep 30
-        - afl-fuzz -i tests/fuzzing/dc_inputs -o tests/fuzzing/dc_outputs -p exploit -S dc13 bin/dc -xc -e "1280937142.20981723890730892738902938071028973408912703984712093j" -f-
+        - afl-fuzz -i tests/fuzzing/dc_inputs -o tests/fuzzing/dc_outputs -p exploit -z -S dc13 bin/dc -xc -e "1280937142.20981723890730892738902938071028973408912703984712093j" -f-
   - window_name: dc14
     layout: even-horizontal
     panes:
@@ -225,7 +225,7 @@ windows:
         - unset DC_EXPR_EXIT
         - unset DC_DIGIT_CLAMP
         - sleep 31
-        - afl-fuzz -i tests/fuzzing/dc_inputs -o tests/fuzzing/dc_outputs -p explore -S dc14 bin/dc -xc -e "1280937142.20981723890730892738902938071028973408912703984712093j" -f-
+        - afl-fuzz -i tests/fuzzing/dc_inputs -o tests/fuzzing/dc_outputs -p explore -z -S dc14 bin/dc -xc -e "1280937142.20981723890730892738902938071028973408912703984712093j" -f-
   - window_name: dc15
     layout: even-horizontal
     panes:
@@ -239,4 +239,4 @@ windows:
         - unset DC_EXPR_EXIT
         - unset DC_DIGIT_CLAMP
         - sleep 32
-        - afl-fuzz -i tests/fuzzing/dc_inputs -o tests/fuzzing/dc_outputs -p exploit -D -S dc15 bin/dc -xC -e "1280937142.20981723890730892738902938071028973408912703984712093j" -f-
+        - afl-fuzz -i tests/fuzzing/dc_inputs -o tests/fuzzing/dc_outputs -p exploit -S dc15 bin/dc -xC -e "1280937142.20981723890730892738902938071028973408912703984712093j" -f-
diff --git a/tests/fuzzing/bc_afl_continue.yaml b/tests/fuzzing/bc_afl_continue.yaml
index 291a1954..14699a8d 100644
--- a/tests/fuzzing/bc_afl_continue.yaml
+++ b/tests/fuzzing/bc_afl_continue.yaml
@@ -23,7 +23,7 @@ windows:
         - unset BC_EXPR_EXIT
         - unset BC_DIGIT_CLAMP
         - sleep 4
-        - afl-fuzz -i- -o tests/fuzzing/bc_outputs1 -p fast -D -M bc11 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
+        - afl-fuzz -i- -o tests/fuzzing/bc_outputs1 -p fast -M bc11 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
   - window_name: bc12
     layout: even-horizontal
     panes:
@@ -39,7 +39,7 @@ windows:
         - unset BC_EXPR_EXIT
         - unset BC_DIGIT_CLAMP
         - sleep 5
-        - afl-fuzz -i- -o tests/fuzzing/bc_outputs1 -p coe -S bc12 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
+        - afl-fuzz -i- -o tests/fuzzing/bc_outputs1 -p coe -z -S bc12 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
   - window_name: bc13
     layout: even-horizontal
     panes:
@@ -55,7 +55,7 @@ windows:
         - unset BC_EXPR_EXIT
         - unset BC_DIGIT_CLAMP
         - sleep 6
-        - afl-fuzz -i- -o tests/fuzzing/bc_outputs1 -p exploit -S bc13 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
+        - afl-fuzz -i- -o tests/fuzzing/bc_outputs1 -p exploit -z -S bc13 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
   - window_name: bc14
     layout: even-horizontal
     panes:
@@ -71,7 +71,7 @@ windows:
         - unset BC_EXPR_EXIT
         - unset BC_DIGIT_CLAMP
         - sleep 7
-        - afl-fuzz -i- -o tests/fuzzing/bc_outputs1 -p explore -S bc14 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
+        - afl-fuzz -i- -o tests/fuzzing/bc_outputs1 -p explore -z -S bc14 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
   - window_name: bc15
     layout: even-horizontal
     panes:
@@ -87,7 +87,7 @@ windows:
         - unset BC_EXPR_EXIT
         - unset BC_DIGIT_CLAMP
         - sleep 9
-        - afl-fuzz -i- -o tests/fuzzing/bc_outputs1 -p exploit -D -S bc15 bin/bc -lqC -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
+        - afl-fuzz -i- -o tests/fuzzing/bc_outputs1 -p exploit -S bc15 bin/bc -lqC -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
   - window_name: bc21
     layout: even-horizontal
     panes:
@@ -103,7 +103,7 @@ windows:
         - unset BC_EXPR_EXIT
         - unset BC_DIGIT_CLAMP
         - sleep 10
-        - afl-fuzz -i- -o tests/fuzzing/bc_outputs2 -p fast -D -M bc21 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
+        - afl-fuzz -i- -o tests/fuzzing/bc_outputs2 -p fast -M bc21 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
   - window_name: bc22
     layout: even-horizontal
     panes:
@@ -119,7 +119,7 @@ windows:
         - unset BC_EXPR_EXIT
         - unset BC_DIGIT_CLAMP
         - sleep 11
-        - afl-fuzz -i- -o tests/fuzzing/bc_outputs2 -p coe -S bc22 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
+        - afl-fuzz -i- -o tests/fuzzing/bc_outputs2 -p coe -z -S bc22 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
   - window_name: bc23
     layout: even-horizontal
     panes:
@@ -135,7 +135,7 @@ windows:
         - unset BC_EXPR_EXIT
         - unset BC_DIGIT_CLAMP
         - sleep 12
-        - afl-fuzz -i- -o tests/fuzzing/bc_outputs2 -p exploit -S bc23 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
+        - afl-fuzz -i- -o tests/fuzzing/bc_outputs2 -p exploit -z -S bc23 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
   - window_name: bc24
     layout: even-horizontal
     panes:
@@ -151,7 +151,7 @@ windows:
         - unset BC_EXPR_EXIT
         - unset BC_DIGIT_CLAMP
         - sleep 13
-        - afl-fuzz -i- -o tests/fuzzing/bc_outputs2 -p explore -S bc24 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
+        - afl-fuzz -i- -o tests/fuzzing/bc_outputs2 -p explore -z -S bc24 bin/bc -lqc -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
   - window_name: bc25
     layout: even-horizontal
     panes:
@@ -167,7 +167,7 @@ windows:
         - unset BC_EXPR_EXIT
         - unset BC_DIGIT_CLAMP
         - sleep 14
-        - afl-fuzz -i- -o tests/fuzzing/bc_outputs2 -p exploit -D -S bc25 bin/bc -lqC -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
+        - afl-fuzz -i- -o tests/fuzzing/bc_outputs2 -p exploit -S bc25 bin/bc -lqC -e "seed = 1280937142.20981723890730892738902938071028973408912703984712093" -f-
   - window_name: dc11
     layout: even-horizontal
     panes:
@@ -181,7 +181,7 @@ windows:
         - unset DC_EXPR_EXIT
         - unset DC_DIGIT_CLAMP
         - sleep 15
-        - afl-fuzz -i- -o tests/fuzzing/dc_outputs -p fast -D -M dc11 bin/dc -xc -e "1280937142.20981723890730892738902938071028973408912703984712093j" -f-
+        - afl-fuzz -i- -o tests/fuzzing/dc_outputs -p fast -M dc11 bin/dc -xc -e "1280937142.20981723890730892738902938071028973408912703984712093j" -f-
   - window_name: dc12
     layout: even-horizontal
     panes:
@@ -195,7 +195,7 @@ windows:
         - unset DC_EXPR_EXIT
         - unset DC_DIGIT_CLAMP
         - sleep 16
-        - afl-fuzz -i- -o tests/fuzzing/dc_outputs -p coe -S dc12 bin/dc -xc -e "1280937142.20981723890730892738902938071028973408912703984712093j" -f-
+        - afl-fuzz -i- -o tests/fuzzing/dc_outputs -p coe -z -S dc12 bin/dc -xc -e "1280937142.20981723890730892738902938071028973408912703984712093j" -f-
   - window_name: dc13
     layout: even-horizontal
     panes:
@@ -209,7 +209,7 @@ windows:
         - unset DC_EXPR_EXIT
         - unset DC_DIGIT_CLAMP
         - sleep 17
-        - afl-fuzz -i- -o tests/fuzzing/dc_outputs -p exploit -S dc13 bin/dc -xc -e "1280937142.20981723890730892738902938071028973408912703984712093j" -f-
+        - afl-fuzz -i- -o tests/fuzzing/dc_outputs -p exploit -z -S dc13 bin/dc -xc -e "1280937142.20981723890730892738902938071028973408912703984712093j" -f-
   - window_name: dc14
     layout: even-horizontal
     panes:
@@ -223,7 +223,7 @@ windows:
         - unset DC_EXPR_EXIT
         - unset DC_DIGIT_CLAMP
         - sleep 18
-        - afl-fuzz -i- -o tests/fuzzing/dc_outputs -p explore -S dc14 bin/dc -xc -e "1280937142.20981723890730892738902938071028973408912703984712093j" -f-
+        - afl-fuzz -i- -o tests/fuzzing/dc_outputs -p explore -z -S dc14 bin/dc -xc -e "1280937142.20981723890730892738902938071028973408912703984712093j" -f-
   - window_name: dc15
     layout: even-horizontal
     panes:
@@ -237,4 +237,4 @@ windows:
         - unset DC_EXPR_EXIT
         - unset DC_DIGIT_CLAMP
         - sleep 19
-        - afl-fuzz -i- -o tests/fuzzing/dc_outputs -p exploit -D -S dc15 bin/dc -xC -e "1280937142.20981723890730892738902938071028973408912703984712093j" -f-
+        - afl-fuzz -i- -o tests/fuzzing/dc_outputs -p exploit -S dc15 bin/dc -xC -e "1280937142.20981723890730892738902938071028973408912703984712093j" -f-