< prev index next >

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

@@ -160,11 +161,11 @@
             throw new IllegalArgumentException("Vector length this species length differ");
 
         return VectorIntrinsics.cast(
             Float256Vector.class,
             float.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 FloatVector reshape(Species<Float> s) {
         Objects.requireNonNull(s);
-        if (s.bitSize() == 64 && (s instanceof Float64Vector.Float64Species)) {
-            Float64Vector.Float64Species ts = (Float64Vector.Float64Species)s;
+        if (s.bitSize() == 64 && (s.boxType() == Float64Vector.class)) {
             return VectorIntrinsics.reinterpret(
                 Float256Vector.class,
                 float.class, LENGTH,
                 Float64Vector.class,
                 float.class, Float64Vector.LENGTH,
-                this, ts,
+                this, s,
                 (species, vector) -> (FloatVector) vector.defaultReinterpret(species)
             );
-        } else if (s.bitSize() == 128 && (s instanceof Float128Vector.Float128Species)) {
-            Float128Vector.Float128Species ts = (Float128Vector.Float128Species)s;
+        } else if (s.bitSize() == 128 && (s.boxType() == Float128Vector.class)) {
             return VectorIntrinsics.reinterpret(
                 Float256Vector.class,
                 float.class, LENGTH,
                 Float128Vector.class,
                 float.class, Float128Vector.LENGTH,
-                this, ts,
+                this, s,
                 (species, vector) -> (FloatVector) vector.defaultReinterpret(species)
             );
-        } else if (s.bitSize() == 256 && (s instanceof Float256Vector.Float256Species)) {
-            Float256Vector.Float256Species ts = (Float256Vector.Float256Species)s;
+        } else if (s.bitSize() == 256 && (s.boxType() == Float256Vector.class)) {
             return VectorIntrinsics.reinterpret(
                 Float256Vector.class,
                 float.class, LENGTH,
                 Float256Vector.class,
                 float.class, Float256Vector.LENGTH,
-                this, ts,
+                this, s,
                 (species, vector) -> (FloatVector) vector.defaultReinterpret(species)
             );
-        } else if (s.bitSize() == 512 && (s instanceof Float512Vector.Float512Species)) {
-            Float512Vector.Float512Species ts = (Float512Vector.Float512Species)s;
+        } else if (s.bitSize() == 512 && (s.boxType() == Float512Vector.class)) {
             return VectorIntrinsics.reinterpret(
                 Float256Vector.class,
                 float.class, LENGTH,
                 Float512Vector.class,
                 float.class, Float512Vector.LENGTH,
-                this, ts,
+                this, s,
                 (species, vector) -> (FloatVector) vector.defaultReinterpret(species)
             );
         } else if ((s.bitSize() > 0) && (s.bitSize() <= 2048)
-                && (s.bitSize() % 128 == 0) && (s instanceof FloatMaxVector.FloatMaxSpecies)) {
-            FloatMaxVector.FloatMaxSpecies ts = (FloatMaxVector.FloatMaxSpecies)s;
+                && (s.bitSize() % 128 == 0) && (s.boxType() == FloatMaxVector.class)) {
             return VectorIntrinsics.reinterpret(
                 Float256Vector.class,
                 float.class, LENGTH,
                 FloatMaxVector.class,
                 float.class, FloatMaxVector.LENGTH,
-                this, ts,
+                this, s,
                 (species, vector) -> (FloatVector) vector.defaultReinterpret(species)
             );
         } else {
             throw new InternalError("Unimplemented size");
         }

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

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

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

@@ -959,11 +955,11 @@
     public void intoArray(float[] 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(Float256Vector.class, float.class, LENGTH, Int256Vector.class,
                                a, Unsafe.ARRAY_FLOAT_BASE_OFFSET, vix,

@@ -1333,11 +1329,11 @@
             }
             return new Float256Mask(res);
         }
 
         @Override
-        public Float256Species species() {
+        public Species<Float> species() {
             return SPECIES;
         }
 
         @Override
         public Float256Vector toVector() {

@@ -1349,10 +1345,35 @@
                 res[i] = (float) (bits[i] ? -1 : 0);
             }
             return new Float256Vector(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 Byte256Vector.Byte256Mask(maskArray);
+            } else if (stype == short.class) {
+                return (Mask <E>) new Short256Vector.Short256Mask(maskArray);
+            } else if (stype == int.class) {
+                return (Mask <E>) new Int256Vector.Int256Mask(maskArray);
+            } else if (stype == long.class) {
+                return (Mask <E>) new Long256Vector.Long256Mask(maskArray);
+            } else if (stype == float.class) {
+                return (Mask <E>) new Float256Vector.Float256Mask(maskArray);
+            } else if (stype == double.class) {
+                return (Mask <E>) new Double256Vector.Double256Mask(maskArray);
+            } else {
+                throw new UnsupportedOperationException("Bad lane type for casting.");
+            }
+        }
+
         // Unary operations
 
         @Override
         @ForceInline
         public Float256Mask not() {

@@ -1421,11 +1442,11 @@
         public Float256Shuffle(IntUnaryOperator f) {
             super(f);
         }
 
         @Override
-        public Float256Species species() {
+        public Species<Float> species() {
             return SPECIES;
         }
 
         @Override
         public FloatVector toVector() {

@@ -1435,10 +1456,35 @@
             }
             return FloatVector.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 Byte256Vector.Byte256Shuffle(shuffleArray);
+            } else if (stype == short.class) {
+                return (Shuffle<F>) new Short256Vector.Short256Shuffle(shuffleArray);
+            } else if (stype == int.class) {
+                return (Shuffle<F>) new Int256Vector.Int256Shuffle(shuffleArray);
+            } else if (stype == long.class) {
+                return (Shuffle<F>) new Long256Vector.Long256Shuffle(shuffleArray);
+            } else if (stype == float.class) {
+                return (Shuffle<F>) new Float256Vector.Float256Shuffle(shuffleArray);
+            } else if (stype == double.class) {
+                return (Shuffle<F>) new Double256Vector.Double256Shuffle(shuffleArray);
+            } else {
+                throw new UnsupportedOperationException("Bad lane type for casting.");
+            }
+        }
+
+        @Override
         public Float256Shuffle rearrange(Vector.Shuffle<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]];

@@ -1448,155 +1494,9 @@
     }
 
     // Species
 
     @Override
-    public Float256Species species() {
+    public Species<Float> species() {
         return SPECIES;
     }
-
-    static final class Float256Species extends FloatSpecies {
-        static final int BIT_SIZE = Shape.S_256_BIT.bitSize();
-
-        static final int LENGTH = BIT_SIZE / Float.SIZE;
-
-        @Override
-        public String toString() {
-           StringBuilder sb = new StringBuilder("Shape[");
-           sb.append(bitSize()).append(" bits, ");
-           sb.append(length()).append(" ").append(float.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<Float> elementType() {
-            return float.class;
-        }
-
-        @Override
-        @ForceInline
-        public Class<?> boxType() {
-            return Float256Vector.class;
-        }
-
-        @Override
-        @ForceInline
-        public Class<?> maskType() {
-            return Float256Mask.class;
-        }
-
-        @Override
-        @ForceInline
-        public int elementSize() {
-            return Float.SIZE;
-        }
-
-        @Override
-        @ForceInline
-        @SuppressWarnings("unchecked")
-        Class<?> vectorType() {
-            return Float256Vector.class;
-        }
-
-        @Override
-        @ForceInline
-        public Shape shape() {
-            return Shape.S_256_BIT;
-        }
-
-       @Override
-       IntVector.IntSpecies indexSpecies() {
-          return INDEX_SPEC;
-       }
-
-        @Override
-        Float256Vector op(FOp f) {
-            float[] res = new float[length()];
-            for (int i = 0; i < length(); i++) {
-                res[i] = f.apply(i);
-            }
-            return new Float256Vector(res);
-        }
-
-        @Override
-        Float256Vector op(Mask<Float> o, FOp f) {
-            float[] res = new float[length()];
-            boolean[] mbits = ((Float256Mask)o).getBits();
-            for (int i = 0; i < length(); i++) {
-                if (mbits[i]) {
-                    res[i] = f.apply(i);
-                }
-            }
-            return new Float256Vector(res);
-        }
-
-        @Override
-        Float256Mask opm(FOpm f) {
-            boolean[] res = new boolean[length()];
-            for (int i = 0; i < length(); i++) {
-                res[i] = (boolean)f.apply(i);
-            }
-            return new Float256Mask(res);
-        }
-
-        // Factories
-
-        @Override
-        @ForceInline
-        public Float256Vector zero() {
-            return VectorIntrinsics.broadcastCoerced(Float256Vector.class, float.class, LENGTH,
-                                                     Float.floatToIntBits(0.0f), SPECIES, 
-                                                     ((bits, s) -> ((Float256Species)s).op(i -> Float.intBitsToFloat((int)bits))));
-        }
-
-        @Override
-        @ForceInline
-        public Float256Vector broadcast(float e) {
-            return VectorIntrinsics.broadcastCoerced(
-                Float256Vector.class, float.class, LENGTH,
-                Float.floatToIntBits(e), SPECIES,
-                ((bits, s) -> ((Float256Species)s).op(i -> Float.intBitsToFloat((int)bits))));
-        }
-
-        @Override
-        @ForceInline
-        public Float256Vector scalars(float... es) {
-            Objects.requireNonNull(es);
-            int ix = VectorIntrinsics.checkIndex(0, es.length, LENGTH);
-            return VectorIntrinsics.load(Float256Vector.class, float.class, LENGTH,
-                                         es, Unsafe.ARRAY_FLOAT_BASE_OFFSET,
-                                         es, ix, SPECIES,
-                                         (c, idx, s) -> ((Float256Species)s).op(n -> c[idx + n]));
-        }
-
-        @Override
-        @ForceInline
-        public <E> Float256Mask cast(Mask<E> m) {
-            if (m.length() != LENGTH)
-                throw new IllegalArgumentException("Mask length this species length differ");
-            return new Float256Mask(m.toArray());
-        }
-
-        @Override
-        @ForceInline
-        public <E> Float256Shuffle cast(Shuffle<E> s) {
-            if (s.length() != LENGTH)
-                throw new IllegalArgumentException("Shuffle length this species length differ");
-            return new Float256Shuffle(s.toArray());
-        }
-    }
 }
< prev index next >