8260369: [PPC64] Add support for JDK-8200555 #2358

TheRealMDoerr · 2021-02-02T16:14:17Z

I'd like to add the PPC64 part of JDK-8200555 "OopHandle should use Access API". This will be required to support ShenandoahGC and zGC.

I have to change register usage. That's what makes this change a bit larger.

Progress

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

Issue

JDK-8260369: [PPC64] Add support for JDK-8200555

Reviewers

Lutz Schmidt (@RealLucy - Reviewer)
@Quaffel (no known github.com user name / role)

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2358/head:pull/2358
$ git checkout pull/2358

bridgekeeper · 2021-02-02T16:14:24Z

👋 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 · 2021-02-02T16:15:22Z

@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 · 2021-02-03T20:48:56Z

Webrevs

RealLucy

Changes look good to me.
Please review and act on my inline comment on interp_masm_ppc_64.cpp(line 507).
Thanks, Lutz

RealLucy · 2021-02-04T11:31:46Z

src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp

  load_heap_oop(result, arrayOopDesc::base_offset_in_bytes(T_OBJECT), result,
                tmp1, tmp2,
-                MacroAssembler::PRESERVATION_FRAME_LR,
+                MacroAssembler::MacroAssembler::PRESERVATION_NONE,


Are you sure you need this duplicate class specification?

RealLucy

LGTM

openjdk · 2021-02-04T12:54:25Z

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

8260369: [PPC64] Add support for JDK-8200555

Reviewed-by: lucy

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

224c166: 8261213: [BACKOUT] MutableSpace's end should be atomic
3495feb: 8260296: SA's dumpreplaydata fails
0791899: 8261154: Memory leak in Java_java_lang_ClassLoader_defineClass0 with long class names
78b0d32: 8234534: Simplify CardTable code after CMS removal
ee2f205: 8260926: Trace resource exhausted events unconditionally
1e0a101: 8259862: MutableSpace's end should be atomic
d2bd499: 8163498: Many long-running security libs tests
c5bb109: 8260019: Move some Thread subtypes out of thread.hpp
08f7454: 8261190: restore original Alibaba copyright line in two files
3bb6a3d: 8261109: [macOS] Remove disabled warning for JNF in make/autoconf/flags-cflags.m4
... and 53 more: https://git.openjdk.java.net/jdk/compare/0093183b33601c13600c78f406f479c4f65dfe0a...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.

TheRealMDoerr · 2021-02-04T13:08:03Z

Thanks for the review!
MacroAssembler::MacroAssembler::PRESERVATION_NONE was a copy&paste bug.
And while fixing it, I noticed that I should use PRESERVATION_NONE in load_field_cp_cache_entry, too, which fits better to the interpreter design on PPC64 where we can usually call C without any save&restore code:
be66f4e
Tested by using clobber code and running a benchmark.

Quaffel

Looks very good! Took some time to understand why load_resolved_reference_at_index can be used without the need for register preservation, but seems to work just fine! I just have some very minor styling complains. Would be great if you could address those, but that's definitely no requirement.

Quaffel · 2021-02-04T13:23:13Z

src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp

-           Rconst_method       = R8_ARG6;
+           Rconst_method       = R8_ARG6,
+           Rconst_pool         = R9_ARG7,
+           R10_tmp             = R10_ARG8;

  assert_different_registers(Rsize_of_parameters, Rsize_of_locals, parent_frame_resize, top_frame_size);


Consider strengthening the assertion. Rconst_method, for instance, must not be equals to Rsize_of_parameters.

Quaffel · 2021-02-05T08:45:34Z

src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp

  Register parent_frame_resize = R6_ARG4, // Frame will grow by this number of bytes.
           top_frame_size      = R7_ARG5,
-           Rconst_method       = R8_ARG6;
+           Rconst_method       = R8_ARG6,
+           Rconst_pool         = R9_ARG7,
+           R10_tmp             = R10_ARG8;


Three variable naming styles in 5 LOCs. Would be great to have a consistent naming style throughout this function.

Quaffel · 2021-02-05T09:29:22Z

src/hotspot/cpu/ppc/templateTable_ppc_64.cpp

    __ bind(Ldone);
  }

  // Load receiver if needed (after appendix is pushed so parameter size is correct).
  if (load_receiver) {
-    const Register Rparam_count = Rscratch;
+    const Register Rparam_count = Rscratch1;


The other variables of type Register declared in this method aren't const, although they aren't subject to change as well.

Quaffel

Seems like GitHub didn't show the latest changes to me. Looks good as well, nice optimization!

Quaffel

Thanks for implementing the feeback. I have nothing to add!

RealLucy

Still looks good to me.

TheRealMDoerr · 2021-02-05T12:57:47Z

Thanks for the reviews!
/integrate

openjdk · 2021-02-05T12:58:48Z

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

224c166: 8261213: [BACKOUT] MutableSpace's end should be atomic
3495feb: 8260296: SA's dumpreplaydata fails
0791899: 8261154: Memory leak in Java_java_lang_ClassLoader_defineClass0 with long class names
78b0d32: 8234534: Simplify CardTable code after CMS removal
ee2f205: 8260926: Trace resource exhausted events unconditionally
1e0a101: 8259862: MutableSpace's end should be atomic
d2bd499: 8163498: Many long-running security libs tests
c5bb109: 8260019: Move some Thread subtypes out of thread.hpp
08f7454: 8261190: restore original Alibaba copyright line in two files
3bb6a3d: 8261109: [macOS] Remove disabled warning for JNF in make/autoconf/flags-cflags.m4
... and 53 more: https://git.openjdk.java.net/jdk/compare/0093183b33601c13600c78f406f479c4f65dfe0a...master

Your commit was automatically rebased without conflicts.

Pushed as commit 48f5220.

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

8260369: [PPC64] Add support for JDK-8200555

2fe4914

openjdk bot added the hotspot hotspot-dev@openjdk.org label Feb 2, 2021

TheRealMDoerr added 2 commits February 3, 2021 16:58

remove debugging code

5623b93

add resolve_weak_handle which is also available on other platforms

7636d1a

TheRealMDoerr marked this pull request as ready for review February 3, 2021 20:45

openjdk bot added the rfr Pull request is ready for review label Feb 3, 2021

RealLucy reviewed Feb 4, 2021

View reviewed changes

remove duplicate MacroAssembler::MacroAssembler::

021aec1

RealLucy approved these changes Feb 4, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Feb 4, 2021

use PRESERVATION_NONE in load_field_cp_cache_entry

be66f4e

Quaffel approved these changes Feb 5, 2021

View reviewed changes

feedback from Niklas

32e919d

Quaffel approved these changes Feb 5, 2021

View reviewed changes

RealLucy approved these changes Feb 5, 2021

View reviewed changes

openjdk bot closed this Feb 5, 2021

openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated labels Feb 5, 2021

TheRealMDoerr deleted the 8260369_ppc64_interp branch February 5, 2021 12:58

openjdk bot removed the rfr Pull request is ready for review label Feb 5, 2021

8260369: [PPC64] Add support for JDK-8200555 #2358

8260369: [PPC64] Add support for JDK-8200555 #2358

TheRealMDoerr commented Feb 2, 2021 •

edited by openjdk bot

bridgekeeper bot commented Feb 2, 2021

openjdk bot commented Feb 2, 2021

mlbridge bot commented Feb 3, 2021 •

edited

RealLucy left a comment

RealLucy Feb 4, 2021

RealLucy left a comment

openjdk bot commented Feb 4, 2021 •

edited

TheRealMDoerr commented Feb 4, 2021

Quaffel left a comment

Quaffel Feb 4, 2021

Quaffel Feb 5, 2021

Quaffel Feb 5, 2021

Quaffel left a comment •

edited

Quaffel left a comment

RealLucy left a comment

TheRealMDoerr commented Feb 5, 2021

openjdk bot commented Feb 5, 2021

8260369: [PPC64] Add support for JDK-8200555 #2358

8260369: [PPC64] Add support for JDK-8200555 #2358

Conversation

TheRealMDoerr commented Feb 2, 2021 • edited by openjdk bot

Progress

Issue

Reviewers

Download

bridgekeeper bot commented Feb 2, 2021

openjdk bot commented Feb 2, 2021

mlbridge bot commented Feb 3, 2021 • edited

Webrevs

RealLucy left a comment

Choose a reason for hiding this comment

RealLucy Feb 4, 2021

Choose a reason for hiding this comment

RealLucy left a comment

Choose a reason for hiding this comment

openjdk bot commented Feb 4, 2021 • edited

TheRealMDoerr commented Feb 4, 2021

Quaffel left a comment

Choose a reason for hiding this comment

Quaffel Feb 4, 2021

Choose a reason for hiding this comment

Quaffel Feb 5, 2021

Choose a reason for hiding this comment

Quaffel Feb 5, 2021

Choose a reason for hiding this comment

Quaffel left a comment • edited

Choose a reason for hiding this comment

Quaffel left a comment

Choose a reason for hiding this comment

RealLucy left a comment

Choose a reason for hiding this comment

TheRealMDoerr commented Feb 5, 2021

openjdk bot commented Feb 5, 2021

TheRealMDoerr commented Feb 2, 2021 •

edited by openjdk bot

mlbridge bot commented Feb 3, 2021 •

edited

openjdk bot commented Feb 4, 2021 •

edited

Quaffel left a comment •

edited