Add params to benchmark report

Author: orangy

runtime/commonMain/src/org/jetbrains/gradle/benchmarks/BenchmarkReporter.kt

@@ -3,30 +3,35 @@ package org.jetbrains.gradle.benchmarks
 expect fun saveReport(reportFile: String?, results: Collection<ReportBenchmarkResult>)
 
 fun formatJson(results: Collection<ReportBenchmarkResult>) =
-    results.joinToString(",", prefix = "[", postfix = "\n]") {
+    results.joinToString(",", prefix = "[", postfix = "\n]") { result ->
         """
   {
-    "benchmark" : "${it.benchmark.name}",
-    "mode" : "${it.config.mode.toText()}",
-    "warmupIterations" : ${it.config.warmups},
-    "warmupTime" : "${it.config.iterationTime} ${it.config.iterationTimeUnit.toText()}",
-    "measurementIterations" : ${it.config.iterations},
-    "measurementTime" : "${it.config.iterationTime} ${it.config.iterationTimeUnit.toText()}",
+    "benchmark" : "${result.benchmark.name}",
+    "mode" : "${result.config.mode.toText()}",
+    "warmupIterations" : ${result.config.warmups},
+    "warmupTime" : "${result.config.iterationTime} ${result.config.iterationTimeUnit.toText()}",
+    "measurementIterations" : ${result.config.iterations},
+    "measurementTime" : "${result.config.iterationTime} ${result.config.iterationTimeUnit.toText()}",
+    "params" : {
+          ${result.params.entries.joinToString(separator = ",\n          ") {
+            "\"${it.key}\" : \"${it.value}\""
+        }}
+    },
     "primaryMetric" : {
-       "score": ${it.score},
-       "scoreError": ${it.error},
+       "score": ${result.score},
+       "scoreError": ${result.error},
        "scoreConfidence" : [
-          ${it.confidence.first},
-          ${it.confidence.second}
+          ${result.confidence.first},
+          ${result.confidence.second}
        ],
        "scorePercentiles" : {
-          ${it.percentiles.entries.joinToString(separator = ",\n          ") {
+          ${result.percentiles.entries.joinToString(separator = ",\n          ") {
             "\"${it.key.format(2)}\" : ${it.value}"
         }}
        },
-       "scoreUnit" : "${unitText(it.config.mode, it.config.outputTimeUnit)}",
+       "scoreUnit" : "${unitText(result.config.mode, result.config.outputTimeUnit)}",
        "rawData" : [
-           ${it.values.joinToString(
+           ${result.values.joinToString(
             prefix = "[\n             ",
             postfix = "\n           ]",
             separator = ",\n             "

runtime/commonMain/src/org/jetbrains/gradle/benchmarks/ReportBenchmarkResult.kt

@@ -3,6 +3,7 @@ package org.jetbrains.gradle.benchmarks
 class ReportBenchmarkResult(
     val config: BenchmarkConfiguration,
     val benchmark: BenchmarkDescriptor<*>,
+    val params: Map<String, String>,
     val score: Double,
     val error: Double,
     val confidence: Pair<Double, Double>,

runtime/commonMain/src/org/jetbrains/gradle/benchmarks/ReportBenchmarksStatistics.kt

@@ -51,7 +51,12 @@ class ReportBenchmarksStatistics(values: DoubleArray) {
     }
 
     companion object {
-        fun createResult(benchmark: BenchmarkDescriptor<*>, config: BenchmarkConfiguration, samples: DoubleArray): ReportBenchmarkResult {
+        fun createResult(
+            benchmark: BenchmarkDescriptor<*>,
+            params: Map<String, String>,
+            config: BenchmarkConfiguration,
+            samples: DoubleArray
+        ): ReportBenchmarkResult {
             val statistics = ReportBenchmarksStatistics(samples)
             val score = statistics.mean()
             val errorMargin = 1.96 * (statistics.standardDeviation() / sqrt(samples.size.toDouble()))
@@ -70,6 +75,7 @@ class ReportBenchmarksStatistics(values: DoubleArray) {
             return ReportBenchmarkResult(
                 config,
                 benchmark,
+                params,
                 score,
                 errorMargin,
                 (score - errorMargin) to (score + errorMargin),

runtime/jsMain/src/org/jetbrains/gradle/benchmarks/js/JsExecutor.kt

@@ -88,7 +88,7 @@ class JsExecutor(name: String, @Suppress("UNUSED_PARAMETER") dummy_args: Array<o
                             nanos.nanosToSample(config.mode, config.outputTimeUnit)
                         }
                         .toDoubleArray()
-                    val result = ReportBenchmarksStatistics.createResult(benchmark, config, samples)
+                    val result = ReportBenchmarksStatistics.createResult(benchmark, params, config, samples)
                     val message = with(result) {
                         "  ~ ${score.sampleToText(
                             config.mode,

runtime/nativeMain/src/org/jetbrains/gradle/benchmarks/native/NativeExecutor.kt

@@ -44,7 +44,7 @@ class NativeExecutor(name: String, args: Array<out String>) : SuiteExecutor(name
                 }
 
                 if (exception == null) {
-                    val result = ReportBenchmarksStatistics.createResult(benchmark, config, samples)
+                    val result = ReportBenchmarksStatistics.createResult(benchmark, params, config, samples)
                     val message = with(result) {
                         // TODO: metric
                         "  ~ ${score.sampleToText(