diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark1/pom.xml b/tools/auto-fuzz/benchmark/java/benchmark1/pom.xml similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark1/pom.xml rename to tools/auto-fuzz/benchmark/java/benchmark1/pom.xml diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark1/src/main/java/autofuzz/benchmark/Benchmark1.java b/tools/auto-fuzz/benchmark/java/benchmark1/src/main/java/autofuzz/benchmark/Benchmark1.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark1/src/main/java/autofuzz/benchmark/Benchmark1.java rename to tools/auto-fuzz/benchmark/java/benchmark1/src/main/java/autofuzz/benchmark/Benchmark1.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark1/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java b/tools/auto-fuzz/benchmark/java/benchmark1/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark1/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java rename to tools/auto-fuzz/benchmark/java/benchmark1/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark1/src/main/java/autofuzz/benchmark/object/SampleClass.java b/tools/auto-fuzz/benchmark/java/benchmark1/src/main/java/autofuzz/benchmark/object/SampleClass.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark1/src/main/java/autofuzz/benchmark/object/SampleClass.java rename to tools/auto-fuzz/benchmark/java/benchmark1/src/main/java/autofuzz/benchmark/object/SampleClass.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark1/src/main/java/autofuzz/benchmark/object/SampleEnum.java b/tools/auto-fuzz/benchmark/java/benchmark1/src/main/java/autofuzz/benchmark/object/SampleEnum.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark1/src/main/java/autofuzz/benchmark/object/SampleEnum.java rename to tools/auto-fuzz/benchmark/java/benchmark1/src/main/java/autofuzz/benchmark/object/SampleEnum.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark1/src/main/java/autofuzz/benchmark/object/SampleInterface.java b/tools/auto-fuzz/benchmark/java/benchmark1/src/main/java/autofuzz/benchmark/object/SampleInterface.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark1/src/main/java/autofuzz/benchmark/object/SampleInterface.java rename to tools/auto-fuzz/benchmark/java/benchmark1/src/main/java/autofuzz/benchmark/object/SampleInterface.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark1/src/main/java/autofuzz/benchmark/object/SampleObject.java b/tools/auto-fuzz/benchmark/java/benchmark1/src/main/java/autofuzz/benchmark/object/SampleObject.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark1/src/main/java/autofuzz/benchmark/object/SampleObject.java rename to tools/auto-fuzz/benchmark/java/benchmark1/src/main/java/autofuzz/benchmark/object/SampleObject.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark2/pom.xml b/tools/auto-fuzz/benchmark/java/benchmark2/pom.xml similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark2/pom.xml rename to tools/auto-fuzz/benchmark/java/benchmark2/pom.xml diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark2/src/main/java/autofuzz/benchmark/Benchmark2.java b/tools/auto-fuzz/benchmark/java/benchmark2/src/main/java/autofuzz/benchmark/Benchmark2.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark2/src/main/java/autofuzz/benchmark/Benchmark2.java rename to tools/auto-fuzz/benchmark/java/benchmark2/src/main/java/autofuzz/benchmark/Benchmark2.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark2/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java b/tools/auto-fuzz/benchmark/java/benchmark2/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark2/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java rename to tools/auto-fuzz/benchmark/java/benchmark2/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark2/src/main/java/autofuzz/benchmark/object/SampleClass.java b/tools/auto-fuzz/benchmark/java/benchmark2/src/main/java/autofuzz/benchmark/object/SampleClass.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark2/src/main/java/autofuzz/benchmark/object/SampleClass.java rename to tools/auto-fuzz/benchmark/java/benchmark2/src/main/java/autofuzz/benchmark/object/SampleClass.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark2/src/main/java/autofuzz/benchmark/object/SampleEnum.java b/tools/auto-fuzz/benchmark/java/benchmark2/src/main/java/autofuzz/benchmark/object/SampleEnum.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark2/src/main/java/autofuzz/benchmark/object/SampleEnum.java rename to tools/auto-fuzz/benchmark/java/benchmark2/src/main/java/autofuzz/benchmark/object/SampleEnum.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark2/src/main/java/autofuzz/benchmark/object/SampleInterface.java b/tools/auto-fuzz/benchmark/java/benchmark2/src/main/java/autofuzz/benchmark/object/SampleInterface.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark2/src/main/java/autofuzz/benchmark/object/SampleInterface.java rename to tools/auto-fuzz/benchmark/java/benchmark2/src/main/java/autofuzz/benchmark/object/SampleInterface.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark2/src/main/java/autofuzz/benchmark/object/SampleObject.java b/tools/auto-fuzz/benchmark/java/benchmark2/src/main/java/autofuzz/benchmark/object/SampleObject.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark2/src/main/java/autofuzz/benchmark/object/SampleObject.java rename to tools/auto-fuzz/benchmark/java/benchmark2/src/main/java/autofuzz/benchmark/object/SampleObject.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark3/pom.xml b/tools/auto-fuzz/benchmark/java/benchmark3/pom.xml similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark3/pom.xml rename to tools/auto-fuzz/benchmark/java/benchmark3/pom.xml diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark3/src/main/java/autofuzz/benchmark/Benchmark3.java b/tools/auto-fuzz/benchmark/java/benchmark3/src/main/java/autofuzz/benchmark/Benchmark3.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark3/src/main/java/autofuzz/benchmark/Benchmark3.java rename to tools/auto-fuzz/benchmark/java/benchmark3/src/main/java/autofuzz/benchmark/Benchmark3.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark3/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java b/tools/auto-fuzz/benchmark/java/benchmark3/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark3/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java rename to tools/auto-fuzz/benchmark/java/benchmark3/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark3/src/main/java/autofuzz/benchmark/object/SampleClass.java b/tools/auto-fuzz/benchmark/java/benchmark3/src/main/java/autofuzz/benchmark/object/SampleClass.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark3/src/main/java/autofuzz/benchmark/object/SampleClass.java rename to tools/auto-fuzz/benchmark/java/benchmark3/src/main/java/autofuzz/benchmark/object/SampleClass.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark3/src/main/java/autofuzz/benchmark/object/SampleEnum.java b/tools/auto-fuzz/benchmark/java/benchmark3/src/main/java/autofuzz/benchmark/object/SampleEnum.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark3/src/main/java/autofuzz/benchmark/object/SampleEnum.java rename to tools/auto-fuzz/benchmark/java/benchmark3/src/main/java/autofuzz/benchmark/object/SampleEnum.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark3/src/main/java/autofuzz/benchmark/object/SampleInterface.java b/tools/auto-fuzz/benchmark/java/benchmark3/src/main/java/autofuzz/benchmark/object/SampleInterface.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark3/src/main/java/autofuzz/benchmark/object/SampleInterface.java rename to tools/auto-fuzz/benchmark/java/benchmark3/src/main/java/autofuzz/benchmark/object/SampleInterface.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark3/src/main/java/autofuzz/benchmark/object/SampleObject.java b/tools/auto-fuzz/benchmark/java/benchmark3/src/main/java/autofuzz/benchmark/object/SampleObject.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark3/src/main/java/autofuzz/benchmark/object/SampleObject.java rename to tools/auto-fuzz/benchmark/java/benchmark3/src/main/java/autofuzz/benchmark/object/SampleObject.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark4/pom.xml b/tools/auto-fuzz/benchmark/java/benchmark4/pom.xml similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark4/pom.xml rename to tools/auto-fuzz/benchmark/java/benchmark4/pom.xml diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark4/src/main/java/autofuzz/benchmark/Benchmark4.java b/tools/auto-fuzz/benchmark/java/benchmark4/src/main/java/autofuzz/benchmark/Benchmark4.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark4/src/main/java/autofuzz/benchmark/Benchmark4.java rename to tools/auto-fuzz/benchmark/java/benchmark4/src/main/java/autofuzz/benchmark/Benchmark4.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark4/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java b/tools/auto-fuzz/benchmark/java/benchmark4/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark4/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java rename to tools/auto-fuzz/benchmark/java/benchmark4/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark4/src/main/java/autofuzz/benchmark/object/SampleClass.java b/tools/auto-fuzz/benchmark/java/benchmark4/src/main/java/autofuzz/benchmark/object/SampleClass.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark4/src/main/java/autofuzz/benchmark/object/SampleClass.java rename to tools/auto-fuzz/benchmark/java/benchmark4/src/main/java/autofuzz/benchmark/object/SampleClass.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark4/src/main/java/autofuzz/benchmark/object/SampleEnum.java b/tools/auto-fuzz/benchmark/java/benchmark4/src/main/java/autofuzz/benchmark/object/SampleEnum.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark4/src/main/java/autofuzz/benchmark/object/SampleEnum.java rename to tools/auto-fuzz/benchmark/java/benchmark4/src/main/java/autofuzz/benchmark/object/SampleEnum.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark4/src/main/java/autofuzz/benchmark/object/SampleInterface.java b/tools/auto-fuzz/benchmark/java/benchmark4/src/main/java/autofuzz/benchmark/object/SampleInterface.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark4/src/main/java/autofuzz/benchmark/object/SampleInterface.java rename to tools/auto-fuzz/benchmark/java/benchmark4/src/main/java/autofuzz/benchmark/object/SampleInterface.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark4/src/main/java/autofuzz/benchmark/object/SampleObject.java b/tools/auto-fuzz/benchmark/java/benchmark4/src/main/java/autofuzz/benchmark/object/SampleObject.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark4/src/main/java/autofuzz/benchmark/object/SampleObject.java rename to tools/auto-fuzz/benchmark/java/benchmark4/src/main/java/autofuzz/benchmark/object/SampleObject.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark5/pom.xml b/tools/auto-fuzz/benchmark/java/benchmark5/pom.xml similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark5/pom.xml rename to tools/auto-fuzz/benchmark/java/benchmark5/pom.xml diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark5/src/main/java/autofuzz/benchmark/Benchmark5.java b/tools/auto-fuzz/benchmark/java/benchmark5/src/main/java/autofuzz/benchmark/Benchmark5.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark5/src/main/java/autofuzz/benchmark/Benchmark5.java rename to tools/auto-fuzz/benchmark/java/benchmark5/src/main/java/autofuzz/benchmark/Benchmark5.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark5/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java b/tools/auto-fuzz/benchmark/java/benchmark5/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark5/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java rename to tools/auto-fuzz/benchmark/java/benchmark5/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark5/src/main/java/autofuzz/benchmark/object/SampleClass.java b/tools/auto-fuzz/benchmark/java/benchmark5/src/main/java/autofuzz/benchmark/object/SampleClass.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark5/src/main/java/autofuzz/benchmark/object/SampleClass.java rename to tools/auto-fuzz/benchmark/java/benchmark5/src/main/java/autofuzz/benchmark/object/SampleClass.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark5/src/main/java/autofuzz/benchmark/object/SampleEnum.java b/tools/auto-fuzz/benchmark/java/benchmark5/src/main/java/autofuzz/benchmark/object/SampleEnum.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark5/src/main/java/autofuzz/benchmark/object/SampleEnum.java rename to tools/auto-fuzz/benchmark/java/benchmark5/src/main/java/autofuzz/benchmark/object/SampleEnum.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark5/src/main/java/autofuzz/benchmark/object/SampleInterface.java b/tools/auto-fuzz/benchmark/java/benchmark5/src/main/java/autofuzz/benchmark/object/SampleInterface.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark5/src/main/java/autofuzz/benchmark/object/SampleInterface.java rename to tools/auto-fuzz/benchmark/java/benchmark5/src/main/java/autofuzz/benchmark/object/SampleInterface.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark5/src/main/java/autofuzz/benchmark/object/SampleObject.java b/tools/auto-fuzz/benchmark/java/benchmark5/src/main/java/autofuzz/benchmark/object/SampleObject.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark5/src/main/java/autofuzz/benchmark/object/SampleObject.java rename to tools/auto-fuzz/benchmark/java/benchmark5/src/main/java/autofuzz/benchmark/object/SampleObject.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark6/pom.xml b/tools/auto-fuzz/benchmark/java/benchmark6/pom.xml similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark6/pom.xml rename to tools/auto-fuzz/benchmark/java/benchmark6/pom.xml diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark6/src/main/java/autofuzz/benchmark/Benchmark6.java b/tools/auto-fuzz/benchmark/java/benchmark6/src/main/java/autofuzz/benchmark/Benchmark6.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark6/src/main/java/autofuzz/benchmark/Benchmark6.java rename to tools/auto-fuzz/benchmark/java/benchmark6/src/main/java/autofuzz/benchmark/Benchmark6.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark6/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java b/tools/auto-fuzz/benchmark/java/benchmark6/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark6/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java rename to tools/auto-fuzz/benchmark/java/benchmark6/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark6/src/main/java/autofuzz/benchmark/object/SampleClass.java b/tools/auto-fuzz/benchmark/java/benchmark6/src/main/java/autofuzz/benchmark/object/SampleClass.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark6/src/main/java/autofuzz/benchmark/object/SampleClass.java rename to tools/auto-fuzz/benchmark/java/benchmark6/src/main/java/autofuzz/benchmark/object/SampleClass.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark6/src/main/java/autofuzz/benchmark/object/SampleEnum.java b/tools/auto-fuzz/benchmark/java/benchmark6/src/main/java/autofuzz/benchmark/object/SampleEnum.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark6/src/main/java/autofuzz/benchmark/object/SampleEnum.java rename to tools/auto-fuzz/benchmark/java/benchmark6/src/main/java/autofuzz/benchmark/object/SampleEnum.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark6/src/main/java/autofuzz/benchmark/object/SampleInterface.java b/tools/auto-fuzz/benchmark/java/benchmark6/src/main/java/autofuzz/benchmark/object/SampleInterface.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark6/src/main/java/autofuzz/benchmark/object/SampleInterface.java rename to tools/auto-fuzz/benchmark/java/benchmark6/src/main/java/autofuzz/benchmark/object/SampleInterface.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark6/src/main/java/autofuzz/benchmark/object/SampleObject.java b/tools/auto-fuzz/benchmark/java/benchmark6/src/main/java/autofuzz/benchmark/object/SampleObject.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark6/src/main/java/autofuzz/benchmark/object/SampleObject.java rename to tools/auto-fuzz/benchmark/java/benchmark6/src/main/java/autofuzz/benchmark/object/SampleObject.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark7/pom.xml b/tools/auto-fuzz/benchmark/java/benchmark7/pom.xml similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark7/pom.xml rename to tools/auto-fuzz/benchmark/java/benchmark7/pom.xml diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark7/src/main/java/autofuzz/benchmark/Benchmark7.java b/tools/auto-fuzz/benchmark/java/benchmark7/src/main/java/autofuzz/benchmark/Benchmark7.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark7/src/main/java/autofuzz/benchmark/Benchmark7.java rename to tools/auto-fuzz/benchmark/java/benchmark7/src/main/java/autofuzz/benchmark/Benchmark7.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark7/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java b/tools/auto-fuzz/benchmark/java/benchmark7/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark7/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java rename to tools/auto-fuzz/benchmark/java/benchmark7/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark7/src/main/java/autofuzz/benchmark/object/SampleClass.java b/tools/auto-fuzz/benchmark/java/benchmark7/src/main/java/autofuzz/benchmark/object/SampleClass.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark7/src/main/java/autofuzz/benchmark/object/SampleClass.java rename to tools/auto-fuzz/benchmark/java/benchmark7/src/main/java/autofuzz/benchmark/object/SampleClass.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark7/src/main/java/autofuzz/benchmark/object/SampleEnum.java b/tools/auto-fuzz/benchmark/java/benchmark7/src/main/java/autofuzz/benchmark/object/SampleEnum.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark7/src/main/java/autofuzz/benchmark/object/SampleEnum.java rename to tools/auto-fuzz/benchmark/java/benchmark7/src/main/java/autofuzz/benchmark/object/SampleEnum.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark7/src/main/java/autofuzz/benchmark/object/SampleInterface.java b/tools/auto-fuzz/benchmark/java/benchmark7/src/main/java/autofuzz/benchmark/object/SampleInterface.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark7/src/main/java/autofuzz/benchmark/object/SampleInterface.java rename to tools/auto-fuzz/benchmark/java/benchmark7/src/main/java/autofuzz/benchmark/object/SampleInterface.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark7/src/main/java/autofuzz/benchmark/object/SampleObject.java b/tools/auto-fuzz/benchmark/java/benchmark7/src/main/java/autofuzz/benchmark/object/SampleObject.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark7/src/main/java/autofuzz/benchmark/object/SampleObject.java rename to tools/auto-fuzz/benchmark/java/benchmark7/src/main/java/autofuzz/benchmark/object/SampleObject.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark8/pom.xml b/tools/auto-fuzz/benchmark/java/benchmark8/pom.xml similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark8/pom.xml rename to tools/auto-fuzz/benchmark/java/benchmark8/pom.xml diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark8/src/main/java/autofuzz/benchmark/Benchmark8.java b/tools/auto-fuzz/benchmark/java/benchmark8/src/main/java/autofuzz/benchmark/Benchmark8.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark8/src/main/java/autofuzz/benchmark/Benchmark8.java rename to tools/auto-fuzz/benchmark/java/benchmark8/src/main/java/autofuzz/benchmark/Benchmark8.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark8/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java b/tools/auto-fuzz/benchmark/java/benchmark8/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark8/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java rename to tools/auto-fuzz/benchmark/java/benchmark8/src/main/java/autofuzz/benchmark/object/AutoFuzzException.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark8/src/main/java/autofuzz/benchmark/object/SampleClass.java b/tools/auto-fuzz/benchmark/java/benchmark8/src/main/java/autofuzz/benchmark/object/SampleClass.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark8/src/main/java/autofuzz/benchmark/object/SampleClass.java rename to tools/auto-fuzz/benchmark/java/benchmark8/src/main/java/autofuzz/benchmark/object/SampleClass.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark8/src/main/java/autofuzz/benchmark/object/SampleEnum.java b/tools/auto-fuzz/benchmark/java/benchmark8/src/main/java/autofuzz/benchmark/object/SampleEnum.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark8/src/main/java/autofuzz/benchmark/object/SampleEnum.java rename to tools/auto-fuzz/benchmark/java/benchmark8/src/main/java/autofuzz/benchmark/object/SampleEnum.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark8/src/main/java/autofuzz/benchmark/object/SampleInterface.java b/tools/auto-fuzz/benchmark/java/benchmark8/src/main/java/autofuzz/benchmark/object/SampleInterface.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark8/src/main/java/autofuzz/benchmark/object/SampleInterface.java rename to tools/auto-fuzz/benchmark/java/benchmark8/src/main/java/autofuzz/benchmark/object/SampleInterface.java diff --git a/tools/auto-fuzz/benchmark/jvm/benchmark8/src/main/java/autofuzz/benchmark/object/SampleObject.java b/tools/auto-fuzz/benchmark/java/benchmark8/src/main/java/autofuzz/benchmark/object/SampleObject.java similarity index 100% rename from tools/auto-fuzz/benchmark/jvm/benchmark8/src/main/java/autofuzz/benchmark/object/SampleObject.java rename to tools/auto-fuzz/benchmark/java/benchmark8/src/main/java/autofuzz/benchmark/object/SampleObject.java diff --git a/tools/auto-fuzz/post_process.py b/tools/auto-fuzz/post_process.py index 0cd4c37b4..f0872f728 100644 --- a/tools/auto-fuzz/post_process.py +++ b/tools/auto-fuzz/post_process.py @@ -147,13 +147,13 @@ def _print_summary_of_trial_run(trial_run, trial_name = trial_run['name'] python_fuzz_path = os.path.join(autofuzz_project_dir, trial_run['name'], "fuzz_1.py") - jvm_fuzz_path = os.path.join(autofuzz_project_dir, trial_run['name'], - "Fuzz1.java") + java_fuzz_path = os.path.join(autofuzz_project_dir, trial_run['name'], + "Fuzz.java") fuzz_path = "" if os.path.isfile(python_fuzz_path): fuzz_path = python_fuzz_path - elif os.path.isfile(jvm_fuzz_path): - fuzz_path = jvm_fuzz_path + elif os.path.isfile(java_fuzz_path): + fuzz_path = java_fuzz_path if print_in_ci: PROJ_LEN_WIDTH = 65 @@ -380,6 +380,11 @@ def print_benchmark_summary(target_dir, trial_runs, language, project_name): def benchmark_summary(language): """Print a list of benchmark target methods and fuzzers that covers them""" + # Currently, only java benchmarking is supported + if not language == 'java': + print('Unsupported language: %s' % language) + return + for autofuzz_project_dir in os.listdir("."): if "autofuzz-" in autofuzz_project_dir: proj_yaml, trial_runs = interpret_autofuzz_run( @@ -498,7 +503,7 @@ def _merge_runs(trial_dir, successful_runs, language): dst_file = os.path.join(next_merged_dir, "fuzz_%d.py" % (idx)) idx += 1 shutil.copyfile(src_file, dst_file) - elif language == "jvm": + elif language == "java": # Extract import statement and main code from original Fuzz.java src_file = os.path.join(trial_dir, run['name'], "Fuzz.java") with open(src_file, "r") as fin: @@ -536,9 +541,9 @@ def _merge_runs(trial_dir, successful_runs, language): java_main_code += "\n" # Writing the merged code into a single Fuzz.java - if language == "jvm": + if language == "java": # Process the merged java code - base_java = base_files.gen_base_fuzzer_jvm(False) + base_java = base_files.gen_base_fuzzer('java', 'maven', False) base_java = base_java.replace("/*IMPORTS*/", "".join(java_import_stmt)) base_java = base_java.replace("/*COUNTER*/", "") base_java = base_java.replace("/*STATIC_OBJECT_CHOICE*/", "") @@ -559,7 +564,7 @@ def _merge_runs(trial_dir, successful_runs, language): shutil.copy(project_yaml, next_merged_dir) # For java project, also copy the build bundle - if language == "jvm": + if language == "java": ant_path = os.path.join(base_autofuzz, "ant.zip") ant_dst = os.path.join(next_merged_dir, "ant.zip") maven_path = os.path.join(base_autofuzz, "maven.zip") @@ -579,13 +584,13 @@ def _merge_runs(trial_dir, successful_runs, language): os.path.join(next_merged_dir, ld)) # Output heuristic ratio - if language == "jvm": + if language == "java": max_heuristic_target = constants.MAX_TARGET_PER_PROJECT_HEURISTIC print("\nHeuristic generation summary:") for i in range(10): if i == 4: continue - heuristic = 'jvm-autofuzz-heuristics-%d' % (i + 1) + heuristic = 'java-autofuzz-heuristics-%d' % (i + 1) if heuristic in java_heuristic_count: print("%s: %d / %s" % (heuristic, java_heuristic_count[heuristic], @@ -618,7 +623,7 @@ def merge_run(target_directory, language="python"): # Merge operation for different language or # None if language not supported merged_project_dir = None - if language == "python" or language == "jvm": + if language == "python" or language == "java": merged_project_dir = _merge_runs(target_directory, successful_runs, language) @@ -638,15 +643,10 @@ def main(): elif args.command == 'heuristics-summary': heuristics_summary() elif args.command == 'benchmark-summary': - if args.language == 'java': - benchmark_summary('jvm') - else: - print('Unsupported language: %s' % args.language) + benchmark_summary(args.language) elif args.command == 'merge': - if args.language == 'python': - merge_run(args.dir, 'python') - elif args.language == 'java': - merge_run(args.dir, 'jvm') + if args.language == 'python' or args.language == 'java': + merge_run(args.dir, args.language) else: print('Unsupported language: %s' % args.language)