[libFuzzer] enable use_cmp by default

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@285353 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Fuzzer/FuzzerFlags.def b/lib/Fuzzer/FuzzerFlags.def
index 01f733d52267942d1ee90aceea510226c5e6484c..bb107a38862f710a01233021072357226b9c73c7 100644 (file)
--- a/lib/Fuzzer/FuzzerFlags.def
+++ b/lib/Fuzzer/FuzzerFlags.def
@@ -49,7 +49,7 @@ FUZZER_FLAG_INT(use_memmem, 1,
                 "Use hints from intercepting memmem, strstr, etc")
 FUZZER_FLAG_INT(use_value_profile, 0,
                 "Experimental. Use value profile to guide fuzzing.")
-FUZZER_FLAG_INT(use_cmp, 0, "Experimenta. Use CMP traces to guide mutations")
+FUZZER_FLAG_INT(use_cmp, 1, "Use CMP traces to guide mutations")
 FUZZER_FLAG_INT(shrink, 0, "Experimental. Try to shrink corpus elements.")
 FUZZER_FLAG_INT(jobs, 0, "Number of jobs to run. If jobs >= 1 we spawn"
                           " this number of jobs in separate worker processes"

diff --git a/lib/Fuzzer/test/fuzzer.test b/lib/Fuzzer/test/fuzzer.test
index 1838b30d0ddb3785bcf4fcb1d17fe0a972979681..ccca3d33fc50ce5962ad40a331f658b435d954c6 100644 (file)
--- a/lib/Fuzzer/test/fuzzer.test
+++ b/lib/Fuzzer/test/fuzzer.test
@@ -7,7 +7,7 @@ RUN: LLVMFuzzer-SimpleTest-TracePC 2>&1 | FileCheck %s
 # only_ascii mode. Will perform some minimal self-validation.
 RUN: LLVMFuzzer-SimpleTest -only_ascii=1 2>&1
 
-RUN: LLVMFuzzer-SimpleCmpTest -max_total_time=1 2>&1 | FileCheck %s --check-prefix=MaxTotalTime
+RUN: LLVMFuzzer-SimpleCmpTest -max_total_time=1 -use_cmp=0 2>&1 | FileCheck %s --check-prefix=MaxTotalTime
 MaxTotalTime: Done {{.*}} runs in {{.}} second(s)
 
 RUN: not LLVMFuzzer-NullDerefTest                  2>&1 | FileCheck %s --check-prefix=NullDerefTest

diff --git a/lib/Fuzzer/test/simple-cmp.test b/lib/Fuzzer/test/simple-cmp.test
index f5791ad506c29f355651d8d74c608e7281c7a5df..145a036652ebd733c812432dd876c9a6ade581ec 100644 (file)
--- a/lib/Fuzzer/test/simple-cmp.test
+++ b/lib/Fuzzer/test/simple-cmp.test
@@ -1,2 +1,2 @@
 CHECK: BINGO
-RUN: not LLVMFuzzer-SimpleCmpTest -seed=1 -use_cmp=1 -runs=100000000 2>&1 | FileCheck %s
+RUN: not LLVMFuzzer-SimpleCmpTest -seed=1 -runs=100000000 2>&1 | FileCheck %s

diff --git a/lib/Fuzzer/test/swap-cmp.test b/lib/Fuzzer/test/swap-cmp.test
index d873a321e0f3bf72cc43b0a18105a42d987f96d4..908b798664b184780e9c1ae68488cffe2b13a450 100644 (file)
--- a/lib/Fuzzer/test/swap-cmp.test
+++ b/lib/Fuzzer/test/swap-cmp.test
@@ -1,2 +1,2 @@
 CHECK: BINGO
-RUN: not LLVMFuzzer-SwapCmpTest -seed=1 -use_cmp=1 -runs=10000000 2>&1 | FileCheck %s
+RUN: not LLVMFuzzer-SwapCmpTest -seed=1 -runs=10000000 2>&1 | FileCheck %s

diff --git a/lib/Fuzzer/test/value-profile-cmp.test b/lib/Fuzzer/test/value-profile-cmp.test
index d183b76f81ff5c852aaff5e7c3ca42fa125636b4..509969d9df4fbde756203681348a6bb2f7a9dee4 100644 (file)
--- a/lib/Fuzzer/test/value-profile-cmp.test
+++ b/lib/Fuzzer/test/value-profile-cmp.test
@@ -1,7 +1,7 @@
 CHECK: BINGO
-RUN: not LLVMFuzzer-SimpleCmpTest -use_value_profile=1 -runs=100000000 2>&1 | FileCheck %s
-RUN: not LLVMFuzzer-SimpleHashTest -use_value_profile=1 -runs=100000000 2>&1 | FileCheck %s
-RUN: not LLVMFuzzer-AbsNegAndConstantTest -use_value_profile=1 -runs=100000000 2>&1 | FileCheck %s
-RUN: not LLVMFuzzer-AbsNegAndConstant64Test -use_value_profile=1 -runs=100000000 2>&1 | FileCheck %s
+RUN: not LLVMFuzzer-SimpleCmpTest -use_cmp=0 -use_value_profile=1 -runs=100000000 2>&1 | FileCheck %s
+RUN: not LLVMFuzzer-SimpleHashTest -use_cmp=0 -use_value_profile=1 -runs=100000000 2>&1 | FileCheck %s
+RUN: not LLVMFuzzer-AbsNegAndConstantTest -use_cmp=0 -use_value_profile=1 -runs=100000000 2>&1 | FileCheck %s
+RUN: not LLVMFuzzer-AbsNegAndConstant64Test -use_cmp=0 -use_value_profile=1 -runs=100000000 2>&1 | FileCheck %s
 
 

diff --git a/lib/Fuzzer/test/value-profile-load.test b/lib/Fuzzer/test/value-profile-load.test
index 05a13821fce93a7359535f7974fc4c7920929e69..14d3109a24e195803d0268ac42ca447db6a5b6bf 100644 (file)
--- a/lib/Fuzzer/test/value-profile-load.test
+++ b/lib/Fuzzer/test/value-profile-load.test
@@ -1,3 +1,3 @@
 CHECK: AddressSanitizer: global-buffer-overflow
-RUN: not LLVMFuzzer-LoadTest -seed=1 -use_value_profile=1 -runs=10000000 2>&1 | FileCheck %s
+RUN: not LLVMFuzzer-LoadTest -seed=1 -use_cmp=0 -use_value_profile=1 -runs=10000000 2>&1 | FileCheck %s
 

diff --git a/lib/Fuzzer/test/value-profile-mem.test b/lib/Fuzzer/test/value-profile-mem.test
index 60cc67fe72ec767cccb8c230daf93e8dd30efb0b..09d737dbe736d0bfbb67b4e9d09c7199d6703d40 100644 (file)
--- a/lib/Fuzzer/test/value-profile-mem.test
+++ b/lib/Fuzzer/test/value-profile-mem.test
@@ -1,4 +1,2 @@
 CHECK: BINGO
-RUN: not LLVMFuzzer-SingleMemcmpTest -seed=1 -use_memcmp=0 -use_value_profile=1 -runs=10000000 2>&1 | FileCheck %s
-RUN: not LLVMFuzzer-SingleStrcmpTest -seed=1 -use_memcmp=0 -use_value_profile=1 -runs=10000000 2>&1 | FileCheck %s
-RUN: not LLVMFuzzer-SingleStrncmpTest -seed=1 -use_memcmp=0 -use_value_profile=1 -runs=10000000 2>&1 | FileCheck %s
+RUN: not LLVMFuzzer-SingleMemcmpTest -seed=1  -use_cmp=0 -use_memcmp=0 -use_value_profile=1 -runs=10000000 2>&1 | FileCheck %s

diff --git a/lib/Fuzzer/test/value-profile-set.test b/lib/Fuzzer/test/value-profile-set.test
index 300afa9320d3fa273c6a76362a1596a4db063a3a..9d06c36563340ad1df12efd214a68ba32c86382d 100644 (file)
--- a/lib/Fuzzer/test/value-profile-set.test
+++ b/lib/Fuzzer/test/value-profile-set.test
@@ -1,3 +1,3 @@
 CHECK: BINGO
-RUN: not LLVMFuzzer-FourIndependentBranchesTest -seed=1 -use_value_profile=1 -runs=100000000 2>&1 | FileCheck %s
+RUN: not LLVMFuzzer-FourIndependentBranchesTest -seed=1 -use_cmp=0 -use_value_profile=1 -runs=100000000 2>&1 | FileCheck %s
 

diff --git a/lib/Fuzzer/test/value-profile-strcmp.test b/lib/Fuzzer/test/value-profile-strcmp.test
new file mode 100644 (file)
index 0000000..1e7ef9b
--- /dev/null
+++ b/lib/Fuzzer/test/value-profile-strcmp.test
@@ -0,0 +1,2 @@
+CHECK: BINGO
+RUN: not LLVMFuzzer-SingleStrcmpTest -seed=1  -use_cmp=0 -use_memcmp=0 -use_value_profile=1 -runs=10000000 2>&1 | FileCheck %s

diff --git a/lib/Fuzzer/test/value-profile-strncmp.test b/lib/Fuzzer/test/value-profile-strncmp.test
new file mode 100644 (file)
index 0000000..6509731
--- /dev/null
+++ b/lib/Fuzzer/test/value-profile-strncmp.test
@@ -0,0 +1,2 @@
+CHECK: BINGO
+RUN: not LLVMFuzzer-SingleStrncmpTest -seed=1 -use_cmp=0 -use_memcmp=0 -use_value_profile=1 -runs=10000000 2>&1 | FileCheck %s

diff --git a/lib/Fuzzer/test/value-profile-switch.test b/lib/Fuzzer/test/value-profile-switch.test
index 7e66e5188e441a5f44ee534ddea392c67daf5698..312fec6c52e346e194252c421c4ab767157482ab 100644 (file)
--- a/lib/Fuzzer/test/value-profile-switch.test
+++ b/lib/Fuzzer/test/value-profile-switch.test
@@ -1,3 +1,3 @@
 CHECK: BINGO
-RUN: not LLVMFuzzer-SwitchTest-TracePC  -use_value_profile=1 -runs=100000000 -seed=1 2>&1 | FileCheck %s
-RUN: not LLVMFuzzer-Switch2Test-TracePC -use_value_profile=1 -runs=100000000 -seed=1 2>&1 | FileCheck %s
+RUN: not LLVMFuzzer-SwitchTest-TracePC  -use_cmp=0 -use_value_profile=1 -runs=100000000 -seed=1 2>&1 | FileCheck %s
+RUN: not LLVMFuzzer-Switch2Test-TracePC -use_cmp=0 -use_value_profile=1 -runs=100000000 -seed=1 2>&1 | FileCheck %s