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

Jump to bottom

8257565: epsilonBarrierSet.hpp should not include barrierSetAssembler #1554

Closed
wants to merge 4 commits into from
Closed

8257565: epsilonBarrierSet.hpp should not include barrierSetAssembler #1554

wants to merge 4 commits into from

Conversation

iklam
Copy link
Member

@iklam iklam commented Dec 2, 2020 •
edited by openjdk bot

Please review this trivial fix:

epsilonBarrierSet.hpp is included (recursively via access.hpp) by many CPP files. It unncessarily includes of barrierSetAssembler.hpp, which causes many of the native code assembler header files to be unnecessarily included by many HotSpot CPP files that do not deal with native code assembly.

Removing this one line reduced the total number of header inclusion for building HotSpot from 260096 to 258193, or about 0.8%.

Progress

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

Issue

  • JDK-8257565: epsilonBarrierSet.hpp should not include barrierSetAssembler

Reviewers

Download

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

@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 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 Dec 2, 2020
@iklam iklam marked this pull request as ready for review December 2, 2020 05:24
@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 •
edited

Webrevs

@tstuefe
Copy link
Member

tstuefe commented Dec 2, 2020

LGTM.

shipilev
shipilev suggested changes Dec 2, 2020
View reviewed changes
src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp Outdated
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
Copy link
Member

Choose a reason for hiding this comment

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

Why the copyright line addition, though? It is not like Red Hat adds its copyrights for trivial changes to shared files like these.

Copy link
Member Author

Choose a reason for hiding this comment

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

Removed.

shipilev
shipilev approved these changes Dec 2, 2020
View reviewed changes
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.

Looks good! Thanks, I'll take care of backports, if any.

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

iklam commented Dec 2, 2020

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

@openjdk
Copy link

openjdk bot commented Dec 2, 2020

@iklam This PR has not yet been marked as ready for integration.

@iklam iklam changed the title 8257565: epsilonBarrierSet.hpp should not include barrierSetAssembler 8257565: epsilonBarrierSet.hpp should not include barrierSetAssemble Dec 2, 2020
@iklam iklam changed the title 8257565: epsilonBarrierSet.hpp should not include barrierSetAssemble 8257565: epsilonBarrierSet.hpp should not include barrierSetAssembler Dec 2, 2020
@openjdk
Copy link

openjdk bot commented Dec 2, 2020 •
edited

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

8257565: epsilonBarrierSet.hpp should not include barrierSetAssembler

Reviewed-by: kbarrett, stuefe, 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 51 new commits pushed to the master branch:

  • 0b8c780: 8256256: UL should not use heap allocation for output string
  • 2508bc7: 8257140: Crash in JvmtiTagMap::flush_object_free_events()
  • cfb50a9: 8253916: ResourceExhausted/resexhausted001 crashes on Linux-x64
  • 287b829: 8254877: GCLogPrecious::_lock rank constrains what locks you are allowed to have when crashing
  • 1fd0ea7: 8256382: Use try_lock for hs_err EventLog printing
  • bff68f1: 8257533: legacy-jre-image includes jpackage and jlink tools
  • 9a60413: 8248736: [aarch64] runtime/signal/TestSigpoll.java failed "fatal error: not an ldr (literal) instruction."
  • e7ca0c4: 8257224: JDK-8251549 didn't update building.html
  • 7e37c7c: 8257471: fatal error: Fatal exception in JVMCI: Exception during JVMCI compiler initialization
  • 3e3745c: 8256008: UL does not report anything if disk writing fails
  • ... and 41 more: https://git.openjdk.java.net/jdk/compare/6eb25d7cb42fb313172d90a56f231743cf6a7884...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 added the ready Pull request is ready to be integrated label Dec 2, 2020
@iklam
Copy link
Member Author

iklam commented Dec 2, 2020

/integrate

@openjdk openjdk bot closed this Dec 2, 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 2, 2020
@openjdk
Copy link

openjdk bot commented Dec 2, 2020

@iklam Since your change was applied there have been 51 commits pushed to the master branch:

  • 0b8c780: 8256256: UL should not use heap allocation for output string
  • 2508bc7: 8257140: Crash in JvmtiTagMap::flush_object_free_events()
  • cfb50a9: 8253916: ResourceExhausted/resexhausted001 crashes on Linux-x64
  • 287b829: 8254877: GCLogPrecious::_lock rank constrains what locks you are allowed to have when crashing
  • 1fd0ea7: 8256382: Use try_lock for hs_err EventLog printing
  • bff68f1: 8257533: legacy-jre-image includes jpackage and jlink tools
  • 9a60413: 8248736: [aarch64] runtime/signal/TestSigpoll.java failed "fatal error: not an ldr (literal) instruction."
  • e7ca0c4: 8257224: JDK-8251549 didn't update building.html
  • 7e37c7c: 8257471: fatal error: Fatal exception in JVMCI: Exception during JVMCI compiler initialization
  • 3e3745c: 8256008: UL does not report anything if disk writing fails
  • ... and 41 more: https://git.openjdk.java.net/jdk/compare/6eb25d7cb42fb313172d90a56f231743cf6a7884...master

Your commit was automatically rebased without conflicts.

Pushed as commit 6704266.

💡 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
Reviewers

@shipilev shipilev shipilev approved these changes

@tstuefe tstuefe tstuefe approved these changes

@kimbarrett kimbarrett kimbarrett approved these changes

Assignees
No one assigned
Labels
hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated
Milestone
No milestone
4 participants
@iklam @tstuefe @shipilev @kimbarrett