Improve collecting metrics - run onUnit callbacks in parser and update counters when creating new profiler instance

Author: WojciechMazur

compiler/src/dotty/tools/dotc/parsing/ParserPhase.scala

@@ -49,7 +49,9 @@ class Parser extends Phase {
     val unitContexts0 =
       for
         unitContext <- unitContexts
-        if parse(using unitContext)
+        if ctx.profiler.onUnit(this, unitContext.compilationUnit){
+          parse(using unitContext)
+        }
       yield unitContext
 
     record("parsedTrees", ast.Trees.ntrees)

compiler/src/dotty/tools/dotc/profile/Profiler.scala

@@ -208,6 +208,7 @@ private [profile] class RealProfiler(reporter : ProfileReporter)(using Context)
   }
 
   reporter.header(this)
+  traceCounters()
 
   override def finished(): Unit = {
     //we may miss a GC event if gc is occurring as we call this
@@ -253,11 +254,11 @@ private [profile] class RealProfiler(reporter : ProfileReporter)(using Context)
   override def afterPhase(event: TracedEventId, phase: Phase, snapBefore: ProfileSnap): Unit = {
     assert(mainThread eq Thread.currentThread())
     val initialSnap = RealProfiler.snapThread(0)
-    if (ctx.settings.YprofileExternalTool.value.contains(phase.toString)) {
+    if (ctx.settings.YprofileExternalTool.value.contains(phase.phaseName)) {
       println("Profile hook stop")
       ExternalToolHook.after()
     }
-    val finalSnap = if (ctx.settings.YprofileRunGcBetweenPhases.value.contains(phase.toString)) {
+    val finalSnap = if (ctx.settings.YprofileRunGcBetweenPhases.value.contains(phase.phaseName)) {
       doGC()
       initialSnap.updateHeap(RealProfiler.readHeapUsage())
     }
@@ -270,9 +271,9 @@ private [profile] class RealProfiler(reporter : ProfileReporter)(using Context)
   override def beforePhase(phase: Phase): (TracedEventId, ProfileSnap) = {
     assert(mainThread eq Thread.currentThread())
     val eventId = traceDurationStart(Category.Phase, phase.phaseName)
-    if (ctx.settings.YprofileRunGcBetweenPhases.value.contains(phase.toString))
+    if (ctx.settings.YprofileRunGcBetweenPhases.value.contains(phase.phaseName))
       doGC()
-    if (ctx.settings.YprofileExternalTool.value.contains(phase.toString)) {
+    if (ctx.settings.YprofileExternalTool.value.contains(phase.phaseName)) {
       println("Profile hook start")
       ExternalToolHook.before()
     }
@@ -290,17 +291,20 @@ private [profile] class RealProfiler(reporter : ProfileReporter)(using Context)
       val now = System.nanoTime()
       traceDurationEnd(Category.File, event)
       if now > nextAfterUnitSnap then
-        val initialSnap = RealProfiler.snapThread(0)
-        chromeTrace.traceCounterEvent("allocBytes", "allocBytes", initialSnap.allocatedBytes, processWide = false)
-        chromeTrace.traceCounterEvent("heapBytes", "heapBytes", initialSnap.heapBytes, processWide = true)
-        chromeTrace.traceCounterEvent("classesLoaded", "classesLoaded", initialSnap.totalClassesLoaded, processWide = true)
-        chromeTrace.traceCounterEvent("jitCompilationTime", "jitCompilationTime", initialSnap.totalJITCompilationTime, processWide = true)
-        chromeTrace.traceCounterEvent("userTime", "userTime", initialSnap.userTimeNanos, processWide = false)
-        chromeTrace.traceCounterEvent("cpuTime", "cpuTime", initialSnap.cpuTimeNanos, processWide = false)
-        chromeTrace.traceCounterEvent("idleTime", "idleTime", initialSnap.idleTimeNanos, processWide = false)
+        traceCounters()
         nextAfterUnitSnap = System.nanoTime() + 10 * 1000 * 1000
   }
 
+  private def traceCounters(): Unit = if chromeTrace != null then
+    val snap = RealProfiler.snapThread(0)
+    chromeTrace.traceCounterEvent("allocBytes", "allocBytes", snap.allocatedBytes, processWide = false)
+    chromeTrace.traceCounterEvent("heapBytes", "heapBytes", snap.heapBytes, processWide = true)
+    chromeTrace.traceCounterEvent("classesLoaded", "classesLoaded", snap.totalClassesLoaded, processWide = true)
+    chromeTrace.traceCounterEvent("jitCompilationTime", "jitCompilationTime", snap.totalJITCompilationTime, processWide = true)
+    chromeTrace.traceCounterEvent("userTime", "userTime", snap.userTimeNanos, processWide = false)
+    chromeTrace.traceCounterEvent("cpuTime", "cpuTime", snap.cpuTimeNanos, processWide = false)
+    chromeTrace.traceCounterEvent("idleTime", "idleTime", snap.idleTimeNanos, processWide = false)
+
   override def beforeTypedDef(sym: Symbol): TracedEventId = traceDurationStart(Category.TypeCheck, symbolName(sym))
   override def afterTypedDef(event: TracedEventId): Unit = traceDurationEnd(Category.TypeCheck, event)