Fix bad performance on complex patmat#9522
Merged
dwijnand merged 1 commit intoscala:2.13.xfrom Mar 3, 2021
Merged
Conversation
e19749f to
7894ceb
Compare
Member
Author
Looks like |
1d5a9fd to
71535b6
Compare
lrytz
approved these changes
Mar 2, 2021
Member
lrytz
left a comment
There was a problem hiding this comment.
LGTM. Maybe use more LinkedHashSet instead of ListSet, as this is all compiler internal?
Member
Author
|
Switch the one method-local only ListSet to a mutable.LinkedHashSet and I made the cartesian product return early by making it a tailrec loop. The rest other ListSets cross file or module boundaries so I'd rather keep them immutable. cc @retronym |
AnalysisBudget.maxDPLLdepth is already working to limit the initial SAT solving. But given enough unassigned symbols, like the test case, the compiler can end up spending the rest of eternity and all its memory expanding the model. So apply the limit where it hurts most (the cartesian product part). The ordered sets and various sortings, instead, are to stabilise the results.
Member
|
at #8830 (comment) @lrytz wrote:
I've noticed it failing in various places as well (on random PRs, on our Windows Jenkins) |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
AnalysisBudget.maxDPLLdepth is already working to limit the initial SAT
solving. But given enough unassigned symbols, like the test case, the
compiler can end up spending the rest of eternity and all its memory
expanding the model. So apply the limit where it hurts most (the
cartesian product part).
The ordered sets and various sortings, instead, are to stabilise the
results.
Fixes scala/bug#12237