--- old/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java 2019-04-09 12:06:29.474938200 -0700 +++ new/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java 2019-04-09 12:06:28.756335200 -0700 @@ -38,19 +38,20 @@ @SuppressWarnings("cast") final class Float512Vector extends FloatVector { - static final Float512Species SPECIES = new Float512Species(); + private static final Species SPECIES = FloatVector.SPECIES_512; static final Float512Vector ZERO = new Float512Vector(); 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() { @@ -162,7 +163,7 @@ return VectorIntrinsics.cast( Float512Vector.class, float.class, LENGTH, - s.vectorType(), + s.boxType(), s.elementType(), LENGTH, this, s, (species, vector) -> vector.castDefault(species) @@ -180,37 +181,37 @@ 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) 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) 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) 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) 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) 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) s, a, 0); } else { throw new UnsupportedOperationException("Bad lane type for casting."); } @@ -300,55 +301,50 @@ @ForceInline public FloatVector reshape(Species 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( Float512Vector.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( Float512Vector.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( Float512Vector.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( Float512Vector.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( Float512Vector.class, float.class, LENGTH, FloatMaxVector.class, float.class, FloatMaxVector.LENGTH, - this, ts, + this, s, (species, vector) -> (FloatVector) vector.defaultReinterpret(species) ); } else { @@ -361,103 +357,103 @@ @Override @ForceInline public FloatVector add(float o) { - return add(SPECIES.broadcast(o)); + return add((Float512Vector)FloatVector.broadcast(SPECIES, o)); } @Override @ForceInline public FloatVector add(float o, Mask m) { - return add(SPECIES.broadcast(o), m); + return add((Float512Vector)FloatVector.broadcast(SPECIES, o), m); } @Override @ForceInline public FloatVector sub(float o) { - return sub(SPECIES.broadcast(o)); + return sub((Float512Vector)FloatVector.broadcast(SPECIES, o)); } @Override @ForceInline public FloatVector sub(float o, Mask m) { - return sub(SPECIES.broadcast(o), m); + return sub((Float512Vector)FloatVector.broadcast(SPECIES, o), m); } @Override @ForceInline public FloatVector mul(float o) { - return mul(SPECIES.broadcast(o)); + return mul((Float512Vector)FloatVector.broadcast(SPECIES, o)); } @Override @ForceInline public FloatVector mul(float o, Mask m) { - return mul(SPECIES.broadcast(o), m); + return mul((Float512Vector)FloatVector.broadcast(SPECIES, o), m); } @Override @ForceInline public FloatVector min(float o) { - return min(SPECIES.broadcast(o)); + return min((Float512Vector)FloatVector.broadcast(SPECIES, o)); } @Override @ForceInline public FloatVector max(float o) { - return max(SPECIES.broadcast(o)); + return max((Float512Vector)FloatVector.broadcast(SPECIES, o)); } @Override @ForceInline public Mask equal(float o) { - return equal(SPECIES.broadcast(o)); + return equal((Float512Vector)FloatVector.broadcast(SPECIES, o)); } @Override @ForceInline public Mask notEqual(float o) { - return notEqual(SPECIES.broadcast(o)); + return notEqual((Float512Vector)FloatVector.broadcast(SPECIES, o)); } @Override @ForceInline public Mask lessThan(float o) { - return lessThan(SPECIES.broadcast(o)); + return lessThan((Float512Vector)FloatVector.broadcast(SPECIES, o)); } @Override @ForceInline public Mask lessThanEq(float o) { - return lessThanEq(SPECIES.broadcast(o)); + return lessThanEq((Float512Vector)FloatVector.broadcast(SPECIES, o)); } @Override @ForceInline public Mask greaterThan(float o) { - return greaterThan(SPECIES.broadcast(o)); + return greaterThan((Float512Vector)FloatVector.broadcast(SPECIES, o)); } @Override @ForceInline public Mask greaterThanEq(float o) { - return greaterThanEq(SPECIES.broadcast(o)); + return greaterThanEq((Float512Vector)FloatVector.broadcast(SPECIES, o)); } @Override @ForceInline public FloatVector blend(float o, Mask m) { - return blend(SPECIES.broadcast(o), m); + return blend((Float512Vector)FloatVector.broadcast(SPECIES, o), m); } @Override @ForceInline public FloatVector div(float o) { - return div(SPECIES.broadcast(o)); + return div((Float512Vector)FloatVector.broadcast(SPECIES, o)); } @Override @ForceInline public FloatVector div(float o, Mask m) { - return div(SPECIES.broadcast(o), m); + return div((Float512Vector)FloatVector.broadcast(SPECIES, o), m); } @Override @@ -469,49 +465,49 @@ @Override @ForceInline public FloatVector atan2(float o) { - return atan2(SPECIES.broadcast(o)); + return atan2((Float512Vector)FloatVector.broadcast(SPECIES, o)); } @Override @ForceInline public FloatVector atan2(float o, Mask m) { - return atan2(SPECIES.broadcast(o), m); + return atan2((Float512Vector)FloatVector.broadcast(SPECIES, o), m); } @Override @ForceInline public FloatVector pow(float o) { - return pow(SPECIES.broadcast(o)); + return pow((Float512Vector)FloatVector.broadcast(SPECIES, o)); } @Override @ForceInline public FloatVector pow(float o, Mask m) { - return pow(SPECIES.broadcast(o), m); + return pow((Float512Vector)FloatVector.broadcast(SPECIES, o), m); } @Override @ForceInline public FloatVector fma(float o1, float o2) { - return fma(SPECIES.broadcast(o1), SPECIES.broadcast(o2)); + return fma((Float512Vector)FloatVector.broadcast(SPECIES, o1), (Float512Vector)FloatVector.broadcast(SPECIES, o2)); } @Override @ForceInline public FloatVector fma(float o1, float o2, Mask m) { - return fma(SPECIES.broadcast(o1), SPECIES.broadcast(o2), m); + return fma((Float512Vector)FloatVector.broadcast(SPECIES, o1), (Float512Vector)FloatVector.broadcast(SPECIES, o2), m); } @Override @ForceInline public FloatVector hypot(float o) { - return hypot(SPECIES.broadcast(o)); + return hypot((Float512Vector)FloatVector.broadcast(SPECIES, o)); } @Override @ForceInline public FloatVector hypot(float o, Mask m) { - return hypot(SPECIES.broadcast(o), m); + return hypot((Float512Vector)FloatVector.broadcast(SPECIES, o), m); } @@ -897,26 +893,26 @@ @Override @ForceInline public float addAll(Mask m) { - return SPECIES.broadcast((float) 0).blend(this, m).addAll(); + return blend((Float512Vector)FloatVector.broadcast(SPECIES, (float) 0), m).addAll(); } @Override @ForceInline public float mulAll(Mask m) { - return SPECIES.broadcast((float) 1).blend(this, m).mulAll(); + return blend((Float512Vector)FloatVector.broadcast(SPECIES, (float) 1), m).mulAll(); } @Override @ForceInline public float minAll(Mask m) { - return SPECIES.broadcast(Float.MAX_VALUE).blend(this, m).minAll(); + return blend((Float512Vector)FloatVector.broadcast(SPECIES, Float.MAX_VALUE), m).minAll(); } @Override @ForceInline public float maxAll(Mask m) { - return SPECIES.broadcast(Float.MIN_VALUE).blend(this, m).maxAll(); + return blend((Float512Vector)FloatVector.broadcast(SPECIES, Float.MIN_VALUE), m).maxAll(); } @Override @@ -961,7 +957,7 @@ 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); @@ -1335,7 +1331,7 @@ } @Override - public Float512Species species() { + public Species species() { return SPECIES; } @@ -1351,6 +1347,31 @@ return new Float512Vector(res); } + @Override + @ForceInline + @SuppressWarnings("unchecked") + public Mask cast(Species 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 ) new Byte512Vector.Byte512Mask(maskArray); + } else if (stype == short.class) { + return (Mask ) new Short512Vector.Short512Mask(maskArray); + } else if (stype == int.class) { + return (Mask ) new Int512Vector.Int512Mask(maskArray); + } else if (stype == long.class) { + return (Mask ) new Long512Vector.Long512Mask(maskArray); + } else if (stype == float.class) { + return (Mask ) new Float512Vector.Float512Mask(maskArray); + } else if (stype == double.class) { + return (Mask ) new Double512Vector.Double512Mask(maskArray); + } else { + throw new UnsupportedOperationException("Bad lane type for casting."); + } + } + // Unary operations @Override @@ -1423,7 +1444,7 @@ } @Override - public Float512Species species() { + public Species species() { return SPECIES; } @@ -1437,6 +1458,31 @@ } @Override + @ForceInline + @SuppressWarnings("unchecked") + public Shuffle cast(Species 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) new Byte512Vector.Byte512Shuffle(shuffleArray); + } else if (stype == short.class) { + return (Shuffle) new Short512Vector.Short512Shuffle(shuffleArray); + } else if (stype == int.class) { + return (Shuffle) new Int512Vector.Int512Shuffle(shuffleArray); + } else if (stype == long.class) { + return (Shuffle) new Long512Vector.Long512Shuffle(shuffleArray); + } else if (stype == float.class) { + return (Shuffle) new Float512Vector.Float512Shuffle(shuffleArray); + } else if (stype == double.class) { + return (Shuffle) new Double512Vector.Double512Shuffle(shuffleArray); + } else { + throw new UnsupportedOperationException("Bad lane type for casting."); + } + } + + @Override public Float512Shuffle rearrange(Vector.Shuffle o) { Float512Shuffle s = (Float512Shuffle) o; byte[] r = new byte[reorder.length]; @@ -1450,153 +1496,7 @@ // Species @Override - public Float512Species species() { + public Species species() { return SPECIES; } - - static final class Float512Species extends FloatSpecies { - static final int BIT_SIZE = Shape.S_512_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 elementType() { - return float.class; - } - - @Override - @ForceInline - public Class boxType() { - return Float512Vector.class; - } - - @Override - @ForceInline - public Class maskType() { - return Float512Mask.class; - } - - @Override - @ForceInline - public int elementSize() { - return Float.SIZE; - } - - @Override - @ForceInline - @SuppressWarnings("unchecked") - Class vectorType() { - return Float512Vector.class; - } - - @Override - @ForceInline - public Shape shape() { - return Shape.S_512_BIT; - } - - @Override - IntVector.IntSpecies indexSpecies() { - return INDEX_SPEC; - } - - @Override - Float512Vector op(FOp f) { - float[] res = new float[length()]; - for (int i = 0; i < length(); i++) { - res[i] = f.apply(i); - } - return new Float512Vector(res); - } - - @Override - Float512Vector op(Mask o, FOp f) { - float[] res = new float[length()]; - boolean[] mbits = ((Float512Mask)o).getBits(); - for (int i = 0; i < length(); i++) { - if (mbits[i]) { - res[i] = f.apply(i); - } - } - return new Float512Vector(res); - } - - @Override - Float512Mask opm(FOpm f) { - boolean[] res = new boolean[length()]; - for (int i = 0; i < length(); i++) { - res[i] = (boolean)f.apply(i); - } - return new Float512Mask(res); - } - - // Factories - - @Override - @ForceInline - public Float512Vector zero() { - return VectorIntrinsics.broadcastCoerced(Float512Vector.class, float.class, LENGTH, - Float.floatToIntBits(0.0f), SPECIES, - ((bits, s) -> ((Float512Species)s).op(i -> Float.intBitsToFloat((int)bits)))); - } - - @Override - @ForceInline - public Float512Vector broadcast(float e) { - return VectorIntrinsics.broadcastCoerced( - Float512Vector.class, float.class, LENGTH, - Float.floatToIntBits(e), SPECIES, - ((bits, s) -> ((Float512Species)s).op(i -> Float.intBitsToFloat((int)bits)))); - } - - @Override - @ForceInline - public Float512Vector scalars(float... es) { - Objects.requireNonNull(es); - int ix = VectorIntrinsics.checkIndex(0, es.length, LENGTH); - return VectorIntrinsics.load(Float512Vector.class, float.class, LENGTH, - es, Unsafe.ARRAY_FLOAT_BASE_OFFSET, - es, ix, SPECIES, - (c, idx, s) -> ((Float512Species)s).op(n -> c[idx + n])); - } - - @Override - @ForceInline - public Float512Mask cast(Mask m) { - if (m.length() != LENGTH) - throw new IllegalArgumentException("Mask length this species length differ"); - return new Float512Mask(m.toArray()); - } - - @Override - @ForceInline - public Float512Shuffle cast(Shuffle s) { - if (s.length() != LENGTH) - throw new IllegalArgumentException("Shuffle length this species length differ"); - return new Float512Shuffle(s.toArray()); - } - } }