Skip to content
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

8253869: sun/hotspot/whitebox/CPUInfoTest.java fails after JDK-8239090 #442

Closed
wants to merge 1 commit into from

Conversation

veresov
Copy link
Contributor

@veresov veresov commented Sep 30, 2020

The fix for JDK-8239090 added printing of some additional CPU flags that make CPUInfoTest.java fail.


Progress

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

Issue

  • JDK-8253869: sun/hotspot/whitebox/CPUInfoTest.java fails after JDK-8239090

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/442/head:pull/442
$ git checkout pull/442

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 30, 2020

👋 Welcome back iveresov! 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 openjdk bot added the rfr Pull request is ready for review label Sep 30, 2020
@openjdk
Copy link

openjdk bot commented Sep 30, 2020

@veresov To determine the appropriate audience for reviewing this pull request, one or more labels corresponding to different subsystems will normally be applied automatically. However, no automatic labelling rule matches the changes in this pull request. In order to have an "RFR" email sent to the correct mailing list, you will need to add one or more applicable labels manually using the /label pull request command.

Applicable Labels
  • 2d
  • awt
  • beans
  • build
  • compiler
  • core-libs
  • hotspot
  • hotspot-compiler
  • hotspot-gc
  • hotspot-jfr
  • hotspot-runtime
  • i18n
  • javadoc
  • jdk
  • jmx
  • kulla
  • net
  • nio
  • security
  • serviceability
  • shenandoah
  • sound
  • swing

@veresov veresov changed the title 8253869: sun/hotspot/whitebox/CPUInfoTest.java fails after JDK-8239090. 8253869: sun/hotspot/whitebox/CPUInfoTest.java fails after JDK-8239090 Sep 30, 2020
@veresov
Copy link
Contributor Author

veresov commented Sep 30, 2020

/label hotspot-compiler

@openjdk openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Sep 30, 2020
@openjdk
Copy link

openjdk bot commented Sep 30, 2020

@veresov
The hotspot-compiler label was successfully added.

@mlbridge
Copy link

mlbridge bot commented Sep 30, 2020

Webrevs

@openjdk
Copy link

openjdk bot commented Sep 30, 2020

@veresov 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 more details.

After integration, the commit message for the final commit will be:

8253869: sun/hotspot/whitebox/CPUInfoTest.java fails after JDK-8239090

Reviewed-by: mikael

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

  • ca0e014: 8252003: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jvmti
  • 092c227: 8252523: Add ASN.1 Formatter to work with test utility HexPrinter
  • 06d8cf6: 8253812: Cleanup AbstractMemberWriter
  • 424d7d6: 8252881: [JVMCI] ResolvedJavaType.resolveMethod fails in fastdebug when invoked with a constructor
  • 2a406f3: 8138732: Rename @HotSpotIntrinsicCandidate to @IntrinsicCandidate and move it to the jdk.internal.vm.annotation package
  • 4b16f8a: 8253872: ArgumentHandler must use the same delimiters as in jvmti_tools.cpp
  • 4fb8c77: 8253733: Cleanup internal taglet API

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 30, 2020
@veresov
Copy link
Contributor Author

veresov commented Sep 30, 2020

/integrate

@openjdk openjdk bot closed this Sep 30, 2020
@openjdk 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 Sep 30, 2020
@openjdk
Copy link

openjdk bot commented Sep 30, 2020

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

  • ca0e014: 8252003: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/jvmti
  • 092c227: 8252523: Add ASN.1 Formatter to work with test utility HexPrinter
  • 06d8cf6: 8253812: Cleanup AbstractMemberWriter
  • 424d7d6: 8252881: [JVMCI] ResolvedJavaType.resolveMethod fails in fastdebug when invoked with a constructor
  • 2a406f3: 8138732: Rename @HotSpotIntrinsicCandidate to @IntrinsicCandidate and move it to the jdk.internal.vm.annotation package
  • 4b16f8a: 8253872: ArgumentHandler must use the same delimiters as in jvmti_tools.cpp
  • 4fb8c77: 8253733: Cleanup internal taglet API

Your commit was automatically rebased without conflicts.

Pushed as commit 79d70f6.

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

Copy link
Member

@dcubed-ojdk dcubed-ojdk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I manually compared the two lists:

$ diff /tmp/f[01]
7c7,8
< "avx512_vbmi2"

"avx512_vmbi"
"avx512_vmbi2"
29a31
"hv"
32d33
< "mmxext"

The old list had "avx512_vbmi2" and that's replaced by
"avx512_vmbi" and "avx512_vmbi2" in the new list.
The new list has "hv" as a new entry.
The old list had "mmxext" as a deleted entry.

I don't know if all that is intentional or not, but the
test job passed so I'm approving this change.

@phohensee
Copy link
Member

Retroactive review:

I'd add a corresponding comment (to the one in CPUInfoTest.java) in vm_version_x86.hpp about having to keep CPUInfoTest.java in sync with FEATURES_LIST.

The old version of vm_version_x86.cpp included both "avx512_vmbi" and "avx512_vmbi2", but did not include "hv".

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
4 participants