From 90754d11c1c9350f29020cdf0a664e87292c840f Mon Sep 17 00:00:00 2001 From: Troels Bjerre Lund Date: Thu, 9 Jun 2022 15:38:14 +0200 Subject: [PATCH] [K/N] Code cleanup from deprecation warnings No functionality change; just quieting some warnings --- .../src/main/kotlin/analyzer/Statistics.kt | 4 ++-- .../kotlin/analyzer/SummaryBenchmarksReport.kt | 8 ++------ .../src/main/kotlin/report/json/JsonParser.kt | 16 ++++++++-------- .../src/main/kotlin/report/json/StringOps.kt | 18 +++++++++--------- .../benchmarksAnalyzer/src/main/kotlin/main.kt | 5 ++--- 5 files changed, 23 insertions(+), 28 deletions(-) diff --git a/kotlin-native/tools/benchmarks/shared/src/main/kotlin/analyzer/Statistics.kt b/kotlin-native/tools/benchmarks/shared/src/main/kotlin/analyzer/Statistics.kt index 79859ecd9d9..628d5d6ce96 100644 --- a/kotlin-native/tools/benchmarks/shared/src/main/kotlin/analyzer/Statistics.kt +++ b/kotlin-native/tools/benchmarks/shared/src/main/kotlin/analyzer/Statistics.kt @@ -87,7 +87,7 @@ fun computeMeanVariance(samples: List): MeanVariance { } val mean = filteredSamples.sum() / filteredSamples.size - val variance = samples.indices.sumByDouble { + val variance = samples.indices.sumOf { (samples[it] - mean) * (samples[it] - mean) } / samples.size val confidenceInterval = sqrt(variance / samples.size) * zStar @@ -143,5 +143,5 @@ fun collectMeanResults(benchmarks: Map>): Benchmar fun collectBenchmarksDurations(benchmarks: Map>): Map = benchmarks.map { (name, resultsSet) -> - name to resultsSet.sumByDouble { it.runtimeInUs } + name to resultsSet.sumOf { it.runtimeInUs } }.toMap() \ No newline at end of file diff --git a/kotlin-native/tools/benchmarks/shared/src/main/kotlin/analyzer/SummaryBenchmarksReport.kt b/kotlin-native/tools/benchmarks/shared/src/main/kotlin/analyzer/SummaryBenchmarksReport.kt index 12c98cd070e..9efab60ee7e 100644 --- a/kotlin-native/tools/benchmarks/shared/src/main/kotlin/analyzer/SummaryBenchmarksReport.kt +++ b/kotlin-native/tools/benchmarks/shared/src/main/kotlin/analyzer/SummaryBenchmarksReport.kt @@ -268,12 +268,8 @@ class SummaryBenchmarksReport(val currentReport: BenchmarksReport, name to benchmarks.filter { it.metric == metric } }?.filter { it.second.isNotEmpty() }?.toMap() metric to DetailedBenchmarksReport( - currentReport.benchmarks.map { (name, benchmarks) -> - name to benchmarks.filter { it.metric == metric } - }.filter { it.second.isNotEmpty() }.toMap(), - previousReport?.benchmarks?.map { (name, benchmarks) -> - name to benchmarks.filter { it.metric == metric } - }?.filter { it.second.isNotEmpty() }?.toMap(), + currentBenchmarks, + previousBenchmarks, meaningfulChangesValue ) }.toMap() diff --git a/kotlin-native/tools/benchmarks/shared/src/main/kotlin/report/json/JsonParser.kt b/kotlin-native/tools/benchmarks/shared/src/main/kotlin/report/json/JsonParser.kt index 42f51e67083..bef8c805480 100644 --- a/kotlin-native/tools/benchmarks/shared/src/main/kotlin/report/json/JsonParser.kt +++ b/kotlin-native/tools/benchmarks/shared/src/main/kotlin/report/json/JsonParser.kt @@ -84,17 +84,17 @@ internal object EscapeCharMappings { } private fun CharArray.initC2ESC(c: Int, esc: Char) { this[c] = esc - if (esc != UNICODE_ESC) ESC2C[esc.toInt()] = c.toChar() + if (esc != UNICODE_ESC) ESC2C[esc.code] = c.toChar() } - private fun CharArray.initC2ESC(c: Char, esc: Char) = initC2ESC(c.toInt(), esc) + private fun CharArray.initC2ESC(c: Char, esc: Char) = initC2ESC(c.code, esc) } private fun ByteArray.initC2TC(c: Int, cl: Byte) { this[c] = cl } private fun ByteArray.initC2TC(c: Char, cl: Byte) { - initC2TC(c.toInt(), cl) + initC2TC(c.code, cl) } -internal fun charToTokenClass(c: Char) = if (c.toInt() < CTC_MAX) C2TC[c.toInt()] else TC_OTHER +internal fun charToTokenClass(c: Char) = if (c.code < CTC_MAX) C2TC[c.code] else TC_OTHER internal fun escapeToChar(c: Int): Char = if (c < ESC2C_MAX) ESC2C[c] else INVALID // JSON low level parser internal class Parser(val source: String) { @@ -226,7 +226,7 @@ internal class Parser(val source: String) { if (curChar == UNICODE_ESC) { curPos = appendHex(source, curPos) } else { - val c = escapeToChar(curChar.toInt()) + val c = escapeToChar(curChar.code) require(c != INVALID, curPos) { "Invalid escaped char '$curChar'" } append(c) } @@ -269,9 +269,9 @@ private fun fromHexChar(source: String, curPos: Int): Int { require(curPos < source.length, curPos) { "Unexpected end in unicode escape" } val curChar = source[curPos] return when (curChar) { - in '0'..'9' -> curChar.toInt() - '0'.toInt() - in 'a'..'f' -> curChar.toInt() - 'a'.toInt() + 10 - in 'A'..'F' -> curChar.toInt() - 'A'.toInt() + 10 + in '0'..'9' -> curChar.code - '0'.code + in 'a'..'f' -> curChar.code - 'a'.code + 10 + in 'A'..'F' -> curChar.code - 'A'.code + 10 else -> fail(curPos, "Invalid toHexChar char '$curChar' in unicode escape") } } diff --git a/kotlin-native/tools/benchmarks/shared/src/main/kotlin/report/json/StringOps.kt b/kotlin-native/tools/benchmarks/shared/src/main/kotlin/report/json/StringOps.kt index 9602c5f2ee6..1c22c669c0e 100644 --- a/kotlin-native/tools/benchmarks/shared/src/main/kotlin/report/json/StringOps.kt +++ b/kotlin-native/tools/benchmarks/shared/src/main/kotlin/report/json/StringOps.kt @@ -18,8 +18,8 @@ package org.jetbrains.report.json private fun toHexChar(i: Int) : Char { val d = i and 0xf - return if (d < 10) (d + '0'.toInt()).toChar() - else (d - 10 + 'a'.toInt()).toChar() + return if (d < 10) (d + '0'.code).toChar() + else (d - 10 + 'a'.code).toChar() } private val ESCAPE_CHARS: Array = arrayOfNulls(128).apply { @@ -30,12 +30,12 @@ private val ESCAPE_CHARS: Array = arrayOfNulls(128).apply { val c4 = toHexChar(c) this[c] = "\\u$c1$c2$c3$c4" } - this['"'.toInt()] = "\\\"" - this['\\'.toInt()] = "\\\\" - this['\t'.toInt()] = "\\t" - this['\b'.toInt()] = "\\b" - this['\n'.toInt()] = "\\n" - this['\r'.toInt()] = "\\r" + this['"'.code] = "\\\"" + this['\\'.code] = "\\\\" + this['\t'.code] = "\\t" + this['\b'.code] = "\\b" + this['\n'.code] = "\\n" + this['\r'.code] = "\\r" this[0x0c] = "\\f" } @@ -44,7 +44,7 @@ internal fun StringBuilder.printQuoted(value: String) { var lastPos = 0 val length = value.length for (i in 0 until length) { - val c = value[i].toInt() + val c = value[i].code // Do not replace this constant with C2ESC_MAX (which is smaller than ESCAPE_CHARS size), // otherwise JIT won't eliminate range check and won't vectorize this loop if (c >= ESCAPE_CHARS.size) continue // no need to escape diff --git a/kotlin-native/tools/benchmarksAnalyzer/src/main/kotlin/main.kt b/kotlin-native/tools/benchmarksAnalyzer/src/main/kotlin/main.kt index 7ebbab7578f..3ae6b7ad167 100644 --- a/kotlin-native/tools/benchmarksAnalyzer/src/main/kotlin/main.kt +++ b/kotlin-native/tools/benchmarksAnalyzer/src/main/kotlin/main.kt @@ -175,9 +175,8 @@ fun main(args: Array) { // Get unstable benchmarks. val unstableBenchmarks = if (!flatReport) DBServerConnector.getUnstableBenchmarks() else null - unstableBenchmarks ?: - if (!flatReport) - println("Failed to get access to server and get unstable benchmarks list!") + if (!flatReport && unstableBenchmarks == null) + println("Failed to get access to server and get unstable benchmarks list!") // Read contents of file. val mainBenchsReport = mergeReportsWithDetailedFlags(getBenchmarkReport(mainReport, user))