--- old/test/jdk/jdk/incubator/vector/Double64VectorTests.java 2019-04-26 14:53:00.266523500 -0700 +++ new/test/jdk/jdk/incubator/vector/Double64VectorTests.java 2019-04-26 14:52:59.660718600 -0700 @@ -730,6 +730,18 @@ + + + + + + + + + + + + static double max(double a, double b) { return (double)(Math.max(a, b)); } @@ -776,7 +788,7 @@ - static double addAll(double[] a, int idx) { + static double addLanes(double[] a, int idx) { double res = 0; for (int i = idx; i < (idx + SPECIES.length()); i++) { res += a[i]; @@ -785,7 +797,7 @@ return res; } - static double addAll(double[] a) { + static double addLanes(double[] a) { double res = 0; for (int i = 0; i < a.length; i += SPECIES.length()) { double tmp = 0; @@ -798,7 +810,7 @@ return res; } @Test(dataProvider = "doubleUnaryOpProvider") - static void addAllDouble64VectorTests(IntFunction fa) { + static void addLanesDouble64VectorTests(IntFunction fa) { double[] a = fa.apply(SPECIES.length()); double[] r = fr.apply(SPECIES.length()); double ra = 0; @@ -806,7 +818,7 @@ for (int ic = 0; ic < INVOC_COUNT; ic++) { for (int i = 0; i < a.length; i += SPECIES.length()) { DoubleVector av = DoubleVector.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()) { DoubleVector av = DoubleVector.fromArray(SPECIES, a, i); - ra += av.addAll(); + ra += av.addLanes(); } } - assertReductionArraysEquals(a, r, ra, Double64VectorTests::addAll, Double64VectorTests::addAll); + assertReductionArraysEquals(a, r, ra, Double64VectorTests::addLanes, Double64VectorTests::addLanes); } - static double mulAll(double[] a, int idx) { + static double mulLanes(double[] a, int idx) { double res = 1; for (int i = idx; i < (idx + SPECIES.length()); i++) { res *= a[i]; @@ -829,7 +841,7 @@ return res; } - static double mulAll(double[] a) { + static double mulLanes(double[] a) { double res = 1; for (int i = 0; i < a.length; i += SPECIES.length()) { double tmp = 1; @@ -842,7 +854,7 @@ return res; } @Test(dataProvider = "doubleUnaryOpProvider") - static void mulAllDouble64VectorTests(IntFunction fa) { + static void mulLanesDouble64VectorTests(IntFunction fa) { double[] a = fa.apply(SPECIES.length()); double[] r = fr.apply(SPECIES.length()); double ra = 1; @@ -850,7 +862,7 @@ for (int ic = 0; ic < INVOC_COUNT; ic++) { for (int i = 0; i < a.length; i += SPECIES.length()) { DoubleVector av = DoubleVector.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()) { DoubleVector av = DoubleVector.fromArray(SPECIES, a, i); - ra *= av.mulAll(); + ra *= av.mulLanes(); } } - assertReductionArraysEquals(a, r, ra, Double64VectorTests::mulAll, Double64VectorTests::mulAll); + assertReductionArraysEquals(a, r, ra, Double64VectorTests::mulLanes, Double64VectorTests::mulLanes); } - static double minAll(double[] a, int idx) { + static double minLanes(double[] a, int idx) { double res = Double.POSITIVE_INFINITY; for (int i = idx; i < (idx + SPECIES.length()); i++) { res = (double)Math.min(res, a[i]); @@ -873,7 +885,7 @@ return res; } - static double minAll(double[] a) { + static double minLanes(double[] a) { double res = Double.POSITIVE_INFINITY; for (int i = 0; i < a.length; i++) { res = (double)Math.min(res, a[i]); @@ -882,7 +894,7 @@ return res; } @Test(dataProvider = "doubleUnaryOpProvider") - static void minAllDouble64VectorTests(IntFunction fa) { + static void minLanesDouble64VectorTests(IntFunction fa) { double[] a = fa.apply(SPECIES.length()); double[] r = fr.apply(SPECIES.length()); double ra = Double.POSITIVE_INFINITY; @@ -890,7 +902,7 @@ for (int ic = 0; ic < INVOC_COUNT; ic++) { for (int i = 0; i < a.length; i += SPECIES.length()) { DoubleVector av = DoubleVector.fromArray(SPECIES, a, i); - r[i] = av.minAll(); + r[i] = av.minLanes(); } } @@ -898,13 +910,13 @@ ra = Double.POSITIVE_INFINITY; for (int i = 0; i < a.length; i += SPECIES.length()) { DoubleVector av = DoubleVector.fromArray(SPECIES, a, i); - ra = (double)Math.min(ra, av.minAll()); + ra = (double)Math.min(ra, av.minLanes()); } } - assertReductionArraysEquals(a, r, ra, Double64VectorTests::minAll, Double64VectorTests::minAll); + assertReductionArraysEquals(a, r, ra, Double64VectorTests::minLanes, Double64VectorTests::minLanes); } - static double maxAll(double[] a, int idx) { + static double maxLanes(double[] a, int idx) { double res = Double.NEGATIVE_INFINITY; for (int i = idx; i < (idx + SPECIES.length()); i++) { res = (double)Math.max(res, a[i]); @@ -913,7 +925,7 @@ return res; } - static double maxAll(double[] a) { + static double maxLanes(double[] a) { double res = Double.NEGATIVE_INFINITY; for (int i = 0; i < a.length; i++) { res = (double)Math.max(res, a[i]); @@ -922,7 +934,7 @@ return res; } @Test(dataProvider = "doubleUnaryOpProvider") - static void maxAllDouble64VectorTests(IntFunction fa) { + static void maxLanesDouble64VectorTests(IntFunction fa) { double[] a = fa.apply(SPECIES.length()); double[] r = fr.apply(SPECIES.length()); double ra = Double.NEGATIVE_INFINITY; @@ -930,7 +942,7 @@ for (int ic = 0; ic < INVOC_COUNT; ic++) { for (int i = 0; i < a.length; i += SPECIES.length()) { DoubleVector av = DoubleVector.fromArray(SPECIES, a, i); - r[i] = av.maxAll(); + r[i] = av.maxLanes(); } } @@ -938,11 +950,11 @@ ra = Double.NEGATIVE_INFINITY; for (int i = 0; i < a.length; i += SPECIES.length()) { DoubleVector av = DoubleVector.fromArray(SPECIES, a, i); - ra = (double)Math.max(ra, av.maxAll()); + ra = (double)Math.max(ra, av.maxLanes()); } } - assertReductionArraysEquals(a, r, ra, Double64VectorTests::maxAll, Double64VectorTests::maxAll); + assertReductionArraysEquals(a, r, ra, Double64VectorTests::maxLanes, Double64VectorTests::maxLanes); }