From 3f1e06b32ea38d5ebb7268b36b34a4a7ffb2598b Mon Sep 17 00:00:00 2001 From: Pavel Kunyavskiy Date: Wed, 13 Jul 2022 12:08:33 +0200 Subject: [PATCH] [K/N] Performance infra fixes --- .../kotlin-js/org/jetbrains/analyzer/Utils.kt | 4 +-- .../tools/benchmarksAnalyzer/web/.gitignore | 1 + .../tools/benchmarksAnalyzer/web/index.html | 17 +++++++++++ .../tools/benchmarksAnalyzer/web/main.js | 29 +++++++++++++++++++ .../ui/src/main/kotlin/main.kt | 2 +- 5 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 kotlin-native/tools/benchmarksAnalyzer/web/.gitignore create mode 100644 kotlin-native/tools/benchmarksAnalyzer/web/index.html create mode 100644 kotlin-native/tools/benchmarksAnalyzer/web/main.js diff --git a/kotlin-native/tools/benchmarksAnalyzer/src/main/kotlin-js/org/jetbrains/analyzer/Utils.kt b/kotlin-native/tools/benchmarksAnalyzer/src/main/kotlin-js/org/jetbrains/analyzer/Utils.kt index bf2de5a77aa..1d19ecb3c54 100644 --- a/kotlin-native/tools/benchmarksAnalyzer/src/main/kotlin-js/org/jetbrains/analyzer/Utils.kt +++ b/kotlin-native/tools/benchmarksAnalyzer/src/main/kotlin-js/org/jetbrains/analyzer/Utils.kt @@ -28,11 +28,9 @@ actual fun assert(value: Boolean, lazyMessage: () -> Any) { } actual fun sendGetRequest(url: String, user: String?, password: String?, followLocation: Boolean) : String { - val proxyServerAddress = "https://perf-proxy.labs.jb.gg/" - val newUrl = proxyServerAddress + url val request = XMLHttpRequest() - request.open("GET", newUrl, false, user, password) + request.open("GET", url, false, user, password) request.send() if (request.status == 200.toShort()) { return request.responseText diff --git a/kotlin-native/tools/benchmarksAnalyzer/web/.gitignore b/kotlin-native/tools/benchmarksAnalyzer/web/.gitignore new file mode 100644 index 00000000000..477f0612bf1 --- /dev/null +++ b/kotlin-native/tools/benchmarksAnalyzer/web/.gitignore @@ -0,0 +1 @@ +benchmarksAnalyzer.js* diff --git a/kotlin-native/tools/benchmarksAnalyzer/web/index.html b/kotlin-native/tools/benchmarksAnalyzer/web/index.html new file mode 100644 index 00000000000..82408225604 --- /dev/null +++ b/kotlin-native/tools/benchmarksAnalyzer/web/index.html @@ -0,0 +1,17 @@ + + + + + Benchmarks report + + + + + + + + + diff --git a/kotlin-native/tools/benchmarksAnalyzer/web/main.js b/kotlin-native/tools/benchmarksAnalyzer/web/main.js new file mode 100644 index 00000000000..b43720d94e9 --- /dev/null +++ b/kotlin-native/tools/benchmarksAnalyzer/web/main.js @@ -0,0 +1,29 @@ +$(function() { + var report = getUrlParameter('report'); + var compareToReport = getUrlParameter('compareTo'); + var hostname = window.location.href.substring(0, window.location.href.lastIndexOf('/')); + if (report === undefined) { + alert("Need to provide report parameter"); + throw new Error("Need to provide report parameter"); + } + if (compareToReport === undefined) { + benchmarksAnalyzer.main_kand9s$([report, "-r", "html", "-o", "html"]); + } else { + benchmarksAnalyzer.main_kand9s$([report,compareToReport, "-r", "html", "-o", "html"]); + } +}); + +var getUrlParameter = function getUrlParameter(sParam) { + var sPageURL = window.location.search.substring(1), + sURLVariables = sPageURL.split('&'), + sParameterName, + i; + + for (i = 0; i < sURLVariables.length; i++) { + sParameterName = sURLVariables[i].split('='); + + if (sParameterName[0] === sParam) { + return sParameterName[1] === undefined ? true : decodeURIComponent(sParameterName[1]); + } + } +}; diff --git a/kotlin-native/tools/performance-server/ui/src/main/kotlin/main.kt b/kotlin-native/tools/performance-server/ui/src/main/kotlin/main.kt index 2f973e6ecac..730179eb5db 100644 --- a/kotlin-native/tools/performance-server/ui/src/main/kotlin/main.kt +++ b/kotlin-native/tools/performance-server/ui/src/main/kotlin/main.kt @@ -132,7 +132,7 @@ fun customizeChart(chart: dynamic, chartContainer: String, jquerySelector: dynam previousBuild = builds.get(data.index - shift) shift++ } - val linkToDetailedInfo = "https://kotlin-native-performance.labs.jb.gg/?report=" + + val linkToDetailedInfo = "https://kotlin-native-perf-summary.labs.jb.gg/compare?report=" + "${currentBuild.buildNumber}:${parameters["target"]}" + "${previousBuild?.let { "&compareTo=${previousBuild.buildNumber}:${parameters["target"]}"