ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-18 04:38:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

benchmark: disallow duplicate entries for the same CPU in COMPARISON

Browse Source
This commit is contained in:
Chris Ball
2023-11-14 09:47:47 -08:00
parent 26045831a2
commit afb9b8a961
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
benchmark/benchmark.py
View File

@ -93,7 +93,7 @@ results = Results(config=None, hardware=None, targets={
debug = lambda text: args.debug and print(blue(text)) debug = lambda text: args.debug and print(blue(text))
if Mode.multicore in chosen_modes: if Mode.multicore in chosen_modes:
print(blue(f" [*] Using {args.fuzzers} fuzzers for multicore fuzzing "), end="") print(blue(f" [*] Using {args.fuzzers} fuzzers for multicore fuzzing "), end="")
print(blue("(use --fuzzers to override)" if args.fuzzers == cpu_count else f"(the default is {cpu_count})")) print(blue("(use --fuzzers to override)." if args.fuzzers == cpu_count else f"(the default is {cpu_count})"))
async def clean_up_tempfiles() -> None: async def clean_up_tempfiles() -> None:
shutil.rmtree(f"{args.basedir}/in") shutil.rmtree(f"{args.basedir}/in")
@ -192,13 +192,16 @@ async def save_benchmark_results() -> None:
with open("benchmark-results.jsonl", "a") as jsonfile: with open("benchmark-results.jsonl", "a") as jsonfile:
json.dump(asdict(results), jsonfile, sort_keys=True) json.dump(asdict(results), jsonfile, sort_keys=True)
jsonfile.write("\n") jsonfile.write("\n")
print(blue(f" [*] Results have been written to {jsonfile.name}")) print(blue(f" [*] Results have been written to the {jsonfile.name} file."))
with open("COMPARISON", "a") as comparisonfile: with open("COMPARISON", "r+") as comparisonfile:
described_config = await describe_afl_config() described_config = await describe_afl_config()
aflconfig = described_config.ljust(12) aflconfig = described_config.ljust(12)
if results.hardware is None: if results.hardware is None:
return return
cpu_model = results.hardware.cpu_model.ljust(51) cpu_model = results.hardware.cpu_model.ljust(51)
if cpu_model in comparisonfile.read():
print(blue(f" [*] Results have not been written to the COMPARISON file; this CPU is already present."))
return
cpu_mhz = str(round(results.hardware.cpu_fastest_core_mhz)).ljust(5) cpu_mhz = str(round(results.hardware.cpu_fastest_core_mhz)).ljust(5)
if "test-instr-persist-shmem" in results.targets and "multicore" in results.targets["test-instr-persist-shmem"]: if "test-instr-persist-shmem" in results.targets and "multicore" in results.targets["test-instr-persist-shmem"]:
if results.targets["test-instr-persist-shmem"]["singlecore"] is None or \ if results.targets["test-instr-persist-shmem"]["singlecore"] is None or \
@ -208,6 +211,7 @@ async def save_benchmark_results() -> None:
multi = str(round(results.targets["test-instr-persist-shmem"]["multicore"].afl_execs_per_sec)).ljust(9) multi = str(round(results.targets["test-instr-persist-shmem"]["multicore"].afl_execs_per_sec)).ljust(9)
cores = str(args.fuzzers).ljust(7) cores = str(args.fuzzers).ljust(7)
comparisonfile.write(f"{cpu_model} | {cpu_mhz} | {cores} | {single} | {multi} | {aflconfig} |\n") comparisonfile.write(f"{cpu_model} | {cpu_mhz} | {cores} | {single} | {multi} | {aflconfig} |\n")
print(blue(f" [*] Results have been written to the COMPARISON file."))
with open("COMPARISON", "r") as comparisonfile: with open("COMPARISON", "r") as comparisonfile:
print(comparisonfile.read()) print(comparisonfile.read())