< prev index next >

src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.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 Float256Vector extends FloatVector {
-    private static final Species<Float> SPECIES = FloatVector.SPECIES_256;
+    private static final VectorSpecies<Float> SPECIES = FloatVector.SPECIES_256;
 
     static final Float256Vector ZERO = new Float256Vector();
 
     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 float[] vec; // Don't access directly, use getElements() instead.
 
     private float[] getElements() {

@@ -80,11 +80,11 @@
         }
         return new Float256Vector(res);
     }
 
     @Override
-    Float256Vector uOp(Mask<Float> o, FUnOp f) {
+    Float256Vector uOp(VectorMask<Float> o, FUnOp f) {
         float[] vec = getElements();
         float[] res = new float[length()];
         boolean[] mbits = ((Float256Mask)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 Float256Vector(res);
     }
 
     @Override
-    Float256Vector bOp(Vector<Float> o1, Mask<Float> o2, FBinOp f) {
+    Float256Vector bOp(Vector<Float> o1, VectorMask<Float> o2, FBinOp f) {
         float[] res = new float[length()];
         float[] vec1 = this.getElements();
         float[] vec2 = ((Float256Vector)o1).getElements();
         boolean[] mbits = ((Float256Mask)o2).getBits();
         for (int i = 0; i < length(); i++) {

@@ -130,11 +130,11 @@
         }
         return new Float256Vector(res);
     }
 
     @Override
-    Float256Vector tOp(Vector<Float> o1, Vector<Float> o2, Mask<Float> o3, FTriOp f) {
+    Float256Vector tOp(Vector<Float> o1, Vector<Float> o2, VectorMask<Float> o3, FTriOp f) {
         float[] res = new float[length()];
         float[] vec1 = getElements();
         float[] vec2 = ((Float256Vector)o1).getElements();
         float[] vec3 = ((Float256Vector)o2).getElements();
         boolean[] mbits = ((Float256Mask)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(float.class)) {
-            return (Vector<F>) reshape((Species<Float>)s);
+            return (Vector<F>) reshape((VectorSpecies<Float>)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 FloatVector reshape(Species<Float> s) {
+    public FloatVector reshape(VectorSpecies<Float> s) {
         Objects.requireNonNull(s);
         if (s.bitSize() == 64 && (s.boxType() == Float64Vector.class)) {
             return VectorIntrinsics.reinterpret(
                 Float256Vector.class,
                 float.class, LENGTH,

@@ -360,11 +360,11 @@
         return add((Float256Vector)FloatVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public FloatVector add(float o, Mask<Float> m) {
+    public FloatVector add(float o, VectorMask<Float> m) {
         return add((Float256Vector)FloatVector.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline

@@ -372,11 +372,11 @@
         return sub((Float256Vector)FloatVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public FloatVector sub(float o, Mask<Float> m) {
+    public FloatVector sub(float o, VectorMask<Float> m) {
         return sub((Float256Vector)FloatVector.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline

@@ -384,11 +384,11 @@
         return mul((Float256Vector)FloatVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public FloatVector mul(float o, Mask<Float> m) {
+    public FloatVector mul(float o, VectorMask<Float> m) {
         return mul((Float256Vector)FloatVector.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline

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

@@ -450,17 +450,17 @@
         return div((Float256Vector)FloatVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public FloatVector div(float o, Mask<Float> m) {
+    public FloatVector div(float o, VectorMask<Float> m) {
         return div((Float256Vector)FloatVector.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline
-    public Float256Vector div(Vector<Float> v, Mask<Float> m) {
+    public Float256Vector div(Vector<Float> v, VectorMask<Float> m) {
         return blend(div(v), m);
     }
 
     @Override
     @ForceInline

@@ -468,11 +468,11 @@
         return atan2((Float256Vector)FloatVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public FloatVector atan2(float o, Mask<Float> m) {
+    public FloatVector atan2(float o, VectorMask<Float> m) {
         return atan2((Float256Vector)FloatVector.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline

@@ -480,11 +480,11 @@
         return pow((Float256Vector)FloatVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public FloatVector pow(float o, Mask<Float> m) {
+    public FloatVector pow(float o, VectorMask<Float> m) {
         return pow((Float256Vector)FloatVector.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline

@@ -492,11 +492,11 @@
         return fma((Float256Vector)FloatVector.broadcast(SPECIES, o1), (Float256Vector)FloatVector.broadcast(SPECIES, o2));
     }
 
     @Override
     @ForceInline
-    public FloatVector fma(float o1, float o2, Mask<Float> m) {
+    public FloatVector fma(float o1, float o2, VectorMask<Float> m) {
         return fma((Float256Vector)FloatVector.broadcast(SPECIES, o1), (Float256Vector)FloatVector.broadcast(SPECIES, o2), m);
     }
 
     @Override
     @ForceInline

@@ -504,20 +504,20 @@
         return hypot((Float256Vector)FloatVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public FloatVector hypot(float o, Mask<Float> m) {
+    public FloatVector hypot(float o, VectorMask<Float> m) {
         return hypot((Float256Vector)FloatVector.broadcast(SPECIES, o), m);
     }
 
 
     // Unary operations
 
     @ForceInline
     @Override
-    public Float256Vector neg(Mask<Float> m) {
+    public Float256Vector neg(VectorMask<Float> m) {
         return blend(neg(), m);
     }
 
     @Override
     @ForceInline

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

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

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

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

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

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

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

@@ -943,11 +943,11 @@
                                (arr, idx, v) -> v.forEach((i, e) -> arr[idx + i] = e));
     }
 
     @Override
     @ForceInline
-    public final void intoArray(float[] a, int ax, Mask<Float> m) {
+    public final void intoArray(float[] a, int ax, VectorMask<Float> m) {
         FloatVector oldVal = FloatVector.fromArray(SPECIES, a, ax);
         FloatVector 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(float[] a, int ax, Mask<Float> m, int[] b, int iy) {
+     public final void intoArray(float[] a, int ax, VectorMask<Float> m, int[] b, int iy) {
          // @@@ This can result in out of bounds errors for unset mask lanes
          FloatVector oldVal = FloatVector.fromArray(SPECIES, a, ax, b, iy);
          FloatVector 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<Float> m) {
+    public final void intoByteArray(byte[] a, int ix, VectorMask<Float> m) {
         Float256Vector oldVal = (Float256Vector) FloatVector.fromByteArray(SPECIES, a, ix);
         Float256Vector newVal = oldVal.blend(this, m);
         newVal.intoByteArray(a, ix);
     }
 

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

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

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

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

@@ -1318,22 +1318,22 @@
             }
             return new Float256Mask(res);
         }
 
         @Override
-        Float256Mask bOp(Mask<Float> o, MBinOp f) {
+        Float256Mask bOp(VectorMask<Float> o, MBinOp f) {
             boolean[] res = new boolean[species().length()];
             boolean[] bits = getBits();
             boolean[] mbits = ((Float256Mask)o).getBits();
             for (int i = 0; i < species().length(); i++) {
                 res[i] = f.apply(i, bits[i], mbits[i]);
             }
             return new Float256Mask(res);
         }
 
         @Override
-        public Species<Float> species() {
+        public VectorSpecies<Float> species() {
             return SPECIES;
         }
 
         @Override
         public Float256Vector 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 Byte256Vector.Byte256Mask(maskArray);
+                return (VectorMask <E>) new Byte256Vector.Byte256Mask(maskArray);
             } else if (stype == short.class) {
-                return (Mask <E>) new Short256Vector.Short256Mask(maskArray);
+                return (VectorMask <E>) new Short256Vector.Short256Mask(maskArray);
             } else if (stype == int.class) {
-                return (Mask <E>) new Int256Vector.Int256Mask(maskArray);
+                return (VectorMask <E>) new Int256Vector.Int256Mask(maskArray);
             } else if (stype == long.class) {
-                return (Mask <E>) new Long256Vector.Long256Mask(maskArray);
+                return (VectorMask <E>) new Long256Vector.Long256Mask(maskArray);
             } else if (stype == float.class) {
-                return (Mask <E>) new Float256Vector.Float256Mask(maskArray);
+                return (VectorMask <E>) new Float256Vector.Float256Mask(maskArray);
             } else if (stype == double.class) {
-                return (Mask <E>) new Double256Vector.Double256Mask(maskArray);
+                return (VectorMask <E>) new Double256Vector.Double256Mask(maskArray);
             } else {
                 throw new UnsupportedOperationException("Bad lane type for casting.");
             }
         }
 

@@ -1385,21 +1385,21 @@
 
         // Binary operations
 
         @Override
         @ForceInline
-        public Float256Mask and(Mask<Float> o) {
+        public Float256Mask and(VectorMask<Float> o) {
             Objects.requireNonNull(o);
             Float256Mask m = (Float256Mask)o;
             return VectorIntrinsics.binaryOp(VECTOR_OP_AND, Float256Mask.class, int.class, LENGTH,
                                              this, m,
                                              (m1, m2) -> m1.bOp(m2, (i, a, b) -> a & b));
         }
 
         @Override
         @ForceInline
-        public Float256Mask or(Mask<Float> o) {
+        public Float256Mask or(VectorMask<Float> o) {
             Objects.requireNonNull(o);
             Float256Mask m = (Float256Mask)o;
             return VectorIntrinsics.binaryOp(VECTOR_OP_OR, Float256Mask.class, int.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, Float256Mask.class, int.class, LENGTH,
-                                         this, FloatVector.maskAllTrue(species()),
+                                         this, VectorMask.maskAllTrue(species()),
                                          (m, __) -> allTrueHelper(((Float256Mask)m).getBits()));
         }
     }
 
     // Shuffle

@@ -1442,11 +1442,11 @@
         public Float256Shuffle(IntUnaryOperator f) {
             super(f);
         }
 
         @Override
-        public Species<Float> species() {
+        public VectorSpecies<Float> species() {
             return SPECIES;
         }
 
         @Override
         public FloatVector 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 Byte256Vector.Byte256Shuffle(shuffleArray);
+                return (VectorShuffle<F>) new Byte256Vector.Byte256Shuffle(shuffleArray);
             } else if (stype == short.class) {
-                return (Shuffle<F>) new Short256Vector.Short256Shuffle(shuffleArray);
+                return (VectorShuffle<F>) new Short256Vector.Short256Shuffle(shuffleArray);
             } else if (stype == int.class) {
-                return (Shuffle<F>) new Int256Vector.Int256Shuffle(shuffleArray);
+                return (VectorShuffle<F>) new Int256Vector.Int256Shuffle(shuffleArray);
             } else if (stype == long.class) {
-                return (Shuffle<F>) new Long256Vector.Long256Shuffle(shuffleArray);
+                return (VectorShuffle<F>) new Long256Vector.Long256Shuffle(shuffleArray);
             } else if (stype == float.class) {
-                return (Shuffle<F>) new Float256Vector.Float256Shuffle(shuffleArray);
+                return (VectorShuffle<F>) new Float256Vector.Float256Shuffle(shuffleArray);
             } else if (stype == double.class) {
-                return (Shuffle<F>) new Double256Vector.Double256Shuffle(shuffleArray);
+                return (VectorShuffle<F>) new Double256Vector.Double256Shuffle(shuffleArray);
             } else {
                 throw new UnsupportedOperationException("Bad lane type for casting.");
             }
         }
 
         @Override
-        public Float256Shuffle rearrange(Vector.Shuffle<Float> o) {
+        public Float256Shuffle rearrange(VectorShuffle<Float> o) {
             Float256Shuffle s = (Float256Shuffle) o;
             byte[] r = new byte[reorder.length];
             for (int i = 0; i < reorder.length; i++) {
                 r[i] = reorder[s.reorder[i]];
             }
             return new Float256Shuffle(r);
         }
     }
 
-    // Species
+    // VectorSpecies
 
     @Override
-    public Species<Float> species() {
+    public VectorSpecies<Float> species() {
         return SPECIES;
     }
 }
< prev index next >