8335367: [s390] Add support for load immediate on condition instructions. #22058

mmatti-sw · 2024-11-13T06:16:23Z

Add support for load immediate on condition instructions.

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

Warning

⚠️ Found trailing period in issue title for 8335367: [s390] Add support for load immediate on condition instructions.

Issue

JDK-8335367: [s390] Add support for load immediate on condition instructions. (Enhancement - P4)

Reviewers

Amit Kumar (@offamitkumar - Committer) Review applies to 31709a7d
Lutz Schmidt (@RealLucy - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22058

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

Using diff file

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

Using Webrev

Link to Webrev Comment

bridgekeeper · 2024-11-13T06:16:50Z

👋 Welcome back mmatti-sw! 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 · 2024-11-13T06:17:20Z

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

8335367: [s390] Add support for load immediate on condition instructions.

Reviewed-by: lucy, amitkumar

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

2979806: 8345795: Update copyright year to 2024 for hotspot in files where it was missed
7e73c43: 8345217: Parallel: Refactor PSParallelCompact::next_src_region
7d3a404: 8339019: Obsolete the UseLinuxPosixThreadCPUClocks flag
a606836: 8345744: Use C++ LINK_TYPE with SetupBuildLauncher in StaticLibs.gmk
fe0173d: 8345803: Update copyright year to 2024 for security in files where it was missed
2207749: 8344629: SSLSocketNoServerHelloClientShutdown test timeout
0b9e749: 8345390: [ubsan] systemDictionaryShared.cpp:964: member call on null pointer
eff20a3: 8345794: Backout doc change introduced by JDK-8235786
48e22ba: 8345693: Update JCov for class file version 69
cc628a1: 8345287: C2: live in computation is broken
... and 559 more: https://git.openjdk.org/jdk/compare/c78de7bf5fc5a4da50c6c64e181abf02a5b12630...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@offamitkumar, @RealLucy) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

openjdk · 2024-11-13T06:18:12Z

@mmatti-sw 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 · 2024-11-13T06:21:28Z

Webrevs

offamitkumar

minor nits to do, otherwise looks good.

src/hotspot/cpu/s390/assembler_s390.hpp

Update the comments as suggested by Amit Kumar Co-authored-by: Amit Kumar <amitlocham09@icloud.com>

offamitkumar · 2024-11-29T04:09:57Z

macOs build failures not related.

@RealLucy free to give a review on this one ?

src/hotspot/cpu/s390/assembler_s390.hpp

RealLucy · 2024-11-29T07:48:45Z

src/hotspot/cpu/s390/macroAssembler_s390.cpp

@@ -3287,7 +3287,7 @@ void MacroAssembler::lookup_secondary_supers_table(Register r_sub_klass,
  z_bru(L_done); // pass whatever result we got from a slow path

  bind(L_failure);
-  // TODO: use load immediate on condition and z_bru above will not be required
+
  z_lghi(r_result, 1);


This lghi deserves a conversion to locghi. Furthermore, without checking for feature availability, the code will require z13 or newer. Is that intended?

yeah, actually that was my intention but then I find out that codepath which jumps to L_failure not comes with setting cc to 2.

testbit(r_array_index, 63); z_bfalse(L_failure);

testbit(r_bitmap, (bit + 1) & Klass::SECONDARY_SUPERS_TABLE_MASK); z_bfalse(L_failure);

So other solution which I could think of is, to assume that search will fail and load 1 at the start

// Initialize r_result with 0 (indicating success). If searching fails, r_result will be loaded // with 1 (failure) at the end of this method. clear_reg(r_result, true /* whole_reg */, false /* set_cc */); // r_result = 0

But then I remembered this: https://github.com/openjdk/jdk/pull/19544/files#r1660693537

So other solution which I could think of is, to assume that search will fail and load 1 at the start

with this we can now look for CC = EQ. And use z_locghi(result, 0, Assembler::bcondEqual);

Also now logic for secondary supers table for c1 & interpreter assumes that search will fail and loads 1 at the start. So to be in sync, better we keep it this way :)

RealLucy

LGTM.

openjdk · 2024-12-04T08:21:01Z

⚠️ @mmatti-sw the full name on your profile does not match the author name in this pull requests' HEAD commit. If this pull request gets integrated then the author name from this pull requests' HEAD commit will be used for the resulting commit. If you wish to push a new commit with a different author name, then please run the following commands in a local repository of your personal fork:

$ git checkout load_imm_on_cond
$ git commit --author='Preferred Full Name <you@example.com>' --allow-empty -m 'Update full name'
$ git push

mmatti-sw · 2024-12-10T09:07:04Z

/integrate

openjdk · 2024-12-10T09:07:58Z

@mmatti-sw
Your change (at version 9f5f396) is now ready to be sponsored by a Committer.

RealLucy · 2024-12-10T14:14:16Z

/sponsor

openjdk · 2024-12-10T14:15:15Z

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

a6277bb: 8340212: -Xshare:off -XX:CompressedClassSpaceBaseAddress=0x40001000000 crashes on macos-aarch64
165fd84: 8342987: Update --release 24 symbol information for JDK 24 build 27
06c44dd: 8345465: Fix performance regression on x64 after JDK-8345120
2979806: 8345795: Update copyright year to 2024 for hotspot in files where it was missed
7e73c43: 8345217: Parallel: Refactor PSParallelCompact::next_src_region
7d3a404: 8339019: Obsolete the UseLinuxPosixThreadCPUClocks flag
a606836: 8345744: Use C++ LINK_TYPE with SetupBuildLauncher in StaticLibs.gmk
fe0173d: 8345803: Update copyright year to 2024 for security in files where it was missed
2207749: 8344629: SSLSocketNoServerHelloClientShutdown test timeout
0b9e749: 8345390: [ubsan] systemDictionaryShared.cpp:964: member call on null pointer
... and 562 more: https://git.openjdk.org/jdk/compare/c78de7bf5fc5a4da50c6c64e181abf02a5b12630...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-12-10T14:15:26Z

@RealLucy @mmatti-sw Pushed as commit 25d9deb.

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

mmatti-sw added 2 commits November 13, 2024 06:08

Add support for load immediate on condition instructions

eb33409

Update

c1e1365

openjdk bot changed the title ~~8335367~~ 8335367: [s390] Add support for load immediate on condition instructions. Nov 13, 2024

openjdk bot added the rfr Pull request is ready for review label Nov 13, 2024

openjdk bot added the hotspot hotspot-dev@openjdk.org label Nov 13, 2024

offamitkumar suggested changes Nov 19, 2024

View reviewed changes

src/hotspot/cpu/s390/assembler_s390.hpp Outdated Show resolved Hide resolved

Update src/hotspot/cpu/s390/assembler_s390.hpp

31709a7

Update the comments as suggested by Amit Kumar Co-authored-by: Amit Kumar <amitlocham09@icloud.com>

offamitkumar approved these changes Nov 29, 2024

View reviewed changes

RealLucy suggested changes Nov 29, 2024

View reviewed changes

Updated based on review comments from Lutz.

9f5f396

mmatti-sw requested a review from RealLucy December 4, 2024 05:30

RealLucy approved these changes Dec 4, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Dec 4, 2024

openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 10, 2024

openjdk bot added the integrated Pull request has been integrated label Dec 10, 2024

openjdk bot closed this Dec 10, 2024

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Dec 10, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8335367: [s390] Add support for load immediate on condition instructions. #22058

8335367: [s390] Add support for load immediate on condition instructions. #22058

mmatti-sw commented Nov 13, 2024 •

edited by openjdk bot

Loading

bridgekeeper bot commented Nov 13, 2024

openjdk bot commented Nov 13, 2024 •

edited

Loading

openjdk bot commented Nov 13, 2024

mlbridge bot commented Nov 13, 2024 •

edited

Loading

offamitkumar left a comment

offamitkumar commented Nov 29, 2024

RealLucy Nov 29, 2024

offamitkumar Nov 29, 2024

offamitkumar Nov 29, 2024

RealLucy left a comment

openjdk bot commented Dec 4, 2024

mmatti-sw commented Dec 10, 2024

openjdk bot commented Dec 10, 2024

RealLucy commented Dec 10, 2024

openjdk bot commented Dec 10, 2024

openjdk bot commented Dec 10, 2024

8335367: [s390] Add support for load immediate on condition instructions. #22058

8335367: [s390] Add support for load immediate on condition instructions. #22058

Conversation

mmatti-sw commented Nov 13, 2024 • edited by openjdk bot Loading

Progress

Warning

Issue

Reviewers

Reviewing

bridgekeeper bot commented Nov 13, 2024

openjdk bot commented Nov 13, 2024 • edited Loading

openjdk bot commented Nov 13, 2024

mlbridge bot commented Nov 13, 2024 • edited Loading

Webrevs

offamitkumar left a comment

Choose a reason for hiding this comment

offamitkumar commented Nov 29, 2024

RealLucy Nov 29, 2024

Choose a reason for hiding this comment

offamitkumar Nov 29, 2024

Choose a reason for hiding this comment

offamitkumar Nov 29, 2024

Choose a reason for hiding this comment

RealLucy left a comment

Choose a reason for hiding this comment

openjdk bot commented Dec 4, 2024

mmatti-sw commented Dec 10, 2024

openjdk bot commented Dec 10, 2024

RealLucy commented Dec 10, 2024

openjdk bot commented Dec 10, 2024

openjdk bot commented Dec 10, 2024

mmatti-sw commented Nov 13, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Nov 13, 2024 •

edited

Loading

mlbridge bot commented Nov 13, 2024 •

edited

Loading