-
Notifications
You must be signed in to change notification settings - Fork 6.2k
8292818: replace 96-bit representation for field metadata with variable-sized streams #12855
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
Conversation
|
👋 Welcome back fparain! A progress list of the required criteria for merging this PR into |
|
/contributor add jrose |
|
@fparain |
Webrevs
|
dholmes-ora
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
HI Fred,
I've taken one pass through this but it is a huge set of changes to try and digest. At this stage just a bunch of style nits.
Thanks.
|
/label hotspot-runtime |
|
@fparain |
coleenp
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was able to do a first pass through the vm code except for jvmci. I didn't look at tests or SA in this pass.
|
/contributor add cjplummer |
|
@fparain |
coleenp
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Most minor comments but one .inline.hpp still in an hpp file.
|
I should point out that I only skimmed the SA and JVMCI changes. |
coleenp
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All my comments are addressed. Thank you! This is significant work.
|
@fparain 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: 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 2 new commits pushed to the
Please see this link for an up-to-date comparison between the source branch of this pull request and the ➡️ To integrate this PR with the above commit message to the |
src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
Outdated
Show resolved
Hide resolved
src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotConstantPool.java
Show resolved
Hide resolved
src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/ResolvedJavaField.java
Outdated
Show resolved
Hide resolved
.../compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java
Outdated
Show resolved
Hide resolved
src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Field.java
Outdated
Show resolved
Hide resolved
src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Field.java
Outdated
Show resolved
Hide resolved
src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java
Outdated
Show resolved
Hide resolved
src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java
Show resolved
Hide resolved
src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java
Outdated
Show resolved
Hide resolved
src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java
Outdated
Show resolved
Hide resolved
src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java
Outdated
Show resolved
Hide resolved
plummercj
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
SA changes looks good. Thanks for taking care of this!
dholmes-ora
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice piece of work Fred - I won't pretend to follow every detail.
A few nits on unnecessary alignment (which may match pre-existing style not evident in the diff).
Thanks.
|
@fparain this pull request can not be integrated into git checkout fieldinfo_unsigned5
git fetch https://git.openjdk.org/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push |
src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java
Outdated
Show resolved
Hide resolved
src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java
Outdated
Show resolved
Hide resolved
|
Chris, Doug, thank you for your reviews and your help. |
|
/integrate |
|
Going to push as commit bfb812a.
Your commit was automatically rebased without conflicts. |
|
One side-effect of this change is that verifying certain old classes (think JCK) can take a long time. For example: Test.java: Probably not worth worrying about - just wanted to point out something I hit while processing the JCK with Native Image. |
Please review this change re-implementing the FieldInfo data structure.
The FieldInfo array is an old data structure storing fields metadata. It has poor extension capabilities, a complex management code because of lack of strong typing and semantic overloading, and a poor memory efficiency.
The new implementation uses a compressed stream to store those metadata, achieving better memory density and providing flexible extensibility, while exposing a strongly typed set of data when uncompressed. The stream is compressed using the unsigned5 encoding, which alreay present in the JDK (because of pack200) and the JVM (because JIT compulers use it to comrpess debugging information).
More technical details are available in the CR: https://bugs.openjdk.org/browse/JDK-8292818
Those changes include a re-organisation of fields' flags, splitting the previous heterogeneous AccessFlags field into three distincts flag categories: immutable flags from the class file, immutable fields defined by the JVM, and finally mutable flags defined by the JVM.
The SA, CI, and JVMCI, which all used to access the old FieldInfo array, have been updated too to deal with the new FieldInfo format.
Tested with mach5, tier 1 to 7.
Thank you.
Progress
Issue
Reviewers
Contributors
<jrose@openjdk.org><cjplummer@openjdk.org>Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/12855/head:pull/12855$ git checkout pull/12855Update a local copy of the PR:
$ git checkout pull/12855$ git pull https://git.openjdk.org/jdk pull/12855/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 12855View PR using the GUI difftool:
$ git pr show -t 12855Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/12855.diff