Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8281544: assert(VM_Version::supports_avx512bw()) failed for Tests jdk…
…/incubator/vector/

Reviewed-by: kvn, neliasso, thartmann
  • Loading branch information
eme64 authored and TobiHartmann committed Feb 21, 2022
1 parent 8563d86 commit 4e0b81c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
Expand Up @@ -452,7 +452,7 @@ class ZSaveLiveRegisters {

void opmask_register_save(KRegister reg) {
_spill_offset -= 8;
__ kmovql(Address(rsp, _spill_offset), reg);
__ kmov(Address(rsp, _spill_offset), reg);
}

void gp_register_restore(Register reg) {
Expand All @@ -461,7 +461,7 @@ class ZSaveLiveRegisters {
}

void opmask_register_restore(KRegister reg) {
__ kmovql(reg, Address(rsp, _spill_offset));
__ kmov(reg, Address(rsp, _spill_offset));
_spill_offset += 8;
}

Expand Down
12 changes: 12 additions & 0 deletions test/jdk/jdk/incubator/vector/VectorMaxConversionTests.java
Expand Up @@ -40,6 +40,18 @@
* VectorMaxConversionTests
*/

/*
* @test
* @bug 8281544
* @summary Test that ZGC and vectorapi with KNL work together.
* @requires vm.gc.Z
* @modules jdk.incubator.vector
* @modules java.base/jdk.internal.vm.annotation
* @run testng/othervm -XX:-TieredCompilation --add-opens jdk.incubator.vector/jdk.incubator.vector=ALL-UNNAMED
* -XX:+UnlockDiagnosticVMOptions -XX:+UseKNLSetting -XX:+UseZGC -XX:+IgnoreUnrecognizedVMOptions
* VectorMaxConversionTests
*/

@Test
public class VectorMaxConversionTests extends AbstractVectorConversionTest {

Expand Down

3 comments on commit 4e0b81c

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@TheRealMDoerr
Copy link
Contributor

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 4e0b81c Mar 29, 2022

Choose a reason for hiding this comment

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

@TheRealMDoerr the backport was successfully created on the branch TheRealMDoerr-backport-4e0b81c5 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 4e0b81c5 from the openjdk/jdk repository.

The commit being backported was authored by Emanuel Peter on 21 Feb 2022 and was reviewed by Vladimir Kozlov, Nils Eliasson and Tobias Hartmann.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev TheRealMDoerr-backport-4e0b81c5:TheRealMDoerr-backport-4e0b81c5
$ git checkout TheRealMDoerr-backport-4e0b81c5
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev TheRealMDoerr-backport-4e0b81c5

Please sign in to comment.