Skip to content

8338126 : C2 SuperWord: VectorCastF2HF / vcvtps2ph produces wrong results for vector length 2 #21480

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.

Sign up for GitHub

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

Closed
wants to merge 4 commits into from
Closed

8338126 : C2 SuperWord: VectorCastF2HF / vcvtps2ph produces wrong results for vector length 2 #21480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dedb4a0
8338126 : C2 SuperWord: VectorCastF2HF / vcvtps2ph produces wrong res…
sviswa7 Oct 11, 2024
ed29932
Update test case
sviswa7 Oct 14, 2024
f298137
Run test on all platforms
sviswa7 Oct 16, 2024
c876dc9
Review comments resolution
sviswa7 Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/hotspot/cpu/x86/x86.ad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3676,6 +3676,7 @@ instruct vconvF2HF(vec dst, vec src) %{
%}

instruct vconvF2HF_mem_reg(memory mem, vec src) %{
predicate(n->as_StoreVector()->memory_size() >= 16);
match(Set mem (StoreVector mem (VectorCastF2HF src)));
format %{ "vcvtps2ph $mem,$src" %}
ins_encode %{
Expand Down
3 changes: 2 additions & 1 deletion test/hotspot/jtreg/compiler/lib/ir_framework/test/IREncodingPrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ public class IREncodingPrinter {
"sve",
// Riscv64
"rvv",
"zvbb"
"zvbb",
"zvfh"
));

public IREncodingPrinter() {
Expand Down
31 changes: 25 additions & 6 deletions test/hotspot/jtreg/compiler/vectorization/TestFloatConversionsVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
* @bug 8294588
* @summary Auto-vectorize Float.floatToFloat16, Float.float16ToFloat APIs
* @requires vm.compiler2.enabled
* @requires (os.simpleArch == "x64" & (vm.cpu.features ~= ".*avx512f.*" | vm.cpu.features ~= ".*f16c.*")) |
* os.arch == "aarch64" |
* (os.arch == "riscv64" & vm.cpu.features ~= ".*zvfh.*")
* @library /test/lib /
* @run driver compiler.vectorization.TestFloatConversionsVector
*/
Expand All @@ -53,7 +50,9 @@ public static void main(String args[]) {
}

@Test
@IR(counts = {IRNode.VECTOR_CAST_F2HF, IRNode.VECTOR_SIZE + "min(max_float, max_short)", "> 0"})
@IR(counts = {IRNode.VECTOR_CAST_F2HF, IRNode.VECTOR_SIZE + "min(max_float, max_short)", "> 0"},
applyIfPlatformOr = {"x64", "true", "aarch64", "true", "riscv64", "true"},
applyIfCPUFeatureOr = {"f16c", "true", "avx512f", "true", "zvfh", "true", "asimd", "true", "sve", "true"})
public void test_float_float16(short[] sout, float[] finp) {
for (int i = 0; i < finp.length; i++) {
sout[i] = Float.floatToFloat16(finp[i]);
Expand All @@ -67,7 +66,16 @@ public void test_float_float16_strided(short[] sout, float[] finp) {
}
}

@Run(test = {"test_float_float16", "test_float_float16_strided"}, mode = RunMode.STANDALONE)
@Test
public void test_float_float16_short_vector(short[] sout, float[] finp) {
for (int i = 0; i < finp.length; i+= 4) {
sout[i+0] = Float.floatToFloat16(finp[i+0]);
sout[i+1] = Float.floatToFloat16(finp[i+1]);
}
}

@Run(test = {"test_float_float16", "test_float_float16_strided",
"test_float_float16_short_vector"}, mode = RunMode.STANDALONE)
public void kernel_test_float_float16() {
finp = new float[ARRLEN];
sout = new short[ARRLEN];
Expand All @@ -93,10 +101,21 @@ public void kernel_test_float_float16() {
for (int i = 0; i < ARRLEN/2; i++) {
Asserts.assertEquals(Float.floatToFloat16(finp[i*2]), sout[i*2]);
}

for (int i = 0; i < ITERS; i++) {
test_float_float16_short_vector(sout, finp);
}

// Verifying the result
Copy link
Member

@jatin-bhateja jatin-bhateja Oct 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Since we are using IR framework, we can leverage existing @Check annotation for verification which works in conjunction with @test method, it will automatically invoke validation after test method execution. We may need little refactoring for this.

Copy link
Author

@sviswa7 sviswa7 Oct 16, 2024

Choose a reason for hiding this comment

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

The added test follows the verification mechanism used already in the test. I would prefer not to get into refactoring.

Copy link
Member

@jatin-bhateja jatin-bhateja Oct 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Okay, we can do it separately.

for (int i = 0; i < ARRLEN; i++) {
Asserts.assertEquals(Float.floatToFloat16(finp[i]), sout[i]);
}
}

@Test
@IR(counts = {IRNode.VECTOR_CAST_HF2F, IRNode.VECTOR_SIZE + "min(max_float, max_short)", "> 0"})
@IR(counts = {IRNode.VECTOR_CAST_HF2F, IRNode.VECTOR_SIZE + "min(max_float, max_short)", "> 0"},
applyIfPlatformOr = {"x64", "true", "aarch64", "true", "riscv64", "true"},
applyIfCPUFeatureOr = {"f16c", "true", "avx512f", "true", "zvfh", "true", "asimd", "true", "sve", "true"})
public void test_float16_float(float[] fout, short[] sinp) {
for (int i = 0; i < sinp.length; i++) {
fout[i] = Float.float16ToFloat(sinp[i]);
Expand Down