diff --git a/performance/build.gradle b/performance/build.gradle index 9670031b941..780372ec6af 100644 --- a/performance/build.gradle +++ b/performance/build.gradle @@ -18,6 +18,10 @@ buildscript { } repositories { + maven { + //TODO: this path should be removed!! + url "https://oss.sonatype.org/content/repositories/snapshots" + } maven { url kotlinCompilerRepo } @@ -91,12 +95,19 @@ task bench(type:DefaultTask) { doLast { def jvmReport = new Report(project.file("build/jvmReport.txt")) def konanReport = new Report(project.file("build/konanReport.txt")) + def average = "none" jvmReport.report.each { k, v -> def ratio = String.format('%.2f', konanReport.report[k]/v * 100) + if (k == 'RingAverage') { + average = ratio + } println("$k : $ratio %") if (System.getenv("TEAMCITY_BUILD_PROPERTIES_FILE") != null) println("##teamcity[buildStatisticValue key='$k' value='$ratio']") } + + println() + println("Average Ring score: $average %") } } @@ -105,7 +116,7 @@ class Report { def Map report = new HashMap() Report(File path) { - path.readLines().drop(3).takeWhile { it.split(':').length == 2 }.each { + path.readLines().drop(3).findAll { it.split(':').length == 2 }.each { def p = it.split(':') report.put(p[0].trim(), Double.parseDouble(p[1].trim())) } diff --git a/platformLibs/build.gradle b/platformLibs/build.gradle index 6c7ad5904a5..ff5d4df21fa 100644 --- a/platformLibs/build.gradle +++ b/platformLibs/build.gradle @@ -55,7 +55,6 @@ private String defFileToInstallTaskName(String target, String name) { return "install${defFileToLibName(target, name).capitalize()}" } -// TODO: Fix the report in performance project class KlibInstall extends Exec { @InputFile public File klib