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

8257563: Remove excessive include of klass.inline.hpp #1552

Conversation

iklam
Copy link
Member

@iklam iklam commented Dec 2, 2020

klass.inline.hpp is unnecessarily included by two popular header files: oop.inline.hpp and modRefBarrierSet.inline.hpp

These two #include lines recursively pull in many header files. Removing them reduce the total number of header inclusion for building HotSpot from 260096 to 254773, or about 2%.

Notes to reviewer. The main changes are in the header files:

  • src/hotspot/share/classfile/systemDictionaryShared.hpp
  • src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp
  • src/hotspot/share/oops/instanceKlass.hpp
  • src/hotspot/share/oops/instanceKlass.inline.hpp
  • src/hotspot/share/oops/oop.inline.hpp

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8257563: Remove excessive include of klass.inline.hpp

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/1552/head:pull/1552
$ git checkout pull/1552

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 2, 2020

👋 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 Dec 2, 2020

@iklam The following labels will be automatically applied to this pull request:

  • hotspot
  • serviceability

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added serviceability serviceability-dev@openjdk.org hotspot hotspot-dev@openjdk.org labels Dec 2, 2020
@iklam
Copy link
Member Author

iklam commented Dec 2, 2020

/label remove serviceability

@openjdk openjdk bot removed the serviceability serviceability-dev@openjdk.org label Dec 2, 2020
@openjdk
Copy link

openjdk bot commented Dec 2, 2020

@iklam
The serviceability label was successfully removed.

@iklam iklam marked this pull request as ready for review Dec 2, 2020
@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 2, 2020
@mlbridge
Copy link

mlbridge bot commented Dec 2, 2020

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Seems okay.

Thanks,
David

@openjdk
Copy link

openjdk bot commented Dec 2, 2020

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

8257563: Remove excessive include of klass.inline.hpp

Reviewed-by: dholmes, stuefe, stefank

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 1 new commit pushed to the master branch:

  • cc1915b: 8253821: Improve ByteBuffer performance with GCM

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 Dec 2, 2020
tstuefe
tstuefe approved these changes Dec 2, 2020
Copy link
Member

@tstuefe tstuefe left a comment

LGTM. Thank you for doing this. My slow notebook thanks you.

..Thomas

stefank
stefank approved these changes Dec 2, 2020
Copy link
Member

@stefank stefank left a comment

Nice! One comment:

#include "oops/klass.inline.hpp"

Copy link
Member

@stefank stefank Dec 2, 2020

Choose a reason for hiding this comment

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

I wonder if this should be put in adlc/main.cpp. I'm not sure, but I don't think we usually put includes in the .ad files.

Copy link
Member Author

@iklam iklam Dec 2, 2020

Choose a reason for hiding this comment

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

We have #includes in the .ad files today. I am not sure what the rules are. I am guessing it is "add includes that are specific to the C code inside this .ad file". So I'd like to keep my changes in s390.ad as is.

$ find . -name \*.ad | xargs grep -l '^#include '
./cpu/aarch64/aarch64.ad
./cpu/aarch64/gc/z/z_aarch64.ad
./cpu/aarch64/gc/shenandoah/shenandoah_aarch64.ad
./cpu/ppc/ppc.ad
./cpu/x86/gc/z/z_x86_64.ad
./cpu/x86/gc/shenandoah/shenandoah_x86_64.ad
./cpu/x86/gc/shenandoah/shenandoah_x86_32.ad
./cpu/x86/x86.ad

Copy link
Member

@stefank stefank Dec 2, 2020

Choose a reason for hiding this comment

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

OK. So platform-specific files seems to have includes. Got it. Thanks.

@iklam
Copy link
Member Author

iklam commented Dec 3, 2020

Thanks @tstuefe @stefank @dholmes-ora for the review. I've tested tier1,builds-tier2,builds-tier3,builds-tier4,builds-tier5 on mach5, plus locally building s390x,ppc64le.
/integrate

@openjdk openjdk bot closed this Dec 3, 2020
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 3, 2020
@openjdk
Copy link

openjdk bot commented Dec 3, 2020

@iklam Since your change was applied there has been 1 commit pushed to the master branch:

  • cc1915b: 8253821: Improve ByteBuffer performance with GCM

Your commit was automatically rebased without conflicts.

Pushed as commit 02a0a02.

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