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

8273806: compiler/cpuflags/TestSSE4Disabled.java should test for CPU feature explicitly #5530

Closed
wants to merge 1 commit into from

Conversation

@shipilev
Copy link
Contributor

@shipilev shipilev commented Sep 15, 2021

JDK-8158214 added a test that verifies that machines with SSE4 support do not crash when lower SSE level is required. But it tests for CPU capabilities weirdly.

This tangentially manifests when running the test with Zero:

$ CONF=linux-x86_64-zero-fastdebug make exploded-test TEST=compiler/cpuflags/TestSSE4Disabled.java
...
STDERR:
Unrecognized VM option 'UseSSE=3'
Error: Could not create the Java Virtual Machine.
Error: A fatal exception has occurred. Program will exit.

I think we can test that target CPU supports SSE4, and only run the test then. It would implicitly fix Zero test failure too, as Zero impersonates a "generic" featureless CPU. Plus, it would stop running the -Xcomp test on arches that do not actually need this test to run.

Additional testing:

  • Linux x86_64 Server, TR 3970X, affected test still runs
  • Linux x86_64 Zero, TR 3970X, affected test is now skipped

Progress

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

Issue

  • JDK-8273806: compiler/cpuflags/TestSSE4Disabled.java should test for CPU feature explicitly

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5530

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 15, 2021

👋 Welcome back shade! 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.

Loading

@openjdk openjdk bot added the rfr label Sep 15, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 15, 2021

@shipilev The following label will be automatically applied to this pull request:

  • hotspot-compiler

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.

Loading

@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 15, 2021

Webrevs

Loading

Copy link
Member

@TobiHartmann TobiHartmann left a comment

I just wanted to say "Looks good to me but the author of the test should also have a look" but then I noticed that I'm the author. So: Looks good and trivial to me :)

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Sep 16, 2021

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

8273806: compiler/cpuflags/TestSSE4Disabled.java should test for CPU feature explicitly

Reviewed-by: thartmann

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

  • d4546b6: 8273526: Extend the OSContainer API pids controller with pids.current
  • 74ffe12: 8273575: memory leak in appendBootClassPath(), paths must be deallocated
  • cbffecc: 8273832: gc/shenandoah/TestJcmdHeapDump.java does not have a @requires vm.gc.shenandoah
  • 7b2beb6: 8273823: Problemlist gc/stringdedup tests timing out on ZGC
  • 8290424: 8272771: frame::pd_ps() is not implemented on any platform
  • a3ca770: 8272815: jpackage --type rpm produces an error: Invalid or unsupported type: [null]
  • 8132bfd: 8273559: Shenandoah: Shenandoah should support multi-threaded heap dump
  • f531b5c: 8273514: java/util/DoubleStreamSums/CompensatedSums.java failure
  • 4c673df: 8273656: Improve java.lang.invoke.MethodType.parameterList() and its usage

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.

Loading

@openjdk openjdk bot added the ready label Sep 16, 2021
@shipilev
Copy link
Contributor Author

@shipilev shipilev commented Sep 16, 2021

I just wanted to say "Looks good to me but the author of the test should also have a look" but then I noticed that I'm the author. So: Looks good and trivial to me :)

Yeah ;) Thanks!

/integrate

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Sep 16, 2021

Going to push as commit 09ecb11.
Since your change was applied there have been 13 commits pushed to the master branch:

  • 99cfc16: 8273805: gc/g1/TestGCLogMessages.java test should handle non-JFR configs
  • 1c5de8b: 8273807: Zero: Drop incorrect test block from compiler/startup/NumCompilerThreadsCheck.java
  • 46af82e: 8273804: Platform.isTieredSupported should handle the no-compiler case
  • 2d13fb2: 8273803: Zero: Handle "zero" variant in CommandLineOptionTest.java
  • d4546b6: 8273526: Extend the OSContainer API pids controller with pids.current
  • 74ffe12: 8273575: memory leak in appendBootClassPath(), paths must be deallocated
  • cbffecc: 8273832: gc/shenandoah/TestJcmdHeapDump.java does not have a @requires vm.gc.shenandoah
  • 7b2beb6: 8273823: Problemlist gc/stringdedup tests timing out on ZGC
  • 8290424: 8272771: frame::pd_ps() is not implemented on any platform
  • a3ca770: 8272815: jpackage --type rpm produces an error: Invalid or unsupported type: [null]
  • ... and 3 more: https://git.openjdk.java.net/jdk/compare/8fbcc8239a3fc04e56ebbd287c7bb5db731977b7...master

Your commit was automatically rebased without conflicts.

Loading

@openjdk openjdk bot closed this Sep 16, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Sep 16, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 16, 2021

@shipilev Pushed as commit 09ecb11.

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

Loading

@shipilev shipilev deleted the JDK-8273806-sse4-cpuflags branch Sep 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants