From 680ac2cebecf93e5924a441a5de6918cd7adf118 Mon Sep 17 00:00:00 2001 From: Hamlin Li Date: Mon, 11 Mar 2024 12:13:06 +0000 Subject: [PATCH] 8327689: RISC-V: adjust test filters of zfh extension Reviewed-by: fyang, gli --- .../jtreg/compiler/intrinsics/float16/Binary16Conversion.java | 2 +- .../compiler/intrinsics/float16/Binary16ConversionNaN.java | 2 +- .../compiler/intrinsics/float16/TestAllFloat16ToFloat.java | 2 +- .../compiler/intrinsics/float16/TestConstFloat16ToFloat.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/hotspot/jtreg/compiler/intrinsics/float16/Binary16Conversion.java b/test/hotspot/jtreg/compiler/intrinsics/float16/Binary16Conversion.java index ab4d8ff8bb7..cd0f0b636a7 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/float16/Binary16Conversion.java +++ b/test/hotspot/jtreg/compiler/intrinsics/float16/Binary16Conversion.java @@ -26,7 +26,7 @@ * @bug 8289551 8302976 * @summary Verify conversion between float and the binary16 format * @requires (vm.cpu.features ~= ".*avx512vl.*" | vm.cpu.features ~= ".*f16c.*") | os.arch=="aarch64" - * | (os.arch == "riscv64" & vm.cpu.features ~= ".*zfh,.*") + * | (os.arch == "riscv64" & vm.cpu.features ~= ".*zfh.*") * @requires vm.compiler1.enabled & vm.compiler2.enabled * @requires vm.compMode != "Xcomp" * @comment default run diff --git a/test/hotspot/jtreg/compiler/intrinsics/float16/Binary16ConversionNaN.java b/test/hotspot/jtreg/compiler/intrinsics/float16/Binary16ConversionNaN.java index f549c1ae670..8aa83544f9f 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/float16/Binary16ConversionNaN.java +++ b/test/hotspot/jtreg/compiler/intrinsics/float16/Binary16ConversionNaN.java @@ -26,7 +26,7 @@ * @bug 8289551 8302976 * @summary Verify NaN sign and significand bits are preserved across conversions * @requires (vm.cpu.features ~= ".*avx512vl.*" | vm.cpu.features ~= ".*f16c.*") | os.arch=="aarch64" - * | (os.arch == "riscv64" & vm.cpu.features ~= ".*zfh,.*") + * | (os.arch == "riscv64" & vm.cpu.features ~= ".*zfh.*") * @requires vm.compiler1.enabled & vm.compiler2.enabled * @requires vm.compMode != "Xcomp" * @library /test/lib / diff --git a/test/hotspot/jtreg/compiler/intrinsics/float16/TestAllFloat16ToFloat.java b/test/hotspot/jtreg/compiler/intrinsics/float16/TestAllFloat16ToFloat.java index 937e17f8fca..acf5b3c4aea 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/float16/TestAllFloat16ToFloat.java +++ b/test/hotspot/jtreg/compiler/intrinsics/float16/TestAllFloat16ToFloat.java @@ -26,7 +26,7 @@ * @bug 8302976 * @summary Verify conversion between float and the binary16 format * @requires (vm.cpu.features ~= ".*avx512vl.*" | vm.cpu.features ~= ".*f16c.*") | os.arch == "aarch64" - * | (os.arch == "riscv64" & vm.cpu.features ~= ".*zfh,.*") + * | (os.arch == "riscv64" & vm.cpu.features ~= ".*zfh.*") * @requires vm.compiler1.enabled & vm.compiler2.enabled * @requires vm.compMode != "Xcomp" * @comment default run: diff --git a/test/hotspot/jtreg/compiler/intrinsics/float16/TestConstFloat16ToFloat.java b/test/hotspot/jtreg/compiler/intrinsics/float16/TestConstFloat16ToFloat.java index f58cf618c1c..af89d353ab2 100644 --- a/test/hotspot/jtreg/compiler/intrinsics/float16/TestConstFloat16ToFloat.java +++ b/test/hotspot/jtreg/compiler/intrinsics/float16/TestConstFloat16ToFloat.java @@ -26,7 +26,7 @@ * @bug 8302976 * @summary Verify conversion cons between float and the binary16 format * @requires (vm.cpu.features ~= ".*avx512vl.*" | vm.cpu.features ~= ".*f16c.*") | os.arch=="aarch64" - * | (os.arch == "riscv64" & vm.cpu.features ~= ".*zfh,.*") + * | (os.arch == "riscv64" & vm.cpu.features ~= ".*zfh.*") * @requires vm.compiler1.enabled & vm.compiler2.enabled * @requires vm.compMode != "Xcomp" * @comment default run: