sroa: Handle looking through chains of KeyValue instances #52369
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
aviatesk
reviewed
Dec 2, 2023
base/compiler/ssair/passes.jl
Outdated
| lifted_val = perform_lifting!(compact, | ||
| visited_philikes, key, result_t, lifted_leaves, collection, nothing) | ||
|
|
||
| compact[idx] = lifted_val === nothing ? nothing : Expr(:call, Core.tuple, lifted_val.val) |
Member
There was a problem hiding this comment.
Suggested change
| compact[idx] = lifted_val === nothing ? nothing : Expr(:call, Core.tuple, lifted_val.val) | |
| compact[idx] = lifted_val === nothing ? nothing : Expr(:call, GlobalRef(Core, :tuple), lifted_val.val) |
base/compiler/ssair/passes.jl
Outdated
|
|
||
| compact[idx] = lifted_val === nothing ? nothing : Expr(:call, Core.tuple, lifted_val.val) | ||
| if lifted_val !== nothing | ||
| if !⊑(𝕃ₒ, compact[SSAValue(idx)][:type], result_t) |
Member
There was a problem hiding this comment.
Suggested change
| if !⊑(𝕃ₒ, compact[SSAValue(idx)][:type], result_t) | |
| if !⊑(𝕃ₒ, compact[SSAValue(idx)][:type], tuple_tfunc(𝕃ₒ, Any[result_t])) |
It looks like it's invalid to use result_t here? compact[SSAValue(idx)][:type] would be something like Union{Nothing, Tuple{...}}.
Keno
force-pushed
the
kf/sroamultikeyvalue
branch
from
d24374f to
53b0d8c
Compare
Addresses an outstanding todo from the KeyValue PR and allows (once all the PRs are merged), optimization when multiple ScopedValues are used `with(a=>1, b=>2)`, etc. To facilitate this, in addition to the sroa adjustment, the ScopedValue code is adjusted to unroll the PersistentDict creation so that the optimizer can see the full chain (we do not support loops in the optimizer).
Keno
force-pushed
the
kf/sroamultikeyvalue
branch
from
53b0d8c to
220fc23
Compare
Keno
added a commit
that referenced
this pull request
Dec 15, 2023
This redoes #52369, to put the walk through tothe chained KeyValue into a more logical place (the definition walking). This way, we automatically inherit correct handling of PhiNodes and ifelse.
Keno
added a commit
that referenced
this pull request
Dec 19, 2023
This redoes #52369, to put the walk through tothe chained KeyValue into a more logical place (the definition walking). This way, we automatically inherit correct handling of PhiNodes and ifelse.
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.
Addresses an outstanding todo from the KeyValue PR and allows (once all the PRs are merged), optimization when multiple ScopedValues are used
with(a=>1, b=>2), etc. To facilitate this, in addition to the sroa adjustment, the ScopedValue code is adjusted to unroll the PersistentDict creation so that the optimizer can see the full chain (we do not support loops in the optimizer).