Skip to content
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

8281812: x86: Use short jumps in TemplateTable::condy_helper #7473

Closed
wants to merge 1 commit into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Feb 15, 2022

Similar to JDK-8281744, this change improves TemplateTable::condy_helper, for the same reason: there are only a few pushes between the jumps, and we can tell MacroAssembler those can be short. There is no significant code that uses condy yet (I think), so the performance improvement for condy is only theoretical. This makes interpreter code a bit more compact, though.

Additional testing:

  • Linux x86_64 fastdebug, java/lang/invoke/condy, runtime/condy
  • Linux x86_32 fastdebug, java/lang/invoke/condy, runtime/condy

Progress

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

Issue

  • JDK-8281812: x86: Use short jumps in TemplateTable::condy_helper

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/7473/head:pull/7473
$ git checkout pull/7473

Update a local copy of the PR:
$ git checkout pull/7473
$ git pull https://git.openjdk.java.net/jdk pull/7473/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 7473

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/7473.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 15, 2022

👋 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 Feb 15, 2022
@openjdk
Copy link

openjdk bot commented Feb 15, 2022

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

  • hotspot-compiler

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-compiler hotspot-compiler-dev@openjdk.org label Feb 15, 2022
@mlbridge
Copy link

mlbridge bot commented Feb 15, 2022

Webrevs

@TobiHartmann
Copy link
Member

TobiHartmann commented Feb 15, 2022

/label remove hotspot-compiler

@openjdk openjdk bot removed the hotspot-compiler hotspot-compiler-dev@openjdk.org label Feb 15, 2022
@openjdk
Copy link

openjdk bot commented Feb 15, 2022

@TobiHartmann
The hotspot-compiler label was successfully removed.

@TobiHartmann
Copy link
Member

This should go to hotspot/runtime.

@TobiHartmann
Copy link
Member

/label add hotspot-runtime

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Feb 15, 2022
@openjdk
Copy link

openjdk bot commented Feb 15, 2022

@TobiHartmann
The hotspot-runtime label was successfully added.

Copy link
Member

@cl4es cl4es 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 might even call it trivial, since the labels are all clearly bound just a few instructions away.

Out of curiousity, do you have data readily available on how much smaller a jccb becomes than a jcc, exactly?

@openjdk
Copy link

openjdk bot commented Feb 15, 2022

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

8281812: x86: Use short jumps in TemplateTable::condy_helper

Reviewed-by: redestad, neliasso

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

  • 2fe0bf6: 8281748: runtime/logging/RedefineClasses.java failed "assert(addr != __null) failed: invariant"
  • bc61484: 8280136: Serial: Remove unnecessary use of ExpandHeap_lock
  • 2112a9d: 8246033: bin/print_config.js script uses nashorn jjs tool
  • 1c12b15: 8281741: [testbug] PrintIdealPhaseTest fails with -Xcomp
  • f82866b: 8281555: [macos] Get rid of deprecated Style Masks constants
  • 8819f45: 8281722: Removal of PrintIdealLevel
  • 622970e: 8281728: Redundant null check in LineNumberInputStream.read

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 Feb 15, 2022
@shipilev
Copy link
Member Author

Out of curiousity, do you have data readily available on how much smaller a jccb becomes than a jcc, exactly?

perfasm says jccb takes 2 bytes, while jcc takes 6 bytes. It matches the Assembler::jcc:

const int short_size = 2;
const int long_size = 6;

@shipilev
Copy link
Member Author

The GHA failure on x86_32 is new and unrelated: https://bugs.openjdk.java.net/browse/JDK-8281822

Copy link

@neliasso neliasso 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!

@shipilev
Copy link
Member Author

Thanks for reviews!

/integrate

@openjdk
Copy link

openjdk bot commented Feb 16, 2022

Going to push as commit fef5d74.
Since your change was applied there have been 14 commits pushed to the master branch:

  • a86cab8: 8236136: tests which use CompilationMode shouldn't be run w/ TieredStopAtLevel
  • 0af356b: 8278173: [vectorapi] Add x64 intrinsics for unsigned (zero extended) casts
  • a24498b: 8281771: Crash in java_lang_invoke_MethodType::print_signature
  • 1aff44b: 8279949: JavaThread::_free_handle_block leaks native memory
  • 394ce5f: 8280825: Modules that "provide" ToolProvider should document the name that can be used
  • 745f7e7: 8281186: runtime/cds/appcds/DumpingWithNoCoops.java fails
  • 1870465: 8281744: x86: Use short jumps in TIG::set_vtos_entry_points
  • 2fe0bf6: 8281748: runtime/logging/RedefineClasses.java failed "assert(addr != __null) failed: invariant"
  • bc61484: 8280136: Serial: Remove unnecessary use of ExpandHeap_lock
  • 2112a9d: 8246033: bin/print_config.js script uses nashorn jjs tool
  • ... and 4 more: https://git.openjdk.java.net/jdk/compare/11f943d148e7bc8d931c382ff019b3e65a87432e...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 16, 2022

@shipilev Pushed as commit fef5d74.

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

@shipilev shipilev deleted the JDK-8281812-short-condy branch March 7, 2022 10:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
4 participants