8290082: [PPC64] ZGC C2 load barrier stub needs to preserve vector registers #9453

TheRealMDoerr · 2022-07-11T14:09:58Z

Preserve volatile vector registers in ZGC C2 load barrier stub.

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-8290082: [PPC64] ZGC C2 load barrier stub needs to preserve vector registers

Reviewers

Erik Österlund (@fisk - Reviewer) ⚠️ Review applies to a1ca2ea5
Richard Reingruber (@reinrich - Reviewer) ⚠️ Review applies to 2d8fa980

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9453

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

Using diff file

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

bridgekeeper · 2022-07-11T14:10:18Z

👋 Welcome back mdoerr! 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 · 2022-07-11T14:13:30Z

@TheRealMDoerr 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.

mlbridge · 2022-07-11T14:15:59Z

Webrevs

fisk

Looks good. Thanks Martin!

openjdk · 2022-07-11T14:25:35Z

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

8290082: [PPC64] ZGC C2 load barrier stub needs to preserve vector registers

Reviewed-by: eosterlund, rrich

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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.

TheRealMDoerr · 2022-07-11T15:32:14Z

Thanks for the prompt review! I have noticed that the first version may use more space below SP than allowed by ABI. 288 Bytes below SP are "volatile program storage", but we may use more when including the vector registers. I had to change the save & restore sequence a bit.

dean-long · 2022-07-11T22:40:17Z

/label hotspot-compiler

dean-long · 2022-07-11T22:40:26Z

Does this need to be fixed in jdk19?

openjdk · 2022-07-11T22:41:12Z

@dean-long
The hotspot-compiler label was successfully added.

TheRealMDoerr · 2022-07-12T04:52:41Z

Would be nice to have in 19, but it doesn't apply cleanly. There is a workaround. I prefer avoiding merging work for Oracle employees. We need it in 17u and 21 LTS.

reinrich · 2022-07-12T07:13:42Z

src/hotspot/cpu/ppc/gc/z/zBarrierSetAssembler_ppc.cpp

+      } else if (vm_reg->is_VectorSRegister()) {
+        assert(SuperwordUseVSX, "or should not reach here");
+        VectorSRegister vs_reg = vm_reg->as_VectorSRegister();
+        if (vs_reg->encoding() >= VSR32->encoding() && vs_reg->encoding() <= VSR51->encoding()) {


Why VSR32 as lower bound? I read in ppc.ad

1st 32 VSRs are aliases for the FPRs wich are already defined above.

Could you please help and explain what this means?

Why VSR51 as upper bound?

I'd suggest to update the comment in register_ppc.hpp and explain the vector scalar registers.
What is the difference between vector and vector scalar registers?

Thanks for looking at it!
VSRs are not separate registers. They contain the regular FPRs (mapped to 0-31) and VRs (mapped to 32-63). FPRs are managed separately while the VRs are not defined elsewhere in the ppc.ad file. There are instructions which operate on VSRs and can access FPRs and VRs. This was tricky to implement in hotspot (JDK-8188139 and many follow-up fixes).
Only the VRs VR0-VR19 are volatile (see register_ppc.hpp), so only these ones need spilling. (Same is done for other register types.)
VR0-VR19 = VSR32-VSR51
Note that only these ones are currently used by C2 (see reg_class vs_reg in ppc.ad). Reason is that we currently don't preserve the non-volatile ones in the Java entry frame.

Thanks for looking at it! VSRs are not separate registers. They contain the
regular FPRs (mapped to 0-31) and VRs (mapped to 32-63). FPRs are managed
separately while the VRs are not defined elsewhere in the ppc.ad file.

Thanks. I think this should be better explained in register_ppc.hpp.

There are instructions which operate on VSRs and can access FPRs and VRs. This
was tricky to implement in hotspot
(JDK-8188139 and many follow-up
fixes). Only the VRs VR0-VR19 are volatile (see register_ppc.hpp), so only
these ones need spilling. (Same is done for other register types.) VR0-VR19 =
VSR32-VSR51
Note that only these ones are currently used by C2 (see reg_class vs_reg in ppc.ad). Reason is that we currently don't preserve the
non-volatile ones in the Java entry frame.

I see. VSR52-VSR64 are declared SOC in ppc.ad. Shouldn't they be SOE then?

I've added a comment to register_ppc.hpp.
Right, they should be SOE. Changed. Note that this doesn't have any effect because the SOE registers are not allocated by C2. But should get fixed to avoid confusion and for possible future usage.

…gisters

…ck below the SP.

openjdk-notifier · 2022-07-12T09:44:57Z

@TheRealMDoerr Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

reinrich

Thanks Martin, your changes looks good to me now.

The commenting in register_ppc.hpp could still be improved though. E.g. the comment refers to v and vs registers but the declared names are VR and VSR. Probably the declared names should be changed but that's nothing to be done in this pr.

Thanks, Richard.

TheRealMDoerr · 2022-07-12T09:51:39Z

Thanks for the reviews! I just fixed a typo in a comment.

TheRealMDoerr · 2022-07-12T13:29:54Z

/integrate

openjdk · 2022-07-12T13:32:03Z

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

e5491a2: 8289910: unify os::message_box across posix platforms
04c47da: 8289768: Clean up unused code
3b9059a: 8290083: ResponseBodyBeforeError: AssertionError or SSLException: Unsupported or unrecognized SSL message

Your commit was automatically rebased without conflicts.

openjdk · 2022-07-12T13:32:23Z

@TheRealMDoerr Pushed as commit 393dc7a.

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

openjdk bot added the rfr Pull request is ready for review label Jul 11, 2022

openjdk bot added the hotspot hotspot-dev@openjdk.org label Jul 11, 2022

fisk approved these changes Jul 11, 2022

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jul 11, 2022

openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Jul 11, 2022

reinrich reviewed Jul 12, 2022

View reviewed changes

TheRealMDoerr added 3 commits July 12, 2022 11:34

8290082: [PPC64] ZGC C2 load barrier stub needs to preserve vector re…

4f190ae

…gisters

Avoid using more than the volatile program storage (288 Bytes) on sta…

6f5cc2b

…ck below the SP.

Update SOE spec for VSR regs. Add comment to register_ppc.hpp

f6d238e

TheRealMDoerr force-pushed the 8290082_PPC64_ZGC_C2_load_barrier_VSR branch from 2d8fa98 to f6d238e Compare July 12, 2022 09:39

Fix typo in comment.

fab3fa4

reinrich approved these changes Jul 12, 2022

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Jul 12, 2022

openjdk bot closed this Jul 12, 2022

TheRealMDoerr deleted the 8290082_PPC64_ZGC_C2_load_barrier_VSR branch July 12, 2022 13:32

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 12, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8290082: [PPC64] ZGC C2 load barrier stub needs to preserve vector registers #9453

8290082: [PPC64] ZGC C2 load barrier stub needs to preserve vector registers #9453

TheRealMDoerr commented Jul 11, 2022 •

edited by openjdk bot

Loading

bridgekeeper bot commented Jul 11, 2022

openjdk bot commented Jul 11, 2022

mlbridge bot commented Jul 11, 2022 •

edited

Loading

fisk left a comment

openjdk bot commented Jul 11, 2022 •

edited

Loading

TheRealMDoerr commented Jul 11, 2022

dean-long commented Jul 11, 2022

dean-long commented Jul 11, 2022

openjdk bot commented Jul 11, 2022

TheRealMDoerr commented Jul 12, 2022

reinrich Jul 12, 2022

TheRealMDoerr Jul 12, 2022

reinrich Jul 12, 2022

TheRealMDoerr Jul 12, 2022

openjdk-notifier bot commented Jul 12, 2022

reinrich left a comment

TheRealMDoerr commented Jul 12, 2022

TheRealMDoerr commented Jul 12, 2022

openjdk bot commented Jul 12, 2022

openjdk bot commented Jul 12, 2022

8290082: [PPC64] ZGC C2 load barrier stub needs to preserve vector registers #9453

8290082: [PPC64] ZGC C2 load barrier stub needs to preserve vector registers #9453

Conversation

TheRealMDoerr commented Jul 11, 2022 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Jul 11, 2022

openjdk bot commented Jul 11, 2022

mlbridge bot commented Jul 11, 2022 • edited Loading

Webrevs

fisk left a comment

Choose a reason for hiding this comment

openjdk bot commented Jul 11, 2022 • edited Loading

TheRealMDoerr commented Jul 11, 2022

dean-long commented Jul 11, 2022

dean-long commented Jul 11, 2022

openjdk bot commented Jul 11, 2022

TheRealMDoerr commented Jul 12, 2022

reinrich Jul 12, 2022

Choose a reason for hiding this comment

TheRealMDoerr Jul 12, 2022

Choose a reason for hiding this comment

reinrich Jul 12, 2022

Choose a reason for hiding this comment

TheRealMDoerr Jul 12, 2022

Choose a reason for hiding this comment

openjdk-notifier bot commented Jul 12, 2022

reinrich left a comment

Choose a reason for hiding this comment

TheRealMDoerr commented Jul 12, 2022

TheRealMDoerr commented Jul 12, 2022

openjdk bot commented Jul 12, 2022

openjdk bot commented Jul 12, 2022

TheRealMDoerr commented Jul 11, 2022 •

edited by openjdk bot

Loading

mlbridge bot commented Jul 11, 2022 •

edited

Loading

openjdk bot commented Jul 11, 2022 •

edited

Loading