bring back small map

google · Feb 22, 2024 · e88e347 · e88e347
1 parent 42af850
commit e88e347
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git a/...ibafl_ctx_adaptive_map/builder.Dockerfile → ...s/libafl_ctx_small_map/builder.Dockerfile b/...ibafl_ctx_adaptive_map/builder.Dockerfile → ...s/libafl_ctx_small_map/builder.Dockerfile
@@ -51,10 +51,11 @@ RUN cd /libafl && git pull && git checkout 2ea1930dfd109b08e37904d7e99a2f6b39c73
 # Compile libafl.
 RUN cd /libafl && \
     unset CFLAGS CXXFLAGS && \
-    cd ./fuzzers/fuzzbench_ctx_adaptive && \
+    export LIBAFL_EDGES_MAP_SIZE=131072 && \
+    cd ./fuzzers/fuzzbench_ctx && \
     PATH="/root/.cargo/bin/:$PATH" cargo build --profile release-fuzzbench --features no_link_main
 
 # Auxiliary weak references.
-RUN cd /libafl/fuzzers/fuzzbench_ctx_adaptive && \
+RUN cd /libafl/fuzzers/fuzzbench_ctx && \
     clang -c stub_rt.c && \
     ar r /stub_rt.a stub_rt.o
diff --git a/...rs/libafl_ctx_adaptive_map/description.md → fuzzers/libafl_ctx_small_map/description.md b/...rs/libafl_ctx_adaptive_map/description.md → fuzzers/libafl_ctx_small_map/description.md
diff --git a/fuzzers/libafl_ctx_adaptive_map/fuzzer.py → fuzzers/libafl_ctx_small_map/fuzzer.py b/fuzzers/libafl_ctx_adaptive_map/fuzzer.py → fuzzers/libafl_ctx_small_map/fuzzer.py
@@ -40,10 +40,10 @@ def prepare_fuzz_environment(input_corpus):
 
 def build():  # pylint: disable=too-many-branches,too-many-statements
     """Build benchmark."""
-    os.environ["CC"] = ("/libafl/fuzzers/fuzzbench_ctx_adaptive/ \
-        target/release-fuzzbench/libafl_cc")
-    os.environ["CXX"] = ("/libafl/fuzzers/fuzzbench_ctx_adaptive/ \
-        target/release-fuzzbench/libafl_cxx")
+    os.environ["CC"] = (
+        "/libafl/fuzzers/fuzzbench_ctx/target/release-fuzzbench/libafl_cc")
+    os.environ["CXX"] = (
+        "/libafl/fuzzers/fuzzbench_ctx/target/release-fuzzbench/libafl_cxx")
 
     os.environ["ASAN_OPTIONS"] = "abort_on_error=0:allocator_may_return_null=1"
     os.environ["UBSAN_OPTIONS"] = "abort_on_error=0"

diff --git a/...libafl_ctx_adaptive_map/runner.Dockerfile → ...rs/libafl_ctx_small_map/runner.Dockerfile b/...libafl_ctx_adaptive_map/runner.Dockerfile → ...rs/libafl_ctx_small_map/runner.Dockerfile
diff --git a/...afl_ngram_adaptive_map/builder.Dockerfile → ...libafl_ngram_small_map/builder.Dockerfile b/...afl_ngram_adaptive_map/builder.Dockerfile → ...libafl_ngram_small_map/builder.Dockerfile
@@ -51,10 +51,11 @@ RUN cd /libafl && git pull && git checkout 2ea1930dfd109b08e37904d7e99a2f6b39c73
 # Compile libafl.
 RUN cd /libafl && \
     unset CFLAGS CXXFLAGS && \
-    cd ./fuzzers/fuzzbench_ngram_adaptive && \
+    export LIBAFL_EDGES_MAP_SIZE=131072 && \
+    cd ./fuzzers/fuzzbench_ngram && \
     PATH="/root/.cargo/bin/:$PATH" cargo build --profile release-fuzzbench --features no_link_main
 
 # Auxiliary weak references.
-RUN cd /libafl/fuzzers/fuzzbench_ngram_adaptive && \
+RUN cd /libafl/fuzzers/fuzzbench_ngram && \
     clang -c stub_rt.c && \
     ar r /stub_rt.a stub_rt.o
diff --git a/.../libafl_ngram_adaptive_map/description.md → ...ers/libafl_ngram_small_map/description.md b/.../libafl_ngram_adaptive_map/description.md → ...ers/libafl_ngram_small_map/description.md
diff --git a/fuzzers/libafl_ngram_adaptive_map/fuzzer.py → fuzzers/libafl_ngram_small_map/fuzzer.py b/fuzzers/libafl_ngram_adaptive_map/fuzzer.py → fuzzers/libafl_ngram_small_map/fuzzer.py
@@ -40,10 +40,10 @@ def prepare_fuzz_environment(input_corpus):
 
 def build():  # pylint: disable=too-many-branches,too-many-statements
     """Build benchmark."""
-    os.environ["CC"] = ("/libafl/fuzzers/fuzzbench_ngram_adaptive/ \
-        target/release-fuzzbench/libafl_cc")
-    os.environ["CXX"] = ("/libafl/fuzzers/fuzzbench_ngram_adaptive/ \
-        target/release-fuzzbench/libafl_cxx")
+    os.environ["CC"] = (
+        "/libafl/fuzzers/fuzzbench_ngram/target/release-fuzzbench/libafl_cc")
+    os.environ["CXX"] = (
+        "/libafl/fuzzers/fuzzbench_ngram/target/release-fuzzbench/libafl_cxx")
 
     os.environ["ASAN_OPTIONS"] = "abort_on_error=0:allocator_may_return_null=1"
     os.environ["UBSAN_OPTIONS"] = "abort_on_error=0"

diff --git a/...bafl_ngram_adaptive_map/runner.Dockerfile → .../libafl_ngram_small_map/runner.Dockerfile b/...bafl_ngram_adaptive_map/runner.Dockerfile → .../libafl_ngram_small_map/runner.Dockerfile