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

8317837: Leftover FFM implementation-only changes #16128

Closed
wants to merge 15 commits into from

Conversation

JornVernee
Copy link
Member

@JornVernee JornVernee commented Oct 10, 2023

Port of miscellaneous leftover implementation-only changes from the panama-foreign repo:

These four related to improving the performance of the internal strlen implementation:

Adding new benchmarks:

Other misc. changes:

Testing: jdk_foreign


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-8317837: Leftover FFM implementation-only changes (Enhancement - P3)

Reviewers

Contributors

  • Maurizio Cimadamore <mcimadamore@openjdk.org>
  • Per Minborg <pminborg@openjdk.org>

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16128

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 10, 2023

👋 Welcome back jvernee! A progress list of the required criteria for merging this PR into pr/15103 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 Oct 10, 2023

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

  • build
  • core-libs

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 build build-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels Oct 10, 2023
@JornVernee
Copy link
Member Author

/contributor add @mcimadamore
/contributor add @minborg

@openjdk
Copy link

openjdk bot commented Oct 10, 2023

@JornVernee
Contributor Maurizio Cimadamore <mcimadamore@openjdk.org> successfully added.

@openjdk
Copy link

openjdk bot commented Oct 10, 2023

@JornVernee
Contributor Per Minborg <pminborg@openjdk.org> successfully added.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/15103 to master October 12, 2023 19:55
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout FFMImplFollowup
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Oct 12, 2023

@JornVernee this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout FFMImplFollowup
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Oct 12, 2023
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Oct 12, 2023
@JornVernee JornVernee marked this pull request as ready for review October 12, 2023 20:40
@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 12, 2023
@mlbridge
Copy link

mlbridge bot commented Oct 12, 2023

Webrevs

Copy link
Contributor

@mcimadamore mcimadamore 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.
It seems like this PR is missing some string optimizations:
https://git.openjdk.org/panama-foreign/pull/875

@JornVernee
Copy link
Member Author

Thanks for the review. I've added the missing patch now

@mcimadamore
Copy link
Contributor

This seems to have been missed too? openjdk/panama-foreign#897

@mcimadamore
Copy link
Contributor

This seems to have been missed too? openjdk/panama-foreign#897

I also don't see https://git.openjdk.org/panama-foreign/pull/894

Perhaps you are planning a different PR for "style" only changes?

@JornVernee
Copy link
Member Author

Yes, both of those are planned for the style-only PR.

@openjdk
Copy link

openjdk bot commented Oct 13, 2023

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

8317837: Leftover FFM implementation-only changes

Co-authored-by: Maurizio Cimadamore <mcimadamore@openjdk.org>
Co-authored-by: Per Minborg <pminborg@openjdk.org>
Reviewed-by: mcimadamore

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

  • 6273ab9: 8317808: HTTP/2 stream cancelImpl may leave subscriber registered
  • 7d31146: 8318028: Remove unused class="centered" from FocusCycle.svg
  • 45b7aed: 8317433: Async UL: Only grab lock once when write():ing
  • 266636d: 8315940: ARM32: Move field resolution information out of the cpCache
  • e490cf9: 8317432: Async UL: Use memcpy instead of strcpy in Message ctr
  • 126f2ac: 8318006: remove unused net related coding
  • 4d90420: 8315026: ProcessHandle implementation listing processes on AIX should use getprocs64
  • 1082c0e: 8317677: Specialize Vtablestubs::entry_for() for VtableBlob
  • ec310fe: 8317919: pthread_attr_init handle return value and destroy pthread_attr_t object
  • ff0b397: 8317959: Check return values of malloc in native java.base coding
  • ... and 7 more: https://git.openjdk.org/jdk/compare/32ac72c3d35138f5253e4defc948304ac3ea1b53...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 Oct 13, 2023
@JornVernee
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 13, 2023

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

  • 605c976: 8318039: GHA: Bump macOS and Xcode versions
  • 6273ab9: 8317808: HTTP/2 stream cancelImpl may leave subscriber registered
  • 7d31146: 8318028: Remove unused class="centered" from FocusCycle.svg
  • 45b7aed: 8317433: Async UL: Only grab lock once when write():ing
  • 266636d: 8315940: ARM32: Move field resolution information out of the cpCache
  • e490cf9: 8317432: Async UL: Use memcpy instead of strcpy in Message ctr
  • 126f2ac: 8318006: remove unused net related coding
  • 4d90420: 8315026: ProcessHandle implementation listing processes on AIX should use getprocs64
  • 1082c0e: 8317677: Specialize Vtablestubs::entry_for() for VtableBlob
  • ec310fe: 8317919: pthread_attr_init handle return value and destroy pthread_attr_t object
  • ... and 8 more: https://git.openjdk.org/jdk/compare/32ac72c3d35138f5253e4defc948304ac3ea1b53...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 13, 2023

@JornVernee Pushed as commit b12c471.

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

@JornVernee JornVernee deleted the FFMImplFollowup branch October 13, 2023 19:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants