src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template

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

@@ -38,11 +38,11 @@
 import jdk.internal.vm.annotation.ForceInline;
 import static jdk.incubator.vector.VectorIntrinsics.*;
 
 @SuppressWarnings("cast")
 final class $vectortype$ extends $abstractvectortype$ {
-    private static final Species<$Boxtype$> SPECIES = $Type$Vector.SPECIES_$BITS$;
+    private static final VectorSpecies<$Boxtype$> SPECIES = $Type$Vector.SPECIES_$BITS$;
 
     static final $vectortype$ ZERO = new $vectortype$();
 
     static final int LENGTH = SPECIES.length();
 

@@ -50,14 +50,14 @@
     // Index vector species
     private static final IntVector.IntSpecies INDEX_SPECIES;
 
     static {
 #if[longOrDouble64]
-        INDEX_SPECIES = (IntVector.IntSpecies) IntVector.species(Shape.S_64_BIT);
+        INDEX_SPECIES = (IntVector.IntSpecies) IntVector.species(VectorShape.S_64_BIT);
 #else[longOrDouble64]
         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));
 #end[longOrDouble64]
     }
 
 #end[!byteOrShort]
     private final $type$[] vec; // Don't access directly, use getElements() instead.

@@ -88,11 +88,11 @@
         }
         return new $vectortype$(res);
     }
 
     @Override
-    $vectortype$ uOp(Mask<$Boxtype$> o, FUnOp f) {
+    $vectortype$ uOp(VectorMask<$Boxtype$> o, FUnOp f) {
         $type$[] vec = getElements();
         $type$[] res = new $type$[length()];
         boolean[] mbits = (($masktype$)o).getBits();
         for (int i = 0; i < length(); i++) {
             res[i] = mbits[i] ? f.apply(i, vec[i]) : vec[i];

@@ -112,11 +112,11 @@
         }
         return new $vectortype$(res);
     }
 
     @Override
-    $vectortype$ bOp(Vector<$Boxtype$> o1, Mask<$Boxtype$> o2, FBinOp f) {
+    $vectortype$ bOp(Vector<$Boxtype$> o1, VectorMask<$Boxtype$> o2, FBinOp f) {
         $type$[] res = new $type$[length()];
         $type$[] vec1 = this.getElements();
         $type$[] vec2 = (($vectortype$)o1).getElements();
         boolean[] mbits = (($masktype$)o2).getBits();
         for (int i = 0; i < length(); i++) {

@@ -138,11 +138,11 @@
         }
         return new $vectortype$(res);
     }
 
     @Override
-    $vectortype$ tOp(Vector<$Boxtype$> o1, Vector<$Boxtype$> o2, Mask<$Boxtype$> o3, FTriOp f) {
+    $vectortype$ tOp(Vector<$Boxtype$> o1, Vector<$Boxtype$> o2, VectorMask<$Boxtype$> o3, FTriOp f) {
         $type$[] res = new $type$[length()];
         $type$[] vec1 = getElements();
         $type$[] vec2 = (($vectortype$)o1).getElements();
         $type$[] vec3 = (($vectortype$)o2).getElements();
         boolean[] mbits = (($masktype$)o3).getBits();

@@ -161,11 +161,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(

@@ -178,73 +178,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($type$.class)) {
-            return (Vector<F>) reshape((Species<$Boxtype$>)s);
+            return (Vector<F>) reshape((VectorSpecies<$Boxtype$>)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(

@@ -305,11 +305,11 @@
         }
     }
 
     @Override
     @ForceInline
-    public $abstractvectortype$ reshape(Species<$Boxtype$> s) {
+    public $abstractvectortype$ reshape(VectorSpecies<$Boxtype$> s) {
         Objects.requireNonNull(s);
         if (s.bitSize() == 64 && (s.boxType() == $Type$64Vector.class)) {
             return VectorIntrinsics.reinterpret(
                 $vectortype$.class,
                 $type$.class, LENGTH,

@@ -368,11 +368,11 @@
         return add(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public $abstractvectortype$ add($type$ o, Mask<$Boxtype$> m) {
+    public $abstractvectortype$ add($type$ o, VectorMask<$Boxtype$> m) {
         return add(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline

@@ -380,11 +380,11 @@
         return sub(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public $abstractvectortype$ sub($type$ o, Mask<$Boxtype$> m) {
+    public $abstractvectortype$ sub($type$ o, VectorMask<$Boxtype$> m) {
         return sub(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline

@@ -392,11 +392,11 @@
         return mul(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public $abstractvectortype$ mul($type$ o, Mask<$Boxtype$> m) {
+    public $abstractvectortype$ mul($type$ o, VectorMask<$Boxtype$> m) {
         return mul(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline

@@ -410,47 +410,47 @@
         return max(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public Mask<$Boxtype$> equal($type$ o) {
+    public VectorMask<$Boxtype$> equal($type$ o) {
         return equal(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public Mask<$Boxtype$> notEqual($type$ o) {
+    public VectorMask<$Boxtype$> notEqual($type$ o) {
         return notEqual(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public Mask<$Boxtype$> lessThan($type$ o) {
+    public VectorMask<$Boxtype$> lessThan($type$ o) {
         return lessThan(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public Mask<$Boxtype$> lessThanEq($type$ o) {
+    public VectorMask<$Boxtype$> lessThanEq($type$ o) {
         return lessThanEq(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public Mask<$Boxtype$> greaterThan($type$ o) {
+    public VectorMask<$Boxtype$> greaterThan($type$ o) {
         return greaterThan(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public Mask<$Boxtype$> greaterThanEq($type$ o) {
+    public VectorMask<$Boxtype$> greaterThanEq($type$ o) {
         return greaterThanEq(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public $abstractvectortype$ blend($type$ o, Mask<$Boxtype$> m) {
+    public $abstractvectortype$ blend($type$ o, VectorMask<$Boxtype$> m) {
         return blend(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o), m);
     }
 
 #if[FP]
     @Override

@@ -459,17 +459,17 @@
         return div(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public $abstractvectortype$ div($type$ o, Mask<$Boxtype$> m) {
+    public $abstractvectortype$ div($type$ o, VectorMask<$Boxtype$> m) {
         return div(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline
-    public $vectortype$ div(Vector<$Boxtype$> v, Mask<$Boxtype$> m) {
+    public $vectortype$ div(Vector<$Boxtype$> v, VectorMask<$Boxtype$> m) {
         return blend(div(v), m);
     }
 
     @Override
     @ForceInline

@@ -477,11 +477,11 @@
         return atan2(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public $abstractvectortype$ atan2($type$ o, Mask<$Boxtype$> m) {
+    public $abstractvectortype$ atan2($type$ o, VectorMask<$Boxtype$> m) {
         return atan2(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline

@@ -489,11 +489,11 @@
         return pow(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public $abstractvectortype$ pow($type$ o, Mask<$Boxtype$> m) {
+    public $abstractvectortype$ pow($type$ o, VectorMask<$Boxtype$> m) {
         return pow(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline

@@ -501,11 +501,11 @@
         return fma(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o1), ($vectortype$)$abstractvectortype$.broadcast(SPECIES, o2));
     }
 
     @Override
     @ForceInline
-    public $abstractvectortype$ fma($type$ o1, $type$ o2, Mask<$Boxtype$> m) {
+    public $abstractvectortype$ fma($type$ o1, $type$ o2, VectorMask<$Boxtype$> m) {
         return fma(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o1), ($vectortype$)$abstractvectortype$.broadcast(SPECIES, o2), m);
     }
 
     @Override
     @ForceInline

@@ -513,11 +513,11 @@
         return hypot(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public $abstractvectortype$ hypot($type$ o, Mask<$Boxtype$> m) {
+    public $abstractvectortype$ hypot($type$ o, VectorMask<$Boxtype$> m) {
         return hypot(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o), m);
     }
 #end[FP]
 
 #if[BITWISE]

@@ -527,11 +527,11 @@
         return and(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public $abstractvectortype$ and($type$ o, Mask<$Boxtype$> m) {
+    public $abstractvectortype$ and($type$ o, VectorMask<$Boxtype$> m) {
         return and(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline

@@ -539,11 +539,11 @@
         return or(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public $abstractvectortype$ or($type$ o, Mask<$Boxtype$> m) {
+    public $abstractvectortype$ or($type$ o, VectorMask<$Boxtype$> m) {
         return or(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline

@@ -551,11 +551,11 @@
         return xor(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public $abstractvectortype$ xor($type$ o, Mask<$Boxtype$> m) {
+    public $abstractvectortype$ xor($type$ o, VectorMask<$Boxtype$> m) {
         return xor(($vectortype$)$abstractvectortype$.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline

@@ -566,11 +566,11 @@
 
     // Unary operations
 
     @ForceInline
     @Override
-    public $vectortype$ neg(Mask<$Boxtype$> m) {
+    public $vectortype$ neg(VectorMask<$Boxtype$> m) {
         return blend(neg(), m);
     }
 
     @Override
     @ForceInline

@@ -581,11 +581,11 @@
             v1 -> v1.uOp((i, a) -> ($type$) Math.abs(a)));
     }
 
     @ForceInline
     @Override
-    public $vectortype$ abs(Mask<$Boxtype$> m) {
+    public $vectortype$ abs(VectorMask<$Boxtype$> m) {
         return blend(abs(), m);
     }
 
 #if[FP]
     @Override

@@ -797,11 +797,11 @@
             v1 -> v1.uOp((i, a) -> ($type$) ~a));
     }
 
     @ForceInline
     @Override
-    public $vectortype$ not(Mask<$Boxtype$> m) {
+    public $vectortype$ not(VectorMask<$Boxtype$> m) {
         return blend(not(), m);
     }
 #end[BITWISE]
     // Binary operations
 

@@ -816,11 +816,11 @@
             (v1, v2) -> v1.bOp(v2, (i, a, b) -> ($type$)(a + b)));
     }
 
     @Override
     @ForceInline
-    public $vectortype$ add(Vector<$Boxtype$> v, Mask<$Boxtype$> m) {
+    public $vectortype$ add(Vector<$Boxtype$> v, VectorMask<$Boxtype$> m) {
         return blend(add(v), m);
     }
 
     @Override
     @ForceInline

@@ -833,11 +833,11 @@
             (v1, v2) -> v1.bOp(v2, (i, a, b) -> ($type$)(a - b)));
     }
 
     @Override
     @ForceInline
-    public $vectortype$ sub(Vector<$Boxtype$> v, Mask<$Boxtype$> m) {
+    public $vectortype$ sub(Vector<$Boxtype$> v, VectorMask<$Boxtype$> m) {
         return blend(sub(v), m);
     }
 
     @Override
     @ForceInline

@@ -850,11 +850,11 @@
             (v1, v2) -> v1.bOp(v2, (i, a, b) -> ($type$)(a * b)));
     }
 
     @Override
     @ForceInline
-    public $vectortype$ mul(Vector<$Boxtype$> v, Mask<$Boxtype$> m) {
+    public $vectortype$ mul(Vector<$Boxtype$> v, VectorMask<$Boxtype$> m) {
         return blend(mul(v), m);
     }
 
     @Override
     @ForceInline

@@ -867,11 +867,11 @@
             (v1, v2) -> v1.bOp(v2, (i, a, b) -> ($type$) Math.min(a, b)));
     }
 
     @Override
     @ForceInline
-    public $vectortype$ min(Vector<$Boxtype$> v, Mask<$Boxtype$> m) {
+    public $vectortype$ min(Vector<$Boxtype$> v, VectorMask<$Boxtype$> m) {
         return blend(min(v), m);
     }
 
     @Override
     @ForceInline

@@ -884,11 +884,11 @@
             (v1, v2) -> v1.bOp(v2, (i, a, b) -> ($type$) Math.max(a, b)));
         }
 
     @Override
     @ForceInline
-    public $vectortype$ max(Vector<$Boxtype$> v, Mask<$Boxtype$> m) {
+    public $vectortype$ max(Vector<$Boxtype$> v, VectorMask<$Boxtype$> m) {
         return blend(max(v), m);
     }
 
 #if[BITWISE]
     @Override

@@ -924,23 +924,23 @@
             (v1, v2) -> v1.bOp(v2, (i, a, b) -> ($type$)(a ^ b)));
     }
 
     @Override
     @ForceInline
-    public $vectortype$ and(Vector<$Boxtype$> v, Mask<$Boxtype$> m) {
+    public $vectortype$ and(Vector<$Boxtype$> v, VectorMask<$Boxtype$> m) {
         return blend(and(v), m);
     }
 
     @Override
     @ForceInline
-    public $vectortype$ or(Vector<$Boxtype$> v, Mask<$Boxtype$> m) {
+    public $vectortype$ or(Vector<$Boxtype$> v, VectorMask<$Boxtype$> m) {
         return blend(or(v), m);
     }
 
     @Override
     @ForceInline
-    public $vectortype$ xor(Vector<$Boxtype$> v, Mask<$Boxtype$> m) {
+    public $vectortype$ xor(Vector<$Boxtype$> v, VectorMask<$Boxtype$> m) {
         return blend(xor(v), m);
     }
 #end[BITWISE]
 
 #if[byte]

@@ -953,11 +953,11 @@
             (v, i) -> v.uOp((__, a) -> ($type$) (a << (i & 7))));
     }
 
     @Override
     @ForceInline
-    public $vectortype$ shiftL(int s, Mask<$Boxtype$> m) {
+    public $vectortype$ shiftL(int s, VectorMask<$Boxtype$> m) {
         return blend(shiftL(s), m);
     }
 
     @Override
     @ForceInline

@@ -968,11 +968,11 @@
             (v, i) -> v.uOp((__, a) -> ($type$) ((a & 0xFF) >>> (i & 7))));
     }
 
     @Override
     @ForceInline
-    public $vectortype$ shiftR(int s, Mask<$Boxtype$> m) {
+    public $vectortype$ shiftR(int s, VectorMask<$Boxtype$> m) {
         return blend(shiftR(s), m);
     }
 
     @Override
     @ForceInline

@@ -983,11 +983,11 @@
             (v, i) -> v.uOp((__, a) -> ($type$) (a >> (i & 7))));
     }
 
     @Override
     @ForceInline
-    public $vectortype$ aShiftR(int s, Mask<$Boxtype$> m) {
+    public $vectortype$ aShiftR(int s, VectorMask<$Boxtype$> m) {
         return blend(aShiftR(s), m);
     }
 #end[byte]
 #if[short]
     @Override

@@ -999,11 +999,11 @@
             (v, i) -> v.uOp((__, a) -> ($type$) (a << (i & 15))));
     }
 
     @Override
     @ForceInline
-    public $vectortype$ shiftL(int s, Mask<$Boxtype$> m) {
+    public $vectortype$ shiftL(int s, VectorMask<$Boxtype$> m) {
         return blend(shiftL(s), m);
     }
 
     @Override
     @ForceInline

@@ -1014,11 +1014,11 @@
             (v, i) -> v.uOp((__, a) -> ($type$) ((a & 0xFFFF) >>> (i & 15))));
     }
 
     @Override
     @ForceInline
-    public $vectortype$ shiftR(int s, Mask<$Boxtype$> m) {
+    public $vectortype$ shiftR(int s, VectorMask<$Boxtype$> m) {
         return blend(shiftR(s), m);
     }
 
     @Override
     @ForceInline

@@ -1029,11 +1029,11 @@
             (v, i) -> v.uOp((__, a) -> ($type$) (a >> (i & 15))));
     }
 
     @Override
     @ForceInline
-    public $vectortype$ aShiftR(int s, Mask<$Boxtype$> m) {
+    public $vectortype$ aShiftR(int s, VectorMask<$Boxtype$> m) {
         return blend(aShiftR(s), m);
     }
 #end[short]
 #if[intOrLong]
     @Override

@@ -1045,11 +1045,11 @@
             (v, i) -> v.uOp((__, a) -> ($type$) (a << i)));
     }
 
     @Override
     @ForceInline
-    public $vectortype$ shiftL(int s, Mask<$Boxtype$> m) {
+    public $vectortype$ shiftL(int s, VectorMask<$Boxtype$> m) {
         return blend(shiftL(s), m);
     }
 
     @Override
     @ForceInline

@@ -1060,11 +1060,11 @@
             (v, i) -> v.uOp((__, a) -> ($type$) (a >>> i)));
     }
 
     @Override
     @ForceInline
-    public $vectortype$ shiftR(int s, Mask<$Boxtype$> m) {
+    public $vectortype$ shiftR(int s, VectorMask<$Boxtype$> m) {
         return blend(shiftR(s), m);
     }
 
     @Override
     @ForceInline

@@ -1075,11 +1075,11 @@
             (v, i) -> v.uOp((__, a) -> ($type$) (a >> i)));
     }
 
     @Override
     @ForceInline
-    public $vectortype$ aShiftR(int s, Mask<$Boxtype$> m) {
+    public $vectortype$ aShiftR(int s, VectorMask<$Boxtype$> m) {
         return blend(aShiftR(s), m);
     }
 
     @Override
     @ForceInline

@@ -1155,11 +1155,11 @@
             v -> (long) v.rOp(($type$) -1, (i, a, b) -> ($type$) (a & b)));
     }
 
     @Override
     @ForceInline
-    public $type$ andAll(Mask<$Boxtype$> m) {
+    public $type$ andAll(VectorMask<$Boxtype$> m) {
         return blend(($vectortype$)$abstractvectortype$.broadcast(SPECIES, ($type$) -1), m).andAll();
     }
 
     @Override
     @ForceInline

@@ -1197,11 +1197,11 @@
             v -> (long) v.rOp(($type$) 0, (i, a, b) -> ($type$) (a | b)));
     }
 
     @Override
     @ForceInline
-    public $type$ orAll(Mask<$Boxtype$> m) {
+    public $type$ orAll(VectorMask<$Boxtype$> m) {
         return blend(($vectortype$)$abstractvectortype$.broadcast(SPECIES, ($type$) 0), m).orAll();
     }
 
     @Override
     @ForceInline

@@ -1212,11 +1212,11 @@
             v -> (long) v.rOp(($type$) 0, (i, a, b) -> ($type$) (a ^ b)));
     }
 
     @Override
     @ForceInline
-    public $type$ xorAll(Mask<$Boxtype$> m) {
+    public $type$ xorAll(VectorMask<$Boxtype$> m) {
         return blend(($vectortype$)$abstractvectortype$.broadcast(SPECIES, ($type$) 0), m).xorAll();
     }
 #end[BITWISE]
 
 #if[FP]

@@ -1274,42 +1274,42 @@
 
 #end[FP]
 
     @Override
     @ForceInline
-    public $type$ addAll(Mask<$Boxtype$> m) {
+    public $type$ addAll(VectorMask<$Boxtype$> m) {
         return blend(($vectortype$)$abstractvectortype$.broadcast(SPECIES, ($type$) 0), m).addAll();
     }
 
 
     @Override
     @ForceInline
-    public $type$ mulAll(Mask<$Boxtype$> m) {
+    public $type$ mulAll(VectorMask<$Boxtype$> m) {
         return blend(($vectortype$)$abstractvectortype$.broadcast(SPECIES, ($type$) 1), m).mulAll();
     }
 
     @Override
     @ForceInline
-    public $type$ minAll(Mask<$Boxtype$> m) {
+    public $type$ minAll(VectorMask<$Boxtype$> m) {
         return blend(($vectortype$)$abstractvectortype$.broadcast(SPECIES, $Boxtype$.MAX_VALUE), m).minAll();
     }
 
     @Override
     @ForceInline
-    public $type$ maxAll(Mask<$Boxtype$> m) {
+    public $type$ maxAll(VectorMask<$Boxtype$> m) {
         return blend(($vectortype$)$abstractvectortype$.broadcast(SPECIES, $Boxtype$.MIN_VALUE), m).maxAll();
     }
 
     @Override
     @ForceInline
-    public Shuffle<$Boxtype$> toShuffle() {
+    public VectorShuffle<$Boxtype$> toShuffle() {
         $type$[] a = toArray();
         int[] sa = new int[a.length];
         for (int i = 0; i < a.length; i++) {
             sa[i] = (int) a[i];
         }
-        return $abstractvectortype$.shuffleFromArray(SPECIES, sa, 0);
+        return VectorShuffle.fromArray(SPECIES, sa, 0);
     }
 
     // Memory operations
 
     private static final int ARRAY_SHIFT         = 31 - Integer.numberOfLeadingZeros(Unsafe.ARRAY_$TYPE$_INDEX_SCALE);

@@ -1327,11 +1327,11 @@
                                (arr, idx, v) -> v.forEach((i, e) -> arr[idx + i] = e));
     }
 
     @Override
     @ForceInline
-    public final void intoArray($type$[] a, int ax, Mask<$Boxtype$> m) {
+    public final void intoArray($type$[] a, int ax, VectorMask<$Boxtype$> m) {
         $abstractvectortype$ oldVal = $abstractvectortype$.fromArray(SPECIES, a, ax);
         $abstractvectortype$ newVal = oldVal.blend(this, m);
         newVal.intoArray(a, ax);
     }
 #if[!byteOrShort]

@@ -1357,11 +1357,11 @@
 #end[longOrDouble64]
     }
 
      @Override
      @ForceInline
-     public final void intoArray($type$[] a, int ax, Mask<$Boxtype$> m, int[] b, int iy) {
+     public final void intoArray($type$[] a, int ax, VectorMask<$Boxtype$> m, int[] b, int iy) {
          // @@@ This can result in out of bounds errors for unset mask lanes
          $abstractvectortype$ oldVal = $abstractvectortype$.fromArray(SPECIES, a, ax, b, iy);
          $abstractvectortype$ newVal = oldVal.blend(this, m);
          newVal.intoArray(a, ax, b, iy);
      }

@@ -1383,11 +1383,11 @@
                                });
     }
 
     @Override
     @ForceInline
-    public final void intoByteArray(byte[] a, int ix, Mask<$Boxtype$> m) {
+    public final void intoByteArray(byte[] a, int ix, VectorMask<$Boxtype$> m) {
         $vectortype$ oldVal = ($vectortype$) $abstractvectortype$.fromByteArray(SPECIES, a, ix);
         $vectortype$ newVal = oldVal.blend(this, m);
         newVal.intoByteArray(a, ix);
     }
 

@@ -1412,11 +1412,11 @@
                                });
     }
 
     @Override
     @ForceInline
-    public void intoByteBuffer(ByteBuffer bb, int ix, Mask<$Boxtype$> m) {
+    public void intoByteBuffer(ByteBuffer bb, int ix, VectorMask<$Boxtype$> m) {
         $vectortype$ oldVal = ($vectortype$) $abstractvectortype$.fromByteBuffer(SPECIES, bb, ix);
         $vectortype$ newVal = oldVal.blend(this, m);
         newVal.intoByteBuffer(bb, ix);
     }
 

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

@@ -1614,17 +1614,17 @@
     }
 
     @Override
     @ForceInline
     public $vectortype$ rearrange(Vector<$Boxtype$> v,
-                                  Shuffle<$Boxtype$> s, Mask<$Boxtype$> m) {
+                                  VectorShuffle<$Boxtype$> s, VectorMask<$Boxtype$> m) {
         return this.rearrange(s).blend(v.rearrange(s), m);
     }
 
     @Override
     @ForceInline
-    public $vectortype$ rearrange(Shuffle<$Boxtype$> o1) {
+    public $vectortype$ rearrange(VectorShuffle<$Boxtype$> o1) {
         Objects.requireNonNull(o1);
         $shuffletype$ s =  ($shuffletype$)o1;
 
         return VectorIntrinsics.rearrangeOp(
             $vectortype$.class, $shuffletype$.class, $type$.class, LENGTH,

@@ -1635,11 +1635,11 @@
             }));
     }
 
     @Override
     @ForceInline
-    public $vectortype$ blend(Vector<$Boxtype$> o1, Mask<$Boxtype$> o2) {
+    public $vectortype$ blend(Vector<$Boxtype$> o1, VectorMask<$Boxtype$> o2) {
         Objects.requireNonNull(o1);
         Objects.requireNonNull(o2);
         $vectortype$ v = ($vectortype$)o1;
         $masktype$   m = ($masktype$)o2;
 

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

@@ -1781,27 +1781,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 Byte$bits$Vector.Byte$bits$Mask(maskArray);
+                return (VectorMask <E>) new Byte$bits$Vector.Byte$bits$Mask(maskArray);
             } else if (stype == short.class) {
-                return (Mask <E>) new Short$bits$Vector.Short$bits$Mask(maskArray);
+                return (VectorMask <E>) new Short$bits$Vector.Short$bits$Mask(maskArray);
             } else if (stype == int.class) {
-                return (Mask <E>) new Int$bits$Vector.Int$bits$Mask(maskArray);
+                return (VectorMask <E>) new Int$bits$Vector.Int$bits$Mask(maskArray);
             } else if (stype == long.class) {
-                return (Mask <E>) new Long$bits$Vector.Long$bits$Mask(maskArray);
+                return (VectorMask <E>) new Long$bits$Vector.Long$bits$Mask(maskArray);
             } else if (stype == float.class) {
-                return (Mask <E>) new Float$bits$Vector.Float$bits$Mask(maskArray);
+                return (VectorMask <E>) new Float$bits$Vector.Float$bits$Mask(maskArray);
             } else if (stype == double.class) {
-                return (Mask <E>) new Double$bits$Vector.Double$bits$Mask(maskArray);
+                return (VectorMask <E>) new Double$bits$Vector.Double$bits$Mask(maskArray);
             } else {
                 throw new UnsupportedOperationException("Bad lane type for casting.");
             }
         }
 

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

@@ -1850,11 +1850,11 @@
 
         @Override
         @ForceInline
         public boolean allTrue() {
             return VectorIntrinsics.test(BT_overflow, $masktype$.class, $bitstype$.class, LENGTH,
-                                         this, $abstractvectortype$.maskAllTrue(species()),
+                                         this, VectorMask.maskAllTrue(species()),
                                          (m, __) -> allTrueHelper((($masktype$)m).getBits()));
         }
     }
 
     // Shuffle

@@ -1875,11 +1875,11 @@
         public $shuffletype$(IntUnaryOperator f) {
             super(f);
         }
 
         @Override
-        public Species<$Boxtype$> species() {
+        public VectorSpecies<$Boxtype$> species() {
             return SPECIES;
         }
 
         @Override
         public $abstractvectortype$ toVector() {

@@ -1891,45 +1891,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 Byte$bits$Vector.Byte$bits$Shuffle(shuffleArray);
+                return (VectorShuffle<F>) new Byte$bits$Vector.Byte$bits$Shuffle(shuffleArray);
             } else if (stype == short.class) {
-                return (Shuffle<F>) new Short$bits$Vector.Short$bits$Shuffle(shuffleArray);
+                return (VectorShuffle<F>) new Short$bits$Vector.Short$bits$Shuffle(shuffleArray);
             } else if (stype == int.class) {
-                return (Shuffle<F>) new Int$bits$Vector.Int$bits$Shuffle(shuffleArray);
+                return (VectorShuffle<F>) new Int$bits$Vector.Int$bits$Shuffle(shuffleArray);
             } else if (stype == long.class) {
-                return (Shuffle<F>) new Long$bits$Vector.Long$bits$Shuffle(shuffleArray);
+                return (VectorShuffle<F>) new Long$bits$Vector.Long$bits$Shuffle(shuffleArray);
             } else if (stype == float.class) {
-                return (Shuffle<F>) new Float$bits$Vector.Float$bits$Shuffle(shuffleArray);
+                return (VectorShuffle<F>) new Float$bits$Vector.Float$bits$Shuffle(shuffleArray);
             } else if (stype == double.class) {
-                return (Shuffle<F>) new Double$bits$Vector.Double$bits$Shuffle(shuffleArray);
+                return (VectorShuffle<F>) new Double$bits$Vector.Double$bits$Shuffle(shuffleArray);
             } else {
                 throw new UnsupportedOperationException("Bad lane type for casting.");
             }
         }
 
         @Override
-        public $shuffletype$ rearrange(Vector.Shuffle<$Boxtype$> o) {
+        public $shuffletype$ rearrange(VectorShuffle<$Boxtype$> o) {
             $shuffletype$ s = ($shuffletype$) o;
             byte[] r = new byte[reorder.length];
             for (int i = 0; i < reorder.length; i++) {
                 r[i] = reorder[s.reorder[i]];
             }
             return new $shuffletype$(r);
         }
     }
 
-    // Species
+    // VectorSpecies
 
     @Override
-    public Species<$Boxtype$> species() {
+    public VectorSpecies<$Boxtype$> species() {
         return SPECIES;
     }
 }