8302668: [TESTBUG] Tests require feature sse4_1 which does not exist, should be sse4.1

Reviewed-by: kvn, thartmann
This commit is contained in:
Emanuel Peter 2023-02-20 08:41:40 +00:00
parent 5c0f50bc01
commit 7e08275cc1
8 changed files with 37 additions and 29 deletions

View File

@ -1,5 +1,6 @@
/*
* Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -107,7 +108,7 @@ public class BasicByteOpTest extends VectorizationTestRunner {
}
@Test
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.MUL_V, ">0"})
public byte[] vectorMul() {
byte[] res = new byte[SIZE];
@ -118,7 +119,7 @@ public class BasicByteOpTest extends VectorizationTestRunner {
}
@Test
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.MUL_V, ">0", IRNode.ADD_V, ">0"})
public byte[] vectorMulAdd() {
byte[] res = new byte[SIZE];
@ -129,7 +130,7 @@ public class BasicByteOpTest extends VectorizationTestRunner {
}
@Test
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.MUL_V, ">0", IRNode.SUB_V, ">0"})
public byte[] vectorMulSub() {
byte[] res = new byte[SIZE];
@ -186,7 +187,7 @@ public class BasicByteOpTest extends VectorizationTestRunner {
// ---------------- Shift ----------------
@Test
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.LSHIFT_V, ">0"})
public byte[] vectorShiftLeft() {
byte[] res = new byte[SIZE];
@ -197,7 +198,7 @@ public class BasicByteOpTest extends VectorizationTestRunner {
}
@Test
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.RSHIFT_V, ">0"})
public byte[] vectorSignedShiftRight() {
byte[] res = new byte[SIZE];
@ -208,7 +209,7 @@ public class BasicByteOpTest extends VectorizationTestRunner {
}
@Test
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.RSHIFT_V, ">0"})
public byte[] vectorUnsignedShiftRight() {
byte[] res = new byte[SIZE];

View File

@ -1,5 +1,6 @@
/*
* Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -107,7 +108,7 @@ public class BasicIntOpTest extends VectorizationTestRunner {
}
@Test
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.MUL_V, ">0"})
public int[] vectorMul() {
int[] res = new int[SIZE];
@ -118,7 +119,7 @@ public class BasicIntOpTest extends VectorizationTestRunner {
}
@Test
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.MUL_V, ">0", IRNode.ADD_V, ">0"})
public int[] vectorMulAdd() {
int[] res = new int[SIZE];
@ -129,7 +130,7 @@ public class BasicIntOpTest extends VectorizationTestRunner {
}
@Test
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.MUL_V, ">0", IRNode.SUB_V, ">0"})
public int[] vectorMulSub() {
int[] res = new int[SIZE];

View File

@ -1,5 +1,6 @@
/*
* Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -119,9 +120,9 @@ public class BasicLongOpTest extends VectorizationTestRunner {
}
@Test
@IR(applyIfCPUFeatureOr = {"sve", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"sve", "true", "sse4.1", "true"},
counts = {IRNode.ADD_V, ">0"})
@IR(applyIfCPUFeatureOr = {"sve", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"sve", "true", "sse4.1", "true"},
counts = {IRNode.MUL_V, ">0"})
public long[] vectorMulAdd() {
long[] res = new long[SIZE];
@ -132,7 +133,7 @@ public class BasicLongOpTest extends VectorizationTestRunner {
}
@Test
@IR(applyIfCPUFeatureOr = {"sve", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"sve", "true", "sse4.1", "true"},
counts = {IRNode.MUL_V, ">0", IRNode.SUB_V, ">0"})
public long[] vectorMulSub() {
long[] res = new long[SIZE];

View File

@ -1,5 +1,6 @@
/*
* Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -104,9 +105,9 @@ public class LoopArrayIndexComputeTest extends VectorizationTestRunner {
}
@Test
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.STORE_VECTOR, ">0"})
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.MUL_V, ">0"})
public int[] indexPlusInvariant() {
int[] res = new int[SIZE];
@ -132,9 +133,9 @@ public class LoopArrayIndexComputeTest extends VectorizationTestRunner {
}
@Test
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.STORE_VECTOR, ">0"})
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.MUL_V, ">0"})
public int[] indexWithInvariantAndConstant() {
int[] res = new int[SIZE];

View File

@ -1,5 +1,6 @@
/*
* Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -93,7 +94,7 @@ public class LoopCombinedOpTest extends VectorizationTestRunner {
}
@Test
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.STORE_VECTOR, ">0"})
public int[] opWithLoopInvariant() {
int[] res = new int[SIZE];
@ -104,7 +105,7 @@ public class LoopCombinedOpTest extends VectorizationTestRunner {
}
@Test
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.STORE_VECTOR, ">0"})
public int[] opWithConstantAndLoopInvariant() {
int[] res = new int[SIZE];
@ -126,7 +127,7 @@ public class LoopCombinedOpTest extends VectorizationTestRunner {
}
@Test
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.STORE_VECTOR, ">0"})
public int[] multipleOpsWithMultipleConstants() {
int[] res = new int[SIZE];
@ -152,7 +153,7 @@ public class LoopCombinedOpTest extends VectorizationTestRunner {
}
@Test
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.STORE_VECTOR, ">0"})
public int[] multipleStoresWithCommonSubExpression() {
int[] res1 = new int[SIZE];
@ -297,7 +298,7 @@ public class LoopCombinedOpTest extends VectorizationTestRunner {
}
@Test
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.STORE_VECTOR, ">0"})
public int[] manuallyUnrolledStride2() {
int[] res = new int[SIZE];
@ -309,7 +310,7 @@ public class LoopCombinedOpTest extends VectorizationTestRunner {
}
@Test
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.STORE_VECTOR, ">0"})
public int partialVectorizableLoop() {
int[] res = new int[SIZE];

View File

@ -1,5 +1,6 @@
/*
* Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -67,7 +68,7 @@ public class LoopLiveOutNodesTest extends VectorizationTestRunner {
}
@Test
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.STORE_VECTOR, ">0"})
public int SimpleIvUsed() {
int i = 0;

View File

@ -1,5 +1,6 @@
/*
* Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -110,7 +111,7 @@ public class LoopRangeStrideTest extends VectorizationTestRunner {
}
@Test
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.STORE_VECTOR, ">0"})
public int[] shortInductionLoop() {
int[] res = new int[SIZE];
@ -175,7 +176,7 @@ public class LoopRangeStrideTest extends VectorizationTestRunner {
}
@Test
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.STORE_VECTOR, ">0"})
public int[] countDownLoop() {
int[] res = new int[SIZE];
@ -196,7 +197,7 @@ public class LoopRangeStrideTest extends VectorizationTestRunner {
// ---------- Stride with scale ----------
@Test
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.STORE_VECTOR, ">0"})
public int[] countupLoopWithNegScale() {
int[] res = new int[SIZE];
@ -207,7 +208,7 @@ public class LoopRangeStrideTest extends VectorizationTestRunner {
}
@Test
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.STORE_VECTOR, ">0"})
public int[] countDownLoopWithNegScale() {
int[] res = new int[SIZE];

View File

@ -1,5 +1,6 @@
/*
* Copyright (c) 2022, 2023, Arm Limited. All rights reserved.
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -97,7 +98,7 @@ public class MultipleLoopsTest extends VectorizationTestRunner {
}
@Test
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.STORE_VECTOR, ">0"})
public int[] nestedLoopOuterNonCounted() {
int i = 1;
@ -113,7 +114,7 @@ public class MultipleLoopsTest extends VectorizationTestRunner {
}
@Test
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4_1", "true"},
@IR(applyIfCPUFeatureOr = {"asimd", "true", "sse4.1", "true"},
counts = {IRNode.STORE_VECTOR, ">0"})
public int[] nestedLoopIndexCompute() {
int[] res = new int[SIZE];