stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8290943: Fix several IR test issues on SVE after JDK-8289801

Browse Source 
Reviewed-by: jiefu, adinn
This commit is contained in:
Hao Sun 2022-07-27 23:42:11 +00:00 committed by Jie Fu
parent c1a3347f17
commit 16a127524c
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
View File

@ -217,6 +217,8 @@ public class IRNode {
public static final String FAST_LOCK = START + "FastLock" + MID + END;
public static final String FAST_UNLOCK = START + "FastUnlock" + MID + END;
public static final String POPULATE_INDEX = START + "PopulateIndex" + MID + END;
/**
* Called by {@link IRMatcher} to merge special composite nodes together with additional user-defined input.
*/

2
test/hotspot/jtreg/compiler/vectorapi/AllBitsSetVectorMatchRuleTest.java
View File

@ -42,7 +42,7 @@ import jdk.test.lib.Utils;
* @key randomness
* @library /test/lib /
* @requires vm.compiler2.enabled
* @requires vm.cpu.features ~= ".*simd.*" | vm.cpu.features ~= ".*sve.*"
* @requires vm.cpu.features ~= ".*simd.*"
* @summary AArch64: [vector] Make all bits set vector sharable for match rules
* @modules jdk.incubator.vector
*

2
test/hotspot/jtreg/compiler/vectorization/TestPopCountVectorLong.java
View File

@ -25,7 +25,7 @@
* @test
* @summary Test vectorization of popcount for Long
* @requires vm.compiler2.enabled
* @requires vm.cpu.features ~= ".*avx512bw.*" | vm.cpu.features ~= ".*sve.*"
* @requires vm.cpu.features ~= ".*avx512bw.*" | (vm.cpu.features ~= ".*sve.*" & (vm.opt.UseSVE == "null" | vm.opt.UseSVE > 0))
* @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64"
* @library /test/lib /
* @run driver compiler.vectorization.TestPopCountVectorLong

8
test/hotspot/jtreg/compiler/vectorization/TestPopulateIndex.java
View File

@ -27,7 +27,7 @@
* @summary Test vectorization of loop induction variable usage in the loop
* @requires vm.compiler2.enabled
* @requires (os.simpleArch == "x64" & vm.cpu.features ~= ".*avx2.*") |
* (os.simpleArch == "aarch64" & vm.cpu.features ~= ".*sve.*")
* (os.simpleArch == "aarch64" & vm.cpu.features ~= ".*sve.*" & (vm.opt.UseSVE == "null" | vm.opt.UseSVE > 0))
* @library /test/lib /
* @run driver compiler.vectorization.TestPopulateIndex
*/
@ -60,7 +60,7 @@ public class TestPopulateIndex {
}
@Test
@IR(counts = {"PopulateIndex", ">= 1"})
@IR(counts = {IRNode.POPULATE_INDEX, "> 0"})
public void indexArrayFill() {
for (int i = 0; i < count; i++) {
idx[i] = i;
@ -78,7 +78,7 @@ public class TestPopulateIndex {
}
@Test
@IR(counts = {"PopulateIndex", ">= 1"})
@IR(counts = {IRNode.POPULATE_INDEX, "> 0"})
public void exprWithIndex1() {
for (int i = 0; i < count; i++) {
dst[i] = src[i] * (i & 7);
@ -96,7 +96,7 @@ public class TestPopulateIndex {
}
@Test
@IR(counts = {"PopulateIndex", ">= 1"})
@IR(counts = {IRNode.POPULATE_INDEX, "> 0"})
public void exprWithIndex2() {
for (int i = 0; i < count; i++) {
f[i] = i * i + 100;