Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: use IPO cache for results #2171

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
+74 −28
Draft

WIP: use IPO cache for results #2171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
192ad10
WIP: use IPO cache for results
vchuravy Dec 5, 2024
d121d48
Update interpreter.jl
wsmoses Dec 6, 2024
49c9e56
swap back to the old form
vchuravy Dec 6, 2024
1144108
fixup impl for 1.10
vchuravy Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 54 additions & 19 deletions src/compiler/interpreter.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,60 @@ end

include("tfunc.jl")

struct EnzymeCache
inactive::Bool
has_rule::Bool
end

if VERSION >= v"1.11.0-"
function CC.ipo_dataflow_analysis!(interp::EnzymeInterpreter, ir::Core.Compiler.IRCode,
caller::Core.Compiler.InferenceResult)
mi = caller.linfo
specTypes = simplify_kw(mi.specTypes)
inactive = false
has_rule = false
if is_inactive_from_sig(interp, specTypes, mi)
inactive = true
else
# 2. Check if rule is defined
if interp.forward_rules && has_frule_from_sig(interp, specTypes, mi)
has_rule = true
elseif interp.reverse_rules && has_rrule_from_sig(interp, specTypes, mi)
has_rule = true
end
end
CC.stack_analysis_result!(caller, EnzymeCache(inactive, has_rule))
@invoke CC.ipo_dataflow_analysis!(interp::Core.Compiler.AbstractInterpreter, ir::Core.Compiler.IRCode,
caller::Core.Compiler.InferenceResult)
end

else # v1.10
# 1.10 doesn't have stack_analysis_result or ipo_dataflow_analysis
function Core.Compiler.finish(interp::EnzymeInterpreter, opt::Core.Compiler.OptimizationState, ir::Core.Compiler.IRCode,
caller::Core.Compiler.InferenceResult)
(; src, linfo) = opt
specTypes = simplify_kw(linfo.specTypes)
inactive = false
has_rule = false
if is_inactive_from_sig(interp, specTypes, linfo)
inactive = true
else
# 2. Check if rule is defined
if interp.forward_rules && has_frule_from_sig(interp, specTypes, linfo)
has_rule = true
elseif interp.reverse_rules && has_rrule_from_sig(interp, specTypes, linfo)
has_rule = true
end
end
@invoke Core.Compiler.finish(interp::Core.Compiler.AbstractInterpreter, opt::Core.Compiler.OptimizationState,
ir::Core.Compiler.IRCode, caller::Core.Compiler.InferenceResult)
# Must happen afterwards
if inactive || has_rule
Core.Compiler.set_inlineable!(src, false)
end
Comment on lines +224 to +226
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aviatesk does this look reasonable to you?

The goal is to do the rule check once, per method and not once per call,

end
end

import Core.Compiler: CallInfo
struct NoInlineCallInfo <: CallInfo
info::CallInfo # wrapped call
Expand Down Expand Up @@ -224,25 +278,6 @@ function Core.Compiler.abstract_call_gf_by_type(
callinfo = NoInlineCallInfo(callinfo, atype, :primitive)
elseif is_alwaysinline_func(specTypes)
callinfo = AlwaysInlineCallInfo(callinfo, atype)
else
# 1. Check if function is inactive
if is_inactive_from_sig(interp, specTypes, sv)
callinfo = NoInlineCallInfo(callinfo, atype, :inactive)
else
# 2. Check if rule is defined
has_rule = get!(interp.rules_cache, specTypes) do
if interp.forward_rules && has_frule_from_sig(interp, specTypes, sv)
return true
elseif interp.reverse_rules && has_rrule_from_sig(interp, specTypes, sv)
return true
else
return false
end
end
if has_rule
callinfo = NoInlineCallInfo(callinfo, atype, interp.forward_rules ? :frule : :rrule)
end
end
end
@static if VERSION ≥ v"1.11-"
return Core.Compiler.CallMeta(ret.rt, ret.exct, ret.effects, callinfo)
Expand Down
29 changes: 20 additions & 9 deletions src/compiler/tfunc.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,42 @@
import EnzymeCore: Annotation
import EnzymeCore.EnzymeRules: FwdConfig, RevConfig, forward, augmented_primal, inactive, _annotate_tt

function add_backedge!(caller::Core.MethodInstance, callee::Core.MethodInstance, @nospecialize(sig))
ccall(:jl_method_instance_add_backedge, Cvoid, (Any, Any, Any), callee, sig, caller)
return nothing
end

function add_mt_backedge!(caller::Core.MethodInstance, mt::Core.MethodTable, @nospecialize(sig))
ccall(:jl_method_table_add_backedge, Cvoid, (Any, Any, Any), mt, sig, caller)
return nothing
end


function has_frule_from_sig(@nospecialize(interp::Core.Compiler.AbstractInterpreter),
@nospecialize(TT), sv::Core.Compiler.AbsIntState)::Bool
@nospecialize(TT), caller::MethodInstance)::Bool
ft, tt = _annotate_tt(TT)
TT = Tuple{<:FwdConfig,<:Annotation{ft},Type{<:Annotation},tt...}
return isapplicable(interp, forward, TT, sv)
return isapplicable(interp, forward, TT, caller)
end

function has_rrule_from_sig(@nospecialize(interp::Core.Compiler.AbstractInterpreter),
@nospecialize(TT), sv::Core.Compiler.AbsIntState)::Bool
@nospecialize(TT), caller::MethodInstance)::Bool
ft, tt = _annotate_tt(TT)
TT = Tuple{<:RevConfig,<:Annotation{ft},Type{<:Annotation},tt...}
return isapplicable(interp, augmented_primal, TT, sv)
return isapplicable(interp, augmented_primal, TT, caller)
end


function is_inactive_from_sig(@nospecialize(interp::Core.Compiler.AbstractInterpreter),
@nospecialize(TT), sv::Core.Compiler.AbsIntState)
return isapplicable(interp, inactive, TT, sv)
@nospecialize(TT), caller::MethodInstance)
return isapplicable(interp, inactive, TT, caller)
end

# `hasmethod` is a precise match using `Core.Compiler.findsup`,
# but here we want the broader query using `Core.Compiler.findall`.
# Also add appropriate backedges to the caller `MethodInstance` if given.
function isapplicable(@nospecialize(interp::Core.Compiler.AbstractInterpreter),
@nospecialize(f), @nospecialize(TT), sv::Core.Compiler.AbsIntState)::Bool
@nospecialize(f), @nospecialize(TT), caller::MethodInstance)::Bool
tt = Base.to_tuple_type(TT)
sig = Base.signature_type(f, tt)
mt = ccall(:jl_method_table_for, Any, (Any,), sig)
Expand All @@ -41,15 +52,15 @@ function isapplicable(@nospecialize(interp::Core.Compiler.AbstractInterpreter),
# added that did not intersect with any existing method
fullmatch = Core.Compiler._any(match::Core.MethodMatch -> match.fully_covers, matches)
if !fullmatch
Core.Compiler.add_mt_backedge!(sv, mt, sig)
add_mt_backedge!(caller, mt, sig)
end
if Core.Compiler.isempty(matches)
return false
else
for i = 1:Core.Compiler.length(matches)
match = Core.Compiler.getindex(matches, i)::Core.MethodMatch
edge = Core.Compiler.specialize_method(match)::Core.MethodInstance
Core.Compiler.add_backedge!(sv, edge)
add_backedge!(caller, edge, sig)
end
return true
end
Expand Down
Loading