8313438: [s390x] build broken after JDK-8301996 #15885

offamitkumar · 2023-09-22T10:34:07Z

Build Fix after JDK-8301996.

Warnings related to new Lightweight locking scheme are seen during the build phase, but we will get rid of them, after integrating #14414 . Testing done for release-vm, slowdebug-vm, fastdebug-vm and optimized-vm.

3 Test failures seen on s390x are un-related to these changes.

jdk/jshell/ClassMembersTest.java
java/lang/invoke/condy/CondyWrongType.java
java/lang/invoke/condy/CondyWithGarbageTest.java

JBS issue for test failures: JDK-8317581.

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-8313438: [s390x] build broken after JDK-8301996 (Bug - P2)

Reviewers

Martin Doerr (@TheRealMDoerr - Reviewer)
Lutz Schmidt (@RealLucy - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15885

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2023-09-22T10:35:54Z

👋 Welcome back amitkumar! 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 · 2023-09-22T10:38:44Z

@offamitkumar The following label will be automatically applied to this pull request:

hotspot-compiler

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 · 2023-09-22T10:42:32Z

Webrevs

offamitkumar · 2023-10-05T14:30:20Z

Hi @RealLucy , @TheRealMDoerr

Please consider to review this PR, as per your availability.

Thank you.

TheRealMDoerr

Looks basically good, but I have a couple of questions and suggestions.

src/hotspot/cpu/s390/templateTable_s390.cpp

TheRealMDoerr · 2023-10-06T10:29:15Z

src/hotspot/cpu/s390/templateTable_s390.cpp

+
+  // Displacement is 0. No need to care about limited displacement range.
+  const Address field(fieldAddr);
+  __ lgr_if_needed(fieldAddr, off);


Was there a problem with the range? Why did it work in the old implementation?

The comment is related to the uses of field. Depending on the instruction, disc is limited to be uimm12 or simm20. But the Address object is with displacement == 0.

I didn't get why the separate agr instructions are needed as part of this PR. Isn't that a separate issue?

Martin, Are you referring to the fix for preserving flag register value till the end ?

If you want that this case to be handled in separate PR, then I'll file a JBS issue.

I need an explanation why this code was changed this way. If it is required for this PR, please explain in comments. If it's a separate issue, please handle separately.

Oh, Issue was with the flag register value. We need to check the volatility at the end of putfield_or_static method. And previous implementation was not preserving the value till the end, why it was working then ? That I don't know.

Current Implementation uses z_tmp_1 for saving flag value till end. obj now points to Z_ARG5 which is also pointed by oopStore_tmp2, and if we don't use agr then in case of object/atos , will run into Multiple usecase for Z_R6 error from do_oop_store() method .

Is the agr only used to save a register? That should be explained in the comments. I believe it's only needed for the object case, right?

The prior implementation used two non-volatile registers. Due to register shortage, only one register can be used. Penalty: compute the sum of obj and off explicitly immediately after the obj pointer is popped from stack. In the non-static case, this can't be done upfront.

src/hotspot/cpu/s390/templateTable_s390.cpp

RealLucy · 2023-10-06T10:56:37Z

src/hotspot/cpu/s390/templateTable_s390.cpp

+
+  // Displacement is 0. No need to care about limited displacement range.
+  const Address field(fieldAddr);
+  __ lgr_if_needed(fieldAddr, off);


The comment is related to the uses of field. Depending on the instruction, disc is limited to be uimm12 or simm20. But the Address object is with displacement == 0.

src/hotspot/cpu/s390/templateTable_s390.cpp

TheRealMDoerr

I couldn't spot any obvious bug. Changes lgtm.

openjdk · 2023-10-09T11:06:40Z

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

8313438: [s390x] build broken after JDK-8301996

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

3ff5a78: 8317693: Unused parameter to Tokens.Token.comment method
508fa71: 8317736: Stream::handleReset locks twice
1f06325: 8317471: ListFormat::parseObject() spec can be improved on parsePosition valid values
a07a4a3: 8317422: [JVMCI] concurrency issue in MethodData creation
7ff1938: 8310727: C2: *_of() methods in PhaseIterGVN should use uint for the node index
a57ae7e: 8317594: G1: Refactor find_empty_from_idx_reverse
6ddbfaa: 8317136: [AIX] Problem List runtime/jni/terminatedThread/TestTerminatedThread.java
0cf1a55: 8317440: Lock rank checking fails when code root set is modified with the Servicelock held after JDK-8315503
bcc986b: 8317601: Windows build on WSL broken after JDK-8317340
460ebcd: 8314978: Multiple server call from connection failing with expect100 in getOutputStream
... and 16 more: https://git.openjdk.org/jdk/compare/a250ae4d1b9c27757eb12d2f1673187c862149aa...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.

RealLucy

Looks good to me, finally.
Thank you for patiently considering all the comments and change requests.

RealLucy · 2023-10-09T18:04:55Z

src/hotspot/cpu/s390/templateTable_s390.cpp

+
+  // Displacement is 0. No need to care about limited displacement range.
+  const Address field(fieldAddr);
+  __ lgr_if_needed(fieldAddr, off);


The prior implementation used two non-volatile registers. Due to register shortage, only one register can be used. Penalty: compute the sum of obj and off explicitly immediately after the obj pointer is popped from stack. In the non-static case, this can't be done upfront.

src/hotspot/cpu/s390/templateTable_s390.cpp

offamitkumar · 2023-10-11T08:49:11Z

Thank you Martin, Lutz. For your valuable reviews & suggestions.

/integrate

openjdk · 2023-10-11T08:49:58Z

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

ca96fd3: 8317839: Exclude java/nio/channels/Channels/SocketChannelStreams.java on AIX
a9b41da: 8317603: Improve exception messages thrown by sun.nio.ch.Net native methods (win)
0fd8071: 8317738: CodeCacheFullCountTest failed with "VirtualMachineError: Out of space in CodeCache for method handle intrinsic"
1161e3d: 8317803: Exclude java/net/Socket/asyncClose/Race.java on AIX
e55c482: 8317790: Fix Bug entry for exclusion of runtime/jni/terminatedThread/TestTerminatedThread.java on AIX
84b7cc1: 8317761: Combine two versions of print_statistics() in java.cpp
3aa4cba: 8316975: Memory leak in MTLSurfaceData
54861df: 8317802: jmh tests fail with Unable to find the resource: /META-INF/BenchmarkList after JDK-8306819
f40ea51: 8317751: ProblemList ConsumeForModalDialogTest.java, MenuItemActivatedTest.java & MouseModifiersUnitTest_Standard.java for windows
fec1d49: 8316452: java/lang/instrument/modules/AppendToClassPathModuleTest.java ignores VM flags
... and 41 more: https://git.openjdk.org/jdk/compare/a250ae4d1b9c27757eb12d2f1673187c862149aa...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-10-11T08:50:08Z

@offamitkumar Pushed as commit 7976151.

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

openjdk bot changed the title ~~8313438~~ 8313438: [s390x] build broken after JDK-8301996 Sep 22, 2023

openjdk bot added the rfr Pull request is ready for review label Sep 22, 2023

openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Sep 22, 2023

offamitkumar marked this pull request as draft September 22, 2023 14:29

openjdk bot removed the rfr Pull request is ready for review label Sep 22, 2023

offamitkumar force-pushed the JDK-8313438 branch 5 times, most recently from b8b5c5a to 5c381ef Compare September 27, 2023 09:35

offamitkumar force-pushed the JDK-8313438 branch from e383004 to d17a366 Compare October 5, 2023 09:54

s390 Invoke Field Port

4d2e1de

offamitkumar force-pushed the JDK-8313438 branch from d17a366 to 4d2e1de Compare October 5, 2023 09:55

offamitkumar marked this pull request as ready for review October 5, 2023 10:11

openjdk bot added the rfr Pull request is ready for review label Oct 5, 2023

TheRealMDoerr reviewed Oct 6, 2023

View reviewed changes

RealLucy suggested changes Oct 6, 2023

View reviewed changes

adds suggestions

f2afd8b

TheRealMDoerr suggested changes Oct 6, 2023

View reviewed changes

src/hotspot/cpu/s390/templateTable_s390.cpp Outdated Show resolved Hide resolved

uses assert instead of if-statement

deeb70e

TheRealMDoerr approved these changes Oct 9, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Oct 9, 2023

RealLucy approved these changes Oct 9, 2023

View reviewed changes

offamitkumar commented Oct 11, 2023

View reviewed changes

src/hotspot/cpu/s390/templateTable_s390.cpp Show resolved Hide resolved

openjdk bot added the integrated Pull request has been integrated label Oct 11, 2023

openjdk bot closed this Oct 11, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 11, 2023

offamitkumar deleted the JDK-8313438 branch May 15, 2024 09:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8313438: [s390x] build broken after JDK-8301996 #15885

8313438: [s390x] build broken after JDK-8301996 #15885

offamitkumar commented Sep 22, 2023 •

edited by openjdk bot

Loading

bridgekeeper bot commented Sep 22, 2023

openjdk bot commented Sep 22, 2023

mlbridge bot commented Sep 22, 2023 •

edited

Loading

offamitkumar commented Oct 5, 2023

TheRealMDoerr left a comment

TheRealMDoerr Oct 6, 2023

RealLucy Oct 6, 2023

TheRealMDoerr Oct 6, 2023

offamitkumar Oct 6, 2023

offamitkumar Oct 6, 2023

TheRealMDoerr Oct 6, 2023

offamitkumar Oct 6, 2023

TheRealMDoerr Oct 6, 2023

RealLucy Oct 9, 2023

RealLucy Oct 6, 2023

TheRealMDoerr left a comment

openjdk bot commented Oct 9, 2023 •

edited

Loading

RealLucy left a comment

RealLucy Oct 9, 2023

offamitkumar commented Oct 11, 2023

openjdk bot commented Oct 11, 2023

openjdk bot commented Oct 11, 2023

8313438: [s390x] build broken after JDK-8301996 #15885

8313438: [s390x] build broken after JDK-8301996 #15885

Conversation

offamitkumar commented Sep 22, 2023 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Sep 22, 2023

openjdk bot commented Sep 22, 2023

mlbridge bot commented Sep 22, 2023 • edited Loading

Webrevs

offamitkumar commented Oct 5, 2023

TheRealMDoerr left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TheRealMDoerr left a comment

Choose a reason for hiding this comment

openjdk bot commented Oct 9, 2023 • edited Loading

RealLucy left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

offamitkumar commented Oct 11, 2023

openjdk bot commented Oct 11, 2023

openjdk bot commented Oct 11, 2023

offamitkumar commented Sep 22, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Sep 22, 2023 •

edited

Loading

openjdk bot commented Oct 9, 2023 •

edited

Loading