[CLI] Include klib generation into IR translation time measurements

#KT-67473

Author: ivandev0

compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt

@@ -330,7 +330,10 @@ class K2JsIrCompiler : CLICompiler<K2JSCompilerArguments>() {
                 return OK
         }
 
-        if (!arguments.irProduceJs) return OK
+        if (!arguments.irProduceJs) {
+            performanceManager?.notifyIRTranslationFinished()
+            return OK
+        }
 
         messageCollector.report(INFO, "Produce executable: $outputDirPath")
         messageCollector.report(INFO, "Cache directory: ${arguments.cacheDirectory}")
@@ -368,6 +371,7 @@ class K2JsIrCompiler : CLICompiler<K2JSCompilerArguments>() {
                 messageCollector.report(INFO, "IC module builder rebuilt JS for module [${File(module).name}]")
             }
 
+            performanceManager?.notifyIRTranslationFinished()
             return OK
         }
 
@@ -612,6 +616,7 @@ class K2JsIrCompiler : CLICompiler<K2JSCompilerArguments>() {
         }
 
         // FIR2IR
+        performanceManager?.notifyIRTranslationStarted()
         val fir2IrActualizedResult = transformFirToIr(moduleStructure, analyzedOutput.output, diagnosticsReporter)
         FirDiagnosticsCompilerResultsReporter.reportToMessageCollector(diagnosticsReporter, messageCollector, true)
         if (diagnosticsReporter.hasErrors) {

compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/klib/compilerPipeline.kt

@@ -231,10 +231,6 @@ fun transformFirToIr(
     }
 
     val firResult = FirResult(firOutputs)
-
-    val performanceManager = moduleStructure.compilerConfiguration[CLIConfigurationKeys.PERF_MANAGER]
-    performanceManager?.notifyIRTranslationStarted()
-
     return firResult.convertToIrAndActualize(
         fir2IrExtensions,
         Fir2IrConfiguration.forKlibCompilation(moduleStructure.compilerConfiguration, diagnosticsReporter),
@@ -247,8 +243,6 @@ fun transformFirToIr(
         specialAnnotationsProvider = null,
     ) { irModuleFragment ->
         (irModuleFragment.descriptor as? FirModuleDescriptor)?.let { it.allDependencyModules = librariesDescriptors }
-    }.also {
-        performanceManager?.notifyIRTranslationFinished()
     }
 }
 

compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/klib/irForKlib.kt

@@ -23,6 +23,7 @@ import org.jetbrains.kotlin.backend.common.serialization.KotlinFileSerializedDat
 import org.jetbrains.kotlin.backend.common.serialization.mangle.ManglerChecker
 import org.jetbrains.kotlin.backend.common.serialization.mangle.descriptor.Ir2DescriptorManglerAdapter
 import org.jetbrains.kotlin.backend.common.serialization.signature.IdSignatureDescriptor
+import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.languageVersionSettings
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
@@ -55,6 +56,9 @@ fun generateIrForKlibSerialization(
     verifySignatures: Boolean = true,
     getDescriptorByLibrary: (KotlinLibrary) -> ModuleDescriptor,
 ): Pair<IrModuleFragment, IrPluginContext> {
+    val performanceManager = configuration[CLIConfigurationKeys.PERF_MANAGER]
+    performanceManager?.notifyIRTranslationStarted()
+
     val errorPolicy = configuration.get(JSConfigurationKeys.ERROR_TOLERANCE_POLICY) ?: ErrorTolerancePolicy.DEFAULT
     val messageLogger = configuration.get(IrMessageLogger.IR_MESSAGE_LOGGER) ?: IrMessageLogger.None
     val symbolTable = SymbolTable(IdSignatureDescriptor(JsManglerDesc), irFactory)

compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/compiler.kt

@@ -49,9 +49,6 @@ fun compile(
     filesToLower: Set<String>? = null,
     granularity: JsGenerationGranularity = JsGenerationGranularity.WHOLE_PROGRAM,
 ): LoweredIr {
-    val performanceManager = depsDescriptors.compilerConfiguration[CLIConfigurationKeys.PERF_MANAGER]
-    performanceManager?.notifyIRTranslationStarted()
-
     val (moduleFragment: IrModuleFragment, dependencyModules, irBuiltIns, symbolTable, deserializer, moduleToName) =
         loadIr(depsDescriptors, irFactory, verifySignatures, filesToLower, loadFunctionInterfacesIntoStdlib = true)
 

compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/compiler.kt

@@ -67,7 +67,6 @@ fun compileToLoweredIr(
     val mainModule = depsDescriptors.mainModule
     val configuration = depsDescriptors.compilerConfiguration
     val performanceManager = depsDescriptors.compilerConfiguration[CLIConfigurationKeys.PERF_MANAGER]
-    performanceManager?.notifyIRTranslationStarted()
 
     val (moduleFragment, dependencyModules, irBuiltIns, symbolTable, irLinker) = loadIr(
         depsDescriptors,