diff --git a/performance/buildSrc/src/main/kotlin/BuildRegister.kt b/performance/buildSrc/src/main/kotlin/BuildRegister.kt index f293732d3d5..0a4ba665bf9 100644 --- a/performance/buildSrc/src/main/kotlin/BuildRegister.kt +++ b/performance/buildSrc/src/main/kotlin/BuildRegister.kt @@ -98,7 +98,9 @@ open class BuildRegister : DefaultTask() { // Get summary information. val output = arrayOf("$analyzer", "summary", "-exec-samples", "all", "-compile", "samples", - "-compile-samples", "HelloWorld,Videoplayer", "-codesize-samples", "all", "$currentBenchmarksReportFile") + "-compile-samples", "HelloWorld,Videoplayer", "-codesize-samples", "all", + "-exec-normalize", "bintray:goldenResults.csv", + "-codesize-normalize", "bintray:goldenResults.csv", "$currentBenchmarksReportFile") .runCommand() // Postprocess information. val buildInfoParts = output.split(',') diff --git a/tools/performance-server/ui/index.ejs b/tools/performance-server/ui/index.ejs index 56eaf87d718..03dac2662a6 100644 --- a/tools/performance-server/ui/index.ejs +++ b/tools/performance-server/ui/index.ejs @@ -74,7 +74,7 @@
-

Execution time

+

Normalized execution time

@@ -88,7 +88,7 @@

-

Code size

+

Normalized code size

diff --git a/tools/performance-server/ui/src/main/kotlin/main.kt b/tools/performance-server/ui/src/main/kotlin/main.kt index 1aaa7e2fdd1..35c4a3311ec 100644 --- a/tools/performance-server/ui/src/main/kotlin/main.kt +++ b/tools/performance-server/ui/src/main/kotlin/main.kt @@ -234,6 +234,12 @@ fun main(args: Array) { val buildsNumbersUrl = "$serverUrl/buildsNumbers/${parameters["target"]}" val buildsNumbers: Array = JSON.parse(sendGetRequest(buildsNumbersUrl)) + // Add release branches to selector. + releaseBranches.forEach { + val option = Option(it, it) + js("$('#inputGroupBranch')").append(js("$(option)")) + } + // Change inputs values connected with parameters and add events listeners. document.querySelector("#inputGroupTarget [value=\"${parameters["target"]}\"]")?.setAttribute("selected", "true") document.querySelector("#inputGroupBuildType [value=\"${parameters["type"]}\"]")?.setAttribute("selected", "true") @@ -266,12 +272,6 @@ fun main(args: Array) { } }) - // Add release branches to selector. - releaseBranches.forEach { - val option = Option(it, it) - js("$('#inputGroupBranch')").append(js("$(option)")) - } - val autocompleteParameters: dynamic = object{} autocompleteParameters["lookup"] = buildsNumbers autocompleteParameters["onSelect"] = { suggestion -> @@ -308,7 +308,7 @@ fun main(args: Array) { } separateValues(it.executionTime, executionTime) { value -> value.toDouble() } separateValues(it.compileTime, compileTime) { value -> value.toDouble() / 1000 } - separateValues(it.codeSize, codeSize) { value -> value.toDouble() / 1024.0 } + separateValues(it.codeSize, codeSize) { value -> value.toDouble() } bundleSize.add(it.bundleSize?.toInt()?. let { it / 1024 / 1024 }) } @@ -316,11 +316,11 @@ fun main(args: Array) { // Draw charts. val execChart = Chartist.Line("#exec_chart", getChartData(labels, executionTime.values), - getChartOptions(executionTime.keys.toTypedArray(), "Time, microseconds")) + getChartOptions(executionTime.keys.toTypedArray(), "Normalized time")) val compileChart = Chartist.Line("#compile_chart", getChartData(labels, compileTime.values), getChartOptions(compileTime.keys.toTypedArray(), "Time, milliseconds")) val codeSizeChart = Chartist.Line("#codesize_chart", getChartData(labels, codeSize.values, sizeClassName), - getChartOptions(codeSize.keys.toTypedArray(), "Size, KB", arrayOf("ct-series-2"))) + getChartOptions(codeSize.keys.toTypedArray(), "Normalized size", arrayOf("ct-series-2"))) val bundleSizeChart = Chartist.Line("#bundlesize_chart", getChartData(labels, listOf(bundleSize), sizeClassName), getChartOptions(arrayOf("Bundle size"), "Size, MB", arrayOf("ct-series-2")))