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

8330339: G1: Move some public methods to private in G1BlockOffsetTable APIs #18800

Closed
wants to merge 3 commits into from

Conversation

lgxbslgx
Copy link
Member

@lgxbslgx lgxbslgx commented Apr 16, 2024

Hi all,

This patch moves several methods to the private part.

Thanks for taking the time to review.

Best Regards,
-- Guoxiong


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-8330339: G1: Move some public methods to private in G1BlockOffsetTable APIs (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18800

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 16, 2024

👋 Welcome back gli! 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 16, 2024

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

8330339: G1: Move some public methods to private in G1BlockOffsetTable APIs

Reviewed-by: ayang, iwalulya

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

  • 5313dcc: 8330733: Generational ZGC: Remove ZBarrier::verify_old_object_live_slow_path
  • 5394f57: 8330621: Make 5 compiler tests use ProcessTools.executeProcess
  • 20546c1: 8330004: Refactor cloning down code in Split If for Template Assertion Predicates
  • bd67ac6: 8329331: Intrinsify Unsafe::setMemory
  • 185e711: 8318650: Optimized subword gather for x86 targets.
  • 6d56996: 8330540: Rename the enum type CompileCommand to CompileCommandEnum
  • f6feeb0: 8330703: Improve link syntax in javax.lang.model.util
  • df04358: 8330179: Clean up non-standard use of /** comments in jdk.compiler
  • c1dd82b: 8329644: Discuss expected visitor evolution patterns in javax.lang.model.util
  • b704e91: 8329433: Reduce nmethod header size
  • ... and 64 more: https://git.openjdk.org/jdk/compare/8a5b86c52954f6917acfda11df183691beb07f56...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-8330339 8330339: G1: Refactor G1BlockOffsetTable APIs Apr 16, 2024
@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 16, 2024
@openjdk
Copy link

openjdk bot commented Apr 16, 2024

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

  • hotspot-gc

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-gc hotspot-gc-dev@openjdk.org label Apr 16, 2024
@mlbridge
Copy link

mlbridge bot commented Apr 16, 2024

Webrevs

Copy link
Member

@albertnetymk albertnetymk left a comment

Choose a reason for hiding this comment

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

The inline.hpp should probably be updated as well to exclude private apis.

@lgxbslgx
Copy link
Member Author

The inline.hpp should probably be updated as well to exclude private apis.

Do you mean:

The methods entry_for_addr and addr_for_entry are not marked as inline in the hpp, so they should be moved to cpp and not inlined?

@albertnetymk
Copy link
Member

Only block_start_reaching_into_card and methods called by it should be in inline.hpp. All other methods can be moved to cpp.

@lgxbslgx
Copy link
Member Author

I am confused by the inline.hpp file now. Previously, I think the non-trivial inlined methods should be put in inline.hpp. But now, it seems my thought is wrong. Now, I don’t really know when we should add such inline.hpp file and which methods should be put into inline.hpp. Could you explain more for me? Thanks.

@albertnetymk
Copy link
Member

Since link-time-opt is disabled by default on most platforms (# Only arm-32 should have link-time-opt enabled as default), compiler needs to "see" the body of a method/function to not treat it as blackbox, i.e. emitting call in asm. As a result, inline.hpp is meant to expose some non-trivial & perf-critical methods to callers in another file (translation unit) so that compiler can perform more/better optimizations.

I think the non-trivial inlined methods should be put in inline.hpp

I think it's more precise to say body of perf-critical public apis should be placed in hpp/inline.hpp. In order for compiler to see through those apis, their recursive callees should be "inlinable" (e.g. placed in inline.hpp) as well. Otherwise, the effect of placing those apis in inline.hpp will be limited.

@lgxbslgx
Copy link
Member Author

Thanks for your explanation. I updated the code just now.

@lgxbslgx lgxbslgx changed the title 8330339: G1: Refactor G1BlockOffsetTable APIs 8330339 Apr 17, 2024
@openjdk openjdk bot changed the title 8330339 8330339: G1: Move some public methods to private in G1BlockOffsetTable APIs Apr 17, 2024
@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 17, 2024
@lgxbslgx
Copy link
Member Author

@albertnetymk Thanks for your review. Waiting for another review.

@lgxbslgx
Copy link
Member Author

@albertnetymk @walulyai Thanks for your reviews. Integrating.

/integrate

@openjdk
Copy link

openjdk bot commented Apr 22, 2024

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

  • 35b30c8: 8330595: Invoke ObjectMethods::bootstrap method exactly
  • 3d62bbf: 8330681: Explicit hashCode and equals for java.lang.runtime.SwitchBootstraps$TypePairs
  • 5313dcc: 8330733: Generational ZGC: Remove ZBarrier::verify_old_object_live_slow_path
  • 5394f57: 8330621: Make 5 compiler tests use ProcessTools.executeProcess
  • 20546c1: 8330004: Refactor cloning down code in Split If for Template Assertion Predicates
  • bd67ac6: 8329331: Intrinsify Unsafe::setMemory
  • 185e711: 8318650: Optimized subword gather for x86 targets.
  • 6d56996: 8330540: Rename the enum type CompileCommand to CompileCommandEnum
  • f6feeb0: 8330703: Improve link syntax in javax.lang.model.util
  • df04358: 8330179: Clean up non-standard use of /** comments in jdk.compiler
  • ... and 66 more: https://git.openjdk.org/jdk/compare/8a5b86c52954f6917acfda11df183691beb07f56...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 22, 2024

@lgxbslgx Pushed as commit 70acade.

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

@lgxbslgx lgxbslgx deleted the MOVE_METHODS branch April 22, 2024 09:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-gc hotspot-gc-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants