diff --git a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractFullPipelineModularizedTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractFullPipelineModularizedTest.kt
index 226a349f51a..083411dd8ef 100644
--- a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractFullPipelineModularizedTest.kt
+++ b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractFullPipelineModularizedTest.kt
@@ -23,6 +23,8 @@ import java.nio.file.Path
 
 abstract class AbstractFullPipelineModularizedTest : AbstractModularizedTest() {
 
+    private val asyncProfilerControl = AsyncProfilerControl()
+
     data class ModuleStatus(val data: ModuleData, val targetInfo: String) {
         var compilationError: String? = null
         var jvmInternalError: String? = null
@@ -64,9 +66,13 @@ abstract class AbstractFullPipelineModularizedTest : AbstractModularizedTest() {
         okModules.clear()
         errorModules.clear()
         crashedModules.clear()
+
+        asyncProfilerControl.beforePass(pass, reportDateStr)
     }
 
     override fun afterPass(pass: Int) {
+        asyncProfilerControl.afterPass(pass, reportDateStr)
+
         createReport(finalReport = pass == PASSES - 1)
         require(totalModules.isNotEmpty()) { "No modules were analyzed" }
         require(okModules.isNotEmpty()) { "All of $totalModules is failed" }
diff --git a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AsyncProfilerControl.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AsyncProfilerControl.kt
new file mode 100644
index 00000000000..8ac19870755
--- /dev/null
+++ b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AsyncProfilerControl.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.fir
+
+import org.jetbrains.kotlin.cli.common.profiling.AsyncProfilerHelper
+import java.io.File
+
+private val ASYNC_PROFILER_LIB = System.getProperty("fir.bench.use.async.profiler.lib")
+private val ASYNC_PROFILER_START_CMD = System.getProperty("fir.bench.use.async.profiler.cmd.start")
+private val ASYNC_PROFILER_STOP_CMD = System.getProperty("fir.bench.use.async.profiler.cmd.stop")
+private val PROFILER_SNAPSHOT_DIR = System.getProperty("fir.bench.snapshot.dir") ?: "tmp/snapshots"
+
+class AsyncProfilerControl {
+    private val asyncProfiler = if (ASYNC_PROFILER_LIB != null) {
+        try {
+            AsyncProfilerHelper.getInstance(ASYNC_PROFILER_LIB)
+        } catch (e: ExceptionInInitializerError) {
+            if (e.cause is ClassNotFoundException) {
+                throw IllegalStateException("Async-profiler initialization error, make sure async-profiler.jar is on classpath", e.cause)
+            }
+            throw e
+        }
+    } else {
+        null
+    }
+
+    private fun executeAsyncProfilerCommand(command: String?, pass: Int, reportDateStr: String) {
+        if (asyncProfiler != null) {
+            require(command != null)
+            fun String.replaceParams(): String =
+                this.replace("\$REPORT_DATE", reportDateStr)
+                    .replace("\$PASS", pass.toString())
+
+            val snapshotDir = File(PROFILER_SNAPSHOT_DIR.replaceParams()).also { it.mkdirs() }
+            val expandedCommand = command
+                .replace("\$SNAPSHOT_DIR", snapshotDir.toString())
+                .replaceParams()
+            val result = asyncProfiler.execute(expandedCommand)
+            println("PROFILER: $result")
+        }
+    }
+
+
+    fun beforePass(pass: Int, reportDateStr: String) {
+        executeAsyncProfilerCommand(ASYNC_PROFILER_START_CMD, pass, reportDateStr)
+    }
+
+    fun afterPass(pass: Int, reportDateStr: String) {
+        executeAsyncProfilerCommand(ASYNC_PROFILER_STOP_CMD, pass, reportDateStr)
+    }
+}
\ No newline at end of file
diff --git a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt
index fa8e42cb957..4101540a6e6 100644
--- a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt
+++ b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt
@@ -52,11 +52,6 @@ private val RUN_CHECKERS = System.getProperty("fir.bench.run.checkers", "false")
 private val USE_LIGHT_TREE = System.getProperty("fir.bench.use.light.tree", "false").toBooleanLenient()!!
 private val DUMP_MEMORY = System.getProperty("fir.bench.dump.memory", "false").toBooleanLenient()!!
 
-private val ASYNC_PROFILER_LIB = System.getProperty("fir.bench.use.async.profiler.lib")
-private val ASYNC_PROFILER_START_CMD = System.getProperty("fir.bench.use.async.profiler.cmd.start")
-private val ASYNC_PROFILER_STOP_CMD = System.getProperty("fir.bench.use.async.profiler.cmd.stop")
-private val PROFILER_SNAPSHOT_DIR = System.getProperty("fir.bench.snapshot.dir") ?: "tmp/snapshots"
-
 private val REPORT_PASS_EVENTS = System.getProperty("fir.bench.report.pass.events", "false").toBooleanLenient()!!
 
 private interface CLibrary : Library {
@@ -121,34 +116,7 @@ class FirResolveModularizedTotalKotlinTest : AbstractModularizedTest() {
 
     private var passEventReporter: PassEventReporter? = null
 
-    private val asyncProfiler = if (ASYNC_PROFILER_LIB != null) {
-        try {
-            AsyncProfilerHelper.getInstance(ASYNC_PROFILER_LIB)
-        } catch (e: ExceptionInInitializerError) {
-            if (e.cause is ClassNotFoundException) {
-                throw IllegalStateException("Async-profiler initialization error, make sure async-profiler.jar is on classpath", e.cause)
-            }
-            throw e
-        }
-    } else {
-        null
-    }
-
-    private fun executeAsyncProfilerCommand(command: String?, pass: Int) {
-        if (asyncProfiler != null) {
-            require(command != null)
-            fun String.replaceParams(): String =
-                this.replace("\$REPORT_DATE", reportDateStr)
-                    .replace("\$PASS", pass.toString())
-
-            val snapshotDir = File(PROFILER_SNAPSHOT_DIR.replaceParams()).also { it.mkdirs() }
-            val expandedCommand = command
-                .replace("\$SNAPSHOT_DIR", snapshotDir.toString())
-                .replaceParams()
-            val result = asyncProfiler.execute(expandedCommand)
-            println("PROFILER: $result")
-        }
-    }
+    private val asyncProfilerControl = AsyncProfilerControl()
 
     @OptIn(ObsoleteTestInfrastructure::class)
     private fun runAnalysis(moduleData: ModuleData, environment: KotlinCoreEnvironment) {
@@ -252,10 +220,13 @@ class FirResolveModularizedTotalKotlinTest : AbstractModularizedTest() {
         if (DUMP_FIR) dump = MultiModuleHtmlFirDump(File(FIR_HTML_DUMP_PATH))
         System.gc()
         passEventReporter?.reportPassStart(pass)
-        executeAsyncProfilerCommand(ASYNC_PROFILER_START_CMD, pass)
+        asyncProfilerControl.beforePass(pass, reportDateStr)
     }
 
     override fun afterPass(pass: Int) {
+
+        asyncProfilerControl.afterPass(pass, reportDateStr)
+
         val statistics = bench.getTotalStatistics()
         statistics.report(System.out, "Pass $pass")
 
@@ -271,8 +242,6 @@ class FirResolveModularizedTotalKotlinTest : AbstractModularizedTest() {
             bench.throwFailure()
         }
 
-        executeAsyncProfilerCommand(ASYNC_PROFILER_STOP_CMD, pass)
-
         passEventReporter?.reportPassEnd(pass)
     }