Do not compact blocks around loops #71868
Merged
+18
−1
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.
We would sometimes compact two blocks where 2nd block participates needs loop alignment. If the 1st block (in which 2nd block was merged) was part of an outer loop, then we would falsely think that we have seen a loop block before the top block and disable aligning that loop. That introduces regression in some benchmarks.
The fix would be to not compact such blocks. Also while working, I noticed that we also compact blocks that are part of different loops and that might make
bbNatLoopNum
information outdated.fgUpdateFlowGraph()
(which calls the block compaction code) is called multiple times from various phases and it will be good if we have thebbNatLoopNum
information as accurate as possible. Hence, I also added a check that will prohibit us from compacting such blocks that are part of different loops.From this PR, we get back the alignment in the benchmark.
Relevant discussion: #71646 (comment)
Fixes: #71646