summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--llvm/lib/Fuzzer/FuzzerFlags.def2
-rw-r--r--llvm/lib/Fuzzer/test/fuzzer.test2
-rw-r--r--llvm/lib/Fuzzer/test/simple-cmp.test2
-rw-r--r--llvm/lib/Fuzzer/test/swap-cmp.test2
-rw-r--r--llvm/lib/Fuzzer/test/value-profile-cmp.test8
-rw-r--r--llvm/lib/Fuzzer/test/value-profile-load.test2
-rw-r--r--llvm/lib/Fuzzer/test/value-profile-mem.test4
-rw-r--r--llvm/lib/Fuzzer/test/value-profile-set.test2
-rw-r--r--llvm/lib/Fuzzer/test/value-profile-strcmp.test2
-rw-r--r--llvm/lib/Fuzzer/test/value-profile-strncmp.test2
-rw-r--r--llvm/lib/Fuzzer/test/value-profile-switch.test4
11 files changed, 17 insertions, 15 deletions
diff --git a/llvm/lib/Fuzzer/FuzzerFlags.def b/llvm/lib/Fuzzer/FuzzerFlags.def
index 01f733d5226..bb107a38862 100644
--- a/llvm/lib/Fuzzer/FuzzerFlags.def
+++ b/llvm/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/llvm/lib/Fuzzer/test/fuzzer.test b/llvm/lib/Fuzzer/test/fuzzer.test
index 1838b30d0dd..ccca3d33fc5 100644
--- a/llvm/lib/Fuzzer/test/fuzzer.test
+++ b/llvm/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/llvm/lib/Fuzzer/test/simple-cmp.test b/llvm/lib/Fuzzer/test/simple-cmp.test
index f5791ad506c..145a036652e 100644
--- a/llvm/lib/Fuzzer/test/simple-cmp.test
+++ b/llvm/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/llvm/lib/Fuzzer/test/swap-cmp.test b/llvm/lib/Fuzzer/test/swap-cmp.test
index d873a321e0f..908b798664b 100644
--- a/llvm/lib/Fuzzer/test/swap-cmp.test
+++ b/llvm/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/llvm/lib/Fuzzer/test/value-profile-cmp.test b/llvm/lib/Fuzzer/test/value-profile-cmp.test
index d183b76f81f..509969d9df4 100644
--- a/llvm/lib/Fuzzer/test/value-profile-cmp.test
+++ b/llvm/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/llvm/lib/Fuzzer/test/value-profile-load.test b/llvm/lib/Fuzzer/test/value-profile-load.test
index 05a13821fce..14d3109a24e 100644
--- a/llvm/lib/Fuzzer/test/value-profile-load.test
+++ b/llvm/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/llvm/lib/Fuzzer/test/value-profile-mem.test b/llvm/lib/Fuzzer/test/value-profile-mem.test
index 60cc67fe72e..09d737dbe73 100644
--- a/llvm/lib/Fuzzer/test/value-profile-mem.test
+++ b/llvm/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/llvm/lib/Fuzzer/test/value-profile-set.test b/llvm/lib/Fuzzer/test/value-profile-set.test
index 300afa9320d..9d06c365633 100644
--- a/llvm/lib/Fuzzer/test/value-profile-set.test
+++ b/llvm/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/llvm/lib/Fuzzer/test/value-profile-strcmp.test b/llvm/lib/Fuzzer/test/value-profile-strcmp.test
new file mode 100644
index 00000000000..1e7ef9b45e9
--- /dev/null
+++ b/llvm/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/llvm/lib/Fuzzer/test/value-profile-strncmp.test b/llvm/lib/Fuzzer/test/value-profile-strncmp.test
new file mode 100644
index 00000000000..650973180c0
--- /dev/null
+++ b/llvm/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/llvm/lib/Fuzzer/test/value-profile-switch.test b/llvm/lib/Fuzzer/test/value-profile-switch.test
index 7e66e5188e4..312fec6c52e 100644
--- a/llvm/lib/Fuzzer/test/value-profile-switch.test
+++ b/llvm/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
OpenPOWER on IntegriCloud