Skip to content

8305757: Call Method::compute_has_loops_flag() when creating CDS archive #13390

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 4 commits into from
Closed

8305757: Call Method::compute_has_loops_flag() when creating CDS archive #13390

wants to merge 4 commits into from

Conversation

iklam
Copy link
Member

@iklam iklam commented Apr 7, 2023 •
edited by openjdk bot
Loading

A simple optimization -- call Method::compute_has_loops_flag() for all methods during CDS archive dump. This way, the JIT doesn't need to do this at runtime.

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-8305757: Call Method::compute_has_loops_flag() when creating CDS archive

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/13390/head:pull/13390
$ git checkout pull/13390

Update a local copy of the PR:
$ git checkout pull/13390
$ git pull https://git.openjdk.org/jdk.git pull/13390/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 13390

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/13390.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 7, 2023

👋 Welcome back iklam! 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
Copy link

openjdk bot commented Apr 7, 2023

@iklam 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 Apr 7, 2023
@iklam
Copy link
Member Author

iklam commented Apr 7, 2023

/label remove hotspot
/label add hotspot-runtime

@openjdk openjdk bot removed the hotspot hotspot-dev@openjdk.org label Apr 7, 2023
@openjdk
Copy link

openjdk bot commented Apr 7, 2023

@iklam
The hotspot label was successfully removed.

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Apr 7, 2023
@openjdk
Copy link

openjdk bot commented Apr 7, 2023

@iklam
The hotspot-runtime label was successfully added.

@iklam iklam marked this pull request as ready for review April 7, 2023 19:36
@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 7, 2023
@mlbridge
Copy link

mlbridge bot commented Apr 7, 2023 •
edited
Loading

Webrevs

coleenp
coleenp approved these changes Apr 17, 2023
View reviewed changes
Copy link
Contributor

@coleenp coleenp left a comment

Choose a reason for hiding this comment

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

Seems like a good thing to do.

@openjdk
Copy link

openjdk bot commented Apr 17, 2023 •
edited
Loading

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

8305757: Call Method::compute_has_loops_flag() when creating CDS archive

Reviewed-by: coleenp, ccheung

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

  • 0f3828d: 8306282: Build failure linux-arm32-open-cmp-baseline after JDK-8257967
  • 803680f: 8306289: 32-bit build failures after JDK-8303422
  • e97fe08: 8306279: Build failure after JDK-8299592
  • 3c7ab80: 8304054: Linux: NullPointerException from FontConfiguration.getVersion in case no fonts are installed
  • 3bba899: 8299592: Fix and reenable warnings in java.desktop native code compilation
  • 896207d: 8306077: Replace NEW_ARENA_ARRAY with NEW_RESOURCE_ARRAY when applicable in opto
  • 54f7b6c: 8301497: Replace NULL with nullptr in cpu/s390
  • 8ecb5df: 8305781: compiler/c2/irTests/TestVectorizationMultiInvar.java failed with "IRViolationException: There were one or multiple IR rule failures."
  • 49726ee: 8305690: [X86] Do not emit two REX prefixes in Assembler::prefix
  • 445ebef: 8305668: PPC: Non-Top Interpreted frames should be independent of ABI_ELFv2
  • ... and 161 more: https://git.openjdk.org/jdk/compare/312bbe7d7550b313ad38ae8dcfd9a7d9b65839fc...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 Pull request is ready to be integrated label Apr 17, 2023
calvinccheung
calvinccheung approved these changes Apr 18, 2023
View reviewed changes
Copy link
Member

@calvinccheung calvinccheung 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. Just one nit.

src/hotspot/share/oops/instanceKlass.cpp Outdated
void InstanceKlass::compute_has_loops_flag_for_methods() {
Array<Method*>* methods = this->methods();
for (int index = 0; index < methods->length(); ++index) {
Method *m = methods->at(index);
Copy link
Member

Choose a reason for hiding this comment

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

Suggestion: Method* m = ...

@iklam
Copy link
Member Author

iklam commented Apr 19, 2023

Thanks @coleenp and @calvinccheung for the review.
/integrate

@openjdk
Copy link

openjdk bot commented Apr 19, 2023

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 19, 2023

@iklam Pushed as commit c7faf60.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@calvinccheung calvinccheung calvinccheung approved these changes

@coleenp coleenp coleenp approved these changes

Assignees
No one assigned
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@iklam @calvinccheung @coleenp