Tweak native formatting function (again)

Author: orangy

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

@@ -82,7 +82,7 @@ class ReportBenchmarksStatistics(values: DoubleArray) {
 
 expect fun Double.format(precision: Int): String
 
-fun Double.formatAtMost(precision: Int): String {
+fun Double.formatSignificant(precision: Int): String {
     val d = (precision - ceil(log10(this)).toInt()).coerceAtLeast(0) // display 4 significant digits
     return format(d)
 }
@@ -91,8 +91,8 @@ fun Double.formatAtMost(precision: Int): String {
 fun Double.nanosToText(mode: Mode, unit: BenchmarkTimeUnit): String {
     val value = nanosToSample(mode, unit)
     return when (mode) {
-        Mode.Throughput -> "${value.formatAtMost(6)} ops/${unit.toText()}"
-        Mode.AverageTime -> "${value.formatAtMost(6)} ${unit.toText()}/op"
+        Mode.Throughput -> "${value.formatSignificant(6)} ops/${unit.toText()}"
+        Mode.AverageTime -> "${value.formatSignificant(6)} ${unit.toText()}/op"
         else -> throw UnsupportedOperationException("$mode is not supported")
     }
 }
@@ -108,8 +108,8 @@ fun unitText(mode: Mode, unit: BenchmarkTimeUnit) = when (mode) {
 fun Double.sampleToText(mode: Mode, unit: BenchmarkTimeUnit): String {
     val value = this
     return when (mode) {
-        Mode.Throughput -> "${value.formatAtMost(6)} ops/${unit.toText()}"
-        Mode.AverageTime -> "${value.formatAtMost(6)} ${unit.toText()}/op"
+        Mode.Throughput -> "${value.formatSignificant(6)} ops/${unit.toText()}"
+        Mode.AverageTime -> "${value.formatSignificant(6)} ${unit.toText()}/op"
         else -> throw UnsupportedOperationException("$mode is not supported")
     }
 }

runtime/commonTest/src/org/jetbrains/gradle/benchmarks/tests/FormatTests.kt

@@ -6,16 +6,25 @@ import kotlin.test.*
 
 class FormatTests {
     @Test
-    fun formatPrecision() {
-        assertEquals("1,200", 1200.0.formatAtMost(4))
-        assertEquals("12.03", 12.03.formatAtMost(4))
-        assertEquals("1,200", 1200.00005.formatAtMost(4))
-        assertEquals("0.00000005000", 0.00000005.formatAtMost(4))
-        assertEquals("0.0001001", 0.00010005.formatAtMost(4))
+    fun format() {
+        assertEquals("1,200.0000", 1200.0.format(4))
+        assertEquals("12.0300", 12.03.format(4))
+        assertEquals("1,200.0001", 1200.00005.format(4))
+        assertEquals("0.0000", 0.00000005.format(4))
+        assertEquals("0.0001", 0.00010005.format(4))
     }
 
     @Test
-    fun formatTimeUnits() {
+    fun formatSignificant() {
+        assertEquals("1,200", 1200.0.formatSignificant(4))
+        assertEquals("12.03", 12.03.formatSignificant(4))
+        assertEquals("1,200", 1200.00005.formatSignificant(4))
+        assertEquals("0.00000005000", 0.00000005.formatSignificant(4))
+        assertEquals("0.0001001", 0.00010005.formatSignificant(4))
+    }
+    
+    @Test
+    fun nanosToText() {
         assertEquals("83.3333 ops/us", 12.0.nanosToText(Mode.Throughput, BenchmarkTimeUnit.MICROSECONDS))
         assertEquals("0.0120000 us/op", 12.0.nanosToText(Mode.AverageTime, BenchmarkTimeUnit.MICROSECONDS))
     }

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

@@ -89,7 +89,7 @@ class JsExecutor(name: String, @Suppress("UNUSED_PARAMETER") dummy_args: Array<o
                     .toDoubleArray()
                 val result = ReportBenchmarksStatistics.createResult(benchmark, config, samples)
                 val message = with(result) {
-                    "  ~ ${score.sampleToText(config.mode, config.outputTimeUnit)} ±${(error / score * 100).formatAtMost(2)}%"
+                    "  ~ ${score.sampleToText(config.mode, config.outputTimeUnit)} ±${(error / score * 100).formatSignificant(2)}%"
                 }
                 val error = event.target.error
                 if (error == null) {

runtime/nativeMain/src/org/jetbrains/gradle/benchmarks/Utils.kt

@@ -7,7 +7,7 @@ actual fun Double.format(precision: Int): String {
     val longPart = toLong()
     val fractional = this - longPart
     val thousands = longPart.toString().replace(Regex("\\B(?=(\\d{3})+(?!\\d))"), ",")
-    if (fractional < DBL_EPSILON || precision == 0)
+    if (precision == 0)
         return thousands
 
     return memScoped {

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

@@ -46,7 +46,7 @@ class NativeExecutor(name: String, args: Array<out String>) : SuiteExecutor(name
                     "  ~ ${score.sampleToText(
                         config.mode,
                         config.outputTimeUnit
-                    )} ±${(error / score * 100).formatAtMost(2)}%"
+                    )} ±${(error / score * 100).formatSignificant(2)}%"
                 }
 
                 reporter.endBenchmark(executionName, benchmark.name, BenchmarkProgress.FinishStatus.Success, message)