Skip to content

8296545: C2 Blackholes should allow load optimizations #1273

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 3 commits into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Apr 19, 2023

Unclean backport to improve Blackhole performance and match it to released JDK 20.
The backport is unclean because there are two little conflicts:

  1. The context conflict in MemBarNode::make, where the MemBarStoreStore was moved to another place. I resolved the conflict by hand: accepted only the Blackhole case removal.
  2. IR Framework needs MUL_I constant for test to work.

Additional testing:

  • macos-aarch64-server-fastdebug, compiler/irTests/blackhole (includes new test)
  • Eyeballing perfasm outputs with/without this patch

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8296545: C2 Blackholes should allow load optimizations

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/1273/head:pull/1273
$ git checkout pull/1273

Update a local copy of the PR:
$ git checkout pull/1273
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/1273/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1273

View PR using the GUI difftool:
$ git pr show -t 1273

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/1273.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 19, 2023

👋 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 changed the title Backport eab0ada3a16a432fdfd1f0b8fceca149c725451b 8296545: C2 Blackholes should allow load optimizations Apr 19, 2023
@openjdk
Copy link

openjdk bot commented Apr 19, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Apr 19, 2023
@mlbridge
Copy link

mlbridge bot commented Apr 19, 2023

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

LGTM.

@openjdk
Copy link

openjdk bot commented Apr 20, 2023

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

8296545: C2 Blackholes should allow load optimizations

Reviewed-by: mdoerr

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:

  • d5cbf22: 8306658: GHA: MSVC installation could be optional since it might already be pre-installed

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 Apr 20, 2023
@GoeLin
Copy link
Member

GoeLin commented Apr 24, 2023

What is wrong with the Pre-submit tests?

@shipilev
Copy link
Member Author

What is wrong with the Pre-submit tests?

Missing ebde2fb, apparently. Remerged from master.

@shipilev
Copy link
Member Author

There was a little conflict in memnode.cpp due to e6e6bed coming in first, I pulled and remerged. This basically eliminates this part of the original difference: "The context conflict in MemBarNode::make, where the MemBarStoreStore was moved to another place. I resolved the conflict by hand: accepted only the Blackhole case removal."

@shipilev
Copy link
Member Author

@TheRealMDoerr, @GoeLin, if you can ack again, please?

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

Still good.

@shipilev
Copy link
Member Author

Thank you! Testing is still good. GHAs are green. Push approval is there.

/integrate

@openjdk
Copy link

openjdk bot commented Apr 25, 2023

Going to push as commit e132605.
Since your change was applied there has been 1 commit pushed to the master branch:

  • d5cbf22: 8306658: GHA: MSVC installation could be optional since it might already be pre-installed

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 25, 2023
@openjdk openjdk bot closed this Apr 25, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 25, 2023
@openjdk
Copy link

openjdk bot commented Apr 25, 2023

@shipilev Pushed as commit e132605.

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

@shipilev shipilev deleted the JDK-8296545-blackhole-loads branch May 2, 2023 09:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants