Skip to content

8335007: Inline OopMapCache table #19882

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

Closed

Conversation

tstuefe
Copy link
Member

@tstuefe tstuefe commented Jun 25, 2024

OopMapCache uses a (closed hashing) table. The table is C-heap allocated. OopMapCache itself is also C-heap allocated. Since table size is fixed, we can just inline the table to OopMapCache and save one unnecessary pointer-hop on lookup.


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-8335007: Inline OopMapCache table (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19882

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 25, 2024

👋 Welcome back stuefe! 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 Jun 25, 2024

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

8335007: Inline OopMapCache table

Reviewed-by: stefank, coleenp, shade

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

  • 79a2301: 8322859: Parallel: Move transform_stack_chunk
  • 37e7698: 8335154: jcmd VM.classes -verbose=false does not set verbose to false
  • f3b69da: 8335136: Underscore as parameter name in one-parameter functional types fails to compile
  • 46b817b: 8333363: ubsan: instanceKlass.cpp: runtime error: member call on null pointer of type 'struct AnnotationArray'
  • 0fc5b27: 8332014: since-checker - Fix @ since tags in jdk.jshell
  • 9d20b58: 8334328: Reduce object allocation for FloatToDecimal and DoubleToDecimal
  • 9bb675f: 8334719: (se) Deferred close of SelectableChannel may result in a Selector doing the final close before concurrent I/O on channel has completed
  • 6682305: 8334779: Test compiler/c1/CanonicalizeArrayLength.java is timing out
  • 3796fdf: 8328536: javac - crash on unknown type referenced in yield statement
  • 07bc523: 8334670: SSLSocketOutputRecord buffer miscalculation
  • ... and 30 more: https://git.openjdk.org/jdk/compare/75a2afacc8f5fdec53350b1cb66076cdfeae12f0...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 changed the title JDK-8335007: Inline OopMapCache table 8335007: Inline OopMapCache table Jun 25, 2024
@openjdk
Copy link

openjdk bot commented Jun 25, 2024

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

  • hotspot-runtime

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-runtime hotspot-runtime-dev@openjdk.org label Jun 25, 2024
@tstuefe
Copy link
Member Author

tstuefe commented Jun 26, 2024

mac os x64 bug unrelated

@tstuefe tstuefe marked this pull request as ready for review June 26, 2024 05:56
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 26, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 26, 2024

Webrevs

Copy link
Member

@stefank stefank left a comment

Choose a reason for hiding this comment

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

I'm not a maintainer of this code, but this change looks good to me.

I reacted a little bit when I saw the _size usage in the array expression, thinking that you were using a member variable. It turns out that it is just a constant with a very unconventionally named (for HotSpot) constant. Would anyone object if we/I changed the name of these constants in a follow-up RFE?

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 26, 2024
@tstuefe
Copy link
Member Author

tstuefe commented Jun 26, 2024

I'm not a maintainer of this code, but this change looks good to me.

I reacted a little bit when I saw the _size usage in the array expression, thinking that you were using a member variable. It turns out that it is just a constant with a very unconventionally named (for HotSpot) constant. Would anyone object if we/I changed the name of these constants in a follow-up RFE?

I am fine with renaming it to something that does not look like a member. "size" ? "tablesize"? Also, make it a static constexpr? Do we still use enums for constants?

@stefank
Copy link
Member

stefank commented Jun 26, 2024

I'm not a maintainer of this code, but this change looks good to me.
I reacted a little bit when I saw the _size usage in the array expression, thinking that you were using a member variable. It turns out that it is just a constant with a very unconventionally named (for HotSpot) constant. Would anyone object if we/I changed the name of these constants in a follow-up RFE?

I am fine with renaming it to something that does not look like a member. "size" ? "tablesize"? Also, make it a static constexpr? Do we still use enums for constants?

The class above uses names the constants like bits_per_entry, so maybe just drop the _ and name it size? (I tend to not like the macro-like names like SIZE)

Most of us try to transition away from enums and instead use explicit type (Not everyone, though). I think there's no consensus around const vs constxpr, but I don't mind seeing things changed to constexpr.

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.

This change looks fine. If you change _size, you should do the same with _probe_depth. Until recently, there's not a lot of maintenance work in this code, so if you leave it, I'm fine with that.

@coleenp
Copy link
Contributor

coleenp commented Jun 26, 2024

If you do change it, change it with this PR please.

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

I am okay with doing this without any further renames.

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

This is also fine.

Copy link
Member

@stefank stefank 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. Thanks!

@tstuefe
Copy link
Member Author

tstuefe commented Jun 27, 2024

Thanks everyone

/integrate

@openjdk
Copy link

openjdk bot commented Jun 27, 2024

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

  • 79a2301: 8322859: Parallel: Move transform_stack_chunk
  • 37e7698: 8335154: jcmd VM.classes -verbose=false does not set verbose to false
  • f3b69da: 8335136: Underscore as parameter name in one-parameter functional types fails to compile
  • 46b817b: 8333363: ubsan: instanceKlass.cpp: runtime error: member call on null pointer of type 'struct AnnotationArray'
  • 0fc5b27: 8332014: since-checker - Fix @ since tags in jdk.jshell
  • 9d20b58: 8334328: Reduce object allocation for FloatToDecimal and DoubleToDecimal
  • 9bb675f: 8334719: (se) Deferred close of SelectableChannel may result in a Selector doing the final close before concurrent I/O on channel has completed
  • 6682305: 8334779: Test compiler/c1/CanonicalizeArrayLength.java is timing out
  • 3796fdf: 8328536: javac - crash on unknown type referenced in yield statement
  • 07bc523: 8334670: SSLSocketOutputRecord buffer miscalculation
  • ... and 30 more: https://git.openjdk.org/jdk/compare/75a2afacc8f5fdec53350b1cb66076cdfeae12f0...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 27, 2024

@tstuefe Pushed as commit 50dd962.

💡 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
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants