8264173: [s390] Improve Hardware Feature Detection And Reporting #3196

RealLucy · 2021-03-25T15:28:21Z

This enhancement is intended to improve the hardware feature detection and reporting, in particular for more recently introduced hardware. The enhancement is a prerequisite for possible future feature exploitation.

Reviews are highly welcome and appreciated.

Progress

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

Issue

JDK-8264173: [s390] Improve Hardware Feature Detection And Reporting

Reviewers

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

Reviewing

Using git

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

Update a local copy of the PR:
$ git checkout pull/3196
$ git pull https://git.openjdk.java.net/jdk pull/3196/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3196

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3196.diff

bridgekeeper · 2021-03-25T15:28:51Z

👋 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-25T15:30:42Z

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

mlbridge · 2021-03-25T15:34:40Z

Webrevs

RealLucy · 2021-03-25T16:07:12Z

/cc hotspot-compiler

openjdk · 2021-03-25T16:07:51Z

@RealLucy
The hotspot-compiler label was successfully added.

TheRealMDoerr

I didn't expect the change to become that large. But it looks good to me. The lengthy output only gets generated with -XX:+Verbose. That's fine.

TheRealMDoerr · 2021-03-29T09:56:26Z

src/hotspot/cpu/s390/vm_version_s390.cpp

+                                   "system-z, g7-z13, ldisp_fast, extimm, pcrel_load/store, cmpb, cond_load/store, interlocked_update, txm, vectorinstr",
+                                   "system-z, g8-z14, ldisp_fast, extimm, pcrel_load/store, cmpb, cond_load/store, interlocked_update, txm, vectorinstr, instrext2, venh1)",
+                                   "system-z, g9-z15, ldisp_fast, extimm, pcrel_load/store, cmpb, cond_load/store, interlocked_update, txm, vectorinstr, instrext2, venh1, instrext3, VEnh2 )"
+                                  };


Would be nice to generate the feature string from a table it instead of having so many copies. But I'm ok with it for now.

TheRealMDoerr · 2021-03-29T10:13:26Z

src/hotspot/cpu/s390/vm_version_s390.cpp

-  if (Verbose) {
-    print_features();
+  if (Verbose || PrintAssembly || PrintStubCode) {
+    print_features_internal("CPU Version as detected internally:  ", PrintAssembly || PrintStubCode);


2 spaces while other usages have no spaces?

You are right. These spaces were excessive. Now they are gone.

openjdk · 2021-03-29T10:19:50Z

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

8264173: [s390] Improve Hardware Feature Detection And Reporting

Reviewed-by: mdoerr, goetz

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

9d65039: 8263984: Invalidate printServices when there are no printers
adb860e: 8255800: Raster creation methods need some specification clean up
eab8455: 8261137: Optimization of Box nodes in uncommon_trap
92fad1b: 8264680: Use the blessed modifier order in java.desktop
17202c8: 8264748: Do not include arguments.hpp from compilerDefinitions.hpp
c3abdc9: 8264797: Do not include klassVtable.hpp from instanceKlass.hpp
eb5c097: 8262389: Use permitted_enctypes if default_tkt_enctypes or default_tgs_enctypes is not present
bfb034a: 8264524: jdk/internal/platform/docker/TestDockerMemoryMetrics.java fails due to swapping not working
a756d8d: 8264759: x86_32 Minimal VM build failure after JDK-8262355
0f13e22: 8264791: java/util/Random/RandomTestBsi1999.java failed "java.security.SecureRandom nextFloat consecutive"
... and 151 more: https://git.openjdk.java.net/jdk/compare/f69afba52735008613f0ede7d650372e95e9a6e0...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 · 2021-03-29T10:32:40Z

Thank you for the review, Martin!

GoeLin · 2021-04-07T16:15:38Z

LGTM

RealLucy · 2021-04-07T16:18:28Z

Thank you Goetz!
I will now proceed and integrate the PR.

RealLucy · 2021-04-07T16:19:03Z

/integrate

openjdk · 2021-04-07T16:20:49Z

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

9d65039: 8263984: Invalidate printServices when there are no printers
adb860e: 8255800: Raster creation methods need some specification clean up
eab8455: 8261137: Optimization of Box nodes in uncommon_trap
92fad1b: 8264680: Use the blessed modifier order in java.desktop
17202c8: 8264748: Do not include arguments.hpp from compilerDefinitions.hpp
c3abdc9: 8264797: Do not include klassVtable.hpp from instanceKlass.hpp
eb5c097: 8262389: Use permitted_enctypes if default_tkt_enctypes or default_tgs_enctypes is not present
bfb034a: 8264524: jdk/internal/platform/docker/TestDockerMemoryMetrics.java fails due to swapping not working
a756d8d: 8264759: x86_32 Minimal VM build failure after JDK-8262355
0f13e22: 8264791: java/util/Random/RandomTestBsi1999.java failed "java.security.SecureRandom nextFloat consecutive"
... and 151 more: https://git.openjdk.java.net/jdk/compare/f69afba52735008613f0ede7d650372e95e9a6e0...master

Your commit was automatically rebased without conflicts.

Pushed as commit d3fdd73.

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

8264173: [s390] Improve Hardware Feature Detection And Reporting

3f52424

openjdk bot added the rfr Pull request is ready for review label Mar 25, 2021

openjdk bot added the hotspot hotspot-dev@openjdk.org label Mar 25, 2021

openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Mar 25, 2021

update copyright headers

d15d115

TheRealMDoerr approved these changes Mar 29, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Mar 29, 2021

cleaned up some spaces

f894238

GoeLin approved these changes Apr 7, 2021

View reviewed changes

openjdk bot closed this Apr 7, 2021

openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 7, 2021

RealLucy deleted the JDK-8264173 branch April 7, 2021 17:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8264173: [s390] Improve Hardware Feature Detection And Reporting #3196

8264173: [s390] Improve Hardware Feature Detection And Reporting #3196

RealLucy commented Mar 25, 2021 •

edited by openjdk bot

bridgekeeper bot commented Mar 25, 2021

openjdk bot commented Mar 25, 2021

mlbridge bot commented Mar 25, 2021 •

edited

RealLucy commented Mar 25, 2021

openjdk bot commented Mar 25, 2021

TheRealMDoerr left a comment

TheRealMDoerr Mar 29, 2021

TheRealMDoerr Mar 29, 2021

RealLucy Mar 29, 2021

openjdk bot commented Mar 29, 2021 •

edited

RealLucy commented Mar 29, 2021

GoeLin commented Apr 7, 2021

RealLucy commented Apr 7, 2021

RealLucy commented Apr 7, 2021

openjdk bot commented Apr 7, 2021

8264173: [s390] Improve Hardware Feature Detection And Reporting #3196

8264173: [s390] Improve Hardware Feature Detection And Reporting #3196

Conversation

RealLucy commented Mar 25, 2021 • edited by openjdk bot

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Mar 25, 2021

openjdk bot commented Mar 25, 2021

mlbridge bot commented Mar 25, 2021 • edited

Webrevs

RealLucy commented Mar 25, 2021

openjdk bot commented Mar 25, 2021

TheRealMDoerr left a comment

Choose a reason for hiding this comment

TheRealMDoerr Mar 29, 2021

Choose a reason for hiding this comment

TheRealMDoerr Mar 29, 2021

Choose a reason for hiding this comment

RealLucy Mar 29, 2021

Choose a reason for hiding this comment

openjdk bot commented Mar 29, 2021 • edited

RealLucy commented Mar 29, 2021

GoeLin commented Apr 7, 2021

RealLucy commented Apr 7, 2021

RealLucy commented Apr 7, 2021

openjdk bot commented Apr 7, 2021

RealLucy commented Mar 25, 2021 •

edited by openjdk bot

mlbridge bot commented Mar 25, 2021 •

edited

openjdk bot commented Mar 29, 2021 •

edited