From 7f055f5d91475dace1a0007ac0ef4e9fc471115e Mon Sep 17 00:00:00 2001 From: LepilkinaElena Date: Fri, 1 Nov 2019 16:58:13 +0300 Subject: [PATCH] Added options in external report (#3534) --- performance/build.gradle | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/performance/build.gradle b/performance/build.gradle index 31af64fcecc..a3feed1cc3e 100644 --- a/performance/build.gradle +++ b/performance/build.gradle @@ -88,19 +88,29 @@ task registerExternalBenchmarks { return def lines = reportFile.readLines() - if (lines.size < 3) { - println("Couldn't use report to register benchmarks. Wrong format.") + if (lines.size < 4) { + project.logger.warn("Couldn't use report to register benchmarks. Wrong format.") return } def name = lines[0] - def status = lines[1] - def compileTime = lines[2] + def options = lines[1] + if (!options.startsWith("OPTIONS")) { + project.logger.warn("Couldn't use report to register benchmarks. Wrong format in options description.") + return + } + def optionsList = options.replace("OPTIONS ", "").replaceAll("\\[|\\]", "").split(",\\s*").toList() + def status = lines[2] + def compileTime = null def codeSize = null - if (lines.size > 3) { - codeSize = lines[3] + lines.drop(3).each { + if (it.startsWith("COMPILE_TIME")) { + compileTime = it + } + if (it.startsWith("CODE_SIZE")) { + codeSize = it + } } // Create benchmarks report. - def compileBenchmark = MPPTools.toCompileBenchmark(compileTime, status, name) def properties = [ "cpu": System.getProperty("os.arch"), "os": System.getProperty("os.name"), @@ -109,9 +119,12 @@ task registerExternalBenchmarks { "kotlinVersion": kotlinVersion, "type": "native", "compilerVersion": konanVersion, - "flags": ["-g"], - "benchmarks": "[]", - "compileTime": [compileBenchmark]] + "flags": optionsList, + "benchmarks": "[]"] + if (compileTime != null) { + def compileBenchmark = MPPTools.toCompileBenchmark(compileTime, status, name) + properties += ["compileTime": [compileBenchmark]] + } if (codeSize != null) { properties += ["codeSize": MPPTools.toCodeSizeBenchmark(codeSize, status, name)] }