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

8293188: x86_64: Introduce stubGenerator_x86_64.hpp #10111

Closed
wants to merge 7 commits into from

Conversation

iwanowww
Copy link
Contributor

@iwanowww iwanowww commented Aug 31, 2022

Introduce stubGenerator_x86_64.hpp and extract StubGenerator class declaration there.

Testing: hs-tier1 - hs-tier4

/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-8293188: x86_64: Introduce stubGenerator_x86_64.hpp

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10111

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 31, 2022

👋 Welcome back vlivanov! 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 openjdk bot added the hotspot hotspot-dev@openjdk.org label Aug 31, 2022
@openjdk
Copy link

openjdk bot commented Aug 31, 2022

@iwanowww
The hotspot label was successfully added.

@iwanowww iwanowww changed the title 8293188: Introduce stubGenerator_x86_64.hpp 8293188: x86_64: Introduce stubGenerator_x86_64.hpp Aug 31, 2022
@iwanowww iwanowww marked this pull request as ready for review August 31, 2022 23:12
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 31, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 31, 2022

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Rather tricky to review but as long as things build okay this should be fine. I'm assuming the motivation here was just to get smaller files to work with?

A couple of minor nits.

Thanks.

src/hotspot/cpu/x86/stubGenerator_x86_64.cpp Outdated Show resolved Hide resolved
src/hotspot/cpu/x86/stubGenerator_x86_64.hpp Outdated Show resolved Hide resolved
src/hotspot/cpu/x86/stubGenerator_x86_64.hpp Show resolved Hide resolved
@openjdk
Copy link

openjdk bot commented Sep 1, 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:

8293188: x86_64: Introduce stubGenerator_x86_64.hpp

Reviewed-by: dholmes, 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 3 new commits pushed to the master branch:

  • 3ac91b0: 8293003: Review running time of Warn5 regression test
  • e0168a0: 8288012: AArch64: unnecessary macro expansion in stubGenerator_aarch64
  • 99c3ab0: 8293010: JDI ObjectReference/referringObjects/referringObjects001 fails: assert(env->is_enabled(JVMTI_EVENT_OBJECT_FREE)) failed: checking

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 the ready Pull request is ready to be integrated label Sep 1, 2022
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.

@openjdk
Copy link

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

iwanowww commented Sep 2, 2022

Thanks for the reviews, David and Vladimir.

I'm assuming the motivation here was just to get smaller files to work with?

Yes, I'm looking at splitting stubGenerator_x86_64.cpp and grouping stub implementations based on the area they belong to.

@iwanowww
Copy link
Contributor Author

iwanowww commented Sep 2, 2022

Thanks for the reviews, David and Vladimir.

/integrate

@openjdk
Copy link

openjdk bot commented Sep 2, 2022

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

  • 2baeebb: 8293006: sun/tools/jhsdb/JStackStressTest.java fails with "UnalignedAddressException: 8baadbabe"
  • da99e3e: 8289400: Improve com/sun/jdi/TestScaffold error reporting
  • 77e21c5: 8290529: C2: assert(BoolTest(btest).is_canonical()) failure
  • fcc0cf9: 8292375: Convert ProtectionDomainCacheTable to ResourceHashtable
  • 6fc58b8: 8293207: Add assert to JVM_ReferenceRefersTo to clarify its API
  • ce06a3b: 8293023: Change CardTable::is_in_young signature
  • 26cac08: 8293209: Parallel: Remove unused variables in PSParallelCompact::invoke
  • 46523b8: 8293219: Microsoft toolchain selection picks 32-bit tools over 64-bit
  • bc5ffc8: 8293100: RISC-V: Need to save and restore callee-saved FloatRegisters in StubGenerator::generate_call_stub
  • 98ce45f: 8292981: Unify and restructure integer printing format specifiers
  • ... and 3 more: https://git.openjdk.org/jdk/compare/0fb9469d93bffd662848b63792406717f7b4ec0d...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 2, 2022

@iwanowww Pushed as commit 0c6094e.

💡 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