8353695: RISC-V: compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java is failing with Zvkn

Reviewed-by: fjiang, mli
This commit is contained in:
Fei Yang 2025-04-08 01:37:29 +00:00
parent b64cdc2813
commit 80ff7b9c94
3 changed files with 5 additions and 4 deletions

View File

@ -26,7 +26,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @requires vm.cpu.features ~= ".*aes.*" & !vm.graal.enabled
* @requires (vm.cpu.features ~= ".*aes.*" | vm.cpu.features ~= ".*zvkn.*") & !vm.graal.enabled
* @build jdk.test.whitebox.WhiteBox
* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
* @run main/othervm/timeout=600 -Xbootclasspath/a:.

View File

@ -28,7 +28,7 @@
* java.management
*
* @build jdk.test.whitebox.WhiteBox
* @requires !(vm.cpu.features ~= ".*aes.*")
* @requires !(vm.cpu.features ~= ".*aes.*" | vm.cpu.features ~= ".*zvkn.*")
* @requires vm.compiler1.enabled | !vm.graal.enabled
* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions

View File

@ -109,12 +109,13 @@ public class IREncodingPrinter {
"asimd",
"sve",
"sve2",
// Riscv64
// RISCV64
"rvv",
"zbkb",
"zfh",
"zvbb",
"zvfh"
"zvfh",
"zvkn"
));
public IREncodingPrinter() {