--- old/test/jdk/jdk/incubator/vector/Float128VectorTests.java 2019-04-26 14:53:09.602356200 -0700 +++ new/test/jdk/jdk/incubator/vector/Float128VectorTests.java 2019-04-26 14:53:09.014012500 -0700 @@ -730,6 +730,18 @@ + + + + + + + + + + + + static float max(float a, float b) { return (float)(Math.max(a, b)); } @@ -776,7 +788,7 @@ - static float addAll(float[] a, int idx) { + static float addLanes(float[] a, int idx) { float res = 0; for (int i = idx; i < (idx + SPECIES.length()); i++) { res += a[i]; @@ -785,7 +797,7 @@ return res; } - static float addAll(float[] a) { + static float addLanes(float[] a) { float res = 0; for (int i = 0; i < a.length; i += SPECIES.length()) { float tmp = 0; @@ -798,7 +810,7 @@ return res; } @Test(dataProvider = "floatUnaryOpProvider") - static void addAllFloat128VectorTests(IntFunction fa) { + static void addLanesFloat128VectorTests(IntFunction fa) { float[] a = fa.apply(SPECIES.length()); float[] r = fr.apply(SPECIES.length()); float ra = 0; @@ -806,7 +818,7 @@ for (int ic = 0; ic < INVOC_COUNT; ic++) { for (int i = 0; i < a.length; i += SPECIES.length()) { FloatVector av = FloatVector.fromArray(SPECIES, a, i); - r[i] = av.addAll(); + r[i] = av.addLanes(); } } @@ -814,13 +826,13 @@ ra = 0; for (int i = 0; i < a.length; i += SPECIES.length()) { FloatVector av = FloatVector.fromArray(SPECIES, a, i); - ra += av.addAll(); + ra += av.addLanes(); } } - assertReductionArraysEquals(a, r, ra, Float128VectorTests::addAll, Float128VectorTests::addAll); + assertReductionArraysEquals(a, r, ra, Float128VectorTests::addLanes, Float128VectorTests::addLanes); } - static float mulAll(float[] a, int idx) { + static float mulLanes(float[] a, int idx) { float res = 1; for (int i = idx; i < (idx + SPECIES.length()); i++) { res *= a[i]; @@ -829,7 +841,7 @@ return res; } - static float mulAll(float[] a) { + static float mulLanes(float[] a) { float res = 1; for (int i = 0; i < a.length; i += SPECIES.length()) { float tmp = 1; @@ -842,7 +854,7 @@ return res; } @Test(dataProvider = "floatUnaryOpProvider") - static void mulAllFloat128VectorTests(IntFunction fa) { + static void mulLanesFloat128VectorTests(IntFunction fa) { float[] a = fa.apply(SPECIES.length()); float[] r = fr.apply(SPECIES.length()); float ra = 1; @@ -850,7 +862,7 @@ for (int ic = 0; ic < INVOC_COUNT; ic++) { for (int i = 0; i < a.length; i += SPECIES.length()) { FloatVector av = FloatVector.fromArray(SPECIES, a, i); - r[i] = av.mulAll(); + r[i] = av.mulLanes(); } } @@ -858,13 +870,13 @@ ra = 1; for (int i = 0; i < a.length; i += SPECIES.length()) { FloatVector av = FloatVector.fromArray(SPECIES, a, i); - ra *= av.mulAll(); + ra *= av.mulLanes(); } } - assertReductionArraysEquals(a, r, ra, Float128VectorTests::mulAll, Float128VectorTests::mulAll); + assertReductionArraysEquals(a, r, ra, Float128VectorTests::mulLanes, Float128VectorTests::mulLanes); } - static float minAll(float[] a, int idx) { + static float minLanes(float[] a, int idx) { float res = Float.POSITIVE_INFINITY; for (int i = idx; i < (idx + SPECIES.length()); i++) { res = (float)Math.min(res, a[i]); @@ -873,7 +885,7 @@ return res; } - static float minAll(float[] a) { + static float minLanes(float[] a) { float res = Float.POSITIVE_INFINITY; for (int i = 0; i < a.length; i++) { res = (float)Math.min(res, a[i]); @@ -882,7 +894,7 @@ return res; } @Test(dataProvider = "floatUnaryOpProvider") - static void minAllFloat128VectorTests(IntFunction fa) { + static void minLanesFloat128VectorTests(IntFunction fa) { float[] a = fa.apply(SPECIES.length()); float[] r = fr.apply(SPECIES.length()); float ra = Float.POSITIVE_INFINITY; @@ -890,7 +902,7 @@ for (int ic = 0; ic < INVOC_COUNT; ic++) { for (int i = 0; i < a.length; i += SPECIES.length()) { FloatVector av = FloatVector.fromArray(SPECIES, a, i); - r[i] = av.minAll(); + r[i] = av.minLanes(); } } @@ -898,13 +910,13 @@ ra = Float.POSITIVE_INFINITY; for (int i = 0; i < a.length; i += SPECIES.length()) { FloatVector av = FloatVector.fromArray(SPECIES, a, i); - ra = (float)Math.min(ra, av.minAll()); + ra = (float)Math.min(ra, av.minLanes()); } } - assertReductionArraysEquals(a, r, ra, Float128VectorTests::minAll, Float128VectorTests::minAll); + assertReductionArraysEquals(a, r, ra, Float128VectorTests::minLanes, Float128VectorTests::minLanes); } - static float maxAll(float[] a, int idx) { + static float maxLanes(float[] a, int idx) { float res = Float.NEGATIVE_INFINITY; for (int i = idx; i < (idx + SPECIES.length()); i++) { res = (float)Math.max(res, a[i]); @@ -913,7 +925,7 @@ return res; } - static float maxAll(float[] a) { + static float maxLanes(float[] a) { float res = Float.NEGATIVE_INFINITY; for (int i = 0; i < a.length; i++) { res = (float)Math.max(res, a[i]); @@ -922,7 +934,7 @@ return res; } @Test(dataProvider = "floatUnaryOpProvider") - static void maxAllFloat128VectorTests(IntFunction fa) { + static void maxLanesFloat128VectorTests(IntFunction fa) { float[] a = fa.apply(SPECIES.length()); float[] r = fr.apply(SPECIES.length()); float ra = Float.NEGATIVE_INFINITY; @@ -930,7 +942,7 @@ for (int ic = 0; ic < INVOC_COUNT; ic++) { for (int i = 0; i < a.length; i += SPECIES.length()) { FloatVector av = FloatVector.fromArray(SPECIES, a, i); - r[i] = av.maxAll(); + r[i] = av.maxLanes(); } } @@ -938,11 +950,11 @@ ra = Float.NEGATIVE_INFINITY; for (int i = 0; i < a.length; i += SPECIES.length()) { FloatVector av = FloatVector.fromArray(SPECIES, a, i); - ra = (float)Math.max(ra, av.maxAll()); + ra = (float)Math.max(ra, av.maxLanes()); } } - assertReductionArraysEquals(a, r, ra, Float128VectorTests::maxAll, Float128VectorTests::maxAll); + assertReductionArraysEquals(a, r, ra, Float128VectorTests::maxLanes, Float128VectorTests::maxLanes); }