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

8264626: C1 should be able to inline excluded methods #3315

Closed
wants to merge 1 commit into from

Conversation

@neliasso
Copy link
Contributor

@neliasso neliasso commented Apr 1, 2021

I noticed a behavioral between c1 and c2. In c2 excluded methods can still be inlined, which is the desired behaviour. Inlining is controlled separately. I propose a small change to c1 inlining that make it work in the same way.


Progress

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

Issue

  • JDK-8264626: C1 should be able to inline excluded methods

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3315/head:pull/3315
$ git checkout pull/3315

Update a local copy of the PR:
$ git checkout pull/3315
$ git pull https://git.openjdk.java.net/jdk pull/3315/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3315

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3315.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 1, 2021

👋 Welcome back neliasso! 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 openjdk bot commented Apr 1, 2021

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

  • hotspot-compiler

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.

@neliasso neliasso marked this pull request as ready for review Apr 1, 2021
@openjdk openjdk bot added the rfr label Apr 1, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 1, 2021

Webrevs

@veresov
veresov approved these changes Apr 3, 2021
Copy link
Contributor

@veresov veresov left a comment

Looks good.

@openjdk
Copy link

@openjdk openjdk bot commented Apr 3, 2021

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

8264626: C1 should be able to inline excluded methods

Reviewed-by: iveresov, thartmann

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

  • ff22353: 8264565: Templatize num_arguments() functions of DCmd subclasses
  • 54b4070: 8264634: CollectCLDClosure collects duplicated CLDs when dumping dynamic archive
  • 43d4a6f: 8264564: AArch64: use MOVI instead of FMOV to zero FP register
  • dc608fd: 8264411: serviceability/jvmti/HeapMonitor tests intermittently fail due to large TLAB size
  • b1a225e: 8263565: NPE was thrown when sun.jvm.hotspot.rmi.serverNamePrefix was set
  • c41cd15: 8264686: ClhsdbTestConnectArgument.java should use SATestUtils::validateSADebugDPrivileges
  • b7baca7: 8264288: Performance issue with MethodHandle.asCollector
  • 9201899: 8264729: Random check-in failing header checks.
  • d920f85: 8264540: WhiteBox.metaspaceReserveAlignment should return shared region alignment
  • 104e925: 8264512: jdk/test/jdk/java/util/prefs/ExportNode.java relies on default platform encoding
  • ... and 65 more: https://git.openjdk.java.net/jdk/compare/21e7402b04d835625521e7ba6f10c58cf708d276...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 label Apr 3, 2021
Copy link
Member

@TobiHartmann TobiHartmann left a comment

Looks good to me.

@neliasso
Copy link
Contributor Author

@neliasso neliasso commented Apr 6, 2021

Thanks for the reviews Igor and Tobias!

@neliasso
Copy link
Contributor Author

@neliasso neliasso commented Apr 6, 2021

/integrate

@openjdk openjdk bot closed this Apr 6, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Apr 6, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 6, 2021

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

  • ff22353: 8264565: Templatize num_arguments() functions of DCmd subclasses
  • 54b4070: 8264634: CollectCLDClosure collects duplicated CLDs when dumping dynamic archive
  • 43d4a6f: 8264564: AArch64: use MOVI instead of FMOV to zero FP register
  • dc608fd: 8264411: serviceability/jvmti/HeapMonitor tests intermittently fail due to large TLAB size
  • b1a225e: 8263565: NPE was thrown when sun.jvm.hotspot.rmi.serverNamePrefix was set
  • c41cd15: 8264686: ClhsdbTestConnectArgument.java should use SATestUtils::validateSADebugDPrivileges
  • b7baca7: 8264288: Performance issue with MethodHandle.asCollector
  • 9201899: 8264729: Random check-in failing header checks.
  • d920f85: 8264540: WhiteBox.metaspaceReserveAlignment should return shared region alignment
  • 104e925: 8264512: jdk/test/jdk/java/util/prefs/ExportNode.java relies on default platform encoding
  • ... and 65 more: https://git.openjdk.java.net/jdk/compare/21e7402b04d835625521e7ba6f10c58cf708d276...master

Your commit was automatically rebased without conflicts.

Pushed as commit ec7b002.

💡 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
3 participants