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

[Lutz Schmidt]

On Mon, 22 Mar 2021 15:09:05 GMT, Martin Doerr <mdoerr at openjdk.org> wrote:

>> Lutz Schmidt has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   Changes as requested by TheRealMDoerr
>
> Thanks for cleaning up! LGTM.

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

> src/hotspot/cpu/s390/vm_version_s390.cpp line 54:
> 
>> 52: static const char* z_name[]    = {"  ", "z900",       "z990",       "z9 EC",      "z10 EC",     "z196 EC",    "ec12",       "z13",        "z14",        "z15" };
>> 53: 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" };
>> 54: 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.

> src/hotspot/cpu/s390/vm_version_s390.cpp line 309:
> 
>> 307:   }
>> 308:   if (is_z9()) {
>> 309:     _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[].

> src/hotspot/cpu/s390/vm_version_s390.hpp line 48:
> 
>> 46: //   z13:  2015-03
>> 47: //   z14:  2017-09
>> 48: //   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.

-------------

PR: https://git.openjdk.java.net/jdk/pull/2918