-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
1.11: allow external abstract interpreter compilation
As mentioned in #53478, the precompilation support for external abstract interpreters in v1.11 isn't perfect, and directly cherry-picking the refined test cases from #53478 into the v1.11 backport branch leads to a test failure (note that this particular problem has likely been fixed in the master branch, probably thanks to #53300). To address this, this commit does more than just cherry-pick the test case, and it also modifies the `CodeInstance(::AbstractInterpreter, ::InferenceResult)` constructor to allow precompilation for external abstract interpreters in v1.11.
- Loading branch information
Showing
5 changed files
with
214 additions
and
179 deletions.
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| # This file is a part of Julia. License is MIT: https://julialang.org/license | ||
|
|
||
| using Test | ||
|
|
||
| include("precompile_utils.jl") | ||
|
|
||
| precompile_test_harness() do load_path | ||
| write(joinpath(load_path, "SimpleModule.jl"), :(module SimpleModule | ||
| basic_callee(x) = x | ||
| basic_caller(x) = basic_callee(x) | ||
| end) |> string) | ||
|
|
||
| newinterp_path = abspath("compiler/newinterp.jl") | ||
| write(joinpath(load_path, "TestAbsIntPrecompile1.jl"), :(module TestAbsIntPrecompile1 | ||
| import SimpleModule: basic_caller, basic_callee | ||
|
|
||
| module Custom | ||
| include("$($newinterp_path)") | ||
| @newinterp PrecompileInterpreter | ||
| end | ||
|
|
||
| Base.return_types((Float64,)) do x | ||
| basic_caller(x) | ||
| end | ||
| Base.return_types((Float64,); interp=Custom.PrecompileInterpreter()) do x | ||
| basic_caller(x) | ||
| end | ||
| Base.return_types((Vector{Float64},)) do x | ||
| sum(x) | ||
| end | ||
| Base.return_types((Vector{Float64},); interp=Custom.PrecompileInterpreter()) do x | ||
| sum(x) | ||
| end | ||
| end) |> string) | ||
| Base.compilecache(Base.PkgId("TestAbsIntPrecompile1")) | ||
|
|
||
| @eval let | ||
| using TestAbsIntPrecompile1 | ||
| cache_owner = Core.Compiler.cache_owner( | ||
| TestAbsIntPrecompile1.Custom.PrecompileInterpreter()) | ||
| let m = only(methods(TestAbsIntPrecompile1.basic_callee)) | ||
| mi = only(Base.specializations(m)) | ||
| ci = mi.cache | ||
| @test isdefined(ci, :next) | ||
| @test ci.owner === nothing | ||
| @test ci.max_world == typemax(UInt) | ||
| ci = ci.next | ||
| @test !isdefined(ci, :next) | ||
| @test ci.owner === cache_owner | ||
| @test ci.max_world == typemax(UInt) | ||
| end | ||
| let m = only(methods(sum, (Vector{Float64},))) | ||
| found = false | ||
| for mi in Base.specializations(m) | ||
| if mi isa Core.MethodInstance && mi.specTypes == Tuple{typeof(sum),Vector{Float64}} | ||
| ci = mi.cache | ||
| @test isdefined(ci, :next) | ||
| @test ci.owner === cache_owner | ||
| @test ci.max_world == typemax(UInt) | ||
| ci = ci.next | ||
| @test !isdefined(ci, :next) | ||
| @test ci.owner === nothing | ||
| @test ci.max_world == typemax(UInt) | ||
| found = true | ||
| break | ||
| end | ||
| end | ||
| @test found | ||
| end | ||
| end | ||
| end | ||
|
|
||
| finish_precompile_test!() |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| # This file is a part of Julia. License is MIT: https://julialang.org/license | ||
|
|
||
| using Test | ||
|
|
||
| include("precompile_utils.jl") | ||
|
|
||
| precompile_test_harness() do load_path | ||
| write(joinpath(load_path, "SimpleModule.jl"), :(module SimpleModule | ||
| basic_callee(x) = x | ||
| basic_caller(x) = basic_callee(x) | ||
| end) |> string) | ||
|
|
||
| newinterp_path = abspath("compiler/newinterp.jl") | ||
| write(joinpath(load_path, "TestAbsIntPrecompile2.jl"), :(module TestAbsIntPrecompile2 | ||
| import SimpleModule: basic_caller, basic_callee | ||
|
|
||
| module Custom | ||
| const CC = Core.Compiler | ||
| include("$($newinterp_path)") | ||
| @newinterp PrecompileInterpreter | ||
| struct CustomData | ||
| inferred | ||
| CustomData(@nospecialize inferred) = new(inferred) | ||
| end | ||
| function CC.transform_result_for_cache(interp::PrecompileInterpreter, | ||
| mi::Core.MethodInstance, valid_worlds::CC.WorldRange, result::CC.InferenceResult) | ||
| inferred_result = @invoke CC.transform_result_for_cache(interp::CC.AbstractInterpreter, | ||
| mi::Core.MethodInstance, valid_worlds::CC.WorldRange, result::CC.InferenceResult) | ||
| return CustomData(inferred_result) | ||
| end | ||
| function CC.inlining_policy(interp::PrecompileInterpreter, @nospecialize(src), | ||
| @nospecialize(info::CC.CallInfo), stmt_flag::UInt32) | ||
| if src isa CustomData | ||
| src = src.inferred | ||
| end | ||
| return @invoke CC.inlining_policy(interp::CC.AbstractInterpreter, src::Any, | ||
| info::CC.CallInfo, stmt_flag::UInt32) | ||
| end | ||
| end | ||
|
|
||
| Base.return_types((Float64,)) do x | ||
| basic_caller(x) | ||
| end | ||
| Base.return_types((Float64,); interp=Custom.PrecompileInterpreter()) do x | ||
| basic_caller(x) | ||
| end | ||
| Base.return_types((Vector{Float64},)) do x | ||
| sum(x) | ||
| end | ||
| Base.return_types((Vector{Float64},); interp=Custom.PrecompileInterpreter()) do x | ||
| sum(x) | ||
| end | ||
| end) |> string) | ||
| Base.compilecache(Base.PkgId("TestAbsIntPrecompile2")) | ||
|
|
||
| @eval let | ||
| using TestAbsIntPrecompile2 | ||
| cache_owner = Core.Compiler.cache_owner( | ||
| TestAbsIntPrecompile2.Custom.PrecompileInterpreter()) | ||
| let m = only(methods(TestAbsIntPrecompile2.basic_callee)) | ||
| mi = only(Base.specializations(m)) | ||
| ci = mi.cache | ||
| @test isdefined(ci, :next) | ||
| @test ci.owner === nothing | ||
| @test ci.max_world == typemax(UInt) | ||
| ci = ci.next | ||
| @test !isdefined(ci, :next) | ||
| @test ci.owner === cache_owner | ||
| @test ci.max_world == typemax(UInt) | ||
| end | ||
| let m = only(methods(sum, (Vector{Float64},))) | ||
| found = false | ||
| for mi = Base.specializations(m) | ||
| if mi isa Core.MethodInstance && mi.specTypes == Tuple{typeof(sum),Vector{Float64}} | ||
| ci = mi.cache | ||
| @test isdefined(ci, :next) | ||
| @test ci.owner === cache_owner | ||
| @test ci.max_world == typemax(UInt) | ||
| ci = ci.next | ||
| @test !isdefined(ci, :next) | ||
| @test ci.owner === nothing | ||
| @test ci.max_world == typemax(UInt) | ||
| found = true | ||
| break | ||
| end | ||
| end | ||
| @test found | ||
| end | ||
| end | ||
| end | ||
|
|
||
| finish_precompile_test!() |
Oops, something went wrong.