azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[K/N] Added Mac OS X (Arm64) target support on performance server

Browse Source
This commit is contained in:
Elena Lepilkina
2022-02-15 13:22:49 +03:00
committed by Space
parent 76220ebf43
commit 703aea1362
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/tools/performance-server/src/main/kotlin/routes/route.kt
+10 -5
View File
@@ -226,8 +226,8 @@ fun router() {
val express = require("express")
val router = express.Router()
val connector = ElasticSearchConnector(networkConnector)
val benchmarksDispatcher = BenchmarksIndexesDispatcher(connector, "env.machine.os",
listOf("Linux", "Mac OS X", "Windows 10")
val benchmarksDispatcher = BenchmarksIndexesDispatcher(connector, "target",
listOf("Linux", "Mac OS X", "Windows 10", "Mac OS X Arm64")
)
val goldenIndex = GoldenResultsIndex(connector)
val buildInfoIndex = BuildInfoIndex(connector)
@@ -282,9 +282,14 @@ fun router() {
val goldenResultPromise = getGoldenResults(goldenIndex)
val goldenResults = goldenResultPromise.await()
// Register build information.
val target = reports[0].env.machine.os.let {
if (it == "Mac OS X" && reports[0].env.machine.cpu == "aarch64")
"$it Arm64"
else it
}
var buildInfoInstance = getConsistentBuildInfo(
BuildInfo(buildInfo.buildNumber, buildInfo.startTime, buildInfo.finishTime,
commitsList, buildInfo.branch, reports[0].env.machine.os, buildInfo.buildType),
commitsList, buildInfo.branch, target, buildInfo.buildType),
reports
)
if (register.bundleSize != null) {
@@ -295,7 +300,7 @@ fun router() {
val bundleSizeReport = BenchmarksReport(reports[0].env,
listOf(bundleSizeBenchmark), reports[0].compiler)
bundleSizeReport.buildNumber = buildInfoInstance.buildNumber
benchmarksDispatcher.insert(bundleSizeReport, reports[0].env.machine.os).then { _ ->
benchmarksDispatcher.insert(bundleSizeReport, target).then { _ ->
println("[BUNDLE] Success insert ${buildInfoInstance.buildNumber}")
}.catch { errorResponse ->
println("Failed to insert data for build")
@@ -307,7 +312,7 @@ fun router() {
.normalizeBenchmarksSet(goldenResults)
benchmarksReport.buildNumber = buildInfoInstance.buildNumber
// Save results in database.
benchmarksDispatcher.insert(benchmarksReport, benchmarksReport.env.machine.os)
benchmarksDispatcher.insert(benchmarksReport, target)
}
if (!buildExists(buildInfoInstance, buildInfoIndex)) {
buildInfoIndex.insert(buildInfoInstance).then { _ ->
kotlin-native/tools/performance-server/ui/index.ejs
+1
View File
@@ -34,6 +34,7 @@
<select class="custom-select" id="inputGroupTarget">
<option value="Linux">Linux</option>
<option value="Mac_OS_X">Mac OS X</option>
<option value="Mac_OS_X_Arm64">Mac OS X(Arm64)</option>
<option value="Windows_10">Windows 10</option>
</select>
</div>
kotlin-native/tools/performance-server/ui/src/main/kotlin/main.kt
+6 -2
View File
@@ -282,8 +282,12 @@ fun main(args: Array<String>) {
}
})
val platformSpecificBenchs = if (parameters["target"] == "Mac_OS_X") ",FrameworkBenchmarksAnalyzer,SpaceFramework_iosX64" else
if (parameters["target"] == "Linux") ",kotlinx.coroutines" else ""
val platformSpecificBenchs = when (parameters["target"]) {
"Mac_OS_X" -> ",FrameworkBenchmarksAnalyzer,SpaceFramework_iosX64"
"Mac_OS_X_Arm64" -> ",FrameworkBenchmarksAnalyzer"
"Linux" -> ",kotlinx.coroutines"
else -> ""
}
var execData = listOf<String>() to listOf<List<Double?>>()
var compileData = listOf<String>() to listOf<List<Double?>>()