Skip to content

Commit 05373c4

Browse files
ivandev0Space Team
authored and
Space Team
committed
[CLI] Include klib generation into IR translation time measurements
#KT-67473 (cherry picked from commit 2816d55)
1 parent cc379a8 commit 05373c4

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

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

+6-1
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,10 @@ class K2JsIrCompiler : CLICompiler<K2JSCompilerArguments>() {
289289
return OK
290290
}
291291

292-
if (!arguments.irProduceJs) return OK
292+
if (!arguments.irProduceJs) {
293+
performanceManager?.notifyIRTranslationFinished()
294+
return OK
295+
}
293296

294297
val moduleKind = configurationJs[JSConfigurationKeys.MODULE_KIND] ?: error("cannot get 'module kind' from configuration")
295298

@@ -329,6 +332,7 @@ class K2JsIrCompiler : CLICompiler<K2JSCompilerArguments>() {
329332
messageCollector.report(INFO, "IC module builder rebuilt JS for module [${File(module).name}]")
330333
}
331334

335+
performanceManager?.notifyIRTranslationFinished()
332336
return OK
333337
}
334338

@@ -573,6 +577,7 @@ class K2JsIrCompiler : CLICompiler<K2JSCompilerArguments>() {
573577
}
574578

575579
// FIR2IR
580+
performanceManager?.notifyIRTranslationStarted()
576581
val fir2IrActualizedResult = transformFirToIr(moduleStructure, analyzedOutput.output, diagnosticsReporter)
577582

578583
if (configuration.getBoolean(CommonConfigurationKeys.INCREMENTAL_COMPILATION)) {

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

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.backend.common.serialization.ICData
2222
import org.jetbrains.kotlin.backend.common.serialization.mangle.ManglerChecker
2323
import org.jetbrains.kotlin.backend.common.serialization.mangle.descriptor.Ir2DescriptorManglerAdapter
2424
import org.jetbrains.kotlin.backend.common.serialization.signature.IdSignatureDescriptor
25+
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
2526
import org.jetbrains.kotlin.config.CommonConfigurationKeys
2627
import org.jetbrains.kotlin.config.CompilerConfiguration
2728
import org.jetbrains.kotlin.config.languageVersionSettings
@@ -59,6 +60,9 @@ fun generateIrForKlibSerialization(
5960
verifySignatures: Boolean = true,
6061
getDescriptorByLibrary: (KotlinLibrary) -> ModuleDescriptor,
6162
): Pair<IrModuleFragment, IrPluginContext> {
63+
val performanceManager = configuration[CLIConfigurationKeys.PERF_MANAGER]
64+
performanceManager?.notifyIRTranslationStarted()
65+
6266
val errorPolicy = configuration.get(JSConfigurationKeys.ERROR_TOLERANCE_POLICY) ?: ErrorTolerancePolicy.DEFAULT
6367
val messageLogger = configuration.get(IrMessageLogger.IR_MESSAGE_LOGGER) ?: IrMessageLogger.None
6468
val symbolTable = SymbolTable(IdSignatureDescriptor(JsManglerDesc), irFactory)

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

-3
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ fun compile(
5050
filesToLower: Set<String>? = null,
5151
granularity: JsGenerationGranularity = JsGenerationGranularity.WHOLE_PROGRAM,
5252
): LoweredIr {
53-
val performanceManager = depsDescriptors.compilerConfiguration[CLIConfigurationKeys.PERF_MANAGER]
54-
performanceManager?.notifyIRTranslationStarted()
55-
5653
val (moduleFragment: IrModuleFragment, dependencyModules, irBuiltIns, symbolTable, deserializer, moduleToName) =
5754
loadIr(depsDescriptors, irFactory, verifySignatures, filesToLower, loadFunctionInterfacesIntoStdlib = true)
5855

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

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ fun compileToLoweredIr(
5353
val mainModule = depsDescriptors.mainModule
5454
val configuration = depsDescriptors.compilerConfiguration
5555
val performanceManager = depsDescriptors.compilerConfiguration[CLIConfigurationKeys.PERF_MANAGER]
56-
performanceManager?.notifyIRTranslationStarted()
5756

5857
val (moduleFragment, dependencyModules, irBuiltIns, symbolTable, irLinker) = loadIr(
5958
depsDescriptors,

0 commit comments

Comments
 (0)