< prev index next >

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

Print this page

        

@@ -110,11 +110,11 @@
      * @return a zero vector of given species
      */
     @ForceInline
     @SuppressWarnings("unchecked")
     public static IntVector zero(VectorSpecies<Integer> species) {
-        return VectorIntrinsics.broadcastCoerced((Class<IntVector>) species.boxType(), int.class, species.length(),
+        return VectorIntrinsics.broadcastCoerced((Class<IntVector>) species.vectorType(), int.class, species.length(),
                                                  0, species,
                                                  ((bits, s) -> ((IntSpecies)s).op(i -> (int)bits)));
     }
 
     /**

@@ -140,11 +140,11 @@
     @ForceInline
     @SuppressWarnings("unchecked")
     public static IntVector fromByteArray(VectorSpecies<Integer> species, byte[] a, int offset) {
         Objects.requireNonNull(a);
         offset = VectorIntrinsics.checkIndex(offset, a.length, species.bitSize() / Byte.SIZE);
-        return VectorIntrinsics.load((Class<IntVector>) species.boxType(), int.class, species.length(),
+        return VectorIntrinsics.load((Class<IntVector>) species.vectorType(), int.class, species.length(),
                                      a, ((long) offset) + Unsafe.ARRAY_BYTE_BASE_OFFSET,
                                      a, offset, species,
                                      (c, idx, s) -> {
                                          ByteBuffer bbc = ByteBuffer.wrap(c, idx, a.length - idx).order(ByteOrder.nativeOrder());
                                          IntBuffer tb = bbc.asIntBuffer();

@@ -198,11 +198,11 @@
     @ForceInline
     @SuppressWarnings("unchecked")
     public static IntVector fromArray(VectorSpecies<Integer> species, int[] a, int offset){
         Objects.requireNonNull(a);
         offset = VectorIntrinsics.checkIndex(offset, a.length, species.length());
-        return VectorIntrinsics.load((Class<IntVector>) species.boxType(), int.class, species.length(),
+        return VectorIntrinsics.load((Class<IntVector>) species.vectorType(), int.class, species.length(),
                                      a, (((long) offset) << ARRAY_SHIFT) + Unsafe.ARRAY_INT_BASE_OFFSET,
                                      a, offset, species,
                                      (c, idx, s) -> ((IntSpecies)s).op(n -> c[idx + n]));
     }
 

@@ -261,12 +261,12 @@
         // Index vector: vix[0:n] = k -> a_offset + indexMap[i_offset + k]
         IntVector vix = IntVector.fromArray(IntVector.species(species.indexShape()), indexMap, i_offset).add(a_offset);
 
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
-        return VectorIntrinsics.loadWithMap((Class<IntVector>) species.boxType(), int.class, species.length(),
-                                            IntVector.species(species.indexShape()).boxType(), a, Unsafe.ARRAY_INT_BASE_OFFSET, vix,
+        return VectorIntrinsics.loadWithMap((Class<IntVector>) species.vectorType(), int.class, species.length(),
+                                            IntVector.species(species.indexShape()).vectorType(), a, Unsafe.ARRAY_INT_BASE_OFFSET, vix,
                                             a, a_offset, indexMap, i_offset, species,
                                             (int[] c, int idx, int[] iMap, int idy, VectorSpecies<Integer> s) ->
                                                 ((IntSpecies)s).op(n -> c[idx + iMap[idy+n]]));
         }
 

@@ -331,11 +331,11 @@
     public static IntVector fromByteBuffer(VectorSpecies<Integer> species, ByteBuffer bb, int offset) {
         if (bb.order() != ByteOrder.nativeOrder()) {
             throw new IllegalArgumentException();
         }
         offset = VectorIntrinsics.checkIndex(offset, bb.limit(), species.bitSize() / Byte.SIZE);
-        return VectorIntrinsics.load((Class<IntVector>) species.boxType(), int.class, species.length(),
+        return VectorIntrinsics.load((Class<IntVector>) species.vectorType(), int.class, species.length(),
                                      U.getReference(bb, BYTE_BUFFER_HB), U.getLong(bb, BUFFER_ADDRESS) + offset,
                                      bb, offset, species,
                                      (c, idx, s) -> {
                                          ByteBuffer bbc = c.duplicate().position(idx).order(ByteOrder.nativeOrder());
                                          IntBuffer tb = bbc.asIntBuffer();

@@ -395,11 +395,11 @@
      */
     @ForceInline
     @SuppressWarnings("unchecked")
     public static IntVector broadcast(VectorSpecies<Integer> species, int e) {
         return VectorIntrinsics.broadcastCoerced(
-            (Class<IntVector>) species.boxType(), int.class, species.length(),
+            (Class<IntVector>) species.vectorType(), int.class, species.length(),
             e, species,
             ((bits, sp) -> ((IntSpecies)sp).op(i -> (int)bits)));
     }
 
     /**

@@ -419,11 +419,11 @@
     @ForceInline
     @SuppressWarnings("unchecked")
     public static IntVector scalars(VectorSpecies<Integer> species, int... es) {
         Objects.requireNonNull(es);
         int ix = VectorIntrinsics.checkIndex(0, es.length, species.length());
-        return VectorIntrinsics.load((Class<IntVector>) species.boxType(), int.class, species.length(),
+        return VectorIntrinsics.load((Class<IntVector>) species.vectorType(), int.class, species.length(),
                                      es, Unsafe.ARRAY_INT_BASE_OFFSET,
                                      es, ix, species,
                                      (c, idx, sp) -> ((IntSpecies)sp).op(n -> c[idx + n]));
     }
 

@@ -797,29 +797,29 @@
 
     /**
      * {@inheritDoc}
      */
     @Override
-    public abstract IntVector rotateEL(int i);
+    public abstract IntVector rotateLanesLeft(int i);
 
     /**
      * {@inheritDoc}
      */
     @Override
-    public abstract IntVector rotateER(int i);
+    public abstract IntVector rotateLanesRight(int i);
 
     /**
      * {@inheritDoc}
      */
     @Override
-    public abstract IntVector shiftEL(int i);
+    public abstract IntVector shiftLanesLeft(int i);
 
     /**
      * {@inheritDoc}
      */
     @Override
-    public abstract IntVector shiftER(int i);
+    public abstract IntVector shiftLanesRight(int i);
 
 
 
     /**
      * Bitwise ANDs this vector with an input vector.

@@ -994,174 +994,186 @@
 
     /**
      * Logically left shifts this vector by the broadcast of an input scalar.
      * <p>
      * This is a lane-wise binary operation which applies the primitive logical left shift
-     * operation ({@code <<}) to each lane.
+     * operation ({@code <<}) to each lane to left shift the
+     * element by shift value as specified by the input scalar.
      *
      * @param s the input scalar; the number of the bits to left shift
      * @return the result of logically left shifting left this vector by the
      * broadcast of an input scalar
      */
-    public abstract IntVector shiftL(int s);
+    public abstract IntVector shiftLeft(int s);
 
     /**
      * Logically left shifts this vector by the broadcast of an input scalar,
      * selecting lane elements controlled by a mask.
      * <p>
      * This is a lane-wise binary operation which applies the primitive logical left shift
-     * operation ({@code <<}) to each lane.
+     * operation ({@code <<}) to each lane to left shift the
+     * element by shift value as specified by the input scalar.
      *
      * @param s the input scalar; the number of the bits to left shift
      * @param m the mask controlling lane selection
-     * @return the result of logically left shifting this vector by the
+     * @return the result of logically left shifting left this vector by the
      * broadcast of an input scalar
      */
-    public abstract IntVector shiftL(int s, VectorMask<Integer> m);
+    public abstract IntVector shiftLeft(int s, VectorMask<Integer> m);
 
     /**
      * Logically left shifts this vector by an input vector.
      * <p>
      * This is a lane-wise binary operation which applies the primitive logical left shift
-     * operation ({@code <<}) to each lane.
+     * operation ({@code <<}) to each lane. For each lane of this vector, the
+     * shift value is the corresponding lane of input vector.
      *
      * @param v the input vector
      * @return the result of logically left shifting this vector by the input
      * vector
      */
-    public abstract IntVector shiftL(Vector<Integer> v);
+    public abstract IntVector shiftLeft(Vector<Integer> v);
 
     /**
      * Logically left shifts this vector by an input vector, selecting lane
      * elements controlled by a mask.
      * <p>
      * This is a lane-wise binary operation which applies the primitive logical left shift
-     * operation ({@code <<}) to each lane.
+     * operation ({@code <<}) to each lane. For each lane of this vector, the
+     * shift value is the corresponding lane of input vector.
      *
      * @param v the input vector
      * @param m the mask controlling lane selection
      * @return the result of logically left shifting this vector by the input
      * vector
      */
-    public IntVector shiftL(Vector<Integer> v, VectorMask<Integer> m) {
-        return bOp(v, m, (i, a, b) -> (int) (a << b));
+    public IntVector shiftLeft(Vector<Integer> v, VectorMask<Integer> m) {
+        return blend(shiftLeft(v), m);
     }
 
     // logical, or unsigned, shift right
 
     /**
      * Logically right shifts (or unsigned right shifts) this vector by the
      * broadcast of an input scalar.
      * <p>
      * This is a lane-wise binary operation which applies the primitive logical right shift
-     * operation ({@code >>>}) to each lane.
+     * operation ({@code >>>}) to each lane to logically right shift the
+     * element by shift value as specified by the input scalar.
      *
      * @param s the input scalar; the number of the bits to right shift
      * @return the result of logically right shifting this vector by the
      * broadcast of an input scalar
      */
-    public abstract IntVector shiftR(int s);
+    public abstract IntVector shiftRight(int s);
 
     /**
      * Logically right shifts (or unsigned right shifts) this vector by the
      * broadcast of an input scalar, selecting lane elements controlled by a
      * mask.
      * <p>
      * This is a lane-wise binary operation which applies the primitive logical right shift
-     * operation ({@code >>>}) to each lane.
+     * operation ({@code >>}) to each lane to logically right shift the
+     * element by shift value as specified by the input scalar.
      *
      * @param s the input scalar; the number of the bits to right shift
      * @param m the mask controlling lane selection
      * @return the result of logically right shifting this vector by the
      * broadcast of an input scalar
      */
-    public abstract IntVector shiftR(int s, VectorMask<Integer> m);
+    public abstract IntVector shiftRight(int s, VectorMask<Integer> m);
 
     /**
      * Logically right shifts (or unsigned right shifts) this vector by an
      * input vector.
      * <p>
      * This is a lane-wise binary operation which applies the primitive logical right shift
-     * operation ({@code >>>}) to each lane.
+     * operation ({@code >>>}) to each lane. For each lane of this vector, the
+     * shift value is the corresponding lane of input vector.
      *
      * @param v the input vector
      * @return the result of logically right shifting this vector by the
      * input vector
      */
-    public abstract IntVector shiftR(Vector<Integer> v);
+    public abstract IntVector shiftRight(Vector<Integer> v);
 
     /**
      * Logically right shifts (or unsigned right shifts) this vector by an
      * input vector, selecting lane elements controlled by a mask.
      * <p>
      * This is a lane-wise binary operation which applies the primitive logical right shift
-     * operation ({@code >>>}) to each lane.
+     * operation ({@code >>>}) to each lane. For each lane of this vector, the
+     * shift value is the corresponding lane of input vector.
      *
      * @param v the input vector
      * @param m the mask controlling lane selection
      * @return the result of logically right shifting this vector by the
      * input vector
      */
-    public IntVector shiftR(Vector<Integer> v, VectorMask<Integer> m) {
-        return bOp(v, m, (i, a, b) -> (int) (a >>> b));
+    public IntVector shiftRight(Vector<Integer> v, VectorMask<Integer> m) {
+        return blend(shiftRight(v), m);
     }
 
     /**
      * Arithmetically right shifts (or signed right shifts) this vector by the
      * broadcast of an input scalar.
      * <p>
      * This is a lane-wise binary operation which applies the primitive arithmetic right
-     * shift operation ({@code >>}) to each lane.
+     * shift operation ({@code >>}) to each lane to arithmetically
+     * right shift the element by shift value as specified by the input scalar.
      *
      * @param s the input scalar; the number of the bits to right shift
      * @return the result of arithmetically right shifting this vector by the
      * broadcast of an input scalar
      */
-    public abstract IntVector aShiftR(int s);
+    public abstract IntVector shiftArithmeticRight(int s);
 
     /**
      * Arithmetically right shifts (or signed right shifts) this vector by the
      * broadcast of an input scalar, selecting lane elements controlled by a
      * mask.
      * <p>
      * This is a lane-wise binary operation which applies the primitive arithmetic right
-     * shift operation ({@code >>}) to each lane.
+     * shift operation ({@code >>}) to each lane to arithmetically
+     * right shift the element by shift value as specified by the input scalar.
      *
      * @param s the input scalar; the number of the bits to right shift
      * @param m the mask controlling lane selection
      * @return the result of arithmetically right shifting this vector by the
      * broadcast of an input scalar
      */
-    public abstract IntVector aShiftR(int s, VectorMask<Integer> m);
+    public abstract IntVector shiftArithmeticRight(int s, VectorMask<Integer> m);
 
     /**
      * Arithmetically right shifts (or signed right shifts) this vector by an
      * input vector.
      * <p>
      * This is a lane-wise binary operation which applies the primitive arithmetic right
-     * shift operation ({@code >>}) to each lane.
+     * shift operation ({@code >>}) to each lane. For each lane of this vector, the
+     * shift value is the corresponding lane of input vector.
      *
      * @param v the input vector
      * @return the result of arithmetically right shifting this vector by the
      * input vector
      */
-    public abstract IntVector aShiftR(Vector<Integer> v);
+    public abstract IntVector shiftArithmeticRight(Vector<Integer> v);
 
     /**
      * Arithmetically right shifts (or signed right shifts) this vector by an
      * input vector, selecting lane elements controlled by a mask.
      * <p>
      * This is a lane-wise binary operation which applies the primitive arithmetic right
-     * shift operation ({@code >>}) to each lane.
+     * shift operation ({@code >>}) to each lane. For each lane of this vector, the
+     * shift value is the corresponding lane of input vector.
      *
      * @param v the input vector
      * @param m the mask controlling lane selection
      * @return the result of arithmetically right shifting this vector by the
      * input vector
      */
-    public IntVector aShiftR(Vector<Integer> v, VectorMask<Integer> m) {
-        return bOp(v, m, (i, a, b) -> (int) (a >> b));
+    public IntVector shiftArithmeticRight(Vector<Integer> v, VectorMask<Integer> m) {
+        return blend(shiftArithmeticRight(v), m);
     }
 
     /**
      * Rotates left this vector by the broadcast of an input scalar.
      * <p>

@@ -1174,12 +1186,12 @@
      * @param s the input scalar; the number of the bits to rotate left
      * @return the result of rotating left this vector by the broadcast of an
      * input scalar
      */
     @ForceInline
-    public final IntVector rotateL(int s) {
-        return shiftL(s).or(shiftR(-s));
+    public final IntVector rotateLeft(int s) {
+        return shiftLeft(s).or(shiftRight(-s));
     }
 
     /**
      * Rotates left this vector by the broadcast of an input scalar, selecting
      * lane elements controlled by a mask.

@@ -1194,12 +1206,12 @@
      * @param m the mask controlling lane selection
      * @return the result of rotating left this vector by the broadcast of an
      * input scalar
      */
     @ForceInline
-    public final IntVector rotateL(int s, VectorMask<Integer> m) {
-        return shiftL(s, m).or(shiftR(-s, m), m);
+    public final IntVector rotateLeft(int s, VectorMask<Integer> m) {
+        return shiftLeft(s, m).or(shiftRight(-s, m), m);
     }
 
     /**
      * Rotates right this vector by the broadcast of an input scalar.
      * <p>

@@ -1212,12 +1224,12 @@
      * @param s the input scalar; the number of the bits to rotate right
      * @return the result of rotating right this vector by the broadcast of an
      * input scalar
      */
     @ForceInline
-    public final IntVector rotateR(int s) {
-        return shiftR(s).or(shiftL(-s));
+    public final IntVector rotateRight(int s) {
+        return shiftRight(s).or(shiftLeft(-s));
     }
 
     /**
      * Rotates right this vector by the broadcast of an input scalar, selecting
      * lane elements controlled by a mask.

@@ -1232,12 +1244,12 @@
      * @param m the mask controlling lane selection
      * @return the result of rotating right this vector by the broadcast of an
      * input scalar
      */
     @ForceInline
-    public final IntVector rotateR(int s, VectorMask<Integer> m) {
-        return shiftR(s, m).or(shiftL(-s, m), m);
+    public final IntVector rotateRight(int s, VectorMask<Integer> m) {
+        return shiftRight(s, m).or(shiftLeft(-s, m), m);
     }
 
     /**
      * {@inheritDoc}
      */

@@ -1575,17 +1587,17 @@
      */
     static final class IntSpecies extends AbstractSpecies<Integer> {
         final Function<int[], IntVector> vectorFactory;
 
         private IntSpecies(VectorShape shape,
-                          Class<?> boxType,
+                          Class<?> vectorType,
                           Class<?> maskType,
                           Function<int[], IntVector> vectorFactory,
                           Function<boolean[], VectorMask<Integer>> maskFactory,
                           Function<IntUnaryOperator, VectorShuffle<Integer>> shuffleFromArrayFactory,
                           fShuffleFromArray<Integer> shuffleFromOpFactory) {
-            super(shape, int.class, Integer.SIZE, boxType, maskType, maskFactory,
+            super(shape, int.class, Integer.SIZE, vectorType, maskType, maskFactory,
                   shuffleFromArrayFactory, shuffleFromOpFactory);
             this.vectorFactory = vectorFactory;
         }
 
         interface FOp {
< prev index next >