Updates for Julia 1.12 #656
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
maleadt
commented
Jan 7, 2025
maleadt
commented
Jan 7, 2025
| @@ -518,7 +542,7 @@ end | |||
| function ci_cache_lookup(cache, mi, min_world, max_world) | |||
| wvc = WorldView(cache, min_world, max_world) | |||
| ci = CC.get(wvc, mi, nothing) | |||
| if ci !== nothing && ci.inferred === nothing | |||
| if VERSION < v"1.12.0-DEV.1434" && ci !== nothing && ci.inferred === nothing | |||
There was a problem hiding this comment.
I'm not sure about this; we encounter CIs with inferred set to nothing, and those seem safe to pass to codegen now?
There was a problem hiding this comment.
Normally most CI should have their value set to nothing. Anything else you might have observed (whether on this version or in the past) is a transient state and can change concurrently, so is unsafe to rely upon
There was a problem hiding this comment.
So you're saying that check is not necessary? If I don't forcibly populate our CI cache for CIs with ci.inferred == nothing, codegen calls into inference which is disallowed (Refusing to automatically run type inference with custom cache lookup.). On 1.11, at least.
maleadt
commented
Jan 7, 2025
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #656 +/- ##
=======================================
Coverage 74.18% 74.18%
=======================================
Files 24 24
Lines 3300 3312 +12
=======================================
+ Hits 2448 2457 +9
- Misses 852 855 +3 ☔ View full report in Codecov by Sentry. |
vchuravy
reviewed
Jan 7, 2025
maleadt
force-pushed
the
tb/1.12
branch
2 times, most recently
from
c125f6c to
74f7602
Compare
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Comment on lines
+118
to
121
| @test occursin(r"\.type.*(julia|j)_[[:alnum:]_.]*child1_\d*,@function", asm) | ||
| @test occursin(r"\.type.*(julia|j)_[[:alnum:]_.]*child2_\d*,@function", asm) | ||
|
|
||
| asm = sprint(io->GCN.code_native(io, mod.parent2, Tuple{Int}; dump_module=true)) |
There was a problem hiding this comment.
Suggested change
| @test occursin(r"\.type.*(julia|j)_[[:alnum:]_.]*child1_\d*,@function", asm) | |
| @test occursin(r"\.type.*(julia|j)_[[:alnum:]_.]*child2_\d*,@function", asm) | |
| asm = sprint(io->GCN.code_native(io, mod.parent2, Tuple{Int}; dump_module=true)) | |
| @test occursin(r"\.type.*(julia|j)_[[:alnum:]_.]*child1_\d*,@function", asm) | |
| @test occursin(r"\.type.*(julia|j)_[[:alnum:]_.]*child2_\d*,@function", asm) | |
| @test occursin(r"\.type.*(julia|j)_[[:alnum:]_.]*child1_\d*,@function", asm) | |
| @test occursin(r"\.type.*(julia|j)_[[:alnum:]_.]*child2_\d*,@function", asm) |
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Comment on lines
+56
to
+57
| @test occursin(r"s_add_u32.*(julia|j)_child_.*@rel32@", asm) | ||
| @test occursin(r"s_addc_u32.*(julia|j)_child_.*@rel32@", asm) |
There was a problem hiding this comment.
Suggested change
| @test occursin(r"s_add_u32.*(julia|j)_child_.*@rel32@", asm) | |
| @test occursin(r"s_addc_u32.*(julia|j)_child_.*@rel32@", asm) | |
| @test occursin(r"s_add_u32.*(julia|j)_child_.*@rel32@", asm) | |
| @test occursin(r"s_addc_u32.*(julia|j)_child_.*@rel32@", asm) |
Comment on lines
+92
to
93
| @test occursin(r"\.type.*(julia|j)_[[:alnum:]_.]*child_\d*,@function", asm) | ||
|
|
There was a problem hiding this comment.
Suggested change
| @test occursin(r"\.type.*(julia|j)_[[:alnum:]_.]*child_\d*,@function", asm) | |
| @test occursin(r"\.type.*(julia|j)_[[:alnum:]_.]*child_\d*,@function", asm) | |
| @test occursin(r"\.type.*(julia|j)_[[:alnum:]_.]*child_\d*,@function", asm) |
Comment on lines
+118
to
121
| @test occursin(r"\.type.*(julia|j)_[[:alnum:]_.]*child1_\d*,@function", asm) | ||
| @test occursin(r"\.type.*(julia|j)_[[:alnum:]_.]*child2_\d*,@function", asm) | ||
|
|
||
| asm = sprint(io->GCN.code_native(io, mod.parent2, Tuple{Int}; dump_module=true)) |
There was a problem hiding this comment.
Suggested change
| @test occursin(r"\.type.*(julia|j)_[[:alnum:]_.]*child1_\d*,@function", asm) | |
| @test occursin(r"\.type.*(julia|j)_[[:alnum:]_.]*child2_\d*,@function", asm) | |
| asm = sprint(io->GCN.code_native(io, mod.parent2, Tuple{Int}; dump_module=true)) | |
| @test occursin(r"\.type.*(julia|j)_[[:alnum:]_.]*child1_\d*,@function", asm) | |
| @test occursin(r"\.type.*(julia|j)_[[:alnum:]_.]*child2_\d*,@function", asm) | |
| @test occursin(r"\.type.*(julia|j)_[[:alnum:]_.]*child1_\d*,@function", asm) | |
| @test occursin(r"\.type.*(julia|j)_[[:alnum:]_.]*child2_\d*,@function", asm) |
Comment on lines
+19
to
20
| @test contains(ir, r"(julia|j)_identity") | ||
|
|
There was a problem hiding this comment.
Suggested change
| @test contains(ir, r"(julia|j)_identity") | |
| @test contains(ir, r"(julia|j)_identity") | |
| @test contains(asm, r"(julia|j)_identity") |
| @@ -187,7 +187,7 @@ end | |||
| ir = sprint(io->Native.code_llvm(io, valid_kernel, Tuple{}; optimize=false, dump_module=true)) | |||
|
|
|||
| # module should contain our function + a generic call wrapper | |||
| @test occursin(r"define\ .* void\ @.*julia_valid_kernel.*\(\)"x, ir) | |||
| @test occursin(r"define\ .* void\ @.*(julia|j)_valid_kernel.*\(\)"x, ir) | |||
There was a problem hiding this comment.
Suggested change
| @test occursin(r"define\ .* void\ @.*(julia|j)_valid_kernel.*\(\)"x, ir) | |
| @test occursin(r"define\ .* void\ @.*(julia|j)_valid_kernel.*\(\)"x, ir) |
| @@ -149,7 +149,7 @@ end | |||
| end | |||
|
|
|||
| asm = sprint(io->PTX.code_native(io, mod.parent, Tuple{Int64})) | |||
| @test occursin(r"call.uni\s+julia_child_"m, asm) | |||
| @test occursin(r"call.uni\s+(julia|j)_child_"m, asm) | |||
There was a problem hiding this comment.
Suggested change
| @test occursin(r"call.uni\s+(julia|j)_child_"m, asm) | |
| @test occursin(r"call.uni\s+(julia|j)_child_"m, asm) |
Comment on lines
+170
to
+171
| @test !occursin(r"\.visible \.func (julia|j)_nonentry", asm) | ||
| @test occursin(r"\.func (julia|j)_nonentry", asm) |
There was a problem hiding this comment.
Suggested change
| @test !occursin(r"\.visible \.func (julia|j)_nonentry", asm) | |
| @test occursin(r"\.func (julia|j)_nonentry", asm) | |
| @test !occursin(r"\.visible \.func (julia|j)_nonentry", asm) | |
| @test occursin(r"\.func (julia|j)_nonentry", asm) |
Comment on lines
+217
to
218
| @test occursin(r"\.func (julia|j)_child_", asm) | ||
|
|
There was a problem hiding this comment.
Suggested change
| @test occursin(r"\.func (julia|j)_child_", asm) | |
| @test occursin(r"\.func (julia|j)_child_", asm) | |
| @test occursin(r"\.func (julia|j)_child_", asm) |
Comment on lines
+244
to
247
| @test occursin(r"\.func (julia|j)_child1_", asm) | ||
| @test occursin(r"\.func (julia|j)_child2_", asm) | ||
|
|
||
| asm = sprint(io->PTX.code_native(io, mod.parent2, Tuple{Int})) |
There was a problem hiding this comment.
Suggested change
| @test occursin(r"\.func (julia|j)_child1_", asm) | |
| @test occursin(r"\.func (julia|j)_child2_", asm) | |
| asm = sprint(io->PTX.code_native(io, mod.parent2, Tuple{Int})) | |
| @test occursin(r"\.func (julia|j)_child1_", asm) | |
| @test occursin(r"\.func (julia|j)_child2_", asm) | |
| @test occursin(r"\.func (julia|j)_child1_", asm) | |
| @test occursin(r"\.func (julia|j)_child2_", asm) |
| @@ -89,7 +89,7 @@ end | |||
| end | |||
|
|
|||
| asm = sprint(io->SPIRV.code_native(io, kernel, Tuple{Bool}; kernel=true)) | |||
| @test occursin(r"OpFunctionCall %void %julia_error", asm) | |||
| @test occursin(r"OpFunctionCall %void %(julia|j)_error", asm) | |||
There was a problem hiding this comment.
Suggested change
| @test occursin(r"OpFunctionCall %void %(julia|j)_error", asm) | |
| @test occursin(r"OpFunctionCall %void %(julia|j)_error", asm) |
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.
The compiler has changed a lot:
SOURCE_MODE_FORCE_SOURCEremovaljl_emit_nativeinstead ofjl_create_nativeAFAIU, as explained by @vtjnash, this now means GPUCompiler.jl has to collect all code instances involved in a compilation job, and make sure type inference has run on them so that the cache is primed (as codegen no longer can recurse back into inference). The implementation for that is based on https://github.com/JuliaLang/julia/blob/0d6bd8cbe4673e7c7eb6237cc18de968b9bbdf63/Compiler/src/typeinfer.jl#L1296-L1325.
@vtjnash Added some questions for you inline.