From cbda22ab48960080c629cff7ebdce05e43686a88 Mon Sep 17 00:00:00 2001
From: Ivan Kylchik <ivan.kylchik@jetbrains.com>
Date: Mon, 4 Mar 2024 18:02:27 +0100
Subject: [PATCH] [K2] Don't include `IRTranslation` time as total `Generation`
 time

Such behavior is more on par with K1.

#KT-65094 Fixed
---
 .../kotlin/cli/jvm/compiler/FirKotlinToJvmBytecodeCompiler.kt   | 2 +-
 .../kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt        | 2 +-
 .../kotlin/incremental/IncrementalFirJvmCompilerRunner.kt       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/FirKotlinToJvmBytecodeCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/FirKotlinToJvmBytecodeCompiler.kt
index abf541f83da..5bf14089453 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/FirKotlinToJvmBytecodeCompiler.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/FirKotlinToJvmBytecodeCompiler.kt
@@ -157,7 +157,6 @@ object FirKotlinToJvmBytecodeCompiler {
             return null
         }
 
-        performanceManager?.notifyGenerationStarted()
         performanceManager?.notifyIRTranslationStarted()
 
         val fir2IrExtensions = JvmFir2IrExtensions(configuration, JvmIrDeserializerImpl(), JvmIrMangler)
@@ -166,6 +165,7 @@ object FirKotlinToJvmBytecodeCompiler {
 
         performanceManager?.notifyIRTranslationFinished()
 
+        performanceManager?.notifyGenerationStarted()
         val generationState = runBackend(
             fir2IrExtensions,
             fir2IrAndIrActualizerResult,
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt
index 44b11e33341..0e84cfe9075 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/pipeline/compilerPipeline.kt
@@ -138,7 +138,6 @@ fun compileModulesUsingFrontendIrAndLightTree(
         return false
     }
 
-    performanceManager?.notifyGenerationStarted()
     performanceManager?.notifyIRTranslationStarted()
 
     val compilerEnvironment = ModuleCompilerEnvironment(projectEnvironment, diagnosticsReporter)
@@ -146,6 +145,7 @@ fun compileModulesUsingFrontendIrAndLightTree(
 
     performanceManager?.notifyIRTranslationFinished()
 
+    performanceManager?.notifyGenerationStarted()
     val codegenOutput = generateCodeFromIr(irInput, compilerEnvironment, performanceManager)
 
     diagnosticsReporter.reportToMessageCollector(
diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunner.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunner.kt
index 817469f1fd8..8bc3dca77bf 100644
--- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunner.kt
+++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalFirJvmCompilerRunner.kt
@@ -267,7 +267,6 @@ open class IncrementalFirJvmCompilerRunner(
 
             val cycleResult = firIncrementalCycle() ?: return ExitCode.COMPILATION_ERROR to allCompiledSources
 
-            performanceManager?.notifyGenerationStarted()
             performanceManager?.notifyIRTranslationStarted()
 
             val extensions = JvmFir2IrExtensions(configuration, JvmIrDeserializerImpl(), JvmIrMangler)
@@ -278,6 +277,7 @@ open class IncrementalFirJvmCompilerRunner(
 
             performanceManager?.notifyIRTranslationFinished()
 
+            performanceManager?.notifyGenerationStarted()
             val irInput = ModuleCompilerIrBackendInput(
                 targetId,
                 configuration,