remove kotlinx, add memory measurement

FormalLanguageConstrainedPathQuerying · May 31, 2024 · 6838763 · 6838763
1 parent 852f0d6
commit 6838763
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 30 deletions.
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
     java
     kotlin("jvm") version "1.9.20"
-    id("org.jetbrains.kotlinx.benchmark") version "0.4.10"
     kotlin("plugin.allopen") version "1.9.20"
+    id("me.champeau.jmh") version "0.7.2"
 }
 
 repositories {
@@ -23,42 +23,47 @@ dependencies {
     implementation("org.antlr:antlr4:4.13.1")
 }
 
-fun getArgs(strFolder: String): Array<String> {
+fun getArgs(strFolder: String): List<String> {
     val resourcesDir = File(strFolder)
     val files = resourcesDir.listFiles()!!
-    return files.map { it.toString() }.sorted().toTypedArray()
+    return files.map { it.toString() }.sorted().toList()
 }
-//benchmark{}
-benchmark {
-    configurations {
-        named("main") {
-            val dataset = "dataset"
-            if (!hasProperty(dataset)) {
-                println("BENCHMARKS FAILED! Set dataset folder by property '$dataset'")
-            }
-            else{
-                param("fileName", *getArgs(property(dataset).toString()))
-            }
-            this.reportFormat = "csv"
-            iterations = 15
-            iterationTime = 1000
-            iterationTimeUnit = "ms"
-            warmups = 5
-            outputTimeUnit = "ms"
-            mode = "avgt"
-            val tools = "toolName"
-            if (hasProperty(tools)) {
-                println("Run benchmarks for: .*${property(tools)}.*")
-                include(".*${property(tools)}.*")
-            }
+jmh {
+    duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE
+    warmupIterations = 5
+    warmup = "1s"
+    iterations = 10
+    timeOnIteration = "2s"
+    verbosity = "EXTRA"
+    benchmarkMode.addAll("AverageTime")
+    failOnError = false
+    resultFormat = "CSV"
+    jvmArgs.addAll("-Xmx128g")
+    val buildDir = project.layout.buildDirectory.get().toString()
+    humanOutputFile = project.file("${buildDir}/reports/jmh/human.txt") // human-readable output file
+    resultsFile = project.file("${buildDir}/reports/jmh/results.txt") // results file
+    profilers = listOf("gc")
 
-        }
+
+    //configure files
+    val dataset = "dataset"
+    if (!hasProperty(dataset)) {
+        println("BENCHMARKS FAILED! Set dataset folder by property '$dataset'")
+    } else {
+        val params = objects.listProperty<String>().value(getArgs(property(dataset).toString()))
+        benchmarkParameters.put("fileName", params)
     }
-    targets {
-        register("main")
+
+    //filter on tools
+    val tools = "toolName"
+    if (hasProperty(tools)) {
+        println("Run benchmarks for: .*${property(tools)}.*")
+        includes = listOf(".*${property(tools)}.*")
     }
+
 }
 
+
 allOpen {
     annotation("org.openjdk.jmh.annotations.State")
 }

diff --git a/benchmarks/src/main/java/org/antlr/Java8.g4 → benchmarks/src/jmh/java/org/antlr/Java8.g4 b/benchmarks/src/main/java/org/antlr/Java8.g4 → benchmarks/src/jmh/java/org/antlr/Java8.g4
diff --git a/benchmarks/src/main/kotlin/org/Antlr.kt → benchmarks/src/jmh/kotlin/org/Antlr.kt b/benchmarks/src/main/kotlin/org/Antlr.kt → benchmarks/src/jmh/kotlin/org/Antlr.kt
diff --git a/benchmarks/src/main/kotlin/org/BaseBench.kt → benchmarks/src/jmh/kotlin/org/BaseBench.kt b/benchmarks/src/main/kotlin/org/BaseBench.kt → benchmarks/src/jmh/kotlin/org/BaseBench.kt
diff --git a/benchmarks/src/main/kotlin/org/Benchmarks.kt → benchmarks/src/jmh/kotlin/org/Benchmarks.kt b/benchmarks/src/main/kotlin/org/Benchmarks.kt → benchmarks/src/jmh/kotlin/org/Benchmarks.kt
diff --git a/...src/main/kotlin/org/RecoveryOfflineGll.kt → .../src/jmh/kotlin/org/RecoveryOfflineGll.kt b/...src/main/kotlin/org/RecoveryOfflineGll.kt → .../src/jmh/kotlin/org/RecoveryOfflineGll.kt
diff --git a/.../src/main/kotlin/org/RecoveryOnlineGll.kt → ...s/src/jmh/kotlin/org/RecoveryOnlineGll.kt b/.../src/main/kotlin/org/RecoveryOnlineGll.kt → ...s/src/jmh/kotlin/org/RecoveryOnlineGll.kt
diff --git a/...s/src/main/kotlin/org/SimpleOfflineGll.kt → ...ks/src/jmh/kotlin/org/SimpleOfflineGll.kt b/...s/src/main/kotlin/org/SimpleOfflineGll.kt → ...ks/src/jmh/kotlin/org/SimpleOfflineGll.kt
diff --git a/...ks/src/main/kotlin/org/SimpleOnlineGll.kt → ...rks/src/jmh/kotlin/org/SimpleOnlineGll.kt b/...ks/src/main/kotlin/org/SimpleOnlineGll.kt → ...rks/src/jmh/kotlin/org/SimpleOnlineGll.kt
diff --git a/generator/src/main/kotlin/org/ucfs/parser/RecoveryParserGenerator.kt b/generator/src/main/kotlin/org/ucfs/parser/RecoveryParserGenerator.kt
@@ -26,7 +26,7 @@ class RecoveryParserGenerator(grammarClazz: Class<*>, terminalsEnum: Class<*>) :
     private fun generateMainLoopFunction(): FunSpec {
         return FunSpec.builder(MAIN_PARSE_FUNC).addModifiers(KModifier.OVERRIDE).addParameter(
             DESCRIPTOR, descriptorType
-        ).addStatement("super.%L()", MAIN_PARSE_FUNC)
+        ).addStatement("super.%L(%L)", MAIN_PARSE_FUNC, DESCRIPTOR)
             .addStatement("%L.%L(this, %L)", recoveryEngineType, RECOVERY_METHOD_NAME, DESCRIPTOR).build()
     }
     override fun getParserClassName(): String {