< prev index next >

src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java

Print this page
rev 54658 : refactored mask and shuffle creation methods, moved classes to top-level

@@ -36,22 +36,22 @@
 import jdk.internal.vm.annotation.ForceInline;
 import static jdk.incubator.vector.VectorIntrinsics.*;
 
 @SuppressWarnings("cast")
 final class Double512Vector extends DoubleVector {
-    private static final Species<Double> SPECIES = DoubleVector.SPECIES_512;
+    private static final VectorSpecies<Double> SPECIES = DoubleVector.SPECIES_512;
 
     static final Double512Vector ZERO = new Double512Vector();
 
     static final int LENGTH = SPECIES.length();
 
     // Index vector species
     private static final IntVector.IntSpecies INDEX_SPECIES;
 
     static {
         int bitSize = Vector.bitSizeForVectorLength(int.class, LENGTH);
-        INDEX_SPECIES = (IntVector.IntSpecies) IntVector.species(Shape.forBitSize(bitSize));
+        INDEX_SPECIES = (IntVector.IntSpecies) IntVector.species(VectorShape.forBitSize(bitSize));
     }
 
     private final double[] vec; // Don't access directly, use getElements() instead.
 
     private double[] getElements() {

@@ -80,11 +80,11 @@
         }
         return new Double512Vector(res);
     }
 
     @Override
-    Double512Vector uOp(Mask<Double> o, FUnOp f) {
+    Double512Vector uOp(VectorMask<Double> o, FUnOp f) {
         double[] vec = getElements();
         double[] res = new double[length()];
         boolean[] mbits = ((Double512Mask)o).getBits();
         for (int i = 0; i < length(); i++) {
             res[i] = mbits[i] ? f.apply(i, vec[i]) : vec[i];

@@ -104,11 +104,11 @@
         }
         return new Double512Vector(res);
     }
 
     @Override
-    Double512Vector bOp(Vector<Double> o1, Mask<Double> o2, FBinOp f) {
+    Double512Vector bOp(Vector<Double> o1, VectorMask<Double> o2, FBinOp f) {
         double[] res = new double[length()];
         double[] vec1 = this.getElements();
         double[] vec2 = ((Double512Vector)o1).getElements();
         boolean[] mbits = ((Double512Mask)o2).getBits();
         for (int i = 0; i < length(); i++) {

@@ -130,11 +130,11 @@
         }
         return new Double512Vector(res);
     }
 
     @Override
-    Double512Vector tOp(Vector<Double> o1, Vector<Double> o2, Mask<Double> o3, FTriOp f) {
+    Double512Vector tOp(Vector<Double> o1, Vector<Double> o2, VectorMask<Double> o3, FTriOp f) {
         double[] res = new double[length()];
         double[] vec1 = getElements();
         double[] vec2 = ((Double512Vector)o1).getElements();
         double[] vec3 = ((Double512Vector)o2).getElements();
         boolean[] mbits = ((Double512Mask)o3).getBits();

@@ -153,11 +153,11 @@
         return v;
     }
 
     @Override
     @ForceInline
-    public <F> Vector<F> cast(Species<F> s) {
+    public <F> Vector<F> cast(VectorSpecies<F> s) {
         Objects.requireNonNull(s);
         if (s.length() != LENGTH)
             throw new IllegalArgumentException("Vector length this species length differ");
 
         return VectorIntrinsics.cast(

@@ -170,73 +170,73 @@
         );
     }
 
     @SuppressWarnings("unchecked")
     @ForceInline
-    private <F> Vector<F> castDefault(Species<F> s) {
+    private <F> Vector<F> castDefault(VectorSpecies<F> s) {
         int limit = s.length();
 
         Class<?> stype = s.elementType();
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
                 a[i] = (byte) this.get(i);
             }
-            return (Vector) ByteVector.fromArray((Species<Byte>) s, a, 0);
+            return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
                 a[i] = (short) this.get(i);
             }
-            return (Vector) ShortVector.fromArray((Species<Short>) s, a, 0);
+            return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
                 a[i] = (int) this.get(i);
             }
-            return (Vector) IntVector.fromArray((Species<Integer>) s, a, 0);
+            return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
                 a[i] = (long) this.get(i);
             }
-            return (Vector) LongVector.fromArray((Species<Long>) s, a, 0);
+            return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
                 a[i] = (float) this.get(i);
             }
-            return (Vector) FloatVector.fromArray((Species<Float>) s, a, 0);
+            return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
                 a[i] = (double) this.get(i);
             }
-            return (Vector) DoubleVector.fromArray((Species<Double>) s, a, 0);
+            return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
             throw new UnsupportedOperationException("Bad lane type for casting.");
         }
     }
 
     @Override
     @ForceInline
     @SuppressWarnings("unchecked")
-    public <F> Vector<F> reinterpret(Species<F> s) {
+    public <F> Vector<F> reinterpret(VectorSpecies<F> s) {
         Objects.requireNonNull(s);
 
         if(s.elementType().equals(double.class)) {
-            return (Vector<F>) reshape((Species<Double>)s);
+            return (Vector<F>) reshape((VectorSpecies<Double>)s);
         }
         if(s.bitSize() == bitSize()) {
             return reinterpretType(s);
         }
 
         return defaultReinterpret(s);
     }
 
     @ForceInline
-    private <F> Vector<F> reinterpretType(Species<F> s) {
+    private <F> Vector<F> reinterpretType(VectorSpecies<F> s) {
         Objects.requireNonNull(s);
 
         Class<?> stype = s.elementType();
         if (stype == byte.class) {
             return VectorIntrinsics.reinterpret(

@@ -297,11 +297,11 @@
         }
     }
 
     @Override
     @ForceInline
-    public DoubleVector reshape(Species<Double> s) {
+    public DoubleVector reshape(VectorSpecies<Double> s) {
         Objects.requireNonNull(s);
         if (s.bitSize() == 64 && (s.boxType() == Double64Vector.class)) {
             return VectorIntrinsics.reinterpret(
                 Double512Vector.class,
                 double.class, LENGTH,

@@ -360,11 +360,11 @@
         return add((Double512Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public DoubleVector add(double o, Mask<Double> m) {
+    public DoubleVector add(double o, VectorMask<Double> m) {
         return add((Double512Vector)DoubleVector.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline

@@ -372,11 +372,11 @@
         return sub((Double512Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public DoubleVector sub(double o, Mask<Double> m) {
+    public DoubleVector sub(double o, VectorMask<Double> m) {
         return sub((Double512Vector)DoubleVector.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline

@@ -384,11 +384,11 @@
         return mul((Double512Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public DoubleVector mul(double o, Mask<Double> m) {
+    public DoubleVector mul(double o, VectorMask<Double> m) {
         return mul((Double512Vector)DoubleVector.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline

@@ -402,47 +402,47 @@
         return max((Double512Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public Mask<Double> equal(double o) {
+    public VectorMask<Double> equal(double o) {
         return equal((Double512Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public Mask<Double> notEqual(double o) {
+    public VectorMask<Double> notEqual(double o) {
         return notEqual((Double512Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public Mask<Double> lessThan(double o) {
+    public VectorMask<Double> lessThan(double o) {
         return lessThan((Double512Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public Mask<Double> lessThanEq(double o) {
+    public VectorMask<Double> lessThanEq(double o) {
         return lessThanEq((Double512Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public Mask<Double> greaterThan(double o) {
+    public VectorMask<Double> greaterThan(double o) {
         return greaterThan((Double512Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public Mask<Double> greaterThanEq(double o) {
+    public VectorMask<Double> greaterThanEq(double o) {
         return greaterThanEq((Double512Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public DoubleVector blend(double o, Mask<Double> m) {
+    public DoubleVector blend(double o, VectorMask<Double> m) {
         return blend((Double512Vector)DoubleVector.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline

@@ -450,17 +450,17 @@
         return div((Double512Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public DoubleVector div(double o, Mask<Double> m) {
+    public DoubleVector div(double o, VectorMask<Double> m) {
         return div((Double512Vector)DoubleVector.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline
-    public Double512Vector div(Vector<Double> v, Mask<Double> m) {
+    public Double512Vector div(Vector<Double> v, VectorMask<Double> m) {
         return blend(div(v), m);
     }
 
     @Override
     @ForceInline

@@ -468,11 +468,11 @@
         return atan2((Double512Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public DoubleVector atan2(double o, Mask<Double> m) {
+    public DoubleVector atan2(double o, VectorMask<Double> m) {
         return atan2((Double512Vector)DoubleVector.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline

@@ -480,11 +480,11 @@
         return pow((Double512Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public DoubleVector pow(double o, Mask<Double> m) {
+    public DoubleVector pow(double o, VectorMask<Double> m) {
         return pow((Double512Vector)DoubleVector.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline

@@ -492,11 +492,11 @@
         return fma((Double512Vector)DoubleVector.broadcast(SPECIES, o1), (Double512Vector)DoubleVector.broadcast(SPECIES, o2));
     }
 
     @Override
     @ForceInline
-    public DoubleVector fma(double o1, double o2, Mask<Double> m) {
+    public DoubleVector fma(double o1, double o2, VectorMask<Double> m) {
         return fma((Double512Vector)DoubleVector.broadcast(SPECIES, o1), (Double512Vector)DoubleVector.broadcast(SPECIES, o2), m);
     }
 
     @Override
     @ForceInline

@@ -504,20 +504,20 @@
         return hypot((Double512Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public DoubleVector hypot(double o, Mask<Double> m) {
+    public DoubleVector hypot(double o, VectorMask<Double> m) {
         return hypot((Double512Vector)DoubleVector.broadcast(SPECIES, o), m);
     }
 
 
     // Unary operations
 
     @ForceInline
     @Override
-    public Double512Vector neg(Mask<Double> m) {
+    public Double512Vector neg(VectorMask<Double> m) {
         return blend(neg(), m);
     }
 
     @Override
     @ForceInline

@@ -528,11 +528,11 @@
             v1 -> v1.uOp((i, a) -> (double) Math.abs(a)));
     }
 
     @ForceInline
     @Override
-    public Double512Vector abs(Mask<Double> m) {
+    public Double512Vector abs(VectorMask<Double> m) {
         return blend(abs(), m);
     }
 
     @Override
     @ForceInline

@@ -745,11 +745,11 @@
             (v1, v2) -> v1.bOp(v2, (i, a, b) -> (double)(a + b)));
     }
 
     @Override
     @ForceInline
-    public Double512Vector add(Vector<Double> v, Mask<Double> m) {
+    public Double512Vector add(Vector<Double> v, VectorMask<Double> m) {
         return blend(add(v), m);
     }
 
     @Override
     @ForceInline

@@ -762,11 +762,11 @@
             (v1, v2) -> v1.bOp(v2, (i, a, b) -> (double)(a - b)));
     }
 
     @Override
     @ForceInline
-    public Double512Vector sub(Vector<Double> v, Mask<Double> m) {
+    public Double512Vector sub(Vector<Double> v, VectorMask<Double> m) {
         return blend(sub(v), m);
     }
 
     @Override
     @ForceInline

@@ -779,11 +779,11 @@
             (v1, v2) -> v1.bOp(v2, (i, a, b) -> (double)(a * b)));
     }
 
     @Override
     @ForceInline
-    public Double512Vector mul(Vector<Double> v, Mask<Double> m) {
+    public Double512Vector mul(Vector<Double> v, VectorMask<Double> m) {
         return blend(mul(v), m);
     }
 
     @Override
     @ForceInline

@@ -796,11 +796,11 @@
             (v1, v2) -> v1.bOp(v2, (i, a, b) -> (double) Math.min(a, b)));
     }
 
     @Override
     @ForceInline
-    public Double512Vector min(Vector<Double> v, Mask<Double> m) {
+    public Double512Vector min(Vector<Double> v, VectorMask<Double> m) {
         return blend(min(v), m);
     }
 
     @Override
     @ForceInline

@@ -813,11 +813,11 @@
             (v1, v2) -> v1.bOp(v2, (i, a, b) -> (double) Math.max(a, b)));
         }
 
     @Override
     @ForceInline
-    public Double512Vector max(Vector<Double> v, Mask<Double> m) {
+    public Double512Vector max(Vector<Double> v, VectorMask<Double> m) {
         return blend(max(v), m);
     }
 
 
     // Ternary operations

@@ -890,42 +890,42 @@
     }
 
 
     @Override
     @ForceInline
-    public double addAll(Mask<Double> m) {
+    public double addAll(VectorMask<Double> m) {
         return blend((Double512Vector)DoubleVector.broadcast(SPECIES, (double) 0), m).addAll();
     }
 
 
     @Override
     @ForceInline
-    public double mulAll(Mask<Double> m) {
+    public double mulAll(VectorMask<Double> m) {
         return blend((Double512Vector)DoubleVector.broadcast(SPECIES, (double) 1), m).mulAll();
     }
 
     @Override
     @ForceInline
-    public double minAll(Mask<Double> m) {
+    public double minAll(VectorMask<Double> m) {
         return blend((Double512Vector)DoubleVector.broadcast(SPECIES, Double.MAX_VALUE), m).minAll();
     }
 
     @Override
     @ForceInline
-    public double maxAll(Mask<Double> m) {
+    public double maxAll(VectorMask<Double> m) {
         return blend((Double512Vector)DoubleVector.broadcast(SPECIES, Double.MIN_VALUE), m).maxAll();
     }
 
     @Override
     @ForceInline
-    public Shuffle<Double> toShuffle() {
+    public VectorShuffle<Double> toShuffle() {
         double[] a = toArray();
         int[] sa = new int[a.length];
         for (int i = 0; i < a.length; i++) {
             sa[i] = (int) a[i];
         }
-        return DoubleVector.shuffleFromArray(SPECIES, sa, 0);
+        return VectorShuffle.fromArray(SPECIES, sa, 0);
     }
 
     // Memory operations
 
     private static final int ARRAY_SHIFT         = 31 - Integer.numberOfLeadingZeros(Unsafe.ARRAY_DOUBLE_INDEX_SCALE);

@@ -943,11 +943,11 @@
                                (arr, idx, v) -> v.forEach((i, e) -> arr[idx + i] = e));
     }
 
     @Override
     @ForceInline
-    public final void intoArray(double[] a, int ax, Mask<Double> m) {
+    public final void intoArray(double[] a, int ax, VectorMask<Double> m) {
         DoubleVector oldVal = DoubleVector.fromArray(SPECIES, a, ax);
         DoubleVector newVal = oldVal.blend(this, m);
         newVal.intoArray(a, ax);
     }
     @Override

@@ -968,11 +968,11 @@
                                (arr, idx, v, indexMap, idy) -> v.forEach((i, e) -> arr[idx+indexMap[idy+i]] = e));
     }
 
      @Override
      @ForceInline
-     public final void intoArray(double[] a, int ax, Mask<Double> m, int[] b, int iy) {
+     public final void intoArray(double[] a, int ax, VectorMask<Double> m, int[] b, int iy) {
          // @@@ This can result in out of bounds errors for unset mask lanes
          DoubleVector oldVal = DoubleVector.fromArray(SPECIES, a, ax, b, iy);
          DoubleVector newVal = oldVal.blend(this, m);
          newVal.intoArray(a, ax, b, iy);
      }

@@ -993,11 +993,11 @@
                                });
     }
 
     @Override
     @ForceInline
-    public final void intoByteArray(byte[] a, int ix, Mask<Double> m) {
+    public final void intoByteArray(byte[] a, int ix, VectorMask<Double> m) {
         Double512Vector oldVal = (Double512Vector) DoubleVector.fromByteArray(SPECIES, a, ix);
         Double512Vector newVal = oldVal.blend(this, m);
         newVal.intoByteArray(a, ix);
     }
 

@@ -1022,11 +1022,11 @@
                                });
     }
 
     @Override
     @ForceInline
-    public void intoByteBuffer(ByteBuffer bb, int ix, Mask<Double> m) {
+    public void intoByteBuffer(ByteBuffer bb, int ix, VectorMask<Double> m) {
         Double512Vector oldVal = (Double512Vector) DoubleVector.fromByteBuffer(SPECIES, bb, ix);
         Double512Vector newVal = oldVal.blend(this, m);
         newVal.intoByteBuffer(bb, ix);
     }
 

@@ -1147,11 +1147,11 @@
             f.apply(i, vec[i]);
         }
     }
 
     @Override
-    void forEach(Mask<Double> o, FUnCon f) {
+    void forEach(VectorMask<Double> o, FUnCon f) {
         boolean[] mbits = ((Double512Mask)o).getBits();
         forEach((i, a) -> {
             if (mbits[i]) { f.apply(i, a); }
         });
     }

@@ -1212,17 +1212,17 @@
     }
 
     @Override
     @ForceInline
     public Double512Vector rearrange(Vector<Double> v,
-                                  Shuffle<Double> s, Mask<Double> m) {
+                                  VectorShuffle<Double> s, VectorMask<Double> m) {
         return this.rearrange(s).blend(v.rearrange(s), m);
     }
 
     @Override
     @ForceInline
-    public Double512Vector rearrange(Shuffle<Double> o1) {
+    public Double512Vector rearrange(VectorShuffle<Double> o1) {
         Objects.requireNonNull(o1);
         Double512Shuffle s =  (Double512Shuffle)o1;
 
         return VectorIntrinsics.rearrangeOp(
             Double512Vector.class, Double512Shuffle.class, double.class, LENGTH,

@@ -1233,11 +1233,11 @@
             }));
     }
 
     @Override
     @ForceInline
-    public Double512Vector blend(Vector<Double> o1, Mask<Double> o2) {
+    public Double512Vector blend(Vector<Double> o1, VectorMask<Double> o2) {
         Objects.requireNonNull(o1);
         Objects.requireNonNull(o2);
         Double512Vector v = (Double512Vector)o1;
         Double512Mask   m = (Double512Mask)o2;
 

@@ -1318,22 +1318,22 @@
             }
             return new Double512Mask(res);
         }
 
         @Override
-        Double512Mask bOp(Mask<Double> o, MBinOp f) {
+        Double512Mask bOp(VectorMask<Double> o, MBinOp f) {
             boolean[] res = new boolean[species().length()];
             boolean[] bits = getBits();
             boolean[] mbits = ((Double512Mask)o).getBits();
             for (int i = 0; i < species().length(); i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
             return new Double512Mask(res);
         }
 
         @Override
-        public Species<Double> species() {
+        public VectorSpecies<Double> species() {
             return SPECIES;
         }
 
         @Override
         public Double512Vector toVector() {

@@ -1348,27 +1348,27 @@
         }
 
         @Override
         @ForceInline
         @SuppressWarnings("unchecked")
-        public <E> Mask<E> cast(Species<E> species) {
+        public <E> VectorMask<E> cast(VectorSpecies<E> species) {
             if (length() != species.length())
-                throw new IllegalArgumentException("Mask length and species length differ");
+                throw new IllegalArgumentException("VectorMask length and species length differ");
             Class<?> stype = species.elementType();
             boolean [] maskArray = toArray();
             if (stype == byte.class) {
-                return (Mask <E>) new Byte512Vector.Byte512Mask(maskArray);
+                return (VectorMask <E>) new Byte512Vector.Byte512Mask(maskArray);
             } else if (stype == short.class) {
-                return (Mask <E>) new Short512Vector.Short512Mask(maskArray);
+                return (VectorMask <E>) new Short512Vector.Short512Mask(maskArray);
             } else if (stype == int.class) {
-                return (Mask <E>) new Int512Vector.Int512Mask(maskArray);
+                return (VectorMask <E>) new Int512Vector.Int512Mask(maskArray);
             } else if (stype == long.class) {
-                return (Mask <E>) new Long512Vector.Long512Mask(maskArray);
+                return (VectorMask <E>) new Long512Vector.Long512Mask(maskArray);
             } else if (stype == float.class) {
-                return (Mask <E>) new Float512Vector.Float512Mask(maskArray);
+                return (VectorMask <E>) new Float512Vector.Float512Mask(maskArray);
             } else if (stype == double.class) {
-                return (Mask <E>) new Double512Vector.Double512Mask(maskArray);
+                return (VectorMask <E>) new Double512Vector.Double512Mask(maskArray);
             } else {
                 throw new UnsupportedOperationException("Bad lane type for casting.");
             }
         }
 

@@ -1385,21 +1385,21 @@
 
         // Binary operations
 
         @Override
         @ForceInline
-        public Double512Mask and(Mask<Double> o) {
+        public Double512Mask and(VectorMask<Double> o) {
             Objects.requireNonNull(o);
             Double512Mask m = (Double512Mask)o;
             return VectorIntrinsics.binaryOp(VECTOR_OP_AND, Double512Mask.class, long.class, LENGTH,
                                              this, m,
                                              (m1, m2) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Double512Mask or(Mask<Double> o) {
+        public Double512Mask or(VectorMask<Double> o) {
             Objects.requireNonNull(o);
             Double512Mask m = (Double512Mask)o;
             return VectorIntrinsics.binaryOp(VECTOR_OP_OR, Double512Mask.class, long.class, LENGTH,
                                              this, m,
                                              (m1, m2) -> m1.bOp(m2, (i, a, b) -> a | b));

@@ -1417,11 +1417,11 @@
 
         @Override
         @ForceInline
         public boolean allTrue() {
             return VectorIntrinsics.test(BT_overflow, Double512Mask.class, long.class, LENGTH,
-                                         this, DoubleVector.maskAllTrue(species()),
+                                         this, VectorMask.maskAllTrue(species()),
                                          (m, __) -> allTrueHelper(((Double512Mask)m).getBits()));
         }
     }
 
     // Shuffle

@@ -1442,11 +1442,11 @@
         public Double512Shuffle(IntUnaryOperator f) {
             super(f);
         }
 
         @Override
-        public Species<Double> species() {
+        public VectorSpecies<Double> species() {
             return SPECIES;
         }
 
         @Override
         public DoubleVector toVector() {

@@ -1458,45 +1458,45 @@
         }
 
         @Override
         @ForceInline
         @SuppressWarnings("unchecked")
-        public <F> Shuffle<F> cast(Species<F> species) {
+        public <F> VectorShuffle<F> cast(VectorSpecies<F> species) {
             if (length() != species.length())
                 throw new IllegalArgumentException("Shuffle length and species length differ");
             Class<?> stype = species.elementType();
             int [] shuffleArray = toArray();
             if (stype == byte.class) {
-                return (Shuffle<F>) new Byte512Vector.Byte512Shuffle(shuffleArray);
+                return (VectorShuffle<F>) new Byte512Vector.Byte512Shuffle(shuffleArray);
             } else if (stype == short.class) {
-                return (Shuffle<F>) new Short512Vector.Short512Shuffle(shuffleArray);
+                return (VectorShuffle<F>) new Short512Vector.Short512Shuffle(shuffleArray);
             } else if (stype == int.class) {
-                return (Shuffle<F>) new Int512Vector.Int512Shuffle(shuffleArray);
+                return (VectorShuffle<F>) new Int512Vector.Int512Shuffle(shuffleArray);
             } else if (stype == long.class) {
-                return (Shuffle<F>) new Long512Vector.Long512Shuffle(shuffleArray);
+                return (VectorShuffle<F>) new Long512Vector.Long512Shuffle(shuffleArray);
             } else if (stype == float.class) {
-                return (Shuffle<F>) new Float512Vector.Float512Shuffle(shuffleArray);
+                return (VectorShuffle<F>) new Float512Vector.Float512Shuffle(shuffleArray);
             } else if (stype == double.class) {
-                return (Shuffle<F>) new Double512Vector.Double512Shuffle(shuffleArray);
+                return (VectorShuffle<F>) new Double512Vector.Double512Shuffle(shuffleArray);
             } else {
                 throw new UnsupportedOperationException("Bad lane type for casting.");
             }
         }
 
         @Override
-        public Double512Shuffle rearrange(Vector.Shuffle<Double> o) {
+        public Double512Shuffle rearrange(VectorShuffle<Double> o) {
             Double512Shuffle s = (Double512Shuffle) o;
             byte[] r = new byte[reorder.length];
             for (int i = 0; i < reorder.length; i++) {
                 r[i] = reorder[s.reorder[i]];
             }
             return new Double512Shuffle(r);
         }
     }
 
-    // Species
+    // VectorSpecies
 
     @Override
-    public Species<Double> species() {
+    public VectorSpecies<Double> species() {
         return SPECIES;
     }
 }
< prev index next >