--- old/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java 2019-04-17 23:05:39.561060000 -0700 +++ new/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java 2019-04-17 23:05:39.070173900 -0700 @@ -125,26 +125,26 @@ *
* This method behaves as if it returns the result of calling the
* byte buffer, offset, and mask accepting
- * {@link #fromByteBuffer(VectorSpecies
* This method behaves as if it returns the result of calling the
* byte buffer, offset, and mask accepting
- * {@link #fromByteBuffer(VectorSpecies
* For each vector lane, where {@code N} is the vector lane index, the
- * array element at index {@code i + N} is placed into the
+ * array element at index {@code offset + N} is placed into the
* resulting vector at lane index {@code N}.
*
* @param species species of desired vector
* @param a the array
- * @param i the offset into the array
+ * @param offset the offset into the array
* @return the vector loaded from an array
- * @throws IndexOutOfBoundsException if {@code i < 0}, or
- * {@code i > a.length - this.length()}
+ * @throws IndexOutOfBoundsException if {@code offset < 0}, or
+ * {@code offset > a.length - species.length()}
*/
@ForceInline
@SuppressWarnings("unchecked")
- public static ShortVector fromArray(VectorSpecies
* For each vector lane, where {@code N} is the vector lane index,
* if the mask lane at index {@code N} is set then the array element at
- * index {@code i + N} is placed into the resulting vector at lane index
+ * index {@code offset + N} is placed into the resulting vector at lane index
* {@code N}, otherwise the default element value is placed into the
* resulting vector at lane index {@code N}.
*
* @param species species of desired vector
* @param a the array
- * @param i the offset into the array
+ * @param offset the offset into the array
* @param m the mask
* @return the vector loaded from an array
- * @throws IndexOutOfBoundsException if {@code i < 0}, or
+ * @throws IndexOutOfBoundsException if {@code offset < 0}, or
* for any vector lane index {@code N} where the mask at lane {@code N}
- * is set {@code i > a.length - N}
+ * is set {@code offset > a.length - N}
*/
@ForceInline
- public static ShortVector fromArray(VectorSpecies
* For each vector lane, where {@code N} is the vector lane index, the
- * array element at index {@code i + indexMap[j + N]} is placed into the
+ * array element at index {@code a_offset + indexMap[i_offset + N]} is placed into the
* resulting vector at lane index {@code N}.
*
* @param species species of desired vector
* @param a the array
- * @param i the offset into the array, may be negative if relative
+ * @param a_offset the offset into the array, may be negative if relative
* indexes in the index map compensate to produce a value within the
* array bounds
* @param indexMap the index map
- * @param j the offset into the index map
+ * @param i_offset the offset into the index map
* @return the vector loaded from an array
- * @throws IndexOutOfBoundsException if {@code j < 0}, or
- * {@code j > indexMap.length - this.length()},
+ * @throws IndexOutOfBoundsException if {@code i_offset < 0}, or
+ * {@code i_offset > indexMap.length - species.length()},
* or for any vector lane index {@code N} the result of
- * {@code i + indexMap[j + N]} is {@code < 0} or {@code >= a.length}
+ * {@code a_offset + indexMap[i_offset + N]} is {@code < 0} or {@code >= a.length}
*/
- public static ShortVector fromArray(VectorSpecies
* For each vector lane, where {@code N} is the vector lane index,
* if the mask lane at index {@code N} is set then the array element at
- * index {@code i + indexMap[j + N]} is placed into the resulting vector
+ * index {@code a_offset + indexMap[i_offset + N]} is placed into the resulting vector
* at lane index {@code N}.
*
* @param species species of desired vector
* @param a the array
- * @param i the offset into the array, may be negative if relative
+ * @param a_offset the offset into the array, may be negative if relative
* indexes in the index map compensate to produce a value within the
* array bounds
* @param m the mask
* @param indexMap the index map
- * @param j the offset into the index map
+ * @param i_offset the offset into the index map
* @return the vector loaded from an array
- * @throws IndexOutOfBoundsException if {@code j < 0}, or
- * {@code j > indexMap.length - this.length()},
+ * @throws IndexOutOfBoundsException if {@code i_offset < 0}, or
+ * {@code i_offset > indexMap.length - species.length()},
* or for any vector lane index {@code N} where the mask at lane
- * {@code N} is set the result of {@code i + indexMap[j + N]} is
+ * {@code N} is set the result of {@code a_offset + indexMap[i_offset + N]} is
* {@code < 0} or {@code >= a.length}
*/
- public static ShortVector fromArray(VectorSpecies
* This method behaves as if it returns the result of calling the
* byte buffer, offset, and mask accepting
- * {@link #fromByteBuffer(VectorSpecies
* For each vector lane, where {@code N} is the vector lane index, the
* the primitive value at index {@code N} is placed into the resulting
* vector at lane index {@code N}.
*
- * @param s species of the desired vector
+ * @param species species of the desired vector
* @param es the given primitive values
- * @return a vector where each lane element is set to a given primitive
- * value
- * @throws IndexOutOfBoundsException if {@code es.length < this.length()}
+ * @return a vector where each lane element is set to given primitive
+ * values
+ * @throws IndexOutOfBoundsException if {@code es.length < species.length()}
*/
@ForceInline
@SuppressWarnings("unchecked")
- public static ShortVector scalars(VectorSpecies
- * This is a vector binary operation where the primitive addition operation
- * ({@code +}) is applied to lane elements.
+ * This is a lane-wise binary operation which applies the primitive addition operation
+ * ({@code +}) to each lane.
*
* @param s the input scalar
* @return the result of adding this vector to the broadcast of an input
@@ -465,8 +462,8 @@
* Adds this vector to broadcast of an input scalar,
* selecting lane elements controlled by a mask.
*
- * This is a vector binary operation where the primitive addition operation
- * ({@code +}) is applied to lane elements.
+ * This is a lane-wise binary operation which applies the primitive addition operation
+ * ({@code +}) to each lane.
*
* @param s the input scalar
* @param m the mask controlling lane selection
@@ -481,8 +478,8 @@
/**
* Subtracts the broadcast of an input scalar from this vector.
*
- * This is a vector binary operation where the primitive subtraction
- * operation ({@code -}) is applied to lane elements.
+ * This is a lane-wise binary operation which applies the primitive subtraction
+ * operation ({@code -}) to each lane.
*
* @param s the input scalar
* @return the result of subtracting the broadcast of an input
@@ -497,8 +494,8 @@
* Subtracts the broadcast of an input scalar from this vector, selecting
* lane elements controlled by a mask.
*
- * This is a vector binary operation where the primitive subtraction
- * operation ({@code -}) is applied to lane elements.
+ * This is a lane-wise binary operation which applies the primitive subtraction
+ * operation ({@code -}) to each lane.
*
* @param s the input scalar
* @param m the mask controlling lane selection
@@ -513,8 +510,8 @@
/**
* Multiplies this vector with the broadcast of an input scalar.
*
- * This is a vector binary operation where the primitive multiplication
- * operation ({@code *}) is applied to lane elements.
+ * This is a lane-wise binary operation which applies the primitive multiplication
+ * operation ({@code *}) to each lane.
*
* @param s the input scalar
* @return the result of multiplying this vector with the broadcast of an
@@ -529,8 +526,8 @@
* Multiplies this vector with the broadcast of an input scalar, selecting
* lane elements controlled by a mask.
*
- * This is a vector binary operation where the primitive multiplication
- * operation ({@code *}) is applied to lane elements.
+ * This is a lane-wise binary operation which applies the primitive multiplication
+ * operation ({@code *}) to each lane.
*
* @param s the input scalar
* @param m the mask controlling lane selection
@@ -560,8 +557,8 @@
/**
* Returns the minimum of this vector and the broadcast of an input scalar.
*
- * This is a vector binary operation where the operation
- * {@code (a, b) -> Math.min(a, b)} is applied to lane elements.
+ * This is a lane-wise binary operation which applies the operation
+ * {@code (a, b) -> Math.min(a, b)} to each lane.
*
* @param s the input scalar
* @return the minimum of this vector and the broadcast of an input scalar
@@ -577,8 +574,8 @@
/**
* Returns the maximum of this vector and the broadcast of an input scalar.
*
- * This is a vector binary operation where the operation
- * {@code (a, b) -> Math.max(a, b)} is applied to lane elements.
+ * This is a lane-wise binary operation which applies the operation
+ * {@code (a, b) -> Math.max(a, b)} to each lane.
*
* @param s the input scalar
* @return the maximum of this vector and the broadcast of an input scalar
@@ -591,8 +588,8 @@
/**
* Tests if this vector is equal to the broadcast of an input scalar.
*
- * This is a vector binary test operation where the primitive equals
- * operation ({@code ==}) is applied to lane elements.
+ * This is a lane-wise binary test operation which applies the primitive equals
+ * operation ({@code ==}) each lane.
*
* @param s the input scalar
* @return the result mask of testing if this vector is equal to the
@@ -606,8 +603,8 @@
/**
* Tests if this vector is not equal to the broadcast of an input scalar.
*
- * This is a vector binary test operation where the primitive not equals
- * operation ({@code !=}) is applied to lane elements.
+ * This is a lane-wise binary test operation which applies the primitive not equals
+ * operation ({@code !=}) to each lane.
*
* @param s the input scalar
* @return the result mask of testing if this vector is not equal to the
@@ -621,8 +618,8 @@
/**
* Tests if this vector is less than the broadcast of an input scalar.
*
- * This is a vector binary test operation where the primitive less than
- * operation ({@code <}) is applied to lane elements.
+ * This is a lane-wise binary test operation which applies the primitive less than
+ * operation ({@code <}) to each lane.
*
* @param s the input scalar
* @return the mask result of testing if this vector is less than the
@@ -636,8 +633,8 @@
/**
* Tests if this vector is less or equal to the broadcast of an input scalar.
*
- * This is a vector binary test operation where the primitive less than
- * or equal to operation ({@code <=}) is applied to lane elements.
+ * This is a lane-wise binary test operation which applies the primitive less than
+ * or equal to operation ({@code <=}) to each lane.
*
* @param s the input scalar
* @return the mask result of testing if this vector is less than or equal
@@ -651,8 +648,8 @@
/**
* Tests if this vector is greater than the broadcast of an input scalar.
*
- * This is a vector binary test operation where the primitive greater than
- * operation ({@code >}) is applied to lane elements.
+ * This is a lane-wise binary test operation which applies the primitive greater than
+ * operation ({@code >}) to each lane.
*
* @param s the input scalar
* @return the mask result of testing if this vector is greater than the
@@ -667,8 +664,8 @@
* Tests if this vector is greater than or equal to the broadcast of an
* input scalar.
*
- * This is a vector binary test operation where the primitive greater than
- * or equal to operation ({@code >=}) is applied to lane elements.
+ * This is a lane-wise binary test operation which applies the primitive greater than
+ * or equal to operation ({@code >=}) to each lane.
*
* @param s the input scalar
* @return the mask result of testing if this vector is greater than or
@@ -723,8 +720,8 @@
/**
* Bitwise ANDs this vector with an input vector.
*
- * This is a vector binary operation where the primitive bitwise AND
- * operation ({@code &}) is applied to lane elements.
+ * This is a lane-wise binary operation which applies the primitive bitwise AND
+ * operation ({@code &}) to each lane.
*
* @param v the input vector
* @return the bitwise AND of this vector with the input vector
@@ -734,8 +731,8 @@
/**
* Bitwise ANDs this vector with the broadcast of an input scalar.
*
- * This is a vector binary operation where the primitive bitwise AND
- * operation ({@code &}) is applied to lane elements.
+ * This is a lane-wise binary operation which applies the primitive bitwise AND
+ * operation ({@code &}) to each lane.
*
* @param s the input scalar
* @return the bitwise AND of this vector with the broadcast of an input
@@ -747,8 +744,8 @@
* Bitwise ANDs this vector with an input vector, selecting lane elements
* controlled by a mask.
*
- * This is a vector binary operation where the primitive bitwise AND
- * operation ({@code &}) is applied to lane elements.
+ * This is a lane-wise binary operation which applies the primitive bitwise AND
+ * operation ({@code &}) to each lane.
*
* @param v the input vector
* @param m the mask controlling lane selection
@@ -760,8 +757,8 @@
* Bitwise ANDs this vector with the broadcast of an input scalar, selecting
* lane elements controlled by a mask.
*
- * This is a vector binary operation where the primitive bitwise AND
- * operation ({@code &}) is applied to lane elements.
+ * This is a lane-wise binary operation which applies the primitive bitwise AND
+ * operation ({@code &}) to each lane.
*
* @param s the input scalar
* @param m the mask controlling lane selection
@@ -773,8 +770,8 @@
/**
* Bitwise ORs this vector with an input vector.
*
- * This is a vector binary operation where the primitive bitwise OR
- * operation ({@code |}) is applied to lane elements.
+ * This is a lane-wise binary operation which applies the primitive bitwise OR
+ * operation ({@code |}) to each lane.
*
* @param v the input vector
* @return the bitwise OR of this vector with the input vector
@@ -784,8 +781,8 @@
/**
* Bitwise ORs this vector with the broadcast of an input scalar.
*
- * This is a vector binary operation where the primitive bitwise OR
- * operation ({@code |}) is applied to lane elements.
+ * This is a lane-wise binary operation which applies the primitive bitwise OR
+ * operation ({@code |}) to each lane.
*
* @param s the input scalar
* @return the bitwise OR of this vector with the broadcast of an input
@@ -797,8 +794,8 @@
* Bitwise ORs this vector with an input vector, selecting lane elements
* controlled by a mask.
*
- * This is a vector binary operation where the primitive bitwise OR
- * operation ({@code |}) is applied to lane elements.
+ * This is a lane-wise binary operation which applies the primitive bitwise OR
+ * operation ({@code |}) to each lane.
*
* @param v the input vector
* @param m the mask controlling lane selection
@@ -810,8 +807,8 @@
* Bitwise ORs this vector with the broadcast of an input scalar, selecting
* lane elements controlled by a mask.
*
- * This is a vector binary operation where the primitive bitwise OR
- * operation ({@code |}) is applied to lane elements.
+ * This is a lane-wise binary operation which applies the primitive bitwise OR
+ * operation ({@code |}) to each lane.
*
* @param s the input scalar
* @param m the mask controlling lane selection
@@ -823,8 +820,8 @@
/**
* Bitwise XORs this vector with an input vector.
*
- * This is a vector binary operation where the primitive bitwise XOR
- * operation ({@code ^}) is applied to lane elements.
+ * This is a lane-wise binary operation which applies the primitive bitwise XOR
+ * operation ({@code ^}) to each lane.
*
* @param v the input vector
* @return the bitwise XOR of this vector with the input vector
@@ -834,8 +831,8 @@
/**
* Bitwise XORs this vector with the broadcast of an input scalar.
*
- * This is a vector binary operation where the primitive bitwise XOR
- * operation ({@code ^}) is applied to lane elements.
+ * This is a lane-wise binary operation which applies the primitive bitwise XOR
+ * operation ({@code ^}) to each lane.
*
* @param s the input scalar
* @return the bitwise XOR of this vector with the broadcast of an input
@@ -847,8 +844,8 @@
* Bitwise XORs this vector with an input vector, selecting lane elements
* controlled by a mask.
*
- * This is a vector binary operation where the primitive bitwise XOR
- * operation ({@code ^}) is applied to lane elements.
+ * This is a lane-wise binary operation which applies the primitive bitwise XOR
+ * operation ({@code ^}) to each lane.
*
* @param v the input vector
* @param m the mask controlling lane selection
@@ -860,8 +857,8 @@
* Bitwise XORs this vector with the broadcast of an input scalar, selecting
* lane elements controlled by a mask.
*
- * This is a vector binary operation where the primitive bitwise XOR
- * operation ({@code ^}) is applied to lane elements.
+ * This is a lane-wise binary operation which applies the primitive bitwise XOR
+ * operation ({@code ^}) to each lane.
*
* @param s the input scalar
* @param m the mask controlling lane selection
@@ -873,8 +870,8 @@
/**
* Bitwise NOTs this vector.
*
- * This is a vector unary operation where the primitive bitwise NOT
- * operation ({@code ~}) is applied to lane elements.
+ * This is a lane-wise unary operation which applies the primitive bitwise NOT
+ * operation ({@code ~}) to each lane.
*
* @return the bitwise NOT of this vector
*/
@@ -883,8 +880,8 @@
/**
* Bitwise NOTs this vector, selecting lane elements controlled by a mask.
*
- * This is a vector unary operation where the primitive bitwise NOT
- * operation ({@code ~}) is applied to lane elements.
+ * This is a lane-wise unary operation which applies the primitive bitwise NOT
+ * operation ({@code ~}) to each lane.
*
* @param m the mask controlling lane selection
* @return the bitwise NOT of this vector
@@ -894,8 +891,8 @@
/**
* Logically left shifts this vector by the broadcast of an input scalar.
*
- * This is a vector binary operation where the primitive logical left shift
- * operation ({@code <<}) is applied to lane elements to left shift the
+ * This is a lane-wise binary operation which applies the primitive logical left shift
+ * operation ({@code <<}) to each lane to left shift the
* element by shift value as specified by the input scalar. Only the 4
* lowest-order bits of shift value are used. It is as if the shift value
* were subjected to a bitwise logical AND operator ({@code &}) with the mask value 0xF.
@@ -911,8 +908,8 @@
* Logically left shifts this vector by the broadcast of an input scalar,
* selecting lane elements controlled by a mask.
*
- * This is a vector binary operation where the primitive logical left shift
- * operation ({@code <<}) is applied to lane elements to left shift the
+ * This is a lane-wise binary operation which applies the primitive logical left shift
+ * operation ({@code <<}) to each lane to left shift the
* element by shift value as specified by the input scalar. Only the 4
* lowest-order bits of shift value are used. It is as if the shift value
* were subjected to a bitwise logical AND operator ({@code &}) with the mask value 0xF.
@@ -932,8 +929,8 @@
* Logically right shifts (or unsigned right shifts) this vector by the
* broadcast of an input scalar.
*
- * This is a vector binary operation where the primitive logical right shift
- * operation ({@code >>>}) is applied to lane elements to logically right shift the
+ * This is a lane-wise binary operation which applies the primitive logical right shift
+ * operation ({@code >>>}) to each lane to logically right shift the
* element by shift value as specified by the input scalar. Only the 4
* lowest-order bits of shift value are used. It is as if the shift value
* were subjected to a bitwise logical AND operator ({@code &}) with the mask value 0xF.
@@ -950,8 +947,8 @@
* broadcast of an input scalar, selecting lane elements controlled by a
* mask.
*
- * This is a vector binary operation where the primitive logical right shift
- * operation ({@code >>>}) is applied to lane elements to logically right shift the
+ * This is a lane-wise binary operation which applies the primitive logical right shift
+ * operation ({@code >>>}) to each lane to logically right shift the
* element by shift value as specified by the input scalar. Only the 4
* lowest-order bits of shift value are used. It is as if the shift value
* were subjected to a bitwise logical AND operator ({@code &}) with the mask value 0xF.
@@ -969,8 +966,8 @@
* Arithmetically right shifts (or signed right shifts) this vector by the
* broadcast of an input scalar.
*
- * This is a vector binary operation where the primitive arithmetic right
- * shift operation ({@code >>}) is applied to lane elements to arithmetically
+ * This is a lane-wise binary operation which applies the primitive arithmetic right
+ * shift operation ({@code >>}) to each lane to arithmetically
* right shift the element by shift value as specified by the input scalar.
* Only the 4 lowest-order bits of shift value are used. It is as if the shift
* value were subjected to a bitwise logical AND operator ({@code &}) with the mask value 0xF.
@@ -987,8 +984,8 @@
* broadcast of an input scalar, selecting lane elements controlled by a
* mask.
*
- * This is a vector binary operation where the primitive arithmetic right
- * shift operation ({@code >>}) is applied to lane elements to arithmetically
+ * This is a lane-wise binary operation which applies the primitive arithmetic right
+ * shift operation ({@code >>}) to each lane to arithmetically
* right shift the element by shift value as specified by the input scalar.
* Only the 4 lowest-order bits of shift value are used. It is as if the shift
* value were subjected to a bitwise logical AND operator ({@code &}) with the mask value 0xF.
@@ -1019,8 +1016,8 @@
/**
* Adds all lane elements of this vector.
*
- * This is an associative vector reduction operation where the addition
- * operation ({@code +}) is applied to lane elements,
+ * This is an associative cross-lane reduction operation which applies the addition
+ * operation ({@code +}) to lane elements,
* and the identity value is {@code 0}.
*
* @return the addition of all the lane elements of this vector
@@ -1031,8 +1028,8 @@
* Adds all lane elements of this vector, selecting lane elements
* controlled by a mask.
*
- * This is an associative vector reduction operation where the addition
- * operation ({@code +}) is applied to lane elements,
+ * This is an associative cross-lane reduction operation which applies the addition
+ * operation ({@code +}) to lane elements,
* and the identity value is {@code 0}.
*
* @param m the mask controlling lane selection
@@ -1043,8 +1040,8 @@
/**
* Multiplies all lane elements of this vector.
*
- * This is an associative vector reduction operation where the
- * multiplication operation ({@code *}) is applied to lane elements,
+ * This is an associative cross-lane reduction operation which applies the
+ * multiplication operation ({@code *}) to lane elements,
* and the identity value is {@code 1}.
*
* @return the multiplication of all the lane elements of this vector
@@ -1055,8 +1052,8 @@
* Multiplies all lane elements of this vector, selecting lane elements
* controlled by a mask.
*
- * This is an associative vector reduction operation where the
- * multiplication operation ({@code *}) is applied to lane elements,
+ * This is an associative cross-lane reduction operation which applies the
+ * multiplication operation ({@code *}) to lane elements,
* and the identity value is {@code 1}.
*
* @param m the mask controlling lane selection
@@ -1067,8 +1064,8 @@
/**
* Returns the minimum lane element of this vector.
*
- * This is an associative vector reduction operation where the operation
- * {@code (a, b) -> Math.min(a, b)} is applied to lane elements,
+ * This is an associative cross-lane reduction operation which applies the operation
+ * {@code (a, b) -> Math.min(a, b)} to lane elements,
* and the identity value is
* {@link Short#MAX_VALUE}.
*
@@ -1080,8 +1077,8 @@
* Returns the minimum lane element of this vector, selecting lane elements
* controlled by a mask.
*
- * This is an associative vector reduction operation where the operation
- * {@code (a, b) -> Math.min(a, b)} is applied to lane elements,
+ * This is an associative cross-lane reduction operation which applies the operation
+ * {@code (a, b) -> Math.min(a, b)} to lane elements,
* and the identity value is
* {@link Short#MAX_VALUE}.
*
@@ -1093,8 +1090,8 @@
/**
* Returns the maximum lane element of this vector.
*
- * This is an associative vector reduction operation where the operation
- * {@code (a, b) -> Math.max(a, b)} is applied to lane elements,
+ * This is an associative cross-lane reduction operation which applies the operation
+ * {@code (a, b) -> Math.max(a, b)} to lane elements,
* and the identity value is
* {@link Short#MIN_VALUE}.
*
@@ -1106,8 +1103,8 @@
* Returns the maximum lane element of this vector, selecting lane elements
* controlled by a mask.
*
- * This is an associative vector reduction operation where the operation
- * {@code (a, b) -> Math.max(a, b)} is applied to lane elements,
+ * This is an associative cross-lane reduction operation which applies the operation
+ * {@code (a, b) -> Math.max(a, b)} to lane elements,
* and the identity value is
* {@link Short#MIN_VALUE}.
*
@@ -1119,8 +1116,8 @@
/**
* Logically ORs all lane elements of this vector.
*
- * This is an associative vector reduction operation where the logical OR
- * operation ({@code |}) is applied to lane elements,
+ * This is an associative cross-lane reduction operation which applies the logical OR
+ * operation ({@code |}) to lane elements,
* and the identity value is {@code 0}.
*
* @return the logical OR all the lane elements of this vector
@@ -1131,8 +1128,8 @@
* Logically ORs all lane elements of this vector, selecting lane elements
* controlled by a mask.
*
- * This is an associative vector reduction operation where the logical OR
- * operation ({@code |}) is applied to lane elements,
+ * This is an associative cross-lane reduction operation which applies the logical OR
+ * operation ({@code |}) to lane elements,
* and the identity value is {@code 0}.
*
* @param m the mask controlling lane selection
@@ -1143,8 +1140,8 @@
/**
* Logically ANDs all lane elements of this vector.
*
- * This is an associative vector reduction operation where the logical AND
- * operation ({@code |}) is applied to lane elements,
+ * This is an associative cross-lane reduction operation which applies the logical AND
+ * operation ({@code |}) to lane elements,
* and the identity value is {@code -1}.
*
* @return the logical AND all the lane elements of this vector
@@ -1155,8 +1152,8 @@
* Logically ANDs all lane elements of this vector, selecting lane elements
* controlled by a mask.
*
- * This is an associative vector reduction operation where the logical AND
- * operation ({@code |}) is applied to lane elements,
+ * This is an associative cross-lane reduction operation which applies the logical AND
+ * operation ({@code |}) to lane elements,
* and the identity value is {@code -1}.
*
* @param m the mask controlling lane selection
@@ -1167,8 +1164,8 @@
/**
* Logically XORs all lane elements of this vector.
*
- * This is an associative vector reduction operation where the logical XOR
- * operation ({@code ^}) is applied to lane elements,
+ * This is an associative cross-lane reduction operation which applies the logical XOR
+ * operation ({@code ^}) to lane elements,
* and the identity value is {@code 0}.
*
* @return the logical XOR all the lane elements of this vector
@@ -1179,8 +1176,8 @@
* Logically XORs all lane elements of this vector, selecting lane elements
* controlled by a mask.
*
- * This is an associative vector reduction operation where the logical XOR
- * operation ({@code ^}) is applied to lane elements,
+ * This is an associative cross-lane reduction operation which applies the logical XOR
+ * operation ({@code ^}) to lane elements,
* and the identity value is {@code 0}.
*
* @param m the mask controlling lane selection
@@ -1198,7 +1195,7 @@
* @throws IllegalArgumentException if the index is is out of range
* ({@code < 0 || >= length()})
*/
- public abstract short get(int i);
+ public abstract short lane(int i);
/**
* Replaces the lane element of this vector at lane index {@code i} with
@@ -1245,30 +1242,30 @@
*
* For each vector lane, where {@code N} is the vector lane index,
* the lane element at index {@code N} is stored into the array at index
- * {@code i + N}.
+ * {@code offset + N}.
*
* @param a the array
- * @param i the offset into the array
- * @throws IndexOutOfBoundsException if {@code i < 0}, or
- * {@code i > a.length - this.length()}
+ * @param offset the offset into the array
+ * @throws IndexOutOfBoundsException if {@code offset < 0}, or
+ * {@code offset > a.length - this.length()}
*/
- public abstract void intoArray(short[] a, int i);
+ public abstract void intoArray(short[] a, int offset);
/**
* Stores this vector into an array starting at offset and using a mask.
*
* For each vector lane, where {@code N} is the vector lane index,
* if the mask lane at index {@code N} is set then the lane element at
- * index {@code N} is stored into the array index {@code i + N}.
+ * index {@code N} is stored into the array index {@code offset + N}.
*
* @param a the array
- * @param i the offset into the array
+ * @param offset the offset into the array
* @param m the mask
- * @throws IndexOutOfBoundsException if {@code i < 0}, or
+ * @throws IndexOutOfBoundsException if {@code offset < 0}, or
* for any vector lane index {@code N} where the mask at lane {@code N}
- * is set {@code i >= a.length - N}
+ * is set {@code offset >= a.length - N}
*/
- public abstract void intoArray(short[] a, int i, VectorMask
* For each vector lane, where {@code N} is the vector lane index, the
* lane element at index {@code N} is stored into the array at index
- * {@code i + indexMap[j + N]}.
+ * {@code a_offset + indexMap[i_offset + N]}.
*
* @param a the array
- * @param i the offset into the array, may be negative if relative
+ * @param a_offset the offset into the array, may be negative if relative
* indexes in the index map compensate to produce a value within the
* array bounds
* @param indexMap the index map
- * @param j the offset into the index map
- * @throws IndexOutOfBoundsException if {@code j < 0}, or
- * {@code j > indexMap.length - this.length()},
+ * @param i_offset the offset into the index map
+ * @throws IndexOutOfBoundsException if {@code i_offset < 0}, or
+ * {@code i_offset > indexMap.length - this.length()},
* or for any vector lane index {@code N} the result of
- * {@code i + indexMap[j + N]} is {@code < 0} or {@code >= a.length}
+ * {@code a_offset + indexMap[i_offset + N]} is {@code < 0} or {@code >= a.length}
*/
- public void intoArray(short[] a, int i, int[] indexMap, int j) {
- forEach((n, e) -> a[i + indexMap[j + n]] = e);
+ public void intoArray(short[] a, int a_offset, int[] indexMap, int i_offset) {
+ forEach((n, e) -> a[a_offset + indexMap[i_offset + n]] = e);
}
/**
@@ -1300,23 +1297,23 @@
* For each vector lane, where {@code N} is the vector lane index,
* if the mask lane at index {@code N} is set then the lane element at
* index {@code N} is stored into the array at index
- * {@code i + indexMap[j + N]}.
+ * {@code a_offset + indexMap[i_offset + N]}.
*
* @param a the array
- * @param i the offset into the array, may be negative if relative
+ * @param a_offset the offset into the array, may be negative if relative
* indexes in the index map compensate to produce a value within the
* array bounds
* @param m the mask
* @param indexMap the index map
- * @param j the offset into the index map
+ * @param i_offset the offset into the index map
* @throws IndexOutOfBoundsException if {@code j < 0}, or
- * {@code j > indexMap.length - this.length()},
+ * {@code i_offset > indexMap.length - this.length()},
* or for any vector lane index {@code N} where the mask at lane
- * {@code N} is set the result of {@code i + indexMap[j + N]} is
+ * {@code N} is set the result of {@code a_offset + indexMap[i_offset + N]} is
* {@code < 0} or {@code >= a.length}
*/
- public void intoArray(short[] a, int i, VectorMask{@code
- * return this.fromByteBuffer(ByteBuffer.wrap(a), i, this.maskAllTrue());
+ * return fromByteBuffer(species, ByteBuffer.wrap(a), offset, VectorMask.allTrue());
* }
*
* @param species species of desired vector
* @param a the byte array
- * @param ix the offset into the array
+ * @param offset the offset into the array
* @return a vector loaded from a byte array
* @throws IndexOutOfBoundsException if {@code i < 0} or
- * {@code i > a.length - (this.length() * this.elementSize() / Byte.SIZE)}
+ * {@code offset > a.length - (species.length() * species.elementSize() / Byte.SIZE)}
*/
@ForceInline
@SuppressWarnings("unchecked")
- public static ShortVector fromByteArray(VectorSpecies{@code
- * return this.fromByteBuffer(ByteBuffer.wrap(a), i, m);
+ * return fromByteBuffer(species, ByteBuffer.wrap(a), offset, m);
* }
*
* @param species species of desired vector
* @param a the byte array
- * @param ix the offset into the array
+ * @param offset the offset into the array
* @param m the mask
* @return a vector loaded from a byte array
- * @throws IndexOutOfBoundsException if {@code i < 0} or
- * {@code i > a.length - (this.length() * this.elementSize() / Byte.SIZE)}
- * @throws IndexOutOfBoundsException if the offset is {@code < 0},
- * or {@code > a.length},
+ * @throws IndexOutOfBoundsException if {@code offset < 0} or
* for any vector lane index {@code N} where the mask at lane {@code N}
* is set
- * {@code i >= a.length - (N * this.elementSize() / Byte.SIZE)}
+ * {@code offset >= a.length - (N * species.elementSize() / Byte.SIZE)}
*/
@ForceInline
- public static ShortVector fromByteArray(VectorSpecies{@code
- * return this.fromByteBuffer(b, i, this.maskAllTrue())
+ * return fromByteBuffer(b, offset, VectorMask.allTrue())
* }
*
* @param species species of desired vector
* @param bb the byte buffer
- * @param ix the offset into the byte buffer
+ * @param offset the offset into the byte buffer
* @return a vector loaded from a byte buffer
* @throws IndexOutOfBoundsException if the offset is {@code < 0},
* or {@code > b.limit()},
* or if there are fewer than
- * {@code this.length() * this.elementSize() / Byte.SIZE} bytes
+ * {@code species.length() * species.elementSize() / Byte.SIZE} bytes
* remaining in the byte buffer from the given offset
*/
@ForceInline
@SuppressWarnings("unchecked")
- public static ShortVector fromByteBuffer(VectorSpecies} is the primitive
+ * {@code EBuffer} is the primitive buffer type, {@code e} is the
+ * primitive element type, and {@code ESpecies} is the primitive
* species for {@code e}:
* {@code
* EBuffer eb = b.duplicate().
- * order(ByteOrder.nativeOrder()).position(i).
+ * order(ByteOrder.nativeOrder()).position(offset).
* asEBuffer();
- * e[] es = new e[this.length()];
+ * e[] es = new e[species.length()];
* for (int n = 0; n < t.length; n++) {
* if (m.isSet(n))
* es[n] = eb.get(n);
* }
- * Vector
*
* @param species species of desired vector
* @param bb the byte buffer
- * @param ix the offset into the byte buffer
+ * @param offset the offset into the byte buffer
* @param m the mask
* @return a vector loaded from a byte buffer
* @throws IndexOutOfBoundsException if the offset is {@code < 0},
* or {@code > b.limit()},
* for any vector lane index {@code N} where the mask at lane {@code N}
* is set
- * {@code i >= b.limit() - (N * this.elementSize() / Byte.SIZE)}
+ * {@code offset >= b.limit() - (N * species.elementSize() / Byte.SIZE)}
*/
@ForceInline
- public static ShortVector fromByteBuffer(VectorSpecies)this).fromArray(es, 0, m);
+ * EVector r = EVector.fromArray(es, 0, m);
* }