--- old/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java 2019-04-11 15:39:58.800901900 -0700
+++ new/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java 2019-04-11 15:39:58.224085700 -0700
@@ -440,230 +440,6 @@
return ((ByteSpecies)s).op(i -> (byte) r.nextInt());
}
- /**
- * Returns a mask where each lane is set or unset according to given
- * {@code boolean} values
- *
- * 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 maskFromValues(Species species, boolean... bits) {
- if (species.boxType() == ByteMaxVector.class)
- return new ByteMaxVector.ByteMaxMask(bits);
- switch (species.bitSize()) {
- case 64: return new Byte64Vector.Byte64Mask(bits);
- case 128: return new Byte128Vector.Byte128Mask(bits);
- case 256: return new Byte256Vector.Byte256Mask(bits);
- case 512: return new Byte512Vector.Byte512Mask(bits);
- default: throw new IllegalArgumentException(Integer.toString(species.bitSize()));
- }
- }
-
- // @@@ This is a bad implementation -- makes lambdas capturing -- fix this
- static Mask trueMask(Species species) {
- if (species.boxType() == ByteMaxVector.class)
- return ByteMaxVector.ByteMaxMask.TRUE_MASK;
- switch (species.bitSize()) {
- case 64: return Byte64Vector.Byte64Mask.TRUE_MASK;
- case 128: return Byte128Vector.Byte128Mask.TRUE_MASK;
- case 256: return Byte256Vector.Byte256Mask.TRUE_MASK;
- case 512: return Byte512Vector.Byte512Mask.TRUE_MASK;
- default: throw new IllegalArgumentException(Integer.toString(species.bitSize()));
- }
- }
-
- static Mask falseMask(Species species) {
- if (species.boxType() == ByteMaxVector.class)
- return ByteMaxVector.ByteMaxMask.FALSE_MASK;
- switch (species.bitSize()) {
- case 64: return Byte64Vector.Byte64Mask.FALSE_MASK;
- case 128: return Byte128Vector.Byte128Mask.FALSE_MASK;
- case 256: return Byte256Vector.Byte256Mask.FALSE_MASK;
- case 512: return Byte512Vector.Byte512Mask.FALSE_MASK;
- default: throw new IllegalArgumentException(Integer.toString(species.bitSize()));
- }
- }
-
- /**
- * Loads a mask from a {@code boolean} array starting at an offset.
- *
- * 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 maskFromArray(Species species, boolean[] bits, int ix) {
- Objects.requireNonNull(bits);
- ix = VectorIntrinsics.checkIndex(ix, bits.length, species.length());
- return VectorIntrinsics.load((Class>) species.maskType(), byte.class, species.length(),
- bits, (((long) ix) << ARRAY_SHIFT) + Unsafe.ARRAY_BOOLEAN_BASE_OFFSET,
- bits, ix, species,
- (c, idx, s) -> (Mask) ((ByteSpecies)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 maskAllTrue(Species species) {
- return VectorIntrinsics.broadcastCoerced((Class>) species.maskType(), byte.class, species.length(),
- (byte)-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 maskAllFalse(Species species) {
- return VectorIntrinsics.broadcastCoerced((Class>) species.maskType(), byte.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.
- *
- * 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.
- *
- * This method behaves as if a shuffle is created from an array of
- * mapped indexes as follows:
- *
{@code
- * int[] a = new int[species.length()];
- * for (int i = 0; i < a.length; i++) {
- * a[i] = f.applyAsInt(i);
- * }
- * return this.shuffleFromValues(a);
- * }
- *
- * @param species shuffle species
- * @param f the lane index mapping function
- * @return a shuffle of mapped indexes
- */
- @ForceInline
- public static Shuffle shuffle(Species species, IntUnaryOperator f) {
- if (species.boxType() == ByteMaxVector.class)
- return new ByteMaxVector.ByteMaxShuffle(f);
- switch (species.bitSize()) {
- case 64: return new Byte64Vector.Byte64Shuffle(f);
- case 128: return new Byte128Vector.Byte128Shuffle(f);
- case 256: return new Byte256Vector.Byte256Shuffle(f);
- case 512: return new Byte512Vector.Byte512Shuffle(f);
- default: throw new IllegalArgumentException(Integer.toString(species.bitSize()));
- }
- }
-
- /**
- * Returns a shuffle where each lane element is the value of its
- * corresponding lane index.
- *
- * This method behaves as if a shuffle is created from an identity
- * index mapping function as follows:
- *
{@code
- * return this.shuffle(i -> i);
- * }
- *
- * @param species shuffle species
- * @return a shuffle of lane indexes
- */
- @ForceInline
- public static Shuffle shuffleIota(Species species) {
- if (species.boxType() == ByteMaxVector.class)
- return new ByteMaxVector.ByteMaxShuffle(AbstractShuffle.IDENTITY);
- switch (species.bitSize()) {
- case 64: return new Byte64Vector.Byte64Shuffle(AbstractShuffle.IDENTITY);
- case 128: return new Byte128Vector.Byte128Shuffle(AbstractShuffle.IDENTITY);
- case 256: return new Byte256Vector.Byte256Shuffle(AbstractShuffle.IDENTITY);
- case 512: return new Byte512Vector.Byte512Shuffle(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.
- *
- * 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 shuffleFromValues(Species species, int... ixs) {
- if (species.boxType() == ByteMaxVector.class)
- return new ByteMaxVector.ByteMaxShuffle(ixs);
- switch (species.bitSize()) {
- case 64: return new Byte64Vector.Byte64Shuffle(ixs);
- case 128: return new Byte128Vector.Byte128Shuffle(ixs);
- case 256: return new Byte256Vector.Byte256Shuffle(ixs);
- case 512: return new Byte512Vector.Byte512Shuffle(ixs);
- default: throw new IllegalArgumentException(Integer.toString(species.bitSize()));
- }
- }
-
- /**
- * Loads a shuffle from an {@code int} array starting at an offset.
- *
- * 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 shuffleFromArray(Species species, int[] ixs, int i) {
- if (species.boxType() == ByteMaxVector.class)
- return new ByteMaxVector.ByteMaxShuffle(ixs, i);
- switch (species.bitSize()) {
- case 64: return new Byte64Vector.Byte64Shuffle(ixs, i);
- case 128: return new Byte128Vector.Byte128Shuffle(ixs, i);
- case 256: return new Byte256Vector.Byte256Shuffle(ixs, i);
- case 512: return new Byte512Vector.Byte512Shuffle(ixs, i);
- default: throw new IllegalArgumentException(Integer.toString(species.bitSize()));
- }
- }
-
// Ops
@Override
@@ -1547,20 +1323,21 @@
public abstract Species species();
/**
- * Class representing {@link ByteVector}'s of the same {@link Vector.Shape Shape}.
+ * Class representing {@link ByteVector}'s of the same {@link Shape Shape}.
*/
- static final class ByteSpecies extends Vector.AbstractSpecies {
+ static final class ByteSpecies extends AbstractSpecies {
final Function vectorFactory;
- final Function> maskFactory;
- private ByteSpecies(Vector.Shape shape,
+ private ByteSpecies(Shape shape,
Class> boxType,
Class> maskType,
Function vectorFactory,
- Function> maskFactory) {
- super(shape, byte.class, Byte.SIZE, boxType, maskType);
+ Function> maskFactory,
+ Function> shuffleFromArrayFactory,
+ fShuffleFromArray shuffleFromOpFactory) {
+ super(shape, byte.class, Byte.SIZE, boxType, maskType, maskFactory,
+ shuffleFromArrayFactory, shuffleFromOpFactory);
this.vectorFactory = vectorFactory;
- this.maskFactory = maskFactory;
}
interface FOp {
@@ -1579,7 +1356,7 @@
return vectorFactory.apply(res);
}
- ByteVector op(Vector.Mask o, FOp f) {
+ ByteVector op(Mask o, FOp f) {
byte[] res = new byte[length()];
boolean[] mbits = ((AbstractMask)o).getBits();
for (int i = 0; i < length(); i++) {
@@ -1589,14 +1366,6 @@
}
return vectorFactory.apply(res);
}
-
- Vector.Mask 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);
- }
}
/**
@@ -1620,7 +1389,7 @@
* @return a species for an element type of {@code byte} and shape
* @throws IllegalArgumentException if no such species exists for the shape
*/
- static ByteSpecies species(Vector.Shape s) {
+ static ByteSpecies species(Shape s) {
Objects.requireNonNull(s);
switch (s) {
case S_64_BIT: return (ByteSpecies) SPECIES_64;
@@ -1632,25 +1401,30 @@
}
}
- /** Species representing {@link ByteVector}s of {@link Vector.Shape#S_64_BIT Shape.S_64_BIT}. */
+ /** Species representing {@link ByteVector}s of {@link Shape#S_64_BIT Shape.S_64_BIT}. */
public static final Species SPECIES_64 = new ByteSpecies(Shape.S_64_BIT, Byte64Vector.class, Byte64Vector.Byte64Mask.class,
- Byte64Vector::new, Byte64Vector.Byte64Mask::new);
+ Byte64Vector::new, Byte64Vector.Byte64Mask::new,
+ Byte64Vector.Byte64Shuffle::new, Byte64Vector.Byte64Shuffle::new);
- /** Species representing {@link ByteVector}s of {@link Vector.Shape#S_128_BIT Shape.S_128_BIT}. */
+ /** Species representing {@link ByteVector}s of {@link Shape#S_128_BIT Shape.S_128_BIT}. */
public static final Species SPECIES_128 = new ByteSpecies(Shape.S_128_BIT, Byte128Vector.class, Byte128Vector.Byte128Mask.class,
- Byte128Vector::new, Byte128Vector.Byte128Mask::new);
+ Byte128Vector::new, Byte128Vector.Byte128Mask::new,
+ Byte128Vector.Byte128Shuffle::new, Byte128Vector.Byte128Shuffle::new);
- /** Species representing {@link ByteVector}s of {@link Vector.Shape#S_256_BIT Shape.S_256_BIT}. */
+ /** Species representing {@link ByteVector}s of {@link Shape#S_256_BIT Shape.S_256_BIT}. */
public static final Species SPECIES_256 = new ByteSpecies(Shape.S_256_BIT, Byte256Vector.class, Byte256Vector.Byte256Mask.class,
- Byte256Vector::new, Byte256Vector.Byte256Mask::new);
+ Byte256Vector::new, Byte256Vector.Byte256Mask::new,
+ Byte256Vector.Byte256Shuffle::new, Byte256Vector.Byte256Shuffle::new);
- /** Species representing {@link ByteVector}s of {@link Vector.Shape#S_512_BIT Shape.S_512_BIT}. */
+ /** Species representing {@link ByteVector}s of {@link Shape#S_512_BIT Shape.S_512_BIT}. */
public static final Species SPECIES_512 = new ByteSpecies(Shape.S_512_BIT, Byte512Vector.class, Byte512Vector.Byte512Mask.class,
- Byte512Vector::new, Byte512Vector.Byte512Mask::new);
+ Byte512Vector::new, Byte512Vector.Byte512Mask::new,
+ Byte512Vector.Byte512Shuffle::new, Byte512Vector.Byte512Shuffle::new);
- /** Species representing {@link ByteVector}s of {@link Vector.Shape#S_Max_BIT Shape.S_Max_BIT}. */
+ /** Species representing {@link ByteVector}s of {@link Shape#S_Max_BIT Shape.S_Max_BIT}. */
public static final Species SPECIES_MAX = new ByteSpecies(Shape.S_Max_BIT, ByteMaxVector.class, ByteMaxVector.ByteMaxMask.class,
- ByteMaxVector::new, ByteMaxVector.ByteMaxMask::new);
+ ByteMaxVector::new, ByteMaxVector.ByteMaxMask::new,
+ ByteMaxVector.ByteMaxShuffle::new, ByteMaxVector.ByteMaxShuffle::new);
/**
* Preferred species for {@link ByteVector}s.