about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChris Ball <chris@printf.net>2023-11-12 07:40:58 -0800
committerChris Ball <chris@printf.net>2023-11-12 07:40:58 -0800
commit8b79d9b4d5efdf4d0e30a323dd3a169f9a7801c5 (patch)
tree1bb8d7325c346de69f391e6e42111da72baab062
parent16993bba8fa359b093d44fe395044bfd392c19f3 (diff)
downloadafl++-8b79d9b4d5efdf4d0e30a323dd3a169f9a7801c5.tar.gz
benchmark: show the number of cores used in COMPARISON
-rw-r--r--benchmark/COMPARISON8
-rw-r--r--benchmark/benchmark.py4
2 files changed, 7 insertions, 5 deletions
diff --git a/benchmark/COMPARISON b/benchmark/COMPARISON
index d8750e34..03a197cd 100644
--- a/benchmark/COMPARISON
+++ b/benchmark/COMPARISON
@@ -1,4 +1,4 @@
-CPU                            | MHz   | singlecore | multicore | afl-*-config |
-===============================|=======|============|===========|==============|
-Apple Mac Studio M2 Ultra 2023 | 3500  | 174386     | 1112585   | both         |
-Intel(R) Core(TM) i9-9900K CPU | 4999  | 133706     | 1169989   | both         |
+CPU                            | MHz   | threads | singlecore | multicore | afl-*-config |
+===============================|=======|=========|============|===========|==============|
+Apple Mac Studio M2 Ultra 2023 | 3500  | 16      | 174386     | 1112585   | both         |
+Intel(R) Core(TM) i9-9900K CPU | 4995  | 16      | 133706     | 1169989   | both         |
diff --git a/benchmark/benchmark.py b/benchmark/benchmark.py
index 6fde621b..2601ef0d 100644
--- a/benchmark/benchmark.py
+++ b/benchmark/benchmark.py
@@ -195,6 +195,7 @@ async def save_benchmark_results() -> None:
         print(blue(f" [*] Results have been written to {jsonfile.name}"))
     with open("COMPARISON", "a") as comparisonfile:
         described_config = await describe_afl_config()
+        aflconfig = described_config.ljust(12)
         if results.hardware is None:
             return
         cpu_model = results.hardware.cpu_model.ljust(42)
@@ -205,9 +206,10 @@ async def save_benchmark_results() -> None:
                 return
             single = str(round(results.targets["test-instr-persist-shmem"]["singlecore"].total_execs_per_sec)).ljust(10)
             multi = str(round(results.targets["test-instr-persist-shmem"]["multicore"].total_execs_per_sec)).ljust(9)
+            cores = str(args.fuzzers).ljust(7)
             if len(cpu_model) > 30:
                 cpu_model = cpu_model[:30]
-            comparisonfile.write(f"{cpu_model} | {cpu_mhz} | {single} | {multi} | {described_config.ljust(12)} |\n")
+            comparisonfile.write(f"{cpu_model} | {cpu_mhz} | {cores} | {single} | {multi} | {aflconfig} |\n")
     with open("COMPARISON", "r") as comparisonfile:
         print(comparisonfile.read())