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

[FIR Test] Fix file counting for global passes

Browse Source
This commit is contained in:
Simon Ogorodnik
2021-07-28 16:11:20 +03:00
committed by teamcityserver
parent 1188d311b3
commit 97bfc49ed6
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirResolveBench.kt
+6 -4
View File
@@ -155,10 +155,10 @@ class FirResolveBench(val withProgress: Boolean, val listener: BenchListener? =
} }
} }
private fun recordTime(stageClass: KClass<*>, diff: VMCounters, time: Long) { private fun recordTime(stageClass: KClass<*>, diff: VMCounters, time: Long, files: Int = 1) {
timePerTransformer.computeIfAbsent(stageClass) { Measure() }.apply { timePerTransformer.computeIfAbsent(stageClass) { Measure() }.apply {
this.time += time this.time += time
this.files += 1 this.files += files
this.user += diff.userTime this.user += diff.userTime
this.cpu += diff.cpuTime this.cpu += diff.cpuTime
this.gcCollections += diff.gcInfo.values.sumOf { it.collections.toInt() } this.gcCollections += diff.gcInfo.values.sumOf { it.collections.toInt() }
@@ -197,7 +197,8 @@ class FirResolveBench(val withProgress: Boolean, val listener: BenchListener? =
private fun runStage(processor: FirGlobalResolveProcessor, firFiles: List<FirFile>) { private fun runStage(processor: FirGlobalResolveProcessor, firFiles: List<FirFile>) {
processWithTimeMeasure( processWithTimeMeasure(
processor::class, processor::class,
{ processor.process(firFiles) } { processor.process(firFiles) },
files = firFiles.size
) { e -> ) { e ->
val message = "Fail on stage ${processor::class}" val message = "Fail on stage ${processor::class}"
println(message) println(message)
@@ -208,6 +209,7 @@ class FirResolveBench(val withProgress: Boolean, val listener: BenchListener? =
private inline fun processWithTimeMeasure( private inline fun processWithTimeMeasure(
kClass: KClass<*>, kClass: KClass<*>,
block: () -> Unit, block: () -> Unit,
files: Int = 1,
catchBlock: (Throwable) -> FailureInfo catchBlock: (Throwable) -> FailureInfo
) { ) {
var fail = false var fail = false
@@ -223,7 +225,7 @@ class FirResolveBench(val withProgress: Boolean, val listener: BenchListener? =
if (!fail) { if (!fail) {
val after = vmStateSnapshot() val after = vmStateSnapshot()
val diff = after - before val diff = after - before
recordTime(kClass, diff, time) recordTime(kClass, diff, time, files)
} }
} }