Skip to content

8255579: x86: Use cmpq(Register,Address) in safepoint_poll #924

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

Closed
wants to merge 2 commits into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Oct 29, 2020

JDK-8253180 added a new block in safepoint_poll that uses broken cmpq (JDK-8255550): it effectively does the comparison with operands swapped. It makes sense to use the non-broken cmpq, as to avoid changing the condition code and thus making the code less understandable. See the discussion in #910.

Testing:

  • tier1 with Z (some SA tests fail, and some other fail with OOME -- seem to be expected/problem-listed)

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Testing

Linux x64 Linux x86 Windows x64 macOS x64
Build ✔️ (5/5 passed) ✔️ (2/2 passed) ✔️ (2/2 passed) ✔️ (2/2 passed)
Test (tier1) ✔️ (9/9 passed) ✔️ (9/9 passed) ✔️ (9/9 passed) ✔️ (9/9 passed)

Issue

  • JDK-8255579: x86: Use cmpq(Register,Address) in safepoint_poll

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/924/head:pull/924
$ git checkout pull/924

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 29, 2020

👋 Welcome back shade! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 29, 2020
@openjdk
Copy link

openjdk bot commented Oct 29, 2020

@shipilev The following label will be automatically applied to this pull request:

  • hotspot

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.

@openjdk openjdk bot added the hotspot hotspot-dev@openjdk.org label Oct 29, 2020
@mlbridge
Copy link

mlbridge bot commented Oct 29, 2020

Webrevs

Copy link
Contributor

@fisk fisk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. I also got confused about this. When this instruction didn't work the way I thought it would, I thought it must be a weird style thing, that everything is right to left in the assembler, for consistency, so it would read from right to left. Then I convinced myself it made sense. But the instruction being incorrectly encoded also checks out. Sigh. Anyway, I ran some local testing that would just fall over immediately if this didn't work. And it seems to work.

@openjdk
Copy link

openjdk bot commented Oct 29, 2020

@shipilev 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:

8255579: x86: Use cmpq(Register,Address) in safepoint_poll

Reviewed-by: eosterlund, zgu

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 1 new commit pushed to the master branch:

  • 72ff8e2: 8254782: Fix benchmark issues in java/lang/StringIndexOfChar.java benchmark

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 29, 2020
@shipilev
Copy link
Member Author

Thanks @fisk! Would you like someone else to look at this, or your review is enough?

@fisk
Copy link
Contributor

fisk commented Oct 29, 2020

Since the encodings of the two instructions are literally identical, I think this classifies as a trivial change. So I'm okay with one review.

Copy link
Contributor

@zhengyu123 zhengyu123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested with Shenandoah + concurrent stack processing on my personal branch, works fine.

@shipilev
Copy link
Member Author

Tests look clean. Pushing, thanks @fisk, @zhengyu123.

/integrate

@openjdk openjdk bot closed this Oct 29, 2020
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 29, 2020
@openjdk
Copy link

openjdk bot commented Oct 29, 2020

@shipilev Since your change was applied there has been 1 commit pushed to the master branch:

  • 72ff8e2: 8254782: Fix benchmark issues in java/lang/StringIndexOfChar.java benchmark

Your commit was automatically rebased without conflicts.

Pushed as commit 4b20e46.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@shipilev shipilev deleted the JDK-8255579-safepoint-poll branch November 2, 2020 09:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants