Merge pull request #212 from timholy/teh/various_fixes

A grabbag of random fixes

examples/OptimizeMe.jl

@@ -8,6 +8,7 @@ module OptimizeMe
 struct Container{T}
     value::T
 end
+
 concat_string(c1::Container, c2::Container) = string(c1.value) * ' ' * string(c2.value)
 
 function contain_concrete(item1, item2)
@@ -31,7 +32,6 @@ end
 struct Object
     x::Int
 end
-Base.show(io::IO, o::Object) = print(io, "Object x: ", o.x)
 
 function makeobjects()
     xs = [1:5; 7]

src/parcel_snoopi.jl

@@ -214,10 +214,11 @@ let known_type_cache = IdDict{Tuple{Module,Tuple{Vararg{Symbol}},Symbol},Bool}()
         strippedname(tn::Core.TypeName) = Symbol(string(tn.name)[2:end])
 
         T === Union{} && return true
+        T = Base.unwrap_unionall(T)
         if isa(T, Union)
             return known_type(mod, T.a) & known_type(mod, T.b)
         end
-        T = Base.unwrap_unionall(T)::DataType
+        T = T::DataType
         tn = T.name
         tpath = fullname(tn.module)
         key = (mod, tpath, tn.name)

src/parcel_snoopi_deep.jl

@@ -668,7 +668,11 @@ function maybe_internal(itrig::InferenceTrigger)
         if isa(linfo, MethodInstance)
             m = linfo.def
             if isa(m, Method)
-                m.module === Base && m.name === :include_string && return false
+                if m.module === Base
+                    m.name === :include_string && return false
+                    m.name === :_include_from_serialized && return false
+                    m.name === :return_types && return false   # from `@inferred`
+                end
                 m.name === :eval && return false
             end
         end
@@ -747,9 +751,11 @@ function skiphigherorder(itrig::InferenceTrigger; exact::Bool=true)
     ft = Base.unwrap_unionall(Base.unwrap_unionall(MethodInstance(itrig.node).specTypes).parameters[1])
     sfs, idx = itrig.callerframes, itrig.btidx
     while idx < length(itrig.node.bt)
-        callermi = sfs[end].linfo
-        if !hasparameter(callermi.specTypes, ft, exact)
-            return InferenceTrigger(itrig.node, sfs, idx)
+        if !isempty(sfs)
+            callermi = sfs[end].linfo
+            if !hasparameter(callermi.specTypes, ft, exact)
+                return InferenceTrigger(itrig.node, sfs, idx)
+            end
         end
         ret = next_julia_frame(itrig.node.bt, idx)
         ret === nothing && return InferenceTrigger(itrig.node, sfs, idx)
@@ -905,8 +911,8 @@ The empty horizontal periods in the flamegraph correspond to times when somethin
 The total width of the flamegraph is set from the `ROOT` node.
 """
 function FlameGraphs.flamegraph(tinf::InferenceTimingNode; tmin = 0.0, excluded_modules=Set([Main::Module]), mode=nothing)
+    isROOT(tinf) && isempty(tinf.children) && error("root node has no children")
     io = IOBuffer()
-
     # Compute a "root" frame for the top-level node, to cover the whole profile
     node_data, _ = _flamegraph_frame(io, tinf, tinf.start_time, true, excluded_modules, mode; toplevel=true)
     root = Node(node_data)

test/snoopi_deep.jl

@@ -329,7 +329,7 @@ end
     tinf_spec =   @snoopi_deep SnoopBench.mappushes(SnoopBench.spell_spec, Ts)
     tf_unspec = flatten(tinf_unspec)
     tf_spec   = flatten(tinf_spec)
-    @test length(tf_unspec) < 10
+    @test length(tf_unspec) < length(Ts) ÷ 5
     @test any(tmi -> occursin("spell_unspec(::Any)", repr(MethodInstance(tmi))), tf_unspec)
     @test length(tf_spec) >= length(Ts)
     @test !any(tmi -> occursin("spell_spec(::Any)", repr(MethodInstance(tmi))), tf_unspec)
@@ -364,8 +364,8 @@ end
     @test tiunspec < tispec/10
     @test trunspec < 10*trspec
     @test nunspec == 1
-    # Test that no runtime dispatch occurs in mappushes!
-    trmp, trtdmp, _, _ = rit[findfirst(pr -> pr.first == mp, rit)].second
-    @test trtdmp == 0
+    # Test that little runtime dispatch occurs in mappushes!
+    _, trtdmpu, _, _ = rit[findfirst(pr -> pr.first == mp, rit)].second
+    @test trtdmpu < trtdmp/10
     # specialization_plot(axs[2], rit; bystr="Inclusive", consts=true, interactive=false)
 end

test/testmodules/SnoopBench.jl

@@ -26,15 +26,15 @@ mappushes3(@nospecialize(f), src) = mappushes3!(f, [], src)
 function spell_spec(::Type{T}) where T
     name = Base.unwrap_unionall(T).name.name
     str = ""
-    for c in str
+    for c in string(name)
         str *= c
     end
     return str
 end
 function spell_unspec(@nospecialize(T))
     name = Base.unwrap_unionall(T).name.name
     str = ""
-    for c in str
+    for c in string(name)
         str *= c
     end
     return str