New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
8263260: [s390] Support latest hardware (z14 and z15) #2918
Conversation
👋 Welcome back lucy! A progress list of the required criteria for merging this PR into |
Dear Community, |
Webrevs
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@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:
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
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Detection looks good to me.
Cleanup proposal: Try to make dates more consistent and comprehensive.
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" }; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Table provides a nice overview, but seems like only z_name is used in the code. The rest only serves as comments.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
_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"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How does this relate to the table above?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changed such that End-of-Support information is taken from table z_EOS[].
@@ -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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How does this relate to the table in the .cpp file? I'd prefer to have such kind of information consolidated at one place.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Consolidated information in vm_version_s390.cpp.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for cleaning up! LGTM.
Goetz and Martin, |
/integrate |
Build errors on Win-x64 are unrelated to these s390-only changes. |
@RealLucy Since your change was applied there have been 212 commits pushed to the
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. |
Progress
Issue
Reviewers
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