8263260: [s390] Support latest hardware (z14 and z15) #2918

RealLucy · 2021-03-10T17:35:20Z

Progress

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

Issue

JDK-8263260: [s390] Support latest hardware (z14 and z15)

Reviewers

Goetz Lindenmaier (@GoeLin - Reviewer) ⚠️ Review applies to c8dcfb4
Martin Doerr (@TheRealMDoerr - Reviewer)

Download

To checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/2918/head:pull/2918
$ git checkout pull/2918

To update a local copy of the PR:
$ git checkout pull/2918
$ git pull https://git.openjdk.java.net/jdk pull/2918/head

bridgekeeper · 2021-03-10T17:35:43Z

👋 Welcome back lucy! 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-03-10T17:36:35Z

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

RealLucy · 2021-03-12T13:02:14Z

Dear Community,
I would appreciate reviews for this enhancement, adding basic detection and support for recent s390 hardware generations.
Thank you!
Lutz

mlbridge · 2021-03-12T13:05:13Z

Webrevs

01: Full - Incremental (1ab0d05)
00: Full (c8dcfb4)

GoeLin

LGTM

openjdk · 2021-03-18T10:22:31Z

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

8263260: [s390] Support latest hardware (z14 and z15)

Reviewed-by: goetz, mdoerr

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

0abbfb2: 8263729: [test] divert spurious output away from stream under test in ProcessBuilder Basic test
6c2220e: 8263861: Shenandoah: Remove unused member in ShenandoahGCStateResetter
5262d95: 8263855: Use the blessed modifier order in java.management/naming
6f1bcb0: 8263593: Fix multiple typos in hsdis README
a9d2267: 8260589: Crash in JfrTraceIdLoadBarrier::load(_jclass*)
42104e5: 8263488: Verify CWarningWindow works with metal rendering pipeline
5a7f22a: 8263579: ZGC: Concurrent mark hangs with debug loglevel
35cd945: 8263908: Build fails due to initialize_static_field_for_dump defined but not used after JDK-8263771
cd45538: 8263771: Refactor javaClasses initialization code to isolate dumping code
118a49f: 8263846: Bad JNI lookup getFocusOwner in accessibility code on Mac OS X
... and 178 more: https://git.openjdk.java.net/jdk/compare/b7f0b3fc8b556b352fd7593ca674ab8e562c709a...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

Detection looks good to me.
Cleanup proposal: Try to make dates more consistent and comprehensive.

TheRealMDoerr · 2021-03-18T11:46:53Z

src/hotspot/cpu/s390/vm_version_s390.cpp

+static const char* z_machine[] = {"  ", "2064",       "2084",       "2094",       "2097",       "2817",       "2827",       "2964",       "3906",       "8561" };
+static const char* z_name[]    = {"  ", "z900",       "z990",       "z9 EC",      "z10 EC",     "z196 EC",    "ec12",       "z13",        "z14",        "z15" };
+static const char* z_WDFM[]    = {"  ", "2006-06-30", "2008-06-30", "2010-06-30", "2012-06-30", "2014-06-30", "2016-12-31", "2019-06-30", "2021-06-30", "tbd" };
+static const char* z_EOS[]     = {"  ", "2014-12-31", "2014-12-31", "2017-10-31", "2019-12-31", "2021-12-31", "tbd",        "tbd",        "tbd",        "tbd" };


Table provides a nice overview, but seems like only z_name is used in the code. The rest only serves as comments.

You are right, as of now, the tables are mostly for documentation. z_EOS is used now to fill _features_string. I'd like to keep the tables as they are for possible future use.

TheRealMDoerr · 2021-03-18T11:46:53Z

src/hotspot/cpu/s390/vm_version_s390.cpp

    _model_string = z_name[4];
    ambiguity++;
  }
  if (is_z9()) {
-    _features_string = "system-z, g3-z9, ldisp_fast, extimm, out-of-support as of 2016-04-01";
+    _features_string = "system-z, g3-z9, ldisp_fast, extimm, out-of-support_as_of_2016-04-01";


How does this relate to the table above?

Changed such that End-of-Support information is taken from table z_EOS[].

TheRealMDoerr · 2021-03-18T11:46:53Z

src/hotspot/cpu/s390/vm_version_s390.hpp

@@ -44,6 +44,8 @@ class VM_Version: public Abstract_VM_Version {
 //   z196: 2010-08
 //   ec12: 2012-09
 //   z13:  2015-03
+//   z14:  2017-09
+//   z15:  2019-09


How does this relate to the table in the .cpp file? I'd prefer to have such kind of information consolidated at one place.

Consolidated information in vm_version_s390.cpp.

TheRealMDoerr

Thanks for cleaning up! LGTM.

RealLucy · 2021-03-22T15:10:15Z

Goetz and Martin,
thanks a lot for your reviews.
Lutz

RealLucy · 2021-03-23T11:49:07Z

/integrate

RealLucy · 2021-03-23T11:49:47Z

Build errors on Win-x64 are unrelated to these s390-only changes.

openjdk · 2021-03-23T11:50:47Z

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

de2ff25: 8263974: Move SystemDictionary::verify_protection_domain
9dad857: 8263080: Obsolete relationship in MulticastSocket API documentation.
851474a: 8263649: AArch64: update cas.m4 to match current AD file
fd3a33a: 8263189: C2: assert(!had_error) failed: bad dominance
7b81f8e: 8263915: runtime/cds/appcds/MismatchedPathTriggerMemoryRelease.java fails when UseCompressedClassPointers is off
2da882c: 8262465: Very long compilation times and high memory consumption in C2 debug builds
0b03d04: 8167015: compiler/codecache/jmx/PoolsIndependenceTest.java timeout
df01b15: 8263977: GTK L&F: Cleanup duplicate checks in GTKStyle and GTKLookAndFeel
57d8f1d: 8263985: BCEscapeAnalyzer::invoke checks target->is_loaded() twice
4ef7c67: 8263979: Cleanup duplicate check in Unicode.contains
... and 202 more: https://git.openjdk.java.net/jdk/compare/b7f0b3fc8b556b352fd7593ca674ab8e562c709a...master

Your commit was automatically rebased without conflicts.

Pushed as commit fbd57bd.

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

8263260: [s390] Support latest hardware (z14 and z15)

c8dcfb4

openjdk bot added the hotspot label Mar 10, 2021

RealLucy marked this pull request as ready for review Mar 12, 2021

openjdk bot added the rfr label Mar 12, 2021

GoeLin approved these changes Mar 18, 2021

View changes

openjdk bot added the ready label Mar 18, 2021

TheRealMDoerr approved these changes Mar 18, 2021

View changes

Changes as requested by TheRealMDoerr

1ab0d05

TheRealMDoerr approved these changes Mar 22, 2021

View changes

openjdk bot closed this Mar 23, 2021

openjdk bot added integrated and removed ready rfr labels Mar 23, 2021

8263260: [s390] Support latest hardware (z14 and z15) #2918

8263260: [s390] Support latest hardware (z14 and z15) #2918

RealLucy commented Mar 10, 2021 •

edited by openjdk[bot] bot

bridgekeeper bot commented Mar 10, 2021

openjdk bot commented Mar 10, 2021

RealLucy commented Mar 12, 2021

mlbridge bot commented Mar 12, 2021 •

edited

GoeLin left a comment

openjdk bot commented Mar 18, 2021 •

edited

TheRealMDoerr left a comment

TheRealMDoerr Mar 18, 2021

RealLucy Mar 22, 2021

TheRealMDoerr Mar 18, 2021

RealLucy Mar 22, 2021

TheRealMDoerr Mar 18, 2021

RealLucy Mar 22, 2021

TheRealMDoerr left a comment

RealLucy commented Mar 22, 2021

RealLucy commented Mar 23, 2021

RealLucy commented Mar 23, 2021

openjdk bot commented Mar 23, 2021

8263260: [s390] Support latest hardware (z14 and z15) #2918

8263260: [s390] Support latest hardware (z14 and z15) #2918

Conversation

RealLucy commented Mar 10, 2021 • edited by openjdk[bot] bot

Progress

Issue

Reviewers

Download

bridgekeeper bot commented Mar 10, 2021

openjdk bot commented Mar 10, 2021

RealLucy commented Mar 12, 2021

mlbridge bot commented Mar 12, 2021 • edited

Webrevs

GoeLin left a comment

openjdk bot commented Mar 18, 2021 • edited

TheRealMDoerr left a comment

TheRealMDoerr Mar 18, 2021

Choose a reason for hiding this comment

RealLucy Mar 22, 2021

Choose a reason for hiding this comment

TheRealMDoerr Mar 18, 2021

Choose a reason for hiding this comment

RealLucy Mar 22, 2021

Choose a reason for hiding this comment

TheRealMDoerr Mar 18, 2021

Choose a reason for hiding this comment

RealLucy Mar 22, 2021

Choose a reason for hiding this comment

TheRealMDoerr left a comment

RealLucy commented Mar 22, 2021

RealLucy commented Mar 23, 2021

RealLucy commented Mar 23, 2021

openjdk bot commented Mar 23, 2021

RealLucy commented Mar 10, 2021 •

edited by openjdk[bot] bot

mlbridge bot commented Mar 12, 2021 •

edited

openjdk bot commented Mar 18, 2021 •

edited