inference: concretize invoke callsite correctly
#46743
Merged
Conversation
This file contains 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
aviatesk
added
compiler:inference
aviatesk
force-pushed
the
avi/concretize-invoke
branch
from
d5bf1e4
to
38d051d
Compare
vtjnash
approved these changes
Sep 13, 2022
Keno
reviewed
Sep 14, 2022
| @@ -885,6 +885,7 @@ function abstract_call_method_with_const_args(interp::AbstractInterpreter, resul | |||
| add_backedge!(res.const_result.mi, sv, invoketypes) | |||
| return res | |||
| end | |||
| f isa InvokeCall && (f = f.f) # unwrap `invoke`-ed function (the call will be virtualized) | |||
There was a problem hiding this comment.
I don't usually like wrapper objects in non-escaped contexts. E.g. one could probably end up with an InvokeCall here, by doing something like const foo = CC.InvokeCall(...) and then calling foo, but I suppose that wouldn't actually be a problem here, since that would still give the right answer, so I suppose it's not a problem.
There was a problem hiding this comment.
Okay, I stopped passing the wrapper object through the f argument, but rather pass the invoke information as an additional argument.
It turns out that previously we didn't concretize `invoke` callsite
correctly, as we didn't take into account whether or not the call being
concretized is `invoke`-d or not, e.g.:
```
julia> invoke_concretized2(a::Int) = a > 0 ? :int : nothing
invoke_concretized2 (generic function with 1 method)
julia> invoke_concretized2(a::Integer) = a > 0 ? :integer : nothing
invoke_concretized2 (generic function with 2 methods)
julia> let
Base.Experimental.@force_compile
Base.@invoke invoke_concretized2(42::Integer)
end
:int # this should return `:integer` instead
```
This commit fixes that up by propagating information `invoke`-d callsite
to `concrete_eval_call`. Now we should pass the following test cases:
```julia
invoke_concretized1(a::Int) = a > 0 ? :int : nothing
invoke_concretized1(a::Integer) = a > 0 ? "integer" : nothing
@test Base.infer_effects((Int,)) do a
@invoke invoke_concretized1(a::Integer)
end |> Core.Compiler.is_foldable
@test Base.return_types() do
@invoke invoke_concretized1(42::Integer)
end |> only === String
invoke_concretized2(a::Int) = a > 0 ? :int : nothing
invoke_concretized2(a::Integer) = a > 0 ? :integer : nothing
@test Base.infer_effects((Int,)) do a
@invoke invoke_concretized2(a::Integer)
end |> Core.Compiler.is_foldable
@test let
Base.Experimental.@force_compile
@invoke invoke_concretized2(42::Integer)
end === :integer
```
aviatesk
force-pushed
the
avi/concretize-invoke
branch
from
38d051d
to
61ba571
Compare
|
The whitespace failure is fixed on master. |
aviatesk
added a commit
that referenced
this pull request
Sep 14, 2022
It turns out that previously we didn't concretize `invoke` callsite
correctly, as we didn't take into account whether the call being
concretized is `invoke`-d or not, e.g.:
```
julia> invoke_concretized2(a::Int) = a > 0 ? :int : nothing
invoke_concretized2 (generic function with 1 method)
julia> invoke_concretized2(a::Integer) = a > 0 ? :integer : nothing
invoke_concretized2 (generic function with 2 methods)
julia> let
Base.Experimental.@force_compile
Base.@invoke invoke_concretized2(42::Integer)
end
:int # this should return `:integer` instead
```
This commit fixes that up by propagating information `invoke`-d callsite
to `concrete_eval_call`. Now we should be able to pass the following test cases:
```julia
invoke_concretized1(a::Int) = a > 0 ? :int : nothing
invoke_concretized1(a::Integer) = a > 0 ? "integer" : nothing
@test Base.infer_effects((Int,)) do a
@invoke invoke_concretized1(a::Integer)
end |> Core.Compiler.is_foldable
@test Base.return_types() do
@invoke invoke_concretized1(42::Integer)
end |> only === String
invoke_concretized2(a::Int) = a > 0 ? :int : nothing
invoke_concretized2(a::Integer) = a > 0 ? :integer : nothing
@test Base.infer_effects((Int,)) do a
@invoke invoke_concretized2(a::Integer)
end |> Core.Compiler.is_foldable
@test let
Base.Experimental.@force_compile
@invoke invoke_concretized2(42::Integer)
end === :integer
```
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.
It turns out that previously we didn't concretize
invokecallsite correctly, as we didn't take into account whether or not the call being concretized isinvoke-d or not, e.g.:This commit fixes that up by propagating information
invoke-d callsite toconcrete_eval_call. Now we should pass the following test cases: