-
Notifications
You must be signed in to change notification settings - Fork 5.8k
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
8279225: [arm32] C1 longs comparison operation destroys argument registers #6934
Conversation
👋 Welcome back snazarki! A progress list of the required criteria for merging this PR into |
@bulasevich could you please check this fix? |
@snazarkin The following label will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command. |
Webrevs
|
Good catch. The fix is Ok, thank you! |
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.
This fix looks good to me. (I'm not a Reviewer).
One thing to remind is that the PR and JBS should use the same title.
@@ -1820,8 +1820,8 @@ void LIR_Assembler::comp_op(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, | |||
__ teq(xhi, yhi); | |||
__ teq(xlo, ylo, eq); | |||
} else { | |||
__ subs(xlo, xlo, ylo); | |||
__ sbcs(xhi, xhi, yhi); | |||
__ cmp(xlo, ylo); |
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.
nit: we may want to use __ subs(Rtemp, xlo, ylo);
here to align with the usage in match rules in arm.ad, e.g., compL_reg_reg_LEGT
. It's okay to me if you use cmp
anyway.
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.
I agree.
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.
Aligned with C2 implementation
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.
Thanks for your update. LGTM. (I'm not a Reviewer)
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.
OK.
@snazarkin 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 5 new commits pushed to the
Please see this link for an up-to-date comparison between the source branch of this pull request and the As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@theRealAph) but any other Committer may sponsor as well. ➡️ To flag this PR as ready for integration with the above commit message, type |
/integrate |
@snazarkin |
/sponsor |
Going to push as commit 299022d.
Your commit was automatically rebased without conflicts. |
@alexeybakhtin @snazarkin Pushed as commit 299022d. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Several regression tests are failed on arm32 CPU if tiered compilation is enabled.
The list includes
java/math/BigDecimal/DivideMcTests
java/util/Arrays/Sorting.java
java/util/Arrays/SortingNearlySortedPrimitive.java
java/util/concurrent/tck/JSR166TestCase
java/util/stream/SliceOpTest.java
etc
It appears C1 comp_op for long operands destroys arguments registers:
void LIR_Assembler::comp_op(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Op2* op) {
....
Register ylo = opr2->as_register_lo();
Register yhi = opr2->as_register_hi();
if (condition == lir_cond_equal || condition == lir_cond_notEqual) {
__ teq(xhi, yhi);
__ teq(xlo, ylo, eq);
} else {
__ subs(xlo, xlo, ylo); // <<< incorrect
__ sbcs(xhi, xhi, yhi); // <<< incorrect
}
...
}
Tested with hotspot_tier2, jdk_tier3 on linux_arm
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/6934/head:pull/6934
$ git checkout pull/6934
Update a local copy of the PR:
$ git checkout pull/6934
$ git pull https://git.openjdk.java.net/jdk pull/6934/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 6934
View PR using the GUI difftool:
$ git pr show -t 6934
Using diff file
Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6934.diff