Insert call instructions (without any caching) #1276
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ure the latter can be removed?
….fill` instead of creating an uninitialized TracedRArray
…urse through the object. This is useful for constructing a new traced object without altering the paths.
…thing. This now handles that.
It checks the contents of the generated MLIR which is different when call operations are generated.
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
Remaining comments which cannot be posted as a review comment to avoid GitHub Rate Limit
| @@ -398,7 +398,7 @@ Base.@nospecializeinfer function traced_type_inner( | |||
| } | |||
| end | |||
| error("Unsupported runtime $runtime") | |||
| elseif mode == TracedTrack || mode == NoStopTracedTrack || mode == TracedSetPath | |||
| elseif mode == TracedTrack || mode == NoStopTracedTrack || mode == TracedSetPath || mode == TracedToTypes | |||
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| elseif mode == TracedTrack || mode == NoStopTracedTrack || mode == TracedSetPath || mode == TracedToTypes | |
| elseif mode == TracedTrack || | |
| mode == NoStopTracedTrack || | |
| mode == TracedSetPath || | |
| mode == TracedToTypes |
| @@ -444,7 +444,7 @@ Base.@nospecializeinfer function traced_type_inner( | |||
| } | |||
| end | |||
| error("Unsupported runtime $runtime") | |||
| elseif mode == TracedTrack || mode == NoStopTracedTrack || mode == TracedSetPath | |||
| elseif mode == TracedTrack || mode == NoStopTracedTrack || mode == TracedSetPath || mode == TracedToTypes | |||
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| elseif mode == TracedTrack || mode == NoStopTracedTrack || mode == TracedSetPath || mode == TracedToTypes | |
| elseif mode == TracedTrack || | |
| mode == NoStopTracedTrack || | |
| mode == TracedSetPath || | |
| mode == TracedToTypes |
| kwargs..., | ||
| ) | ||
| if mode == TracedToTypes | ||
| return |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| return | |
| return nothing |
| return nothing | ||
| end | ||
| if mode == TracedTrack | ||
| TracedUtils.set_paths!(prev, (TracedUtils.get_paths(prev)..., path)) | ||
| !isnothing(path) && TracedUtils.set_paths!(prev, (TracedUtils.get_paths(prev)..., path)) |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| !isnothing(path) && TracedUtils.set_paths!(prev, (TracedUtils.get_paths(prev)..., path)) | |
| !isnothing(path) && | |
| TracedUtils.set_paths!(prev, (TracedUtils.get_paths(prev)..., path)) |
| if !haskey(seen, prev) | ||
| return seen[prev] = prev | ||
| end | ||
| return prev | ||
| end | ||
| if mode == NoStopTracedTrack | ||
| TracedUtils.set_paths!(prev, (TracedUtils.get_paths(prev)..., path)) | ||
| !isnothing(path) && TracedUtils.set_paths!(prev, (TracedUtils.get_paths(prev)..., path)) |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| !isnothing(path) && TracedUtils.set_paths!(prev, (TracedUtils.get_paths(prev)..., path)) | |
| !isnothing(path) && | |
| TracedUtils.set_paths!(prev, (TracedUtils.get_paths(prev)..., path)) |
| if !haskey(seen, prev) | ||
| return seen[prev] = prev | ||
| end | ||
| return prev | ||
| end | ||
| if mode == NoStopTracedTrack | ||
| TracedUtils.set_paths!(prev, (TracedUtils.get_paths(prev)..., path)) | ||
| !isnothing(path) && TracedUtils.set_paths!(prev, (TracedUtils.get_paths(prev)..., path)) |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| !isnothing(path) && TracedUtils.set_paths!(prev, (TracedUtils.get_paths(prev)..., path)) | |
| !isnothing(path) && | |
| TracedUtils.set_paths!(prev, (TracedUtils.get_paths(prev)..., path)) |
| if !haskey(seen, prev) | ||
| seen[prev] = prev # don't return! | ||
| end | ||
| return prev | ||
| end | ||
| if mode == TracedSetPath | ||
| TracedUtils.set_paths!(prev, (TracedUtils.get_paths(prev)..., path)) | ||
| !isnothing(path) && TracedUtils.set_paths!(prev, (TracedUtils.get_paths(prev)..., path)) |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| !isnothing(path) && TracedUtils.set_paths!(prev, (TracedUtils.get_paths(prev)..., path)) | |
| !isnothing(path) && | |
| TracedUtils.set_paths!(prev, (TracedUtils.get_paths(prev)..., path)) |
| pr.traced_args_to_shardings, | ||
| pr.sym_visibility, | ||
| pr.args, | ||
| pr.N |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| pr.N | |
| pr.N, |
|
|
||
| function deactivate_fnbody!(fnbody) | ||
| MLIR.IR.deactivate!(fnbody) | ||
| Ops.deactivate_constant_context!(fnbody) |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| Ops.deactivate_constant_context!(fnbody) | |
| return Ops.deactivate_constant_context!(fnbody) |
| Ops.deactivate_constant_context!(fnbody) | ||
| end | ||
|
|
||
| function call_prologue(f, args, ) |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| function call_prologue(f, args, ) | |
| function call_prologue(f, args) |
Comment on lines
+583
to
+597
| fnbody | ||
| ) = result = TracedUtils.prepare_mlir_fn_args( | ||
| args, | ||
| f_name, | ||
| concretein, | ||
| true, # mutate_args | ||
| toscalar, | ||
| argprefix, | ||
| runtime, | ||
| optimize_then_pad, | ||
| do_transpose, | ||
| input_shardings, | ||
| verify_arg_names | ||
| ) | ||
| mlir_caller_args = Reactant.MLIR.IR.Value[TracedUtils.get_mlir_data(x) for x in linear_args] |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| fnbody | |
| ) = result = TracedUtils.prepare_mlir_fn_args( | |
| args, | |
| f_name, | |
| concretein, | |
| true, # mutate_args | |
| toscalar, | |
| argprefix, | |
| runtime, | |
| optimize_then_pad, | |
| do_transpose, | |
| input_shardings, | |
| verify_arg_names | |
| ) | |
| mlir_caller_args = Reactant.MLIR.IR.Value[TracedUtils.get_mlir_data(x) for x in linear_args] | |
| fnbody, | |
| ) = | |
| result = TracedUtils.prepare_mlir_fn_args( | |
| args, | |
| f_name, | |
| concretein, | |
| true, # mutate_args | |
| toscalar, | |
| argprefix, | |
| runtime, | |
| optimize_then_pad, | |
| do_transpose, | |
| input_shardings, | |
| verify_arg_names, | |
| ) | |
| mlir_caller_args = Reactant.MLIR.IR.Value[ | |
| TracedUtils.get_mlir_data(x) for x in linear_args | |
| ] |
| return result | ||
| end | ||
|
|
||
| function finalize_function(result, traced_args, linear_args, mlir_caller_args, seen_args, fnbody, func, mod, name, in_tys, inv_map, argprefix, traced_args_to_shardings, sym_visibility, args, N) |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| function finalize_function(result, traced_args, linear_args, mlir_caller_args, seen_args, fnbody, func, mod, name, in_tys, inv_map, argprefix, traced_args_to_shardings, sym_visibility, args, N) | |
| function finalize_function( | |
| result, | |
| traced_args, | |
| linear_args, | |
| mlir_caller_args, | |
| seen_args, | |
| fnbody, | |
| func, | |
| mod, | |
| name, | |
| in_tys, | |
| inv_map, | |
| argprefix, | |
| traced_args_to_shardings, | |
| sym_visibility, | |
| args, | |
| N, | |
| ) |
| construct_function_without_args = false | ||
| output_shardings = nothing | ||
|
|
||
|
|
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
Comment on lines
+636
to
+650
|
|
||
| (; | ||
| func2, | ||
| f_name, | ||
| traced_result, | ||
| ret, | ||
| linear_args, | ||
| in_tys, | ||
| linear_results, | ||
| num_partitions, | ||
| is_sharded, | ||
| unique_meshes, | ||
| mutated_args, | ||
| global_device_ids | ||
| ) = TracedUtils.finalize_mlir_fn( |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| (; | |
| func2, | |
| f_name, | |
| traced_result, | |
| ret, | |
| linear_args, | |
| in_tys, | |
| linear_results, | |
| num_partitions, | |
| is_sharded, | |
| unique_meshes, | |
| mutated_args, | |
| global_device_ids | |
| ) = TracedUtils.finalize_mlir_fn( | |
| (; func2, f_name, traced_result, ret, linear_args, in_tys, linear_results, num_partitions, is_sharded, unique_meshes, mutated_args, global_device_ids) = TracedUtils.finalize_mlir_fn( |
| args, | ||
| N, | ||
| concretein, | ||
| toscalar |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| toscalar | |
| toscalar, |
Comment on lines
+703
to
+704
| ) | ||
|
|
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| ) | |
| ) |
|
|
||
| end | ||
|
|
||
| function call_epilogue(f, args, traced_result, linear_args, f_name, ret, linear_results, mlir_caller_args, argprefix, resprefix, resargprefix) |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| function call_epilogue(f, args, traced_result, linear_args, f_name, ret, linear_results, mlir_caller_args, argprefix, resprefix, resargprefix) | |
| function call_epilogue( | |
| f, | |
| args, | |
| traced_result, | |
| linear_args, | |
| f_name, | |
| ret, | |
| linear_results, | |
| mlir_caller_args, | |
| argprefix, | |
| resprefix, | |
| resargprefix, | |
| ) |
| callee=MLIR.IR.FlatSymbolRefAttribute(f_name), | ||
| ) | ||
|
|
||
|
|
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| else | ||
| Core.println("Not tracing call to $fn.") | ||
| end | ||
|
|
||
|
|
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
… call operation for blacklisted operations but not for the functions called within them.
|
Status: |
| @@ -131,6 +131,11 @@ function set_mlir_data!(x::AnyTracedRArray{T}, data) where {T} | |||
| return x | |||
| end | |||
|
|
|||
| function set_mlir_data!(x::T, data) where T | |||
| @warn "Setting mlir data on a $T is a no-op." | |||
| return x | |||
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| return x | |
| function set_mlir_data!(x::T, data) where {T} |
…en calling `make_tracer` on the `AnyTracedRArray`.
Comment on lines
+851
to
+855
| Core.println("Found method from module $(method.module) with name $(method.name), TRACE_CALLS[] = $(TRACE_CALLS[])") | ||
| trace_call_within = TRACE_CALLS[] && !( | ||
| has_ancestor(method.module, Reactant.TracedRNumberOverrides) || | ||
| has_ancestor(method.module, Reactant.TracedRArrayOverrides) || | ||
| has_ancestor(method.module, Core) |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| Core.println("Found method from module $(method.module) with name $(method.name), TRACE_CALLS[] = $(TRACE_CALLS[])") | |
| trace_call_within = TRACE_CALLS[] && !( | |
| has_ancestor(method.module, Reactant.TracedRNumberOverrides) || | |
| has_ancestor(method.module, Reactant.TracedRArrayOverrides) || | |
| has_ancestor(method.module, Core) | |
| Core.println( | |
| "Found method from module $(method.module) with name $(method.name), TRACE_CALLS[] = $(TRACE_CALLS[])", | |
| ) | |
| trace_call_within = | |
| TRACE_CALLS[] && !( | |
| has_ancestor(method.module, Reactant.TracedRNumberOverrides) || | |
| has_ancestor(method.module, Reactant.TracedRArrayOverrides) || | |
| has_ancestor(method.module, Core) |
| has_ancestor(method.module, Reactant.TracedRArrayOverrides) || | ||
| has_ancestor(method.module, Core) | ||
| ) | ||
| if TRACE_CALLS[] && !(!(fn <: Function) || sizeof(fn) != 0 || fn <: Base.BroadcastFunction) |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| if TRACE_CALLS[] && !(!(fn <: Function) || sizeof(fn) != 0 || fn <: Base.BroadcastFunction) | |
| if TRACE_CALLS[] && | |
| !(!(fn <: Function) || sizeof(fn) != 0 || fn <: Base.BroadcastFunction) |
Comment on lines
+1047
to
+1050
| ocres = if TRACE_CALLS[] && !(!(fn <: Function) || sizeof(fn) != 0 || fn <: Base.BroadcastFunction) | ||
| push!(code_info.slotnames, :tryfinallystate) | ||
| push!(code_info.slotflags, zero(UInt8)) | ||
| tryfinally_slot = Core.SlotNumber(length(code_info.slotnames)) |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| ocres = if TRACE_CALLS[] && !(!(fn <: Function) || sizeof(fn) != 0 || fn <: Base.BroadcastFunction) | |
| push!(code_info.slotnames, :tryfinallystate) | |
| push!(code_info.slotflags, zero(UInt8)) | |
| tryfinally_slot = Core.SlotNumber(length(code_info.slotnames)) | |
| ocres = | |
| if TRACE_CALLS[] && | |
| !(!(fn <: Function) || sizeof(fn) != 0 || fn <: Base.BroadcastFunction) | |
| push!(code_info.slotnames, :tryfinallystate) | |
| push!(code_info.slotflags, zero(UInt8)) | |
| tryfinally_slot = Core.SlotNumber(length(code_info.slotnames)) | |
| push!(code_info.slotnames, :ocres) | |
| push!(code_info.slotflags, zero(UInt8)) | |
| ocres_slot = Core.SlotNumber(length(code_info.slotnames)) | |
| push_inst!(Core.NewvarNode(ocres_slot)) | |
| cached_or_nothing = push_inst!( | |
| Expr(:call, get_cache, fn_args[1], fn_args[2:end]...) | |
| ) | |
| is_not_cached = push_inst!( | |
| Expr(:call, GlobalRef(Base, :isnothing), cached_or_nothing) | |
| ) | |
| # TODO: conditional jump to cached block | |
| # cached_dest = 0 | |
| # push_inst!(Core.GotoIfNot(is_not_cached, cached_dest)) |
Comment on lines
+1052
to
+1055
| push!(code_info.slotnames, :ocres) | ||
| push!(code_info.slotflags, zero(UInt8)) | ||
| ocres_slot = Core.SlotNumber(length(code_info.slotnames)) | ||
| push_inst!(Core.NewvarNode(ocres_slot)) |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| push!(code_info.slotnames, :ocres) | |
| push!(code_info.slotflags, zero(UInt8)) | |
| ocres_slot = Core.SlotNumber(length(code_info.slotnames)) | |
| push_inst!(Core.NewvarNode(ocres_slot)) | |
| prologue_result = push_inst!( | |
| Expr( | |
| :call, | |
| GlobalRef(Reactant, :call_prologue), | |
| fn_args[1], | |
| push_inst!(Expr(:call, GlobalRef(Core, :tuple), fn_args[2:end]...)), | |
| ), | |
| ) |
| ocres_slot = Core.SlotNumber(length(code_info.slotnames)) | ||
| push_inst!(Core.NewvarNode(ocres_slot)) | ||
|
|
||
|
|
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| catch_dest = length(overdubbed_code) + 12 | |
| enter = push_inst!(@static if VERSION < v"1.11" | |
| Expr(:enter, catch_dest) | |
| else | |
| Core.EnterNode(catch_dest) | |
| end) | |
Comment on lines
+1155
to
+1162
| finalize_function_result = push_inst!(Expr( | ||
| :call, | ||
| GlobalRef(Core, :_apply_iterate), | ||
| Base.iterate, | ||
| GlobalRef(Reactant, :finalize_function), | ||
| push_inst!(Expr(:call, GlobalRef(Core, :tuple), traced_result)), | ||
| push_inst!(Expr(:call, GlobalRef(Reactant, :get_args_for), QuoteNode(:finalize_function), prologue_result)) | ||
| )) |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| finalize_function_result = push_inst!(Expr( | |
| :call, | |
| GlobalRef(Core, :_apply_iterate), | |
| Base.iterate, | |
| GlobalRef(Reactant, :finalize_function), | |
| push_inst!(Expr(:call, GlobalRef(Core, :tuple), traced_result)), | |
| push_inst!(Expr(:call, GlobalRef(Reactant, :get_args_for), QuoteNode(:finalize_function), prologue_result)) | |
| )) | |
| finalize_function_result = push_inst!( | |
| Expr( | |
| :call, | |
| GlobalRef(Core, :_apply_iterate), | |
| Base.iterate, | |
| GlobalRef(Reactant, :finalize_function), | |
| push_inst!(Expr(:call, GlobalRef(Core, :tuple), traced_result)), | |
| push_inst!( | |
| Expr( | |
| :call, | |
| GlobalRef(Reactant, :get_args_for), | |
| QuoteNode(:finalize_function), | |
| prologue_result, | |
| ), | |
| ), | |
| ), | |
| ) |
| push_inst!(Expr(:call, GlobalRef(Reactant, :get_args_for), QuoteNode(:finalize_function), prologue_result)) | ||
| )) | ||
|
|
||
| # TODO: save cache |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| # TODO: save cache | |
| # TODO: save cache |
|
|
||
| # TODO: save cache | ||
|
|
||
| # TODO: unconditional jump over cached block. |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| # TODO: unconditional jump over cached block. | |
| # TODO: unconditional jump over cached block. |
|
|
||
| # TODO: unconditional jump over cached block. | ||
|
|
||
| # TODO: cached block |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| # TODO: cached block | |
| # TODO: cached block |
Comment on lines
+1170
to
+1184
| # TODO: common final handling | ||
| traced_result = push_inst!(Expr( | ||
| :call, | ||
| GlobalRef(Core, :_apply_iterate), | ||
| Base.iterate, | ||
| call_epilogue, | ||
| push_inst!(Expr(:call, GlobalRef(Core, :tuple), fn_args[1], push_inst!(Expr(:call, GlobalRef(Core, :tuple), fn_args[2:end]...)))), | ||
| push_inst!(Expr(:call, GlobalRef(Core, :tuple), traced_result)), | ||
| push_inst!(Expr(:call, GlobalRef(Reactant, :get_args_from_finalize_function), finalize_function_result)), | ||
| )) | ||
| traced_result | ||
| else | ||
| traced_result = push_inst!(Expr(:call, oc, fn_args[2:end]...)) | ||
| traced_result | ||
| end |
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| # TODO: common final handling | |
| traced_result = push_inst!(Expr( | |
| :call, | |
| GlobalRef(Core, :_apply_iterate), | |
| Base.iterate, | |
| call_epilogue, | |
| push_inst!(Expr(:call, GlobalRef(Core, :tuple), fn_args[1], push_inst!(Expr(:call, GlobalRef(Core, :tuple), fn_args[2:end]...)))), | |
| push_inst!(Expr(:call, GlobalRef(Core, :tuple), traced_result)), | |
| push_inst!(Expr(:call, GlobalRef(Reactant, :get_args_from_finalize_function), finalize_function_result)), | |
| )) | |
| traced_result | |
| else | |
| traced_result = push_inst!(Expr(:call, oc, fn_args[2:end]...)) | |
| traced_result | |
| end | |
| # TODO: common final handling | |
| traced_result = push_inst!( | |
| Expr( | |
| :call, | |
| GlobalRef(Core, :_apply_iterate), | |
| Base.iterate, | |
| call_epilogue, | |
| push_inst!( | |
| Expr( | |
| :call, | |
| GlobalRef(Core, :tuple), | |
| fn_args[1], | |
| push_inst!( | |
| Expr(:call, GlobalRef(Core, :tuple), fn_args[2:end]...) | |
| ), | |
| ), | |
| ), | |
| push_inst!(Expr(:call, GlobalRef(Core, :tuple), traced_result)), | |
| push_inst!( | |
| Expr( | |
| :call, | |
| GlobalRef(Reactant, :get_args_from_finalize_function), | |
| finalize_function_result, | |
| ), | |
| ), | |
| ), | |
| ) | |
| traced_result | |
| else | |
| traced_result = push_inst!(Expr(:call, oc, fn_args[2:end]...)) | |
| traced_result | |
| end |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.