Merge pull request #81 from timholy/teh/nightly

Support AbstractInterpreter

Author: timholy

Project.toml

@@ -14,6 +14,7 @@ julia = "1"
 
 [extras]
 ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
+Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
 JLD = "4138dd39-2aa7-5051-a626-17a0bb65d9c8"
 MatLang = "05b439c0-bb3c-11e9-1d8d-1f0a9ebca87a"
@@ -22,4 +23,4 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Pkg", "ColorTypes", "Test", "FixedPointNumbers", "JLD", "SparseArrays", "MatLang"]
+test = ["Pkg", "ColorTypes", "Documenter", "Test", "FixedPointNumbers", "JLD", "SparseArrays", "MatLang"]

src/snoopi.jl

@@ -2,23 +2,41 @@ export @snoopi
 
 const __inf_timing__ = Tuple{Float64,Core.MethodInstance}[]
 
-function typeinf_ext_timed(linfo::Core.MethodInstance, params::Core.Compiler.Params)
-    tstart = time()
-    ret = Core.Compiler.typeinf_ext(linfo, params)
-    tstop = time()
-    push!(__inf_timing__, (tstop-tstart, linfo))
-    return ret
-end
-function typeinf_ext_timed(linfo::Core.MethodInstance, world::UInt)
-    tstart = time()
-    ret = Core.Compiler.typeinf_ext(linfo, world)
-    tstop = time()
-    push!(__inf_timing__, (tstop-tstart, linfo))
-    return ret
+if isdefined(Core.Compiler, :Params)
+    function typeinf_ext_timed(linfo::Core.MethodInstance, params::Core.Compiler.Params)
+        tstart = time()
+        ret = Core.Compiler.typeinf_ext(linfo, params)
+        tstop = time()
+        push!(__inf_timing__, (tstop-tstart, linfo))
+        return ret
+    end
+    function typeinf_ext_timed(linfo::Core.MethodInstance, world::UInt)
+        tstart = time()
+        ret = Core.Compiler.typeinf_ext(linfo, world)
+        tstop = time()
+        push!(__inf_timing__, (tstop-tstart, linfo))
+        return ret
+    end
+    @noinline stop_timing() = ccall(:jl_set_typeinf_func, Cvoid, (Any,), Core.Compiler.typeinf_ext)
+else
+    function typeinf_ext_timed(interp::Core.Compiler.AbstractInterpreter, linfo::Core.MethodInstance)
+        tstart = time()
+        ret = Core.Compiler.typeinf_ext_toplevel(interp, linfo)
+        tstop = time()
+        push!(__inf_timing__, (tstop-tstart, linfo))
+        return ret
+    end
+    function typeinf_ext_timed(linfo::Core.MethodInstance, world::UInt)
+        tstart = time()
+        ret = Core.Compiler.typeinf_ext_toplevel(linfo, world)
+        tstop = time()
+        push!(__inf_timing__, (tstop-tstart, linfo))
+        return ret
+    end
+    @noinline stop_timing() = ccall(:jl_set_typeinf_func, Cvoid, (Any,), Core.Compiler.typeinf_ext_toplevel)
 end
 
 @noinline start_timing() = ccall(:jl_set_typeinf_func, Cvoid, (Any,), typeinf_ext_timed)
-@noinline stop_timing() = ccall(:jl_set_typeinf_func, Cvoid, (Any,), Core.Compiler.typeinf_ext)
 
 function sort_timed_inf(tmin)
     data = __inf_timing__
@@ -68,8 +86,13 @@ function __init__()
     # typeinf_ext_timed must be compiled before it gets run
     # We do this in __init__ to make sure it gets compiled to native code
     # (the *.ji file stores only the inferred code)
-    precompile(typeinf_ext_timed, (Core.MethodInstance, Core.Compiler.Params))
-    precompile(typeinf_ext_timed, (Core.MethodInstance, UInt))
+    if isdefined(Core.Compiler, :Params)
+        @assert precompile(typeinf_ext_timed, (Core.MethodInstance, Core.Compiler.Params))
+        @assert precompile(typeinf_ext_timed, (Core.MethodInstance, UInt))
+    else
+        @assert precompile(typeinf_ext_timed, (Core.Compiler.NativeInterpreter, Core.MethodInstance))
+        @assert precompile(typeinf_ext_timed, (Core.MethodInstance, UInt))
+    end
     precompile(start_timing, ())
     precompile(stop_timing, ())
     nothing