8298413: [s390] CPUInfoTest fails due to uppercase feature string

[offamitkumar]

CPUInfoTest.java is failing on s390 due to an incorrect feature string. Feature Vector Enhancement is shown as VEnh2 instead of venh2. Beside that out-of-support date/(tbd) was not being included even if it was present there so this issue is also addressed by this fix.

---

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-8298413: [s390] CPUInfoTest fails due to uppercase feature string

Reviewers

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

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12286

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

Using diff file

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

[bridgekeeper]

👋 Welcome back offamitkumar! 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]

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

Webrevs

• 00: Full (c8df72d7)

[offamitkumar]

Hi @RealLucy and @TheRealMDoerr,

would you like to review this PR as well.

[TheRealMDoerr]

LGTM.

[openjdk]

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

8298413: [s390] CPUInfoTest fails due to uppercase feature string

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

• 98433a2: 8296999: AArch64: scalar intrinsics for reverse method in Integer and Long
• c04a982: 8301818: RISC-V: Factor out function mvw from MacroAssembler
• 787e16b: 8289077: Add manual tests to open
• 07fb4f9: 7167356: (javac) investigate failing tests in JavacParserTest
• 3ac2bed: 8299324: inline_native_setCurrentThread lacks GC barrier for Shenandoah
• d53ade1: 8301813: Bad caret position in error message
• 8c01b6e: 8221580: Confusing diagnostic for assigning a static final field in a constructor
• c129ce4: 8300259: Add test coverage for processing of pending block files in signed JARs
• b569742: 8301788: AlgorithmId should keep lowercase characters from 3rd party providers
• 05ea083: 8301167: Update VerifySignedJar to actually exercise and test verification
• ... and 130 more: https://git.openjdk.org/jdk/compare/64b25ea0b410542635b6d99a92ec290da47c85ce...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@TheRealMDoerr, @RealLucy) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

[RealLucy]

LGTM

[offamitkumar]

thanks @RealLucy and @TheRealMDoerr

/integrate

[openjdk]

@offamitkumar
Your change (at version c8df72d) is now ready to be sponsored by a Committer.

[RealLucy]

/sponsor

[openjdk]

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

• 98433a2: 8296999: AArch64: scalar intrinsics for reverse method in Integer and Long
• c04a982: 8301818: RISC-V: Factor out function mvw from MacroAssembler
• 787e16b: 8289077: Add manual tests to open
• 07fb4f9: 7167356: (javac) investigate failing tests in JavacParserTest
• 3ac2bed: 8299324: inline_native_setCurrentThread lacks GC barrier for Shenandoah
• d53ade1: 8301813: Bad caret position in error message
• 8c01b6e: 8221580: Confusing diagnostic for assigning a static final field in a constructor
• c129ce4: 8300259: Add test coverage for processing of pending block files in signed JARs
• b569742: 8301788: AlgorithmId should keep lowercase characters from 3rd party providers
• 05ea083: 8301167: Update VerifySignedJar to actually exercise and test verification
• ... and 130 more: https://git.openjdk.org/jdk/compare/64b25ea0b410542635b6d99a92ec290da47c85ce...master

Your commit was automatically rebased without conflicts.

[openjdk]

@RealLucy @offamitkumar Pushed as commit 9dad874.

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

[offamitkumar]

/backport jdk17u-dev

[openjdk]

@offamitkumar Could not automatically backport 9dad874f to openjdk/jdk17u-dev due to conflicts in the following files:

• src/hotspot/cpu/s390/vm_version_s390.cpp

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-offamitkumar-9dad874f

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 9dad874ff9f03f5891aa8b37e7826a67c851f06d

# Backport the commit
$ git cherry-pick --no-commit 9dad874ff9f03f5891aa8b37e7826a67c851f06d
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 9dad874ff9f03f5891aa8b37e7826a67c851f06d'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk17u-dev with the title Backport 9dad874ff9f03f5891aa8b37e7826a67c851f06d.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 9dad874f from the openjdk/jdk repository.

The commit being backported was authored by Amit Kumar on 7 Feb 2023 and was reviewed by Martin Doerr and Lutz Schmidt.

Thanks!