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

8293254: x86_64: Extract arraycopy stub implementations into a separate file #10128

Closed
wants to merge 6 commits into from

Conversation

iwanowww
Copy link

@iwanowww iwanowww commented Sep 1, 2022

Move arraycopy stub implementations from stubGenerator_x86_64.cpp into stubGenerator_x86_64_arraycopy.cpp.

Testing: hs-tier1 - hs-tier4

PS: FTR I left MacroAssembler::generate_fill_avx3() intact because it is called from MacroAssembler::generate_fill() which is shared between x86_64 and x86_32. Otherwise, I would either need to copy MacroAssembler::generate_fill() or put it into a separate file (e.g., stubGenerator_x86.cpp or stubGenerator_x86_arraycopy.cpp). IMO it doesn't add much value compared to keeping it in macroAssembler_x86.cpp.

/cc hotspot


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-8293254: x86_64: Extract arraycopy stub implementations into a separate file

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10128

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 1, 2022

👋 Welcome back vlivanov! A progress list of the required criteria for merging this PR into pr/10111 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the hotspot hotspot-dev@openjdk.org label Sep 1, 2022
@openjdk
Copy link

openjdk bot commented Sep 1, 2022

@iwanowww
The hotspot label was successfully added.

@iwanowww iwanowww marked this pull request as ready for review September 1, 2022 20:44
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 1, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 1, 2022

Webrevs

Copy link
Member

@dean-long dean-long left a comment

Choose a reason for hiding this comment

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

It seems OK, assuming there are no hidden changes, just cut and paste plus renames and adding "__ ". Considering the number of lines changes, it would be hard for a reviewer to check all the lines without effectively reproducing all the steps.

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

Good. I agree with you about not moving generate_fill_avx3.

@iwanowww
Copy link
Author

iwanowww commented Sep 1, 2022

It seems OK, assuming there are no hidden changes, just cut and paste plus renames and adding "__ "

Yes. Except some additional formatting, it's copy-pasted code with "__" sprinkled where methods on MacroAssembler are invoked.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/10111 to master September 2, 2022 17:08
@openjdk-notifier
Copy link

The dependent pull request 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 stub.x86_64.arraycopy
git fetch https://git.openjdk.org/jdk 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 Sep 2, 2022

@iwanowww 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 stub.x86_64.arraycopy
git fetch https://git.openjdk.org/jdk 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 Sep 2, 2022
@openjdk
Copy link

openjdk bot commented Sep 2, 2022

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

8293254: x86_64: Extract arraycopy stub implementations into a separate file

Reviewed-by: dlong, kvn

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:

  • e1e6732: 8293319: [C2 cleanup] Remove unused other_path arg in Parse::adjust_map_after_if

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 ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Sep 2, 2022
@iwanowww
Copy link
Author

iwanowww commented Sep 6, 2022

Thanks for the reviews, Dean and Vladimir.

/integrate

@openjdk
Copy link

openjdk bot commented Sep 6, 2022

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

  • fb6eb6f: 8293245: x86_64: Extract Adler32 stub implementation into stubGenerator_x86_64_adler.cpp
  • da59618: 8264744: (fs) Use file cloning in Linux version of Files::copy method
  • 85d4b49: 8283929: GHA: Add RISC-V build config
  • 98d85e6: 8292579: (tz) Update Timezone Data to 2022c
  • 7c96608: 8293403: JfrResolution::on_jvmci_resolution crashes when caller is null
  • c05015b: 8291736: find_method_handle_intrinsic leaks Method*
  • b2067e6: 8291725: Leftover marks when VM shutdown aborts bitmap clearing make mixed gc fail
  • 6a1e98c: 8293213: G1: Remove redundant assertion in G1RemSet::clean_card_before_refine
  • a92c1ff: 8287912: GTK L&F : Background of tree icons are red
  • 272745b: 8293340: Remove unused _code in {Zero,Template}InterpreterGenerator
  • ... and 27 more: https://git.openjdk.org/jdk/compare/5757e2129ef23f6aa11a9a29d77ae86971b401c0...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 6, 2022

@iwanowww Pushed as commit 5b4c415.

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