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

8265606: Reduce allocations in AdapterHandlerLibrary::get_adapter #3595

Closed
wants to merge 4 commits into from

Conversation

cl4es
Copy link
Member

@cl4es cl4es commented Apr 20, 2021

Use stack allocated arrays used when looking up and creating adapters. Resource allocate if number of args grows large, which is relatively rare.


Progress

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

Issue

  • JDK-8265606: Reduce allocations in AdapterHandlerLibrary::get_adapter

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3595

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 20, 2021

👋 Welcome back redestad! 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 20, 2021

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

  • hotspot

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 hotspot-dev@openjdk.org label Apr 20, 2021
@cl4es cl4es marked this pull request as ready for review April 21, 2021 11:00
@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 21, 2021
@mlbridge
Copy link

mlbridge bot commented Apr 21, 2021

Webrevs

@cl4es
Copy link
Member Author

cl4es commented Apr 21, 2021

/label remove hotspot
/label add hotspot-runtime

@openjdk openjdk bot removed the hotspot hotspot-dev@openjdk.org label Apr 21, 2021
@openjdk
Copy link

openjdk bot commented Apr 21, 2021

@cl4es
The hotspot label was successfully removed.

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Apr 21, 2021
@openjdk
Copy link

openjdk bot commented Apr 21, 2021

@cl4es
The hotspot-runtime label was successfully added.

@@ -2954,7 +2961,7 @@ VMRegPair *SharedRuntime::find_callee_arguments(Symbol* sig, bool has_receiver,
// This method is returning a data structure allocating as a
// ResourceObject, so do not put any ResourceMarks in here.

BasicType *sig_bt = NEW_RESOURCE_ARRAY(BasicType, 256);
BasicType sig_bt[256];
Copy link
Member

Choose a reason for hiding this comment

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

Was this line changed by mistake? The rest of the PR looks good to me.

Copy link
Member Author

@cl4es cl4es Apr 21, 2021

Choose a reason for hiding this comment

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

It was intentional, but it's also a bit of a scope creep: this method is about creating and returning the VMRegPair array, but it also resource-allocs this sig_bt array and keeps it alive for however long the regs array is kept alive, which means we hold on to a bit more memory for longer for no reason.

Copy link
Member

Choose a reason for hiding this comment

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

The think the original code was written to avoid allocating large arrays on the stack.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ok, I reverted this change. It's not part of anything I know sees much use anyhow.

@openjdk
Copy link

openjdk bot commented Apr 21, 2021

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

8265606: Reduce allocations in AdapterHandlerLibrary::get_adapter

Reviewed-by: iklam

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

  • f45d460: 8265017: runtime/HiddenClasses/StressHiddenClasses.java timed out on Win* OCI
  • 0136c89: 8265490: Unterminated string passed to FindClass() in hotspot test
  • 325edbc: 8265450: Merge PreservedMarksSet::restore code paths
  • b337f63: 8037397: RegEx pattern matching loses character class after intersection (&&) operator
  • 07a7510: 8200145: Conditional expression mistakenly treated as standalone
  • 41fc7dd: 8199079: Test javax/swing/UIDefaults/6302464/bug6302464.java is unstable
  • 45c474a: 8168408: Test java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java fails intermittentently on windows
  • 18ee419: 8198422: Test java/awt/font/StyledMetrics/BoldSpace.java is unstable
  • da86029: 8265326: Strange Characters in G1GC GC Log
  • 7879adb: 8265343: Update Debian-based cross-compilation recipes
  • ... and 33 more: https://git.openjdk.java.net/jdk/compare/ab2240741cfc7d10f012c1d588a92cf6f94e1de6...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 Apr 21, 2021
@cl4es
Copy link
Member Author

cl4es commented Apr 23, 2021

/integrate

@openjdk openjdk bot closed this Apr 23, 2021
@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 Apr 23, 2021
@openjdk
Copy link

openjdk bot commented Apr 23, 2021

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

  • bfc1cd8: 8264320: ShouldNotReachHere in Compile::print_inlining_move_to()
  • 5db64c3: 8265268: Unify ReservedSpace reservation code in initialize and try_reserve_heap
  • 191f1fc: 8265759: Shenandoah: Avoid race for referent in assert
  • b3a319c: 8264842: IGV: different nodes sharing idx are treated as equal
  • 95f0fd6: 8265696: Move CDS sources to src/hotspot/shared/cds
  • a715b09: 8265798: Minimal build broken by JDK-8261090
  • 13d3263: 8265484: Fix up TRAPS usage in GenerateOopMap::compute_map and callers
  • a8ddbd1: 8265683: vmTestbase/nsk/jdb tests failed with "JDWP exit error AGENT_ERROR_INTERNAL(181)"
  • 7a55914: 8264196: Change link_and_cleanup_shared_classes(CATCH) to CHECK
  • b84f690: 8265793: Remove duplicate jtreg TEST.groups references for some client tests
  • ... and 67 more: https://git.openjdk.java.net/jdk/compare/ab2240741cfc7d10f012c1d588a92cf6f94e1de6...master

Your commit was automatically rebased without conflicts.

Pushed as commit 891f72f.

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

@cl4es cl4es deleted the adapter_noalloc branch April 23, 2021 13:06
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
2 participants