spirv-opt: fix copy-propagate-arrays index opti on structs. #4891
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
s-perron
approved these changes
Aug 11, 2022
| result->GetMember(components); | ||
| return result; | ||
| if (!result) { | ||
| return nullptr; |
There was a problem hiding this comment.
Good change putting this fisrt.
Keenuts
force-pushed
the
fix-4887-alt
branch
2 times, most recently
from
907d042
to
1d91d65
Compare
Keenuts
changed the title
Copy-propagate-arrays optimization pass would create unused constants, even if the optimization not completed. This was caused by the way we handled OpAccessChain squashing: we only referenced constants, and had to create them upfront. Signed-off-by: Nathan Gauër <brioche@google.com>
s-perron
requested changes
Aug 12, 2022
s-perron
approved these changes
Aug 15, 2022
As per SPIR-V spec:
OpAccessChain indices must be OpConstant when indexing into a structure.
This optimization tried to remove load cascade. But in some scenario
failed:
```c
cbuffer MyStruct {
uint my_field;
};
uint main(uint index) {
const uint my_array[1] = { my_field };
return my_array[index]
}
```
This is valid as the struct is indexed with a constant index, and then
the array is indexed using a dynamic index.
The optimization would consider the local array to be useless and
generated a load directly into the struct.
Fixes KhronosGroup#4887
Signed-off-by: Nathan Gauër <brioche@google.com>
|
Looks good, but do not merge until Kokoro runs the presubmits. It seems to be slow today. |
|
Thanks for the review! |
|
I don't think the tests ran. When they run, there are 20 checks. This only has 2. Edit: I check the continuous build, and it does not look like anything is failing. |
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.
Copy-propagate-arrays optimization pass would create unused constants,
even if the optimization not completed.
This was caused by the way we handled OpAccessChain squashing: we
only referenced constants, and had to create them upfront.
For now, I couldn't find a path to reproduce this. (Might have one involving RuntimeArrays, but couldn't generate one).
This however will be more visible once #4887 is fixed since we would need to abort while computing the final OpAccessChain.
Signed-off-by: Nathan Gauër brioche@google.com