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

Jump to bottom

WIP improve frule inference #202

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

WIP improve frule inference #202

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cefe938
WIP
Keno Jul 31, 2023
607ba18
wip
aviatesk Jul 31, 2023
0362267
Update src/stage2/interpreter.jl
aviatesk Jul 31, 2023
2438a47
fix on 1.10
aviatesk Jul 31, 2023
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
48 changes: 35 additions & 13 deletions src/stage2/interpreter.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,11 @@ struct ADInterpreter <: AbstractInterpreter
unopt::Union{OffsetVector{UnoptCache},Nothing}
transformed::OffsetVector{OptCache}

# Cache results for forward inference over a converged inference (current_level == missing)
generic::OptCache

native_interpreter::NativeInterpreter
current_level::Int
current_level::Union{Int, Missing}
remarks::OffsetVector{RemarksCache}

function _ADInterpreter()
Expand All @@ -66,6 +69,7 @@ struct ADInterpreter <: AbstractInterpreter
#=opt::OffsetVector{OptCache}=#OffsetVector([OptCache(), OptCache()], 0:1),
#=unopt::Union{OffsetVector{UnoptCache},Nothing}=#OffsetVector([UnoptCache(), UnoptCache()], 0:1),
#=transformed::OffsetVector{OptCache}=#OffsetVector([OptCache(), OptCache()], 0:1),
OptCache(),
#=native_interpreter::NativeInterpreter=#NativeInterpreter(),
#=current_level::Int=#0,
#=remarks::OffsetVector{RemarksCache}=#OffsetVector([RemarksCache()], 0:0))
Expand All @@ -76,10 +80,11 @@ struct ADInterpreter <: AbstractInterpreter
opt::OffsetVector{OptCache} = interp.opt,
unopt::Union{OffsetVector{UnoptCache},Nothing} = interp.unopt,
transformed::OffsetVector{OptCache} = interp.transformed,
generic::OptCache = interp.generic,
native_interpreter::NativeInterpreter = interp.native_interpreter,
current_level::Int = interp.current_level,
current_level::Union{Int, Missing} = interp.current_level,
remarks::OffsetVector{RemarksCache} = interp.remarks)
return new(forward, backward, opt, unopt, transformed, native_interpreter, current_level, remarks)
return new(forward, backward, opt, unopt, transformed, generic, native_interpreter, current_level, remarks)
end
end

Expand All @@ -89,13 +94,39 @@ lower_level(interp::ADInterpreter) = change_level(interp, interp.current_level -

disable_forward(interp::ADInterpreter) = ADInterpreter(interp; forward=false)

const GENERIC_INFERENCE_ENABLED = isdefined(CC, :update_bestguess!)

@static if GENERIC_INFERENCE_ENABLED

function CC.InferenceState(result::InferenceResult, cache::Symbol, interp::ADInterpreter)
sv = @invoke CC.InferenceState(result::InferenceResult, cache::Symbol, interp::AbstractInterpreter)
sv === nothing && return sv
if interp.current_level === missing
# override initial bestguess
arginfo = ArgInfo(nothing, result.argtypes)
si = StmtInfo(false)
sv.bestguess = CC.abstract_call(interp.native_interpreter, arginfo, si, sv).rt
end
return sv
end

function CC.update_bestguess!(interp::ADInterpreter, frame::InferenceState,
currstate::CC.VarTable, @nospecialize(rt))
if interp.current_level === missing
rt = CC.getfield_tfunc(rt, Const(1))
end
return @invoke CC.update_bestguess!(interp::AbstractInterpreter, frame::InferenceState,
currstate::CC.VarTable, rt::Any)
end

end # @static if GENERIC_INFERENCE_ENABLED

function Cthulhu.get_optimized_codeinst(interp::ADInterpreter, curs::ADCursor)
@show curs
(curs.transformed ? interp.transformed : interp.opt)[curs.level][curs.mi]
end
Cthulhu.AbstractCursor(interp::ADInterpreter, mi::MethodInstance) = ADCursor(0, mi, false)


# This is a lie, but let's clean this up later
Cthulhu.can_descend(interp::ADInterpreter, @nospecialize(key), optimize::Bool) = true

Expand Down Expand Up @@ -335,15 +366,6 @@ function CC.inlining_policy(interp::ADInterpreter,
nothing, info::CC.CallInfo, stmt_flag::UInt8, mi::MethodInstance, argtypes::Vector{Any})
end

# TODO remove this overload once https://github.com/JuliaLang/julia/pull/49191 gets merged
function CC.abstract_call_gf_by_type(interp::ADInterpreter, @nospecialize(f),
arginfo::ArgInfo, si::StmtInfo, @nospecialize(atype),
sv::IRInterpretationState, max_methods::Int)
return @invoke CC.abstract_call_gf_by_type(interp::AbstractInterpreter, f::Any,
arginfo::ArgInfo, si::StmtInfo, atype::Any,
sv::CC.AbsIntState, max_methods::Int)
end

#=
function CC.optimize(interp::ADInterpreter, opt::OptimizationState,
params::OptimizationParams, caller::InferenceResult)
Expand Down