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 39accd47d48..e8a78e6c773 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
@@ -158,7 +158,6 @@ object FirKotlinToJvmBytecodeCompiler {
         val fir2IrAndIrActualizerResult =
             firResult.convertToIrAndActualizeForJvm(fir2IrExtensions, configuration, diagnosticsReporter, irGenerationExtensions)
 
-        performanceManager?.notifyGenerationStarted()
         val generationState = runBackend(
             fir2IrExtensions,
             fir2IrAndIrActualizerResult,
@@ -167,8 +166,6 @@ object FirKotlinToJvmBytecodeCompiler {
 
         FirDiagnosticsCompilerResultsReporter.reportToMessageCollector(diagnosticsReporter, messageCollector, renderDiagnosticNames)
 
-        performanceManager?.notifyIRGenerationFinished()
-        performanceManager?.notifyGenerationFinished()
         ProgressIndicatorAndCompilationCanceledStatus.checkCanceled()
 
         return firResult to generationState
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 61376a431a2..0e2737969a4 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
@@ -136,16 +136,12 @@ fun compileModulesUsingFrontendIrAndLightTree(
     val compilerEnvironment = ModuleCompilerEnvironment(projectEnvironment, diagnosticsReporter)
     val irInput = convertAnalyzedFirToIr(compilerInput, analysisResults, compilerEnvironment)
 
-    performanceManager?.notifyGenerationStarted()
     val codegenOutput = generateCodeFromIr(irInput, compilerEnvironment, performanceManager)
 
     diagnosticsReporter.reportToMessageCollector(
         messageCollector, moduleConfiguration.getBoolean(CLIConfigurationKeys.RENDER_DIAGNOSTIC_INTERNAL_NAME)
     )
 
-    performanceManager?.notifyIRGenerationFinished()
-    performanceManager?.notifyGenerationFinished()
-
     return writeOutputsIfNeeded(
         project,
         compilerConfiguration,
@@ -236,6 +232,7 @@ fun generateCodeFromIr(
         environment.diagnosticsReporter
     ).build()
 
+    performanceManager?.notifyGenerationStarted()
     performanceManager?.notifyIRLoweringStarted()
     generationState.beforeCompile()
     codegenFactory.generateModuleInFrontendIRMode(
@@ -255,6 +252,9 @@ fun generateCodeFromIr(
     }
     CodegenFactory.doCheckCancelled(generationState)
     generationState.factory.done()
+    performanceManager?.notifyIRGenerationFinished()
+
+    performanceManager?.notifyGenerationFinished()
 
     return ModuleCompilerOutput(generationState)
 }
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 2418c24e110..902ba2e28ad 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
@@ -269,7 +269,6 @@ open class IncrementalFirJvmCompilerRunner(
                 extensions, configuration, compilerEnvironment.diagnosticsReporter, irGenerationExtensions,
             )
 
-            performanceManager?.notifyGenerationStarted()
             val irInput = ModuleCompilerIrBackendInput(
                 targetId,
                 configuration,
@@ -282,9 +281,6 @@ open class IncrementalFirJvmCompilerRunner(
 
             val codegenOutput = generateCodeFromIr(irInput, compilerEnvironment, performanceManager)
 
-            performanceManager?.notifyIRGenerationFinished()
-            performanceManager?.notifyGenerationFinished()
-
             diagnosticsReporter.reportToMessageCollector(messageCollector, renderDiagnosticName)
 
             writeOutputsIfNeeded(