-
Notifications
You must be signed in to change notification settings - Fork 6.1k
8360175: C2 crash: assert(edge_from_to(prior_use,n)) failed: before block local scheduling #26157
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Conversation
👋 Welcome back mhaessig! A progress list of the required criteria for merging this PR into |
@mhaessig This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 16 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems fine.
@@ -346,7 +346,7 @@ bool Peephole::lea_remove_redundant(Block* block, int block_index, PhaseCFG* cfg | |||
for (DUIterator_Fast imax, i = decode->fast_outs(imax); i < imax; i++) { | |||
Node* dependant_lea = decode->fast_out(i); | |||
if (dependant_lea->is_Mach() && dependant_lea->as_Mach()->ideal_Opcode() == Op_AddP) { | |||
dependant_lea->set_req(AddPNode::Base, decode_address); | |||
dependant_lea->set_req(AddPNode::Base, lea_derived_oop->in(AddPNode::Address)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The fix looks reasonable to me, too. No worries about the regression test, thanks for trying! A small question: Why don't we use lea_address
?
Another thing I've noticed while browsing the code: ra_
and new_root
seem to be unused and could be removed (could probably also be squeezed into this PR here instead of creating a new issue just for that).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We cannot use lea_address
because in case of a spill that also gets moved up one node to check if the lea and the decode point to the same grandparent.
Another thing I've noticed while browsing the code: ra_ and new_root seem to be unused and could be removed.
These arguments come from the machinery that calls this out of the matcher. I am not too familiar with it, so my working assumption so far has been to keep the signature the same as the other peepholes, which seems logical since it is called by generated code.
The triggered assert is part of the schedule verification code that runs just before machine code is emitted. The debug output showed that a
leaPCompressedOopOffset
node was causing the assert, which suggested the peephole optimization introduced in #25471 as the cause. The failure proved quite difficult to reproduce. It failed more often on Windows and required-XX:+UseKNLSetting
(forces code generation for Intel's Knights Landing platform), which forces-XX:+OptoScheduling
.The root-cause is a subtle bug in the rewiring of the base edge of
leaP*
nodes in theremove_redundant_lea
peephole. When the peephole removed adecodeHeapOop_not_null
including a spill, it did not set the base edge of theleaP*
node to the same node as the address edge, which is the intent of the peephole, but to the parent node of the spill. That is not catastrophic in most cases, but might reference another register slot, which causes this assert. Concretely, we see the following graphgets rewired to
instead of
This PR fixes this by always setting the base edge of the
leaP*
node to the same node as the address edge. Unfortunately, I was not able to construct a regression test because of the difficulty of reproducing the bug.Testing
windows-x64-debug
(test that reliably produced the failure addressed in this PR)Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/26157/head:pull/26157
$ git checkout pull/26157
Update a local copy of the PR:
$ git checkout pull/26157
$ git pull https://git.openjdk.org/jdk.git pull/26157/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 26157
View PR using the GUI difftool:
$ git pr show -t 26157
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/26157.diff
Using Webrev
Link to Webrev Comment