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

8309240: Array classes should be stored in dynamic CDS archive #14959

Conversation

calvinccheung
Copy link
Member

@calvinccheung calvinccheung commented Jul 20, 2023

Please review this RFE for adding array classes in the dynamic CDS archive.

During dynamic dump, only the array classes with the element_klass already in the static archive will be stored in the dynamic archive. See ArchiveBuilder::gather_array_klasses(). It is because the array classes which are in the same archive (either static or dynamic) are already "connected" together. Higher dimension primitive array classes are also stored in the dynamic archive. Note that one-dimensional primitive array classes are store in the static archive.

During runtime, the DynamicArchive::setup_array_klasses() is for setting up the array classes. If only the bottom_klass is in the static archive, the function will point the array_klasses to the stored array classes in the dynamic archive. If a lower dimension array class is already in the static archive, its higher_dimension will be set to refer to the stored array classes in the dynamic archive.

Some logging is added to ObjArrayKlass::array_klass(int n, TRAPS) to indicate an array class is being loaded from the archive.

Passed tiers 1 - 4 testing.


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-8309240: Array classes should be stored in dynamic CDS archive (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14959

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

Using diff file

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

Webrev

Link to Webrev Comment

@calvinccheung
Copy link
Member Author

/label add hotspot-runtime

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 20, 2023

👋 Welcome back ccheung! 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 hotspot-runtime hotspot-runtime-dev@openjdk.org label Jul 20, 2023
@openjdk
Copy link

openjdk bot commented Jul 20, 2023

@calvinccheung
The hotspot-runtime label was successfully added.

@calvinccheung calvinccheung marked this pull request as ready for review July 20, 2023 16:51
@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 20, 2023
@mlbridge
Copy link

mlbridge bot commented Jul 20, 2023

@calvinccheung
Copy link
Member Author

The commit simplifies:

  • DynamicArchive::setup_array_klasses();
  • changes in dumpTimeClassInfo.cpp are now handled in ArchiveBuilder::is_excluded().

src/hotspot/share/cds/archiveBuilder.cpp Outdated Show resolved Hide resolved
src/hotspot/share/cds/archiveBuilder.cpp Outdated Show resolved Hide resolved
src/hotspot/share/oops/objArrayKlass.cpp Outdated Show resolved Hide resolved
src/hotspot/share/cds/dynamicArchive.cpp Show resolved Hide resolved
src/hotspot/share/cds/dynamicArchive.cpp Outdated Show resolved Hide resolved
src/hotspot/share/cds/archiveBuilder.cpp Outdated Show resolved Hide resolved
Copy link
Member

@iklam iklam left a comment

Choose a reason for hiding this comment

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

LGTM. Just a small nit.

src/hotspot/share/cds/dynamicArchive.cpp Show resolved Hide resolved
@openjdk
Copy link

openjdk bot commented Jul 27, 2023

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

8309240: Array classes should be stored in dynamic CDS archive

Reviewed-by: iklam

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

  • bf70777: 8312181: CDS dynamic dump crashes when verifying unlinked class from static archive
  • 7ba8c69: 8312596: Null pointer access in Compile::TracePhase::~TracePhase after JDK-8311976
  • ec2f38f: 8313428: GHA: Bump GCC versions for July 2023 updates
  • 98a915a: 8313256: Exclude failing multicast tests on AIX
  • 94b50b7: 8313404: Fix section label in test/jdk/ProblemList.txt
  • ee3e091: 8313249: Fix -Wconversion warnings in verifier code
  • e36960e: 8312420: Integrate Graal's blender micro benchmark
  • 0a3c6d6: 8280482: Window transparency bug on Linux

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 Jul 27, 2023
@openjdk
Copy link

openjdk bot commented Jul 31, 2023

@calvinccheung this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout 8309240-array-classes-dynamic-cds
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added merge-conflict Pull request has merge conflict with target branch and removed ready Pull request is ready to be integrated labels Jul 31, 2023
@openjdk openjdk bot added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Jul 31, 2023
@ashu-mehra
Copy link
Contributor

Just one more suggestion for adding a comment. Rest looks good!

@ashu-mehra
Copy link
Contributor

@calvinccheung thanks for considering the suggestions!

@calvinccheung
Copy link
Member Author

Thanks @iklam and @ashu-mehra for the review.

/integrate

@openjdk
Copy link

openjdk bot commented Aug 1, 2023

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

  • bf70777: 8312181: CDS dynamic dump crashes when verifying unlinked class from static archive
  • 7ba8c69: 8312596: Null pointer access in Compile::TracePhase::~TracePhase after JDK-8311976
  • ec2f38f: 8313428: GHA: Bump GCC versions for July 2023 updates
  • 98a915a: 8313256: Exclude failing multicast tests on AIX
  • 94b50b7: 8313404: Fix section label in test/jdk/ProblemList.txt
  • ee3e091: 8313249: Fix -Wconversion warnings in verifier code
  • e36960e: 8312420: Integrate Graal's blender micro benchmark
  • 0a3c6d6: 8280482: Window transparency bug on Linux

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 1, 2023

@calvinccheung Pushed as commit dc14247.

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

@calvinccheung calvinccheung deleted the 8309240-array-classes-dynamic-cds branch August 2, 2023 20:54
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
5 participants