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

8275586: Zero: Simplify interpreter initialization #6029

Closed

Conversation

shipilev
Copy link
Contributor

@shipilev shipilev commented Oct 20, 2021

The prolog in BytecodeInterpreter is hairy due to early initialization of interpreter statics. Previous rewrites make it mostly redundant, and we can now simplify it.

This also implicitly fixes a initialization bug. If JvmtiExport::can_post_interpreter_events() changes at runtime, we will call into the uninitialized version:

    // Call the interpreter
    if (JvmtiExport::can_post_interpreter_events()) {
      BytecodeInterpreter::run<true>(istate);
    } else {
      BytecodeInterpreter::run<false>(istate);
    } 

Additional testing:

  • Linux x86_64 fastdebug make bootcycle-images

Progress

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

Issue

  • JDK-8275586: Zero: Simplify interpreter initialization

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6029

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Oct 20, 2021

👋 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 label Oct 20, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 20, 2021

@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 label Oct 20, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Oct 20, 2021

Webrevs

@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Oct 25, 2021

Any takers? :)

@openjdk
Copy link

@openjdk openjdk bot commented Nov 3, 2021

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

8275586: Zero: Simplify interpreter initialization

Reviewed-by: aph, adinn

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

  • c62b347: 8276623: JDK-8275650 accidentally pushed "out" file
  • a1f4c42: 8276227: ciReplay: SIGSEGV if classfile for replay compilation is not present after JDK-8275868
  • 9eadcbb: 8276217: Harmonize StrictMath intrinsics handling
  • fb0be81: 8276096: Simplify Unsafe.{load|store}Fence fallbacks by delegating to fullFence
  • 558ee40: 8276615: Update CR number of some tests in ProblemList-zgc.txt
  • 603bba2: 8271420: Extend CDS custom loader support to Windows platform
  • ce8c767: 8276220: Reduce excessive allocations in DateTimeFormatter
  • 0ab910d: 8276066: Reset LoopPercentProfileLimit for x86 due to suboptimal performance
  • f3320d2: 8276588: Change "ccc" to "CSR" in HotSpot sources
  • 32895ac: 8275650: Problemlist java/io/File/createTempFile/SpecialTempFile.java for Windows 11
  • ... and 236 more: https://git.openjdk.java.net/jdk/compare/31500692d1503cb73249e0425e6930aaaa49258a...master

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 label Nov 3, 2021
@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Nov 4, 2021

I think I need a second (R)eviewer for this.

adinn
adinn approved these changes Nov 4, 2021
Copy link
Contributor

@adinn adinn left a comment

Yes this looks good.

@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Nov 4, 2021

Cool, thank you.

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Nov 4, 2021

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

  • c62b347: 8276623: JDK-8275650 accidentally pushed "out" file
  • a1f4c42: 8276227: ciReplay: SIGSEGV if classfile for replay compilation is not present after JDK-8275868
  • 9eadcbb: 8276217: Harmonize StrictMath intrinsics handling
  • fb0be81: 8276096: Simplify Unsafe.{load|store}Fence fallbacks by delegating to fullFence
  • 558ee40: 8276615: Update CR number of some tests in ProblemList-zgc.txt
  • 603bba2: 8271420: Extend CDS custom loader support to Windows platform
  • ce8c767: 8276220: Reduce excessive allocations in DateTimeFormatter
  • 0ab910d: 8276066: Reset LoopPercentProfileLimit for x86 due to suboptimal performance
  • f3320d2: 8276588: Change "ccc" to "CSR" in HotSpot sources
  • 32895ac: 8275650: Problemlist java/io/File/createTempFile/SpecialTempFile.java for Windows 11
  • ... and 236 more: https://git.openjdk.java.net/jdk/compare/31500692d1503cb73249e0425e6930aaaa49258a...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Nov 4, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Nov 4, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 4, 2021

@shipilev Pushed as commit 3613ce7.

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

@shipilev shipilev deleted the JDK-8275586-zero-simplify-prolog branch Nov 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot integrated
3 participants