Merge pull request #11 from JITx-Inc/jb/new-profiler

jb/new profiler

Author: jwatson0

ci/build-stanza-version.txt

@@ -7,4 +7,4 @@
 #   like 1.23.45
 #
 # Use version 0.17.56 to compile 0.18.0
-0.19.6
+0.19.5

compiler/codegen.stanza

@@ -49,6 +49,10 @@ public defstruct AsmStubs :
   stack-limit:Int
   registers:Int
   system-registers-space:Int
+  profile-flag:Int
+  profile-buffer:Int
+  function-counters:Int
+  function-info:Int
   heap-start:Int
   heap-top:Int
   heap-limit:Int
@@ -72,6 +76,7 @@ public defstruct AsmStubs :
   collect-garbage:Int
   saved-regs:Tuple<Int>
   saved-fregs:Tuple<Int>
+  heap-statistics:Int
   class-table:Int
   global-root-table:Int
   stackmap-table:Int
@@ -105,6 +110,10 @@ public defn AsmStubs (backend:Backend) :
     next(id-counter)  ;stack-limit:Int
     next(id-counter)  ;registers:Int
     next(id-counter)  ;system-registers-space:Int
+    next(id-counter)  ;profile-flag:Int
+    next(id-counter)  ;profile-buffer:Int
+    next(id-counter)  ;function-counters:Int
+    next(id-counter)  ;function-info:Int
     next(id-counter)  ;heap-start:Int
     next(id-counter)  ;heap-top:Int
     next(id-counter)  ;heap-limit:Int
@@ -128,6 +137,7 @@ public defn AsmStubs (backend:Backend) :
     next(id-counter)  ;collect-garbage:Int
     saved-regs        ;saved-regs:Tuple<Int>
     saved-fregs       ;saved-fregs:Tuple<Int>
+    next(id-counter)  ;heap-statistics:Int
     next(id-counter)  ;class-table:Int
     next(id-counter)  ;global-root-table:Int
     next(id-counter)  ;stackmap-table:Int
@@ -204,6 +214,10 @@ public defn compile-runtime-stubs (emitter:CodeEmitter, stubs:AsmStubs) :
   comment("stack-limit = %_" % [stack-limit(stubs)])
   comment("registers = %_" % [registers(stubs)])
   comment("system-registers-space = %_" % [system-registers-space(stubs)])
+  comment("profile-flag = %_" % [profile-flag(stubs)])
+  comment("profile-buffer = %_" % [profile-buffer(stubs)])
+  comment("function-counters = %_" % [function-counters(stubs)])
+  comment("function-info = %_" % [function-info(stubs)])
   comment("heap-start = %_" % [heap-start(stubs)])
   comment("heap-top = %_" % [heap-top(stubs)])
   comment("heap-limit = %_" % [heap-limit(stubs)])
@@ -334,6 +348,12 @@ public defn compile-entry-function (emitter:CodeEmitter, stubs:AsmStubs) :
                                #label(safepoint-table)        ;safepoint-table:ptr<?>
                                #label(debug-table)            ;debug-table:ptr<?>
                                #label(local-var-table)        ;local-var-table:ptr<?>
+                               #label(heap-statistics)        ;heap-statistics:ptr<?>
+                               #long()                        ;heap-dominator-tree:ptr<?>
+                               #label(profile-flag)           ;profile-flag: ptr<long>
+                               #long()                        ;profile-buffer: ptr<long>
+                               #label(function-counters)      ;function-counters: ptr<long>
+                               #label(function-info)          ;function-info: ptr<FunctionInfoTable>
                                #label(class-table)            ;class-table:ptr<?>
                                #label(global-root-table)      ;global-root-table:ptr<GlobalRoots>
                                #label(stackmap-table)         ;stackmap-table:ptr<?>

compiler/compiler-build-settings.stanza

@@ -22,6 +22,8 @@ public defstruct BuildSettings :
   build-from-source?: True|False
   optimize?: True|False
   debug?: True|False
+  profile?: True|False
+  coverage?: True|False
   ccfiles: Tuple<String>
   ccflags: Tuple<String|Tuple<String>>
   flags: Tuple<Symbol>

compiler/compiler-main.stanza

@@ -158,6 +158,8 @@ public defn compile (proj-manager:ProjManager,
                      backend:Backend,
                      optimize?:True|False,
                      debug?:True|False,
+                     profile?:True|False,
+                     coverage?:True|False,
                      macro-plugins:Tuple<String>,
                      force-build-macros?:True|False) -> CompilationResult :
   defn driver () :
@@ -224,7 +226,7 @@ public defn compile (proj-manager:ProjManager,
       `unoptimized-asm :
         val packages = for p in /packages(result) map :
           match(p) :
-            (p:EPackage) : compile(lower-unoptimized(p), debug?)
+            (p:EPackage) : compile(lower-unoptimized(p, profile?, coverage?), debug?)
             (p:StdPkg)  : p
         compile-vmpackages(pkgsaver when write-out-pkgs?,
                            packages,
@@ -244,7 +246,7 @@ public defn compile (proj-manager:ProjManager,
     val epackages = for p in packages map :
       match(p:FastPkg) : EPackage(packageio(p), exps(p))
       else : p as EPackage
-    compile(lower-optimized(epackages), debug?)
+    compile(lower-optimized(epackages, profile?, coverage?), debug?)
 
   ;- pkgsaver: False if we not need to write out any .pkg files to disk (either
   ;  to pkg dir or to pkg cache.).
@@ -309,7 +311,7 @@ public defn compile (proj-manager:ProjManager,
     for package in packages do :
       match(package) :
         (epackage:EPackage) :
-          val vmpackage = compile(lower-unoptimized(epackage), debug?)
+          val vmpackage = compile(lower-unoptimized(epackage, profile?, coverage?), debug?)
           val npkg = normalize(vmpackage, backend)
           val buffer = Vector<Ins>()
           emit-normalized-package(npkg, buffer-emitter(buffer, stubs), stubs)
@@ -399,3 +401,4 @@ defn collapse (p:NormVMPackage|StdPkg) :
     defmethod debug-table (this) : debug-table(vmp)
     defmethod safepoint-table (this) : safepoint-table(vmp)
     defmethod debug-name-table (this): debug-name-table(vmp)
+    defmethod function-info (this) : function-info(vmp)

compiler/compiler.stanza

@@ -69,6 +69,9 @@ defn compute-build-settings (projenv:StandardProjEnv,
       val build-optimization = optimize?(settings) or optimize(s)
       ;Compute build optimization level
       val build-debug = debug?(settings)
+      ;Compute build profile level
+      val build-profile = profile?(settings) or profile(s)
+      val build-coverage = coverage?(settings) or coverage(s)
       ;Compute assembly
       val build-asm = string-or?(original-asm(settings), value?(assembly(s)))
       ;Compute output
@@ -110,6 +113,8 @@ defn compute-build-settings (projenv:StandardProjEnv,
         build-from-source?(settings)
         build-optimization,
         build-debug,
+        build-profile,
+        build-coverage,
         build-ccfiles,
         build-ccflags,
         to-tuple(build-flags),
@@ -243,10 +248,12 @@ public defn compile (settings:BuildSettings, system:System) :
       println("Build target %~ is already up-to-date." % [build-target?(settings*)])
     else :
       setup-system-flags(settings*)
+      add-flag(`HEAP-ANALYZER)
       val proj-params = ProjParams(compiler-flags(), optimize?(settings*), debug?(settings*), false, build-from-source?(settings), pkg-cache-dir(settings*))
       val proj-manager = ProjManager(proj, proj-params, auxfile)
       val comp-result = compile(proj-manager, auxfile, build-inputs!(settings*), vm-packages(settings*), asm?(settings*), pkg-dir(settings*),
-                                backend(platform(settings*) as Symbol), optimize?(settings*), debug?(settings*), 
+                                backend(platform(settings*) as Symbol), optimize?(settings*), debug?(settings*),
+                                profile?(settings*), coverage?(settings*),
                                 macro-plugins(settings*), inputs(settings) is BuildTarget)
       save(auxfile)
       within delete-temporary-file-on-finish(settings*) :

compiler/defs-db.stanza

@@ -99,6 +99,8 @@ protected-when(TESTING) defn analyze-input (input:DefsDbInput) -> DependencyResu
     true,                                   ;build-from-source?
     optimize?(input),                       ;optimize?
     false,                                  ;debug?
+    false,                                  ;profile?
+    false,                                  ;coverage?
     [],                                     ;ccfiles
     [],                                     ;ccflags
     flags(input)                            ;flags

compiler/dl-ir.stanza

@@ -1192,6 +1192,7 @@ public val CORE-COLLECT-STACK-TRACE-ID = register $ core-fnid(`collect-stack-tra
 public val CORE-COLLECT-GARBAGE-ID = register $ core-fnid(`collect-garbage, [`long])
 public val CORE-MAKE-STRING-ID = register $ core-fnid(`String, [DPtrT(DByte())])
 public val CORE-EXECUTE-TOPLEVEL-COMMAND-ID = register $ core-fnid(`execute-toplevel-command, [DArrow([], core-type(`False))])
+public val CORE-PROFILE-STACK-TRACE-ID = register $ core-fnid(`profile-stack-trace)
 
 ;============================================================
 ;====================== ID Environment ======================

compiler/el-infer.stanza

@@ -360,7 +360,7 @@ defn analyze-single-block (emit:Ins -> ?,
       (ins:ETupleSet|EStruct|EPtr|ELabel|ETCall|
            EDump|EConv|EGoto|ECheckLength|ECheckSet|
            EBoxSet|EReturn|EObjectTGet|EClosureTGet|
-           ETDef|ETypeObject|EEnd|ELive|ECheckFail|ESafepoint) : gen-trivial-commands(ins)
+           ETDef|ETypeObject|EEnd|ELive|ECheckFail|ESafepoint|EProfile) : gen-trivial-commands(ins)
 
   ;Utility: For any uses of inferred variables generate
   ;them here.
@@ -551,7 +551,7 @@ defn analyze-single-block (emit:Ins -> ?,
   defn gen-trivial-commands (ins:ETupleSet|EStruct|EPtr|ELabel|ETCall|
                                  EDump|EConv|EGoto|ECheckLength|ECheckSet|
                                  EBoxSet|EReturn|EObjectTGet|EClosureTGet|
-                                 ETDef|ETypeObject|EEnd|ELive|ECheckFail|ESafepoint) :
+                                 ETDef|ETypeObject|EEnd|ELive|ECheckFail|ESafepoint|EProfile) :
     gen-uses(ins)
     emit(Wrapped<EIns>(ins))
     for x in varlocs(ins) do :

compiler/el-ir.stanza

@@ -46,6 +46,7 @@ public defstruct EBot <: HiEType
 public defstruct EPackage :
   packageio: PackageIO with: (updater => sub-packageio)
   exps: Tuple<ETExp> with: (updater => sub-exps)
+  function-info: False|Tuple<FunctionInfo> with: (default => false, updater => sub-function-info)
 
 public defn name (e:EPackage) :
   package(packageio(e))
@@ -544,6 +545,10 @@ public defstruct DetupleContext <: CastErrorContext
 public defstruct GetVarContext <: CastErrorContext
 public defstruct BranchContext <: CastErrorContext
 
+public defstruct EProfile <: EIns :
+  id: Int
+  kind: Int
+
 ;============================================================
 ;======================= Primitives =========================
 ;============================================================
@@ -761,6 +766,7 @@ defmethod print (o:OutputStream, e:EIns) :
     (e:ETypeof) : P $ "goto L%_ when typeof(%_, %_) else L%_" % [n1(e), y(e), type(e), n2(e)]
     (e:ECheckFail) : P $ "check-fail(%_) %_ : %_" % [ctxt(e), y(e), type(e)]
     (e:ESafepoint) : P $ "safepoint %_ ;%_" % [group-id(e), info?(e)]
+    (e:EProfile) : P $ "profile(%_,%_)" % [id(e), kind(e)]
 
 defmethod print (o:OutputStream, t:CallType) :
   print{o, _} $ match(t) :
@@ -1001,6 +1007,7 @@ defsyntax el-ir :
   defrule eins = (?x:#vloc : ?xt:#etype = load ?loc:#eloc) : ELoad(x, xt, loc)
   defrule eins = (?x:#vloc = call ?t:#calltype ?f:#eimm(?ys:#eimm ...)) : ECall(x, f, to-tuple(ys), t, add-base-dir(closest-info()))
   defrule eins = (?x:#vloc = ?y:#eimm) : EDef(x, y)
+  defrule eins = (profile(?id:#int, ?arg:#int)) : EProfile(id, arg)
 
   defproduction calltype : CallType
   defrule calltype = (guarded((?a1:#etype ...) -> ?a2:#etype)) : CallGuarded(to-tuple(a1), a2)
@@ -1305,7 +1312,7 @@ defmethod map<?T> (f:ELItem -> ELItem, item:ELItem&?T) -> ELItem&T :
     (t:EBot) : t
 
     ;EPackage
-    (e:EPackage) : EPackage(packageio(e), h(exps(e)))
+    (e:EPackage) : EPackage(packageio(e), h(exps(e)), function-info(e))
 
     ;ETExps
     (e:EDefGlobal) : EDefGlobal(n(e), h(type(e)), mutable?(e), lostanza?(e))
@@ -1420,6 +1427,9 @@ defmethod map<?T> (f:ELItem -> ELItem, item:ELItem&?T) -> ELItem&T :
     ;Closures
     (e:EClosure) : EClosure(n(e), h(targs(e)), h(ys(e)))
 
+    ;Profile
+    (e:EProfile) : EProfile(id(e), kind(e))
+
 ;============================================================
 ;===================== Definitions ==========================
 ;============================================================
@@ -1478,6 +1488,7 @@ public defn varlocs (e:EIns) -> Tuple<EVarLoc> :
     (e:ETypeof) : []
     (e:ECheckFail) : []
     (e:ESafepoint) : []
+    (e:EProfile) : []
 
 ;Return the list of immediates that the instruction
 ;uses to perform its action.
@@ -1532,6 +1543,7 @@ public defn uses (e:EIns) -> Seqable<EImm> :
     (e:ETypeof) : [y(e)]
     (e:ECheckFail) : [y(e)]
     (e:ESafepoint) : []
+    (e:EProfile) : []
 
 ;Return the list of immediates that the instruction
 ;uses to retrieve its location.

compiler/el-to-vm.stanza

@@ -61,7 +61,7 @@ public defn compile (epackage:EPackage, debug?:True|False) -> VMPackage :
       val init = compile-init(init-compiler, iotable, progbuffer)
       init
 
-    val vmp = to-vmpackage(progbuffer, io, init)
+    val vmp = to-vmpackage(progbuffer, io, init, function-info(epackage))
     ;dump(vmp, "logs", "pre-analyze")
     val vmp* = within time-ms!("VM Analyze") : analyze(vmp)
     ;dump(vmp*, "logs", false)
@@ -565,7 +565,7 @@ defmulti add (b:ProgBuffer, e:VMMethod) -> False
 defmulti add (b:ProgBuffer, e:VMDebugInfo) -> False
 defmulti add (b:ProgBuffer, e:SafepointEntry) -> SafepointIns
 defmulti add (b:ProgBuffer, e:VMDebugName) -> False
-defmulti to-vmpackage (b:ProgBuffer, io:PackageIO, init:Int|False) -> VMPackage
+defmulti to-vmpackage (b:ProgBuffer, io:PackageIO, init:Int|False, function-info:False|Tuple<FunctionInfo>) -> VMPackage
 
 defn ProgBuffer () :
   val globals = Vector<VMGlobal>()
@@ -591,7 +591,7 @@ defn ProgBuffer () :
     defmethod add (this, e:VMDebugInfo) : add(debug, e)
     defmethod add (this, e:SafepointEntry) : add(sptable, e)
     defmethod add (this, e:VMDebugName) : add(debugnames, e)
-    defmethod to-vmpackage (this, io:PackageIO, init:Int|False) :
+    defmethod to-vmpackage (this, io:PackageIO, init:Int|False, function-info:False|Tuple<FunctionInfo>) :
       VMPackage(io, init,
                 to-tuple(globals),
                 to-tuple(datas),
@@ -603,6 +603,7 @@ defn ProgBuffer () :
                 to-tuple(extern-defns),
                 VMDebugNameTable(to-tuple(debugnames)),
                 VMDebugInfoTable(to-tuple(debug)),
+                function-info
                 compile(sptable))
 
 ;============================================================
@@ -1544,6 +1545,8 @@ defn Compiler (gt:GlobalTable,
           (info:StackTraceInfo) :
             make-safepoint(info) when /info(info) is-not False
           (f:False) : false
+      (ins:EProfile) :
+        emit(ProfileIns(id(ins), kind(ins)))
 
   ;---------------------------------------------------------
   ;--------------- Create the Compiler Type ----------------