Revert "Change prefetch to avoid deadlock"#121910
Closed
Zoxc wants to merge 1 commit intorust-lang:mainfrom
Closed
Revert "Change prefetch to avoid deadlock"#121910Zoxc wants to merge 1 commit intorust-lang:mainfrom
Zoxc wants to merge 1 commit intorust-lang:mainfrom
Conversation
Collaborator
This comment has been minimized.
This comment has been minimized.
Collaborator
|
☔ The latest upstream changes (presumably #137535) made this pull request unmergeable. Please resolve the merge conflicts. |
This reverts commit 8870768.
Contributor
|
@Zoxc I assume the You and cc: @matthiaskrgr probably know why it was applied. @rustbot label -S-blocked |
Member
|
I added the label because of "Blocked on rust-lang/rustc-rayon#12 to avoid deadlocks." looks like the upstream pr has not been merged to this day |
Contributor
Author
|
Yeah, it can be unblocked since #143035 landed. It does regress performance now, so I'll have to do some profiling to see if that can be fixed.
|
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Member
|
Hi @Zoxc, ping from triage team. Are there any further updates on this PR? |
Contributor
Author
|
I wasn't able to spot why this is no longer an improvement. |
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
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.
This reverts #118488 as that is just a workaround.
Blocked on rust-lang/rustc-rayon#12 to avoid deadlocks.