< prev index next >

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

Print this page

        

@@ -459,234 +459,10 @@
     public static FloatVector random(Species<Float> s) {
         ThreadLocalRandom r = ThreadLocalRandom.current();
         return ((FloatSpecies)s).op(i -> r.nextFloat());
     }
 
-    /**
-     * Returns a mask where each lane is set or unset according to given
-     * {@code boolean} values
-     * <p>
-     * For each mask lane, where {@code N} is the mask lane index,
-     * if the given {@code boolean} value at index {@code N} is {@code true}
-     * then the mask lane at index {@code N} is set, otherwise it is unset.
-     *
-     * @param species mask species
-     * @param bits the given {@code boolean} values
-     * @return a mask where each lane is set or unset according to the given {@code boolean} value
-     * @throws IndexOutOfBoundsException if {@code bits.length < species.length()}
-     */
-    @ForceInline
-    public static Mask<Float> maskFromValues(Species<Float> species, boolean... bits) {
-        if (species.boxType() == FloatMaxVector.class)
-            return new FloatMaxVector.FloatMaxMask(bits);
-        switch (species.bitSize()) {
-            case 64: return new Float64Vector.Float64Mask(bits);
-            case 128: return new Float128Vector.Float128Mask(bits);
-            case 256: return new Float256Vector.Float256Mask(bits);
-            case 512: return new Float512Vector.Float512Mask(bits);
-            default: throw new IllegalArgumentException(Integer.toString(species.bitSize()));
-        }
-    }
-
-    // @@@ This is a bad implementation -- makes lambdas capturing -- fix this
-    static Mask<Float> trueMask(Species<Float> species) {
-        if (species.boxType() == FloatMaxVector.class)
-            return FloatMaxVector.FloatMaxMask.TRUE_MASK;
-        switch (species.bitSize()) {
-            case 64: return Float64Vector.Float64Mask.TRUE_MASK;
-            case 128: return Float128Vector.Float128Mask.TRUE_MASK;
-            case 256: return Float256Vector.Float256Mask.TRUE_MASK;
-            case 512: return Float512Vector.Float512Mask.TRUE_MASK;
-            default: throw new IllegalArgumentException(Integer.toString(species.bitSize()));
-        }
-    }
-
-    static Mask<Float> falseMask(Species<Float> species) {
-        if (species.boxType() == FloatMaxVector.class)
-            return FloatMaxVector.FloatMaxMask.FALSE_MASK;
-        switch (species.bitSize()) {
-            case 64: return Float64Vector.Float64Mask.FALSE_MASK;
-            case 128: return Float128Vector.Float128Mask.FALSE_MASK;
-            case 256: return Float256Vector.Float256Mask.FALSE_MASK;
-            case 512: return Float512Vector.Float512Mask.FALSE_MASK;
-            default: throw new IllegalArgumentException(Integer.toString(species.bitSize()));
-        }
-    }
-
-    /**
-     * Loads a mask from a {@code boolean} array starting at an offset.
-     * <p>
-     * For each mask lane, where {@code N} is the mask lane index,
-     * if the array element at index {@code ix + N} is {@code true} then the
-     * mask lane at index {@code N} is set, otherwise it is unset.
-     *
-     * @param species mask species
-     * @param bits the {@code boolean} array
-     * @param ix the offset into the array
-     * @return the mask loaded from a {@code boolean} array
-     * @throws IndexOutOfBoundsException if {@code ix < 0}, or
-     * {@code ix > bits.length - species.length()}
-     */
-    @ForceInline
-    @SuppressWarnings("unchecked")
-    public static Mask<Float> maskFromArray(Species<Float> species, boolean[] bits, int ix) {
-        Objects.requireNonNull(bits);
-        ix = VectorIntrinsics.checkIndex(ix, bits.length, species.length());
-        return VectorIntrinsics.load((Class<Mask<Float>>) species.maskType(), int.class, species.length(),
-                                     bits, (((long) ix) << ARRAY_SHIFT) + Unsafe.ARRAY_BOOLEAN_BASE_OFFSET,
-                                     bits, ix, species,
-                                     (c, idx, s) -> (Mask<Float>) ((FloatSpecies)s).opm(n -> c[idx + n]));
-    }
-
-    /**
-     * Returns a mask where all lanes are set.
-     *
-     * @param species mask species
-     * @return a mask where all lanes are set
-     */
-    @ForceInline
-    @SuppressWarnings("unchecked")
-    public static Mask<Float> maskAllTrue(Species<Float> species) {
-        return VectorIntrinsics.broadcastCoerced((Class<Mask<Float>>) species.maskType(), int.class, species.length(),
-                                                 (int)-1,  species,
-                                                 ((z, s) -> trueMask(s)));
-    }
-
-    /**
-     * Returns a mask where all lanes are unset.
-     *
-     * @param species mask species
-     * @return a mask where all lanes are unset
-     */
-    @ForceInline
-    @SuppressWarnings("unchecked")
-    public static Mask<Float> maskAllFalse(Species<Float> species) {
-        return VectorIntrinsics.broadcastCoerced((Class<Mask<Float>>) species.maskType(), int.class, species.length(),
-                                                 0, species, 
-                                                 ((z, s) -> falseMask(s)));
-    }
-
-    /**
-     * Returns a shuffle of mapped indexes where each lane element is
-     * the result of applying a mapping function to the corresponding lane
-     * index.
-     * <p>
-     * Care should be taken to ensure Shuffle values produced from this
-     * method are consumed as constants to ensure optimal generation of
-     * code.  For example, values held in static final fields or values
-     * held in loop constant local variables.
-     * <p>
-     * This method behaves as if a shuffle is created from an array of
-     * mapped indexes as follows:
-     * <pre>{@code
-     *   int[] a = new int[species.length()];
-     *   for (int i = 0; i < a.length; i++) {
-     *       a[i] = f.applyAsInt(i);
-     *   }
-     *   return this.shuffleFromValues(a);
-     * }</pre>
-     *
-     * @param species shuffle species
-     * @param f the lane index mapping function
-     * @return a shuffle of mapped indexes
-     */
-    @ForceInline
-    public static Shuffle<Float> shuffle(Species<Float> species, IntUnaryOperator f) {
-        if (species.boxType() == FloatMaxVector.class)
-            return new FloatMaxVector.FloatMaxShuffle(f);
-        switch (species.bitSize()) {
-            case 64: return new Float64Vector.Float64Shuffle(f);
-            case 128: return new Float128Vector.Float128Shuffle(f);
-            case 256: return new Float256Vector.Float256Shuffle(f);
-            case 512: return new Float512Vector.Float512Shuffle(f);
-            default: throw new IllegalArgumentException(Integer.toString(species.bitSize()));
-        }
-    }
-
-    /**
-     * Returns a shuffle where each lane element is the value of its
-     * corresponding lane index.
-     * <p>
-     * This method behaves as if a shuffle is created from an identity
-     * index mapping function as follows:
-     * <pre>{@code
-     *   return this.shuffle(i -> i);
-     * }</pre>
-     *
-     * @param species shuffle species
-     * @return a shuffle of lane indexes
-     */
-    @ForceInline
-    public static Shuffle<Float> shuffleIota(Species<Float> species) {
-        if (species.boxType() == FloatMaxVector.class)
-            return new FloatMaxVector.FloatMaxShuffle(AbstractShuffle.IDENTITY);
-        switch (species.bitSize()) {
-            case 64: return new Float64Vector.Float64Shuffle(AbstractShuffle.IDENTITY);
-            case 128: return new Float128Vector.Float128Shuffle(AbstractShuffle.IDENTITY);
-            case 256: return new Float256Vector.Float256Shuffle(AbstractShuffle.IDENTITY);
-            case 512: return new Float512Vector.Float512Shuffle(AbstractShuffle.IDENTITY);
-            default: throw new IllegalArgumentException(Integer.toString(species.bitSize()));
-        }
-    }
-
-    /**
-     * Returns a shuffle where each lane element is set to a given
-     * {@code int} value logically AND'ed by the species length minus one.
-     * <p>
-     * For each shuffle lane, where {@code N} is the shuffle lane index, the
-     * the {@code int} value at index {@code N} logically AND'ed by
-     * {@code species.length() - 1} is placed into the resulting shuffle at
-     * lane index {@code N}.
-     *
-     * @param species shuffle species
-     * @param ixs the given {@code int} values
-     * @return a shuffle where each lane element is set to a given
-     * {@code int} value
-     * @throws IndexOutOfBoundsException if the number of int values is
-     * {@code < species.length()}
-     */
-    @ForceInline
-    public static Shuffle<Float> shuffleFromValues(Species<Float> species, int... ixs) {
-        if (species.boxType() == FloatMaxVector.class)
-            return new FloatMaxVector.FloatMaxShuffle(ixs);
-        switch (species.bitSize()) {
-            case 64: return new Float64Vector.Float64Shuffle(ixs);
-            case 128: return new Float128Vector.Float128Shuffle(ixs);
-            case 256: return new Float256Vector.Float256Shuffle(ixs);
-            case 512: return new Float512Vector.Float512Shuffle(ixs);
-            default: throw new IllegalArgumentException(Integer.toString(species.bitSize()));
-        }
-    }
-
-    /**
-     * Loads a shuffle from an {@code int} array starting at an offset.
-     * <p>
-     * For each shuffle lane, where {@code N} is the shuffle lane index, the
-     * array element at index {@code i + N} logically AND'ed by
-     * {@code species.length() - 1} is placed into the resulting shuffle at lane
-     * index {@code N}.
-     *
-     * @param species shuffle species
-     * @param ixs the {@code int} array
-     * @param i the offset into the array
-     * @return a shuffle loaded from the {@code int} array
-     * @throws IndexOutOfBoundsException if {@code i < 0}, or
-     * {@code i > a.length - species.length()}
-     */
-    @ForceInline
-    public static Shuffle<Float> shuffleFromArray(Species<Float> species, int[] ixs, int i) {
-        if (species.boxType() == FloatMaxVector.class)
-            return new FloatMaxVector.FloatMaxShuffle(ixs, i);
-        switch (species.bitSize()) {
-            case 64: return new Float64Vector.Float64Shuffle(ixs, i);
-            case 128: return new Float128Vector.Float128Shuffle(ixs, i);
-            case 256: return new Float256Vector.Float256Shuffle(ixs, i);
-            case 512: return new Float512Vector.Float512Shuffle(ixs, i);
-            default: throw new IllegalArgumentException(Integer.toString(species.bitSize()));
-        }
-    }
-
     // Ops
 
     @Override
     public abstract FloatVector add(Vector<Float> v);
 

@@ -2097,24 +1873,25 @@
 
     @Override
     public abstract Species<Float> species();
 
     /**
-     * Class representing {@link FloatVector}'s of the same {@link Vector.Shape Shape}.
+     * Class representing {@link FloatVector}'s of the same {@link Shape Shape}.
      */
-    static final class FloatSpecies extends Vector.AbstractSpecies<Float> {
+    static final class FloatSpecies extends AbstractSpecies<Float> {
         final Function<float[], FloatVector> vectorFactory;
-        final Function<boolean[], Vector.Mask<Float>> maskFactory;
 
-        private FloatSpecies(Vector.Shape shape,
+        private FloatSpecies(Shape shape,
                           Class<?> boxType,
                           Class<?> maskType,
                           Function<float[], FloatVector> vectorFactory,
-                          Function<boolean[], Vector.Mask<Float>> maskFactory) {
-            super(shape, float.class, Float.SIZE, boxType, maskType);
+                          Function<boolean[], Mask<Float>> maskFactory,
+                          Function<IntUnaryOperator, Shuffle<Float>> shuffleFromArrayFactory,
+                          fShuffleFromArray<Float> shuffleFromOpFactory) {
+            super(shape, float.class, Float.SIZE, boxType, maskType, maskFactory,
+                  shuffleFromArrayFactory, shuffleFromOpFactory);
             this.vectorFactory = vectorFactory;
-            this.maskFactory = maskFactory;
         }
 
         interface FOp {
             float apply(int i);
         }

@@ -2129,28 +1906,20 @@
                 res[i] = f.apply(i);
             }
             return vectorFactory.apply(res);
         }
 
-        FloatVector op(Vector.Mask<Float> o, FOp f) {
+        FloatVector op(Mask<Float> o, FOp f) {
             float[] res = new float[length()];
             boolean[] mbits = ((AbstractMask<Float>)o).getBits();
             for (int i = 0; i < length(); i++) {
                 if (mbits[i]) {
                     res[i] = f.apply(i);
                 }
             }
             return vectorFactory.apply(res);
         }
-
-        Vector.Mask<Float> opm(IntVector.IntSpecies.FOpm f) {
-            boolean[] res = new boolean[length()];
-            for (int i = 0; i < length(); i++) {
-                res[i] = (boolean)f.apply(i);
-            }
-            return maskFactory.apply(res);
-        }
     }
 
     /**
      * Finds the preferred species for an element type of {@code float}.
      * <p>

@@ -2170,11 +1939,11 @@
      *
      * @param s the shape
      * @return a species for an element type of {@code float} and shape
      * @throws IllegalArgumentException if no such species exists for the shape
      */
-    static FloatSpecies species(Vector.Shape s) {
+    static FloatSpecies species(Shape s) {
         Objects.requireNonNull(s);
         switch (s) {
             case S_64_BIT: return (FloatSpecies) SPECIES_64;
             case S_128_BIT: return (FloatSpecies) SPECIES_128;
             case S_256_BIT: return (FloatSpecies) SPECIES_256;

@@ -2182,29 +1951,34 @@
             case S_Max_BIT: return (FloatSpecies) SPECIES_MAX;
             default: throw new IllegalArgumentException("Bad shape: " + s);
         }
     }
 
-    /** Species representing {@link FloatVector}s of {@link Vector.Shape#S_64_BIT Shape.S_64_BIT}. */
+    /** Species representing {@link FloatVector}s of {@link Shape#S_64_BIT Shape.S_64_BIT}. */
     public static final Species<Float> SPECIES_64 = new FloatSpecies(Shape.S_64_BIT, Float64Vector.class, Float64Vector.Float64Mask.class,
-                                                                     Float64Vector::new, Float64Vector.Float64Mask::new);
+                                                                     Float64Vector::new, Float64Vector.Float64Mask::new,
+                                                                     Float64Vector.Float64Shuffle::new, Float64Vector.Float64Shuffle::new);
 
-    /** Species representing {@link FloatVector}s of {@link Vector.Shape#S_128_BIT Shape.S_128_BIT}. */
+    /** Species representing {@link FloatVector}s of {@link Shape#S_128_BIT Shape.S_128_BIT}. */
     public static final Species<Float> SPECIES_128 = new FloatSpecies(Shape.S_128_BIT, Float128Vector.class, Float128Vector.Float128Mask.class,
-                                                                      Float128Vector::new, Float128Vector.Float128Mask::new);
+                                                                      Float128Vector::new, Float128Vector.Float128Mask::new,
+                                                                      Float128Vector.Float128Shuffle::new, Float128Vector.Float128Shuffle::new);
 
-    /** Species representing {@link FloatVector}s of {@link Vector.Shape#S_256_BIT Shape.S_256_BIT}. */
+    /** Species representing {@link FloatVector}s of {@link Shape#S_256_BIT Shape.S_256_BIT}. */
     public static final Species<Float> SPECIES_256 = new FloatSpecies(Shape.S_256_BIT, Float256Vector.class, Float256Vector.Float256Mask.class,
-                                                                      Float256Vector::new, Float256Vector.Float256Mask::new);
+                                                                      Float256Vector::new, Float256Vector.Float256Mask::new,
+                                                                      Float256Vector.Float256Shuffle::new, Float256Vector.Float256Shuffle::new);
 
-    /** Species representing {@link FloatVector}s of {@link Vector.Shape#S_512_BIT Shape.S_512_BIT}. */
+    /** Species representing {@link FloatVector}s of {@link Shape#S_512_BIT Shape.S_512_BIT}. */
     public static final Species<Float> SPECIES_512 = new FloatSpecies(Shape.S_512_BIT, Float512Vector.class, Float512Vector.Float512Mask.class,
-                                                                      Float512Vector::new, Float512Vector.Float512Mask::new);
+                                                                      Float512Vector::new, Float512Vector.Float512Mask::new,
+                                                                      Float512Vector.Float512Shuffle::new, Float512Vector.Float512Shuffle::new);
 
-    /** Species representing {@link FloatVector}s of {@link Vector.Shape#S_Max_BIT Shape.S_Max_BIT}. */
+    /** Species representing {@link FloatVector}s of {@link Shape#S_Max_BIT Shape.S_Max_BIT}. */
     public static final Species<Float> SPECIES_MAX = new FloatSpecies(Shape.S_Max_BIT, FloatMaxVector.class, FloatMaxVector.FloatMaxMask.class,
-                                                                      FloatMaxVector::new, FloatMaxVector.FloatMaxMask::new);
+                                                                      FloatMaxVector::new, FloatMaxVector.FloatMaxMask::new,
+                                                                      FloatMaxVector.FloatMaxShuffle::new, FloatMaxVector.FloatMaxShuffle::new);
 
     /**
      * Preferred species for {@link FloatVector}s.
      * A preferred species is a species of maximal bit size for the platform.
      */
< prev index next >