< prev index next >

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

Print this page
rev 55589 : Species-phase2
rev 55591 : XxxSpecies made package private

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

@@ -160,11 +161,11 @@
             throw new IllegalArgumentException("Vector length this species length differ");
 
         return VectorIntrinsics.cast(
             Double128Vector.class,
             double.class, LENGTH,
-            s.vectorType(),
+            s.boxType(),
             s.elementType(), LENGTH,
             this, s,
             (species, vector) -> vector.castDefault(species)
         );
     }

@@ -178,41 +179,41 @@
         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((ByteVector.ByteSpecies) s, a, 0);
+            return (Vector) ByteVector.fromArray((Species<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((ShortVector.ShortSpecies) s, a, 0);
+            return (Vector) ShortVector.fromArray((Species<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((IntVector.IntSpecies) s, a, 0);
+            return (Vector) IntVector.fromArray((Species<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((LongVector.LongSpecies) s, a, 0);
+            return (Vector) LongVector.fromArray((Species<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((FloatVector.FloatSpecies) s, a, 0);
+            return (Vector) FloatVector.fromArray((Species<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((DoubleVector.DoubleSpecies) s, a, 0);
+            return (Vector) DoubleVector.fromArray((Species<Double>) s, a, 0);
         } else {
             throw new UnsupportedOperationException("Bad lane type for casting.");
         }
     }
 

@@ -298,59 +299,54 @@
 
     @Override
     @ForceInline
     public DoubleVector reshape(Species<Double> s) {
         Objects.requireNonNull(s);
-        if (s.bitSize() == 64 && (s instanceof Double64Vector.Double64Species)) {
-            Double64Vector.Double64Species ts = (Double64Vector.Double64Species)s;
+        if (s.bitSize() == 64 && (s.boxType() == Double64Vector.class)) {
             return VectorIntrinsics.reinterpret(
                 Double128Vector.class,
                 double.class, LENGTH,
                 Double64Vector.class,
                 double.class, Double64Vector.LENGTH,
-                this, ts,
+                this, s,
                 (species, vector) -> (DoubleVector) vector.defaultReinterpret(species)
             );
-        } else if (s.bitSize() == 128 && (s instanceof Double128Vector.Double128Species)) {
-            Double128Vector.Double128Species ts = (Double128Vector.Double128Species)s;
+        } else if (s.bitSize() == 128 && (s.boxType() == Double128Vector.class)) {
             return VectorIntrinsics.reinterpret(
                 Double128Vector.class,
                 double.class, LENGTH,
                 Double128Vector.class,
                 double.class, Double128Vector.LENGTH,
-                this, ts,
+                this, s,
                 (species, vector) -> (DoubleVector) vector.defaultReinterpret(species)
             );
-        } else if (s.bitSize() == 256 && (s instanceof Double256Vector.Double256Species)) {
-            Double256Vector.Double256Species ts = (Double256Vector.Double256Species)s;
+        } else if (s.bitSize() == 256 && (s.boxType() == Double256Vector.class)) {
             return VectorIntrinsics.reinterpret(
                 Double128Vector.class,
                 double.class, LENGTH,
                 Double256Vector.class,
                 double.class, Double256Vector.LENGTH,
-                this, ts,
+                this, s,
                 (species, vector) -> (DoubleVector) vector.defaultReinterpret(species)
             );
-        } else if (s.bitSize() == 512 && (s instanceof Double512Vector.Double512Species)) {
-            Double512Vector.Double512Species ts = (Double512Vector.Double512Species)s;
+        } else if (s.bitSize() == 512 && (s.boxType() == Double512Vector.class)) {
             return VectorIntrinsics.reinterpret(
                 Double128Vector.class,
                 double.class, LENGTH,
                 Double512Vector.class,
                 double.class, Double512Vector.LENGTH,
-                this, ts,
+                this, s,
                 (species, vector) -> (DoubleVector) vector.defaultReinterpret(species)
             );
         } else if ((s.bitSize() > 0) && (s.bitSize() <= 2048)
-                && (s.bitSize() % 128 == 0) && (s instanceof DoubleMaxVector.DoubleMaxSpecies)) {
-            DoubleMaxVector.DoubleMaxSpecies ts = (DoubleMaxVector.DoubleMaxSpecies)s;
+                && (s.bitSize() % 128 == 0) && (s.boxType() == DoubleMaxVector.class)) {
             return VectorIntrinsics.reinterpret(
                 Double128Vector.class,
                 double.class, LENGTH,
                 DoubleMaxVector.class,
                 double.class, DoubleMaxVector.LENGTH,
-                this, ts,
+                this, s,
                 (species, vector) -> (DoubleVector) vector.defaultReinterpret(species)
             );
         } else {
             throw new InternalError("Unimplemented size");
         }

@@ -359,107 +355,107 @@
     // Binary operations with scalars
 
     @Override
     @ForceInline
     public DoubleVector add(double o) {
-        return add(SPECIES.broadcast(o));
+        return add((Double128Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
     public DoubleVector add(double o, Mask<Double> m) {
-        return add(SPECIES.broadcast(o), m);
+        return add((Double128Vector)DoubleVector.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline
     public DoubleVector sub(double o) {
-        return sub(SPECIES.broadcast(o));
+        return sub((Double128Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
     public DoubleVector sub(double o, Mask<Double> m) {
-        return sub(SPECIES.broadcast(o), m);
+        return sub((Double128Vector)DoubleVector.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline
     public DoubleVector mul(double o) {
-        return mul(SPECIES.broadcast(o));
+        return mul((Double128Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
     public DoubleVector mul(double o, Mask<Double> m) {
-        return mul(SPECIES.broadcast(o), m);
+        return mul((Double128Vector)DoubleVector.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline
     public DoubleVector min(double o) {
-        return min(SPECIES.broadcast(o));
+        return min((Double128Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
     public DoubleVector max(double o) {
-        return max(SPECIES.broadcast(o));
+        return max((Double128Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
     public Mask<Double> equal(double o) {
-        return equal(SPECIES.broadcast(o));
+        return equal((Double128Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
     public Mask<Double> notEqual(double o) {
-        return notEqual(SPECIES.broadcast(o));
+        return notEqual((Double128Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
     public Mask<Double> lessThan(double o) {
-        return lessThan(SPECIES.broadcast(o));
+        return lessThan((Double128Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
     public Mask<Double> lessThanEq(double o) {
-        return lessThanEq(SPECIES.broadcast(o));
+        return lessThanEq((Double128Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
     public Mask<Double> greaterThan(double o) {
-        return greaterThan(SPECIES.broadcast(o));
+        return greaterThan((Double128Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
     public Mask<Double> greaterThanEq(double o) {
-        return greaterThanEq(SPECIES.broadcast(o));
+        return greaterThanEq((Double128Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
     public DoubleVector blend(double o, Mask<Double> m) {
-        return blend(SPECIES.broadcast(o), m);
+        return blend((Double128Vector)DoubleVector.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline
     public DoubleVector div(double o) {
-        return div(SPECIES.broadcast(o));
+        return div((Double128Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
     public DoubleVector div(double o, Mask<Double> m) {
-        return div(SPECIES.broadcast(o), m);
+        return div((Double128Vector)DoubleVector.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline
     public Double128Vector div(Vector<Double> v, Mask<Double> m) {

@@ -467,53 +463,53 @@
     }
 
     @Override
     @ForceInline
     public DoubleVector atan2(double o) {
-        return atan2(SPECIES.broadcast(o));
+        return atan2((Double128Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
     public DoubleVector atan2(double o, Mask<Double> m) {
-        return atan2(SPECIES.broadcast(o), m);
+        return atan2((Double128Vector)DoubleVector.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline
     public DoubleVector pow(double o) {
-        return pow(SPECIES.broadcast(o));
+        return pow((Double128Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
     public DoubleVector pow(double o, Mask<Double> m) {
-        return pow(SPECIES.broadcast(o), m);
+        return pow((Double128Vector)DoubleVector.broadcast(SPECIES, o), m);
     }
 
     @Override
     @ForceInline
     public DoubleVector fma(double o1, double o2) {
-        return fma(SPECIES.broadcast(o1), SPECIES.broadcast(o2));
+        return fma((Double128Vector)DoubleVector.broadcast(SPECIES, o1), (Double128Vector)DoubleVector.broadcast(SPECIES, o2));
     }
 
     @Override
     @ForceInline
     public DoubleVector fma(double o1, double o2, Mask<Double> m) {
-        return fma(SPECIES.broadcast(o1), SPECIES.broadcast(o2), m);
+        return fma((Double128Vector)DoubleVector.broadcast(SPECIES, o1), (Double128Vector)DoubleVector.broadcast(SPECIES, o2), m);
     }
 
     @Override
     @ForceInline
     public DoubleVector hypot(double o) {
-        return hypot(SPECIES.broadcast(o));
+        return hypot((Double128Vector)DoubleVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
     public DoubleVector hypot(double o, Mask<Double> m) {
-        return hypot(SPECIES.broadcast(o), m);
+        return hypot((Double128Vector)DoubleVector.broadcast(SPECIES, o), m);
     }
 
 
     // Unary operations
 

@@ -895,30 +891,30 @@
 
 
     @Override
     @ForceInline
     public double addAll(Mask<Double> m) {
-        return SPECIES.broadcast((double) 0).blend(this, m).addAll();
+        return blend((Double128Vector)DoubleVector.broadcast(SPECIES, (double) 0), m).addAll();
     }
 
 
     @Override
     @ForceInline
     public double mulAll(Mask<Double> m) {
-        return SPECIES.broadcast((double) 1).blend(this, m).mulAll();
+        return blend((Double128Vector)DoubleVector.broadcast(SPECIES, (double) 1), m).mulAll();
     }
 
     @Override
     @ForceInline
     public double minAll(Mask<Double> m) {
-        return SPECIES.broadcast(Double.MAX_VALUE).blend(this, m).minAll();
+        return blend((Double128Vector)DoubleVector.broadcast(SPECIES, Double.MAX_VALUE), m).minAll();
     }
 
     @Override
     @ForceInline
     public double maxAll(Mask<Double> m) {
-        return SPECIES.broadcast(Double.MIN_VALUE).blend(this, m).maxAll();
+        return blend((Double128Vector)DoubleVector.broadcast(SPECIES, Double.MIN_VALUE), m).maxAll();
     }
 
     @Override
     @ForceInline
     public Shuffle<Double> toShuffle() {

@@ -959,11 +955,11 @@
     public void intoArray(double[] a, int ix, int[] b, int iy) {
         Objects.requireNonNull(a);
         Objects.requireNonNull(b);
 
         // Index vector: vix[0:n] = i -> ix + indexMap[iy + i]
-        IntVector vix = IntVector.fromArray(INDEX_SPEC, b, iy).add(ix);
+        IntVector vix = IntVector.fromArray(INDEX_SPECIES, b, iy).add(ix);
 
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         VectorIntrinsics.storeWithMap(Double128Vector.class, double.class, LENGTH, Int64Vector.class,
                                a, Unsafe.ARRAY_DOUBLE_BASE_OFFSET, vix,

@@ -1333,11 +1329,11 @@
             }
             return new Double128Mask(res);
         }
 
         @Override
-        public Double128Species species() {
+        public Species<Double> species() {
             return SPECIES;
         }
 
         @Override
         public Double128Vector toVector() {

@@ -1349,10 +1345,35 @@
                 res[i] = (double) (bits[i] ? -1 : 0);
             }
             return new Double128Vector(res);
         }
 
+        @Override
+        @ForceInline
+        @SuppressWarnings("unchecked")
+        public <E> Mask<E> cast(Species<E> species) {
+            if (length() != species.length())
+                throw new IllegalArgumentException("Mask length and species length differ");
+            Class<?> stype = species.elementType();
+            boolean [] maskArray = toArray();
+            if (stype == byte.class) {
+                return (Mask <E>) new Byte128Vector.Byte128Mask(maskArray);
+            } else if (stype == short.class) {
+                return (Mask <E>) new Short128Vector.Short128Mask(maskArray);
+            } else if (stype == int.class) {
+                return (Mask <E>) new Int128Vector.Int128Mask(maskArray);
+            } else if (stype == long.class) {
+                return (Mask <E>) new Long128Vector.Long128Mask(maskArray);
+            } else if (stype == float.class) {
+                return (Mask <E>) new Float128Vector.Float128Mask(maskArray);
+            } else if (stype == double.class) {
+                return (Mask <E>) new Double128Vector.Double128Mask(maskArray);
+            } else {
+                throw new UnsupportedOperationException("Bad lane type for casting.");
+            }
+        }
+
         // Unary operations
 
         @Override
         @ForceInline
         public Double128Mask not() {

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

@@ -1435,10 +1456,35 @@
             }
             return DoubleVector.fromArray(SPECIES, va, 0);
         }
 
         @Override
+        @ForceInline
+        @SuppressWarnings("unchecked")
+        public <F> Shuffle<F> cast(Species<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 Byte128Vector.Byte128Shuffle(shuffleArray);
+            } else if (stype == short.class) {
+                return (Shuffle<F>) new Short128Vector.Short128Shuffle(shuffleArray);
+            } else if (stype == int.class) {
+                return (Shuffle<F>) new Int128Vector.Int128Shuffle(shuffleArray);
+            } else if (stype == long.class) {
+                return (Shuffle<F>) new Long128Vector.Long128Shuffle(shuffleArray);
+            } else if (stype == float.class) {
+                return (Shuffle<F>) new Float128Vector.Float128Shuffle(shuffleArray);
+            } else if (stype == double.class) {
+                return (Shuffle<F>) new Double128Vector.Double128Shuffle(shuffleArray);
+            } else {
+                throw new UnsupportedOperationException("Bad lane type for casting.");
+            }
+        }
+
+        @Override
         public Double128Shuffle rearrange(Vector.Shuffle<Double> o) {
             Double128Shuffle s = (Double128Shuffle) o;
             byte[] r = new byte[reorder.length];
             for (int i = 0; i < reorder.length; i++) {
                 r[i] = reorder[s.reorder[i]];

@@ -1448,155 +1494,9 @@
     }
 
     // Species
 
     @Override
-    public Double128Species species() {
+    public Species<Double> species() {
         return SPECIES;
     }
-
-    static final class Double128Species extends DoubleSpecies {
-        static final int BIT_SIZE = Shape.S_128_BIT.bitSize();
-
-        static final int LENGTH = BIT_SIZE / Double.SIZE;
-
-        @Override
-        public String toString() {
-           StringBuilder sb = new StringBuilder("Shape[");
-           sb.append(bitSize()).append(" bits, ");
-           sb.append(length()).append(" ").append(double.class.getSimpleName()).append("s x ");
-           sb.append(elementSize()).append(" bits");
-           sb.append("]");
-           return sb.toString();
-        }
-
-        @Override
-        @ForceInline
-        public int bitSize() {
-            return BIT_SIZE;
-        }
-
-        @Override
-        @ForceInline
-        public int length() {
-            return LENGTH;
-        }
-
-        @Override
-        @ForceInline
-        public Class<Double> elementType() {
-            return double.class;
-        }
-
-        @Override
-        @ForceInline
-        public Class<?> boxType() {
-            return Double128Vector.class;
-        }
-
-        @Override
-        @ForceInline
-        public Class<?> maskType() {
-            return Double128Mask.class;
-        }
-
-        @Override
-        @ForceInline
-        public int elementSize() {
-            return Double.SIZE;
-        }
-
-        @Override
-        @ForceInline
-        @SuppressWarnings("unchecked")
-        Class<?> vectorType() {
-            return Double128Vector.class;
-        }
-
-        @Override
-        @ForceInline
-        public Shape shape() {
-            return Shape.S_128_BIT;
-        }
-
-       @Override
-       IntVector.IntSpecies indexSpecies() {
-          return INDEX_SPEC;
-       }
-
-        @Override
-        Double128Vector op(FOp f) {
-            double[] res = new double[length()];
-            for (int i = 0; i < length(); i++) {
-                res[i] = f.apply(i);
-            }
-            return new Double128Vector(res);
-        }
-
-        @Override
-        Double128Vector op(Mask<Double> o, FOp f) {
-            double[] res = new double[length()];
-            boolean[] mbits = ((Double128Mask)o).getBits();
-            for (int i = 0; i < length(); i++) {
-                if (mbits[i]) {
-                    res[i] = f.apply(i);
-                }
-            }
-            return new Double128Vector(res);
-        }
-
-        @Override
-        Double128Mask opm(FOpm f) {
-            boolean[] res = new boolean[length()];
-            for (int i = 0; i < length(); i++) {
-                res[i] = (boolean)f.apply(i);
-            }
-            return new Double128Mask(res);
-        }
-
-        // Factories
-
-        @Override
-        @ForceInline
-        public Double128Vector zero() {
-            return VectorIntrinsics.broadcastCoerced(Double128Vector.class, double.class, LENGTH,
-                                                     Double.doubleToLongBits(0.0f), SPECIES, 
-                                                     ((bits, s) -> ((Double128Species)s).op(i -> Double.longBitsToDouble((long)bits))));
-        }
-
-        @Override
-        @ForceInline
-        public Double128Vector broadcast(double e) {
-            return VectorIntrinsics.broadcastCoerced(
-                Double128Vector.class, double.class, LENGTH,
-                Double.doubleToLongBits(e), SPECIES,
-                ((bits, s) -> ((Double128Species)s).op(i -> Double.longBitsToDouble((long)bits))));
-        }
-
-        @Override
-        @ForceInline
-        public Double128Vector scalars(double... es) {
-            Objects.requireNonNull(es);
-            int ix = VectorIntrinsics.checkIndex(0, es.length, LENGTH);
-            return VectorIntrinsics.load(Double128Vector.class, double.class, LENGTH,
-                                         es, Unsafe.ARRAY_DOUBLE_BASE_OFFSET,
-                                         es, ix, SPECIES,
-                                         (c, idx, s) -> ((Double128Species)s).op(n -> c[idx + n]));
-        }
-
-        @Override
-        @ForceInline
-        public <E> Double128Mask cast(Mask<E> m) {
-            if (m.length() != LENGTH)
-                throw new IllegalArgumentException("Mask length this species length differ");
-            return new Double128Mask(m.toArray());
-        }
-
-        @Override
-        @ForceInline
-        public <E> Double128Shuffle cast(Shuffle<E> s) {
-            if (s.length() != LENGTH)
-                throw new IllegalArgumentException("Shuffle length this species length differ");
-            return new Double128Shuffle(s.toArray());
-        }
-    }
 }
< prev index next >