Fix RemoveUnstructuredLoopExits when an exiting edge jumps out multiple levels of loops. #6668
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
e62783e to
55338e7
Compare
Collaborator
Author
|
yeah, I need to fix this. I thought I was running with ASAN but I wasn't. |
dmpots
approved these changes
Jun 4, 2024
Contributor
dmpots
left a comment
There was a problem hiding this comment.
LGTM, thanks for the fix!
I appreciate the comments and level of detail. A totally optional suggestion would be to add some ascii art to the test or comment to clarify the situation. Sometimes a picture can really help the understanding.
Collaborator
Author
Indeed pictures are great. I've added ASCII art depictions of the CFGs for the two reduced test cases. The "regression" case is a mess, and doesn't provide extra insight. |
llvm-beanz
approved these changes
Jun 5, 2024
Collaborator
Author
|
The failures are weird; I can't explain them by this change. An error is caused by this warning (with warnings-as-error): The source at that spot has a pragma that appears to guard the warning. I'll try a no-change amend commit to kick off the bots again. |
…le levels of loops Before doing any major surgery on an exit from loop L, ensure that if an exit edge from L goes to block X, then X is in L's parent loop or no loop at all. Add test cases: - a reduced test case where the exiting block does not dominate its own loop latch. - a reduced test case where the exiting block is the latch for its own loop. This reproduces the assert triggered by the original HLSL. - the original HLSL that triggered this bug fix. - the intermediate module from the original HLSL, taken just before the attempt to remove unstructured loop exits.
Collaborator
Author
|
Trying again by rebasing against latest main. |
Collaborator
|
The Windows build failures here seem to be related to a VM image update that occurred last night. Our builds work fine on VM image 20240514.3.0, and fail on 20240603.1.0. Given that I'm fairly confident this PR isn't related to the issues I'm going to bypass the merge checks to merge the PR. |
14 tasks
llvm-beanz
added a commit
to llvm-beanz/DirectXShaderCompiler
that referenced
this pull request
Jun 10, 2024
We do not want this change to stick around forever but we need it to work around the broken GitHub runner images: actions/runner-images#10004 Related microsoft#6668
amaiorano
added a commit
to amaiorano/DirectXShaderCompiler
that referenced
this pull request
Jun 11, 2024
…t multiple levels of loops. (microsoft#6668)" This reverts commit 8206fbd. Reason for revert: since landing this, new asserts/crashes have been found.
llvm-beanz
added a commit
that referenced
this pull request
Jun 11, 2024
This PR contains two changes: 1) Moves a pragma to disable a warning, which seems to be required by the new compiler. 2) Adds a preprocessor define to workaround the crashes caused by the runner image mismatching C++ runtime versions. The second change we will want to revert once the runner images are fixed. The issue tracking the runner images is: actions/runner-images#10004 Related #6668
amaiorano
added a commit
to amaiorano/DirectXShaderCompiler
that referenced
this pull request
Jun 11, 2024
…t multiple levels of loops. (microsoft#6668)" This reverts commit 8206fbd. Reason for revert: since landing this, new asserts/crashes have been found.
pow2clk
pushed a commit
to pow2clk/DirectXShaderCompiler
that referenced
this pull request
Jul 16, 2024
This PR contains two changes: 1) Moves a pragma to disable a warning, which seems to be required by the new compiler. 2) Adds a preprocessor define to workaround the crashes caused by the runner image mismatching C++ runtime versions. The second change we will want to revert once the runner images are fixed. The issue tracking the runner images is: actions/runner-images#10004 Related microsoft#6668 (cherry picked from commit 0b9acdb)
SjMxr233
pushed a commit
to ShaderHelper/DirectXShaderCompiler
that referenced
this pull request
Jul 24, 2025
…le levels of loops. (microsoft#6668) Before doing any major surgery on an exit from loop L, ensure that if an exit edge from L goes to block X, then X is in L's parent loop or no loop at all. Add test cases: - a reduced test case where the exiting block does not dominate its own loop latch. - a reduced test case where the exiting block is the latch for its own loop. This reproduces the assert triggered by the original HLSL. - the original HLSL that triggered this bug fix. - the intermediate module from the original HLSL, taken just before the attempt to remove unstructured loop exits.
SjMxr233
pushed a commit
to ShaderHelper/DirectXShaderCompiler
that referenced
this pull request
Jul 24, 2025
This PR contains two changes: 1) Moves a pragma to disable a warning, which seems to be required by the new compiler. 2) Adds a preprocessor define to workaround the crashes caused by the runner image mismatching C++ runtime versions. The second change we will want to revert once the runner images are fixed. The issue tracking the runner images is: actions/runner-images#10004 Related microsoft#6668
SjMxr233
pushed a commit
to ShaderHelper/DirectXShaderCompiler
that referenced
this pull request
Jul 24, 2025
…t multiple levels of loops. (microsoft#6668)" (microsoft#6685) This reverts commit 8206fbd. Reason for revert: since landing this, new asserts/crashes have been found.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Before doing any major surgery on an exit from loop L, ensure that if an exit edge from L goes to block X, then X is in L's parent loop or no loop at all.
Add test cases: