internal: separate VM profiler data from ConfigRef

compiler/ast/lineinfos.nim

@@ -26,12 +26,6 @@ type
     col*: int16
     fileIndex*: FileIndex
 
-  SourceLinePosition* = tuple
-    ## Identifies a line in a source file. Only intended for use by
-    ## the profiler.
-    fileIndex: typeof(TLineInfo.fileIndex)
-    line: typeof(TLineInfo.line)
-
   LineColPair* = tuple
     line: typeof(TLineInfo.line)
     col: typeof(TLineInfo.col)

compiler/front/main.nim

@@ -56,7 +56,6 @@ import
   compiler/vm/[
     compilerbridge, # Configuration file evaluation, `nim e`
     vmbackend,      # VM code generation
-    vmprofiler
   ]
 
 import compiler/ic/[
@@ -686,7 +685,7 @@ proc mainCommand*(graph: ModuleGraph) =
                            srcCodeOrigin: instLoc()))
 
   if optProfileVM in conf.globalOptions:
-    conf.writeln cmdOutUserProf, conf.dump(conf.vmProfileData)
+    conf.writeln cmdOutUserProf, dumpVmProfilerData(graph)
 
   if conf.errorCounter == 0 and conf.cmd notin {cmdTcc, cmdDump, cmdNop}:
     if conf.isEnabled(rintSuccessX):

compiler/front/options.nim

@@ -161,13 +161,6 @@ type
 
   Suggestions* = seq[Suggest]
 
-  ProfileInfo* = object
-    time*: float
-    count*: int
-
-  ProfileData* = ref object
-    data*: TableRef[SourceLinePosition, ProfileInfo]
-
   StdOrrKind* = enum
     stdOrrStdout
     stdOrrStderr
@@ -303,7 +296,6 @@ type
     writeHook*: proc(conf: ConfigRef, output: string, flags: MsgFlags) {.closure.}
     structuredReportHook*: ReportHook
     astDiagToLegacyReport*: proc(conf: ConfigRef, d: PAstDiag): Report
-    vmProfileData*: ProfileData
     setMsgFormat*: proc(config: ConfigRef, fmt: MsgFormatKind) {.closure.}
       ## callback that sets the message format for legacy reporting, needs to
       ## set before CLI handling, because reports are just that awful
@@ -772,9 +764,6 @@ template newPackageCache*(): untyped =
                  else:
                    modeCaseSensitive)
 
-proc newProfileData(): ProfileData =
-  ProfileData(data: newTable[SourceLinePosition, ProfileInfo]())
-
 proc isDefined*(conf: ConfigRef; symbol: string): bool
 
 const defaultHackController = HackController(
@@ -933,7 +922,6 @@ proc newConfigRef*(hook: ReportHook): ConfigRef =
     ),
     suggestMaxResults: 10_000,
     maxLoopIterationsVM: 10_000_000,
-    vmProfileData: newProfileData(),
     spellSuggestMax: spellSuggestSecretSauce,
   )
   initConfigRefCommon(result)

compiler/vm/compilerbridge.nim

@@ -46,6 +46,7 @@ import
     vmjit,
     vmlegacy,
     vmops,
+    vmprofiler,
     vmtypegen,
     vmutils,
     vm
@@ -655,6 +656,14 @@ proc evalMacroCall*(module: PSym; idgen: IdGenerator; g: ModuleGraph;
 
   result = evalMacroCall(c.jit, c.vm, call, args, sym)
 
+proc dumpVmProfilerData*(graph: ModuleGraph): string =
+  ## Dumps the profiler data collected by the profiler of the VM instance
+  ## associated with `graph` to a string.
+  let c = PEvalContext(graph.vm)
+  result =
+    if c != nil: dump(graph.config, c.vm.profiler)
+    else:        ""
+
 # ----------- the VM-related compilerapi -----------
 
 # NOTE: it might make sense to move the VM-related compilerapi into

compiler/vm/vmdef.nim

@@ -734,10 +734,25 @@ type
                              ## instruction during cleanup. -1 indicates that
                              ## no clean-up is happening
 
+  ProfileInfo* = object
+    ## Profiler data for a single procedure.
+    time*: float ## the time spent on executing instructions (exclusive)
+    count*: int  ## the number of instruction executed (exclusive)
+
+  SourceLinePosition* = tuple
+    ## Identifies a line in a source file. Only intended for use by
+    ## the profiler.
+    fileIndex: typeof(TLineInfo.fileIndex)
+    line: typeof(TLineInfo.line)
+
   Profiler* = object
+    # XXX: move this type to the ``vmprofiler`` module once possible
     tEnter*: float
     sframe*: StackFrameIndex   ## The current stack frame
 
+    data*: TableRef[SourceLinePosition, ProfileInfo]
+    # XXX: use a ``Table`` instead of a ``TableRef``
+
 func `<`*(a, b: FieldIndex): bool {.borrow.}
 func `<=`*(a, b: FieldIndex): bool {.borrow.}
 func `==`*(a, b: FieldIndex): bool {.borrow.}
@@ -866,6 +881,7 @@ proc initCtx*(module: PSym; cache: IdentCache; g: ModuleGraph;
     loopIterations: g.config.maxLoopIterationsVM,
     comesFromHeuristic: unknownLineInfo,
     callbacks: @[],
+    profiler: Profiler(data: newTable[SourceLinePosition, ProfileInfo]()),
     cache: cache,
     config: g.config,
     graph: g,

compiler/vm/vmprofiler.nim

@@ -24,27 +24,26 @@ proc enter*(prof: var Profiler, c: TCtx, sframe: StackFrameIndex) {.inline.} =
 proc leaveImpl(prof: var Profiler, c: TCtx) {.noinline.} =
   let tLeave = cpuTime()
   var frameIdx = prof.sframe
-  var data = c.config.vmProfileData.data
   while frameIdx >= 0:
     let frame = c.sframes[frameIdx]
     if frame.prc != nil:
       let li = (frame.prc.info.fileIndex, frame.prc.info.line)
-      if li notin data:
-        data[li] = ProfileInfo()
-      data[li].time += tLeave - prof.tEnter
+      if li notin prof.data:
+        prof.data[li] = ProfileInfo()
+      prof.data[li].time += tLeave - prof.tEnter
       if frameIdx == prof.sframe:
-        inc data[li].count
+        inc prof.data[li].count
     dec frameIdx
 
 proc leave*(prof: var Profiler, c: TCtx) {.inline.} =
   if optProfileVM in c.config.globalOptions:
     leaveImpl(prof, c)
 
-proc dump*(conf: ConfigRef, pd: ProfileData): string =
-  ## constructs a string containing a report of vm exectuion based on the given
-  ## `ProfileData`. The report is formatted and ready to print to console or
-  ## similar interface.
-  var data = pd.data
+proc dump*(conf: ConfigRef, prof: Profiler): string =
+  ## Constructs a string containing a report of VM execution based on the
+  ## data collected by `prof`. The report is formatted and ready to print to
+  ## console or similar interface.
+  var data = prof.data
   result = "\nprof:     µs    #instr  location\n"
   for i in 0..<32:
     var infoMax: ProfileInfo