From f84c2a9a62882a0179bdf40f567c5d3029328ee4 Mon Sep 17 00:00:00 2001 From: Jatin Bhateja Date: Thu, 2 Apr 2026 10:34:34 +0530 Subject: [PATCH] Post merge fixups --- .../jdk/incubator/vector/AbstractMask.java | 4 ++- .../jdk/incubator/vector/AbstractShuffle.java | 3 +- .../jdk/incubator/vector/AbstractSpecies.java | 2 +- .../jdk/incubator/vector/AbstractVector.java | 2 +- .../jdk/incubator/vector/Float16Vector.java | 3 +- .../incubator/vector/Float16Vector128.java | 36 +++++++++---------- .../incubator/vector/Float16Vector256.java | 36 +++++++++---------- .../incubator/vector/Float16Vector512.java | 36 +++++++++---------- .../jdk/incubator/vector/Float16Vector64.java | 36 +++++++++---------- .../incubator/vector/Float16VectorMax.java | 36 +++++++++---------- 10 files changed, 99 insertions(+), 95 deletions(-) diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractMask.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractMask.java index 9ac90c08c27..9fac32da26d 100644 --- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractMask.java +++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractMask.java @@ -36,7 +36,9 @@ abstract sealed class AbstractMask extends VectorMask FloatVector64.FloatMask64, FloatVector128.FloatMask128, FloatVector256.FloatMask256, FloatVector512.FloatMask512, FloatVectorMax.FloatMaskMax, IntVector64.IntMask64, IntVector128.IntMask128, IntVector256.IntMask256, IntVector512.IntMask512, IntVectorMax.IntMaskMax, LongVector64.LongMask64, LongVector128.LongMask128, LongVector256.LongMask256, LongVector512.LongMask512, LongVectorMax.LongMaskMax, - ShortVector64.ShortMask64, ShortVector128.ShortMask128, ShortVector256.ShortMask256, ShortVector512.ShortMask512, ShortVectorMax.ShortMaskMax { + ShortVector64.ShortMask64, ShortVector128.ShortMask128, ShortVector256.ShortMask256, ShortVector512.ShortMask512, ShortVectorMax.ShortMaskMax, + Float16Vector64.Float16Mask64, Float16Vector128.Float16Mask128, Float16Vector256.Float16Mask256, Float16Vector512.Float16Mask512, + Float16VectorMax.Float16MaskMax { AbstractMask(boolean[] bits) { super(bits); } diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractShuffle.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractShuffle.java index bea495f74fc..8c22329a833 100644 --- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractShuffle.java +++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractShuffle.java @@ -35,7 +35,8 @@ abstract sealed class AbstractShuffle extends VectorShuffle FloatVector64.FloatShuffle64, FloatVector128.FloatShuffle128, FloatVector256.FloatShuffle256, FloatVector512.FloatShuffle512, FloatVectorMax.FloatShuffleMax, IntVector64.IntShuffle64, IntVector128.IntShuffle128, IntVector256.IntShuffle256, IntVector512.IntShuffle512, IntVectorMax.IntShuffleMax, LongVector64.LongShuffle64, LongVector128.LongShuffle128, LongVector256.LongShuffle256, LongVector512.LongShuffle512, LongVectorMax.LongShuffleMax, - ShortVector64.ShortShuffle64, ShortVector128.ShortShuffle128, ShortVector256.ShortShuffle256, ShortVector512.ShortShuffle512, ShortVectorMax.ShortShuffleMax { + ShortVector64.ShortShuffle64, ShortVector128.ShortShuffle128, ShortVector256.ShortShuffle256, ShortVector512.ShortShuffle512, ShortVectorMax.ShortShuffleMax, + Float16Vector64.Float16Shuffle64, Float16Vector128.Float16Shuffle128, Float16Vector256.Float16Shuffle256, Float16Vector512.Float16Shuffle512, Float16VectorMax.Float16ShuffleMax { static final IntUnaryOperator IDENTITY = i -> i; // Internal representation allows for a maximum index of E.MAX_VALUE - 1 diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractSpecies.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractSpecies.java index 4a69c97315b..fa338f27975 100644 --- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractSpecies.java +++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractSpecies.java @@ -37,7 +37,7 @@ import jdk.internal.vm.annotation.TrustFinalFields; abstract sealed class AbstractSpecies extends jdk.internal.vm.vector.VectorSupport.VectorSpecies implements VectorSpecies permits ByteVector.ByteSpecies, DoubleVector.DoubleSpecies, FloatVector.FloatSpecies, - IntVector.IntSpecies, LongVector.LongSpecies, ShortVector.ShortSpecies { + IntVector.IntSpecies, LongVector.LongSpecies, ShortVector.ShortSpecies, Float16Vector.Float16Species { final VectorShape vectorShape; final LaneType laneType; final int laneCount; diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java index 4635a3b4817..3770ef5f975 100644 --- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java +++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractVector.java @@ -35,7 +35,7 @@ import static jdk.incubator.vector.VectorOperators.*; @SuppressWarnings("cast") abstract sealed class AbstractVector extends Vector - permits ByteVector, DoubleVector, FloatVector, IntVector, LongVector, ShortVector { + permits ByteVector, DoubleVector, FloatVector, IntVector, LongVector, ShortVector, Float16Vector { /** * The order of vector bytes when stored in natural, * array elements of the same lane type. diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16Vector.java index b4b4910fb3d..4f6dbe54113 100644 --- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16Vector.java +++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16Vector.java @@ -52,7 +52,8 @@ import static java.lang.Float.*; * {@code short} values. */ @SuppressWarnings("cast") // warning: redundant cast -public abstract class Float16Vector extends AbstractVector { +public abstract sealed class Float16Vector extends AbstractVector + permits Float16Vector64, Float16Vector128, Float16Vector256, Float16Vector512, Float16VectorMax { Float16Vector(short[] vec) { super(vec); diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16Vector128.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16Vector128.java index 531e7aa4161..2fbe57f4cfe 100644 --- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16Vector128.java +++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16Vector128.java @@ -25,22 +25,22 @@ package jdk.incubator.vector; import java.lang.foreign.MemorySegment; -import java.lang.foreign.ValueLayout; import java.nio.ByteOrder; import java.util.Arrays; import java.util.Objects; import java.util.function.IntUnaryOperator; +import jdk.internal.ValueBased; import jdk.internal.vm.annotation.ForceInline; import jdk.internal.vm.vector.VectorSupport; -import static jdk.internal.vm.vector.VectorSupport.*; - import static jdk.incubator.vector.VectorOperators.*; +import static jdk.internal.vm.vector.VectorSupport.*; // -- This file was mechanically generated: Do not edit! -- // @SuppressWarnings("cast") // warning: redundant cast +@ValueBased final class Float16Vector128 extends Float16Vector { static final Float16Species VSPECIES = (Float16Species) Float16Vector.SPECIES_128; @@ -370,7 +370,7 @@ final class Float16Vector128 extends Float16Vector { @Override @ForceInline public final Float16Shuffle128 toShuffle() { - return (Float16Shuffle128) toShuffle(vspecies(), false); + return (Float16Shuffle128) toShuffle(VSPECIES, false); } // Specialized unary testing @@ -583,7 +583,7 @@ final class Float16Vector128 extends Float16Vector { } // Mask - + @ValueBased static final class Float16Mask128 extends AbstractMask { static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM @@ -631,7 +631,7 @@ final class Float16Vector128 extends Float16Vector { @Override Float16Mask128 uOp(MUnOp f) { - boolean[] res = new boolean[vspecies().laneCount()]; + boolean[] res = new boolean[VSPECIES.laneCount()]; boolean[] bits = getBits(); for (int i = 0; i < res.length; i++) { res[i] = f.apply(i, bits[i]); @@ -641,7 +641,7 @@ final class Float16Vector128 extends Float16Vector { @Override Float16Mask128 bOp(VectorMask m, MBinOp f) { - boolean[] res = new boolean[vspecies().laneCount()]; + boolean[] res = new boolean[VSPECIES.laneCount()]; boolean[] bits = getBits(); boolean[] mbits = ((Float16Mask128)m).getBits(); for (int i = 0; i < res.length; i++) { @@ -791,16 +791,16 @@ final class Float16Vector128 extends Float16Vector { @ForceInline public boolean anyTrue() { return VectorSupport.test(BT_ne, Float16Mask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, - this, vspecies().maskAll(true), - (m, __) -> anyTrueHelper(((Float16Mask128)m).getBits())); + this, VSPECIES.maskAll(true), + (m, _) -> anyTrueHelper(((Float16Mask128)m).getBits())); } @Override @ForceInline public boolean allTrue() { return VectorSupport.test(BT_overflow, Float16Mask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, - this, vspecies().maskAll(true), - (m, __) -> allTrueHelper(((Float16Mask128)m).getBits())); + this, VSPECIES.maskAll(true), + (m, _) -> allTrueHelper(((Float16Mask128)m).getBits())); } @ForceInline @@ -808,7 +808,7 @@ final class Float16Vector128 extends Float16Vector { static Float16Mask128 maskAll(boolean bit) { return VectorSupport.fromBitsCoerced(Float16Mask128.class, LANEBITS_TYPE_ORDINAL, VLENGTH, (bit ? -1 : 0), MODE_BROADCAST, null, - (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK)); + (v, _) -> (v != 0 ? TRUE_MASK : FALSE_MASK)); } private static final Float16Mask128 TRUE_MASK = new Float16Mask128(true); private static final Float16Mask128 FALSE_MASK = new Float16Mask128(false); @@ -816,7 +816,7 @@ final class Float16Vector128 extends Float16Vector { } // Shuffle - + @ValueBased static final class Float16Shuffle128 extends AbstractShuffle { static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM @@ -857,7 +857,7 @@ final class Float16Vector128 extends Float16Vector { @Override @ForceInline public Float16Vector128 toVector() { - return (Float16Vector128) toBitsVector().castShape(vspecies(), 0); + return (Float16Vector128) toBitsVector().castShape(VSPECIES, 0); } @Override @@ -868,7 +868,7 @@ final class Float16Vector128 extends Float16Vector { @Override ShortVector128 toBitsVector0() { - return ((ShortVector128) vspecies().asIntegral().dummyVector()).vectorFactory(indices()); + return ((ShortVector128) VSPECIES.asIntegral().dummyVector()).vectorFactory(indices()); } @Override @@ -907,7 +907,7 @@ final class Float16Vector128 extends Float16Vector { @ForceInline public final Float16Mask128 laneIsValid() { return (Float16Mask128) toBitsVector().compare(VectorOperators.GE, 0) - .cast(vspecies()); + .cast(VSPECIES); } @ForceInline @@ -915,7 +915,7 @@ final class Float16Vector128 extends Float16Vector { public final Float16Shuffle128 rearrange(VectorShuffle shuffle) { Float16Shuffle128 concreteShuffle = (Float16Shuffle128) shuffle; return (Float16Shuffle128) toBitsVector().rearrange(concreteShuffle.cast(ShortVector.SPECIES_128)) - .toShuffle(vspecies(), false); + .toShuffle(VSPECIES, false); } @ForceInline @@ -928,7 +928,7 @@ final class Float16Vector128 extends Float16Vector { v = (ShortVector128) v.blend(v.lanewise(VectorOperators.ADD, length()), v.compare(VectorOperators.LT, 0)); } - return (Float16Shuffle128) v.toShuffle(vspecies(), false); + return (Float16Shuffle128) v.toShuffle(VSPECIES, false); } private static short[] prepare(int[] indices, int offset) { diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16Vector256.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16Vector256.java index 560580b6171..83d02309625 100644 --- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16Vector256.java +++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16Vector256.java @@ -25,22 +25,22 @@ package jdk.incubator.vector; import java.lang.foreign.MemorySegment; -import java.lang.foreign.ValueLayout; import java.nio.ByteOrder; import java.util.Arrays; import java.util.Objects; import java.util.function.IntUnaryOperator; +import jdk.internal.ValueBased; import jdk.internal.vm.annotation.ForceInline; import jdk.internal.vm.vector.VectorSupport; -import static jdk.internal.vm.vector.VectorSupport.*; - import static jdk.incubator.vector.VectorOperators.*; +import static jdk.internal.vm.vector.VectorSupport.*; // -- This file was mechanically generated: Do not edit! -- // @SuppressWarnings("cast") // warning: redundant cast +@ValueBased final class Float16Vector256 extends Float16Vector { static final Float16Species VSPECIES = (Float16Species) Float16Vector.SPECIES_256; @@ -370,7 +370,7 @@ final class Float16Vector256 extends Float16Vector { @Override @ForceInline public final Float16Shuffle256 toShuffle() { - return (Float16Shuffle256) toShuffle(vspecies(), false); + return (Float16Shuffle256) toShuffle(VSPECIES, false); } // Specialized unary testing @@ -599,7 +599,7 @@ final class Float16Vector256 extends Float16Vector { } // Mask - + @ValueBased static final class Float16Mask256 extends AbstractMask { static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM @@ -647,7 +647,7 @@ final class Float16Vector256 extends Float16Vector { @Override Float16Mask256 uOp(MUnOp f) { - boolean[] res = new boolean[vspecies().laneCount()]; + boolean[] res = new boolean[VSPECIES.laneCount()]; boolean[] bits = getBits(); for (int i = 0; i < res.length; i++) { res[i] = f.apply(i, bits[i]); @@ -657,7 +657,7 @@ final class Float16Vector256 extends Float16Vector { @Override Float16Mask256 bOp(VectorMask m, MBinOp f) { - boolean[] res = new boolean[vspecies().laneCount()]; + boolean[] res = new boolean[VSPECIES.laneCount()]; boolean[] bits = getBits(); boolean[] mbits = ((Float16Mask256)m).getBits(); for (int i = 0; i < res.length; i++) { @@ -807,16 +807,16 @@ final class Float16Vector256 extends Float16Vector { @ForceInline public boolean anyTrue() { return VectorSupport.test(BT_ne, Float16Mask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, - this, vspecies().maskAll(true), - (m, __) -> anyTrueHelper(((Float16Mask256)m).getBits())); + this, VSPECIES.maskAll(true), + (m, _) -> anyTrueHelper(((Float16Mask256)m).getBits())); } @Override @ForceInline public boolean allTrue() { return VectorSupport.test(BT_overflow, Float16Mask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, - this, vspecies().maskAll(true), - (m, __) -> allTrueHelper(((Float16Mask256)m).getBits())); + this, VSPECIES.maskAll(true), + (m, _) -> allTrueHelper(((Float16Mask256)m).getBits())); } @ForceInline @@ -824,7 +824,7 @@ final class Float16Vector256 extends Float16Vector { static Float16Mask256 maskAll(boolean bit) { return VectorSupport.fromBitsCoerced(Float16Mask256.class, LANEBITS_TYPE_ORDINAL, VLENGTH, (bit ? -1 : 0), MODE_BROADCAST, null, - (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK)); + (v, _) -> (v != 0 ? TRUE_MASK : FALSE_MASK)); } private static final Float16Mask256 TRUE_MASK = new Float16Mask256(true); private static final Float16Mask256 FALSE_MASK = new Float16Mask256(false); @@ -832,7 +832,7 @@ final class Float16Vector256 extends Float16Vector { } // Shuffle - + @ValueBased static final class Float16Shuffle256 extends AbstractShuffle { static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM @@ -873,7 +873,7 @@ final class Float16Vector256 extends Float16Vector { @Override @ForceInline public Float16Vector256 toVector() { - return (Float16Vector256) toBitsVector().castShape(vspecies(), 0); + return (Float16Vector256) toBitsVector().castShape(VSPECIES, 0); } @Override @@ -884,7 +884,7 @@ final class Float16Vector256 extends Float16Vector { @Override ShortVector256 toBitsVector0() { - return ((ShortVector256) vspecies().asIntegral().dummyVector()).vectorFactory(indices()); + return ((ShortVector256) VSPECIES.asIntegral().dummyVector()).vectorFactory(indices()); } @Override @@ -923,7 +923,7 @@ final class Float16Vector256 extends Float16Vector { @ForceInline public final Float16Mask256 laneIsValid() { return (Float16Mask256) toBitsVector().compare(VectorOperators.GE, 0) - .cast(vspecies()); + .cast(VSPECIES); } @ForceInline @@ -931,7 +931,7 @@ final class Float16Vector256 extends Float16Vector { public final Float16Shuffle256 rearrange(VectorShuffle shuffle) { Float16Shuffle256 concreteShuffle = (Float16Shuffle256) shuffle; return (Float16Shuffle256) toBitsVector().rearrange(concreteShuffle.cast(ShortVector.SPECIES_256)) - .toShuffle(vspecies(), false); + .toShuffle(VSPECIES, false); } @ForceInline @@ -944,7 +944,7 @@ final class Float16Vector256 extends Float16Vector { v = (ShortVector256) v.blend(v.lanewise(VectorOperators.ADD, length()), v.compare(VectorOperators.LT, 0)); } - return (Float16Shuffle256) v.toShuffle(vspecies(), false); + return (Float16Shuffle256) v.toShuffle(VSPECIES, false); } private static short[] prepare(int[] indices, int offset) { diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16Vector512.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16Vector512.java index da52c345950..c6212876551 100644 --- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16Vector512.java +++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16Vector512.java @@ -25,22 +25,22 @@ package jdk.incubator.vector; import java.lang.foreign.MemorySegment; -import java.lang.foreign.ValueLayout; import java.nio.ByteOrder; import java.util.Arrays; import java.util.Objects; import java.util.function.IntUnaryOperator; +import jdk.internal.ValueBased; import jdk.internal.vm.annotation.ForceInline; import jdk.internal.vm.vector.VectorSupport; -import static jdk.internal.vm.vector.VectorSupport.*; - import static jdk.incubator.vector.VectorOperators.*; +import static jdk.internal.vm.vector.VectorSupport.*; // -- This file was mechanically generated: Do not edit! -- // @SuppressWarnings("cast") // warning: redundant cast +@ValueBased final class Float16Vector512 extends Float16Vector { static final Float16Species VSPECIES = (Float16Species) Float16Vector.SPECIES_512; @@ -370,7 +370,7 @@ final class Float16Vector512 extends Float16Vector { @Override @ForceInline public final Float16Shuffle512 toShuffle() { - return (Float16Shuffle512) toShuffle(vspecies(), false); + return (Float16Shuffle512) toShuffle(VSPECIES, false); } // Specialized unary testing @@ -631,7 +631,7 @@ final class Float16Vector512 extends Float16Vector { } // Mask - + @ValueBased static final class Float16Mask512 extends AbstractMask { static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM @@ -679,7 +679,7 @@ final class Float16Vector512 extends Float16Vector { @Override Float16Mask512 uOp(MUnOp f) { - boolean[] res = new boolean[vspecies().laneCount()]; + boolean[] res = new boolean[VSPECIES.laneCount()]; boolean[] bits = getBits(); for (int i = 0; i < res.length; i++) { res[i] = f.apply(i, bits[i]); @@ -689,7 +689,7 @@ final class Float16Vector512 extends Float16Vector { @Override Float16Mask512 bOp(VectorMask m, MBinOp f) { - boolean[] res = new boolean[vspecies().laneCount()]; + boolean[] res = new boolean[VSPECIES.laneCount()]; boolean[] bits = getBits(); boolean[] mbits = ((Float16Mask512)m).getBits(); for (int i = 0; i < res.length; i++) { @@ -839,16 +839,16 @@ final class Float16Vector512 extends Float16Vector { @ForceInline public boolean anyTrue() { return VectorSupport.test(BT_ne, Float16Mask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, - this, vspecies().maskAll(true), - (m, __) -> anyTrueHelper(((Float16Mask512)m).getBits())); + this, VSPECIES.maskAll(true), + (m, _) -> anyTrueHelper(((Float16Mask512)m).getBits())); } @Override @ForceInline public boolean allTrue() { return VectorSupport.test(BT_overflow, Float16Mask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, - this, vspecies().maskAll(true), - (m, __) -> allTrueHelper(((Float16Mask512)m).getBits())); + this, VSPECIES.maskAll(true), + (m, _) -> allTrueHelper(((Float16Mask512)m).getBits())); } @ForceInline @@ -856,7 +856,7 @@ final class Float16Vector512 extends Float16Vector { static Float16Mask512 maskAll(boolean bit) { return VectorSupport.fromBitsCoerced(Float16Mask512.class, LANEBITS_TYPE_ORDINAL, VLENGTH, (bit ? -1 : 0), MODE_BROADCAST, null, - (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK)); + (v, _) -> (v != 0 ? TRUE_MASK : FALSE_MASK)); } private static final Float16Mask512 TRUE_MASK = new Float16Mask512(true); private static final Float16Mask512 FALSE_MASK = new Float16Mask512(false); @@ -864,7 +864,7 @@ final class Float16Vector512 extends Float16Vector { } // Shuffle - + @ValueBased static final class Float16Shuffle512 extends AbstractShuffle { static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM @@ -905,7 +905,7 @@ final class Float16Vector512 extends Float16Vector { @Override @ForceInline public Float16Vector512 toVector() { - return (Float16Vector512) toBitsVector().castShape(vspecies(), 0); + return (Float16Vector512) toBitsVector().castShape(VSPECIES, 0); } @Override @@ -916,7 +916,7 @@ final class Float16Vector512 extends Float16Vector { @Override ShortVector512 toBitsVector0() { - return ((ShortVector512) vspecies().asIntegral().dummyVector()).vectorFactory(indices()); + return ((ShortVector512) VSPECIES.asIntegral().dummyVector()).vectorFactory(indices()); } @Override @@ -955,7 +955,7 @@ final class Float16Vector512 extends Float16Vector { @ForceInline public final Float16Mask512 laneIsValid() { return (Float16Mask512) toBitsVector().compare(VectorOperators.GE, 0) - .cast(vspecies()); + .cast(VSPECIES); } @ForceInline @@ -963,7 +963,7 @@ final class Float16Vector512 extends Float16Vector { public final Float16Shuffle512 rearrange(VectorShuffle shuffle) { Float16Shuffle512 concreteShuffle = (Float16Shuffle512) shuffle; return (Float16Shuffle512) toBitsVector().rearrange(concreteShuffle.cast(ShortVector.SPECIES_512)) - .toShuffle(vspecies(), false); + .toShuffle(VSPECIES, false); } @ForceInline @@ -976,7 +976,7 @@ final class Float16Vector512 extends Float16Vector { v = (ShortVector512) v.blend(v.lanewise(VectorOperators.ADD, length()), v.compare(VectorOperators.LT, 0)); } - return (Float16Shuffle512) v.toShuffle(vspecies(), false); + return (Float16Shuffle512) v.toShuffle(VSPECIES, false); } private static short[] prepare(int[] indices, int offset) { diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16Vector64.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16Vector64.java index 0239b016e83..1c57c2e5af3 100644 --- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16Vector64.java +++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16Vector64.java @@ -25,22 +25,22 @@ package jdk.incubator.vector; import java.lang.foreign.MemorySegment; -import java.lang.foreign.ValueLayout; import java.nio.ByteOrder; import java.util.Arrays; import java.util.Objects; import java.util.function.IntUnaryOperator; +import jdk.internal.ValueBased; import jdk.internal.vm.annotation.ForceInline; import jdk.internal.vm.vector.VectorSupport; -import static jdk.internal.vm.vector.VectorSupport.*; - import static jdk.incubator.vector.VectorOperators.*; +import static jdk.internal.vm.vector.VectorSupport.*; // -- This file was mechanically generated: Do not edit! -- // @SuppressWarnings("cast") // warning: redundant cast +@ValueBased final class Float16Vector64 extends Float16Vector { static final Float16Species VSPECIES = (Float16Species) Float16Vector.SPECIES_64; @@ -370,7 +370,7 @@ final class Float16Vector64 extends Float16Vector { @Override @ForceInline public final Float16Shuffle64 toShuffle() { - return (Float16Shuffle64) toShuffle(vspecies(), false); + return (Float16Shuffle64) toShuffle(VSPECIES, false); } // Specialized unary testing @@ -575,7 +575,7 @@ final class Float16Vector64 extends Float16Vector { } // Mask - + @ValueBased static final class Float16Mask64 extends AbstractMask { static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM @@ -623,7 +623,7 @@ final class Float16Vector64 extends Float16Vector { @Override Float16Mask64 uOp(MUnOp f) { - boolean[] res = new boolean[vspecies().laneCount()]; + boolean[] res = new boolean[VSPECIES.laneCount()]; boolean[] bits = getBits(); for (int i = 0; i < res.length; i++) { res[i] = f.apply(i, bits[i]); @@ -633,7 +633,7 @@ final class Float16Vector64 extends Float16Vector { @Override Float16Mask64 bOp(VectorMask m, MBinOp f) { - boolean[] res = new boolean[vspecies().laneCount()]; + boolean[] res = new boolean[VSPECIES.laneCount()]; boolean[] bits = getBits(); boolean[] mbits = ((Float16Mask64)m).getBits(); for (int i = 0; i < res.length; i++) { @@ -783,16 +783,16 @@ final class Float16Vector64 extends Float16Vector { @ForceInline public boolean anyTrue() { return VectorSupport.test(BT_ne, Float16Mask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, - this, vspecies().maskAll(true), - (m, __) -> anyTrueHelper(((Float16Mask64)m).getBits())); + this, VSPECIES.maskAll(true), + (m, _) -> anyTrueHelper(((Float16Mask64)m).getBits())); } @Override @ForceInline public boolean allTrue() { return VectorSupport.test(BT_overflow, Float16Mask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, - this, vspecies().maskAll(true), - (m, __) -> allTrueHelper(((Float16Mask64)m).getBits())); + this, VSPECIES.maskAll(true), + (m, _) -> allTrueHelper(((Float16Mask64)m).getBits())); } @ForceInline @@ -800,7 +800,7 @@ final class Float16Vector64 extends Float16Vector { static Float16Mask64 maskAll(boolean bit) { return VectorSupport.fromBitsCoerced(Float16Mask64.class, LANEBITS_TYPE_ORDINAL, VLENGTH, (bit ? -1 : 0), MODE_BROADCAST, null, - (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK)); + (v, _) -> (v != 0 ? TRUE_MASK : FALSE_MASK)); } private static final Float16Mask64 TRUE_MASK = new Float16Mask64(true); private static final Float16Mask64 FALSE_MASK = new Float16Mask64(false); @@ -808,7 +808,7 @@ final class Float16Vector64 extends Float16Vector { } // Shuffle - + @ValueBased static final class Float16Shuffle64 extends AbstractShuffle { static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM @@ -849,7 +849,7 @@ final class Float16Vector64 extends Float16Vector { @Override @ForceInline public Float16Vector64 toVector() { - return (Float16Vector64) toBitsVector().castShape(vspecies(), 0); + return (Float16Vector64) toBitsVector().castShape(VSPECIES, 0); } @Override @@ -860,7 +860,7 @@ final class Float16Vector64 extends Float16Vector { @Override ShortVector64 toBitsVector0() { - return ((ShortVector64) vspecies().asIntegral().dummyVector()).vectorFactory(indices()); + return ((ShortVector64) VSPECIES.asIntegral().dummyVector()).vectorFactory(indices()); } @Override @@ -899,7 +899,7 @@ final class Float16Vector64 extends Float16Vector { @ForceInline public final Float16Mask64 laneIsValid() { return (Float16Mask64) toBitsVector().compare(VectorOperators.GE, 0) - .cast(vspecies()); + .cast(VSPECIES); } @ForceInline @@ -907,7 +907,7 @@ final class Float16Vector64 extends Float16Vector { public final Float16Shuffle64 rearrange(VectorShuffle shuffle) { Float16Shuffle64 concreteShuffle = (Float16Shuffle64) shuffle; return (Float16Shuffle64) toBitsVector().rearrange(concreteShuffle.cast(ShortVector.SPECIES_64)) - .toShuffle(vspecies(), false); + .toShuffle(VSPECIES, false); } @ForceInline @@ -920,7 +920,7 @@ final class Float16Vector64 extends Float16Vector { v = (ShortVector64) v.blend(v.lanewise(VectorOperators.ADD, length()), v.compare(VectorOperators.LT, 0)); } - return (Float16Shuffle64) v.toShuffle(vspecies(), false); + return (Float16Shuffle64) v.toShuffle(VSPECIES, false); } private static short[] prepare(int[] indices, int offset) { diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16VectorMax.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16VectorMax.java index 852408c45f5..c51057ac10f 100644 --- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16VectorMax.java +++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float16VectorMax.java @@ -25,22 +25,22 @@ package jdk.incubator.vector; import java.lang.foreign.MemorySegment; -import java.lang.foreign.ValueLayout; import java.nio.ByteOrder; import java.util.Arrays; import java.util.Objects; import java.util.function.IntUnaryOperator; +import jdk.internal.ValueBased; import jdk.internal.vm.annotation.ForceInline; import jdk.internal.vm.vector.VectorSupport; -import static jdk.internal.vm.vector.VectorSupport.*; - import static jdk.incubator.vector.VectorOperators.*; +import static jdk.internal.vm.vector.VectorSupport.*; // -- This file was mechanically generated: Do not edit! -- // @SuppressWarnings("cast") // warning: redundant cast +@ValueBased final class Float16VectorMax extends Float16Vector { static final Float16Species VSPECIES = (Float16Species) Float16Vector.SPECIES_MAX; @@ -370,7 +370,7 @@ final class Float16VectorMax extends Float16Vector { @Override @ForceInline public final Float16ShuffleMax toShuffle() { - return (Float16ShuffleMax) toShuffle(vspecies(), false); + return (Float16ShuffleMax) toShuffle(VSPECIES, false); } // Specialized unary testing @@ -568,7 +568,7 @@ final class Float16VectorMax extends Float16Vector { } // Mask - + @ValueBased static final class Float16MaskMax extends AbstractMask { static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM @@ -616,7 +616,7 @@ final class Float16VectorMax extends Float16Vector { @Override Float16MaskMax uOp(MUnOp f) { - boolean[] res = new boolean[vspecies().laneCount()]; + boolean[] res = new boolean[VSPECIES.laneCount()]; boolean[] bits = getBits(); for (int i = 0; i < res.length; i++) { res[i] = f.apply(i, bits[i]); @@ -626,7 +626,7 @@ final class Float16VectorMax extends Float16Vector { @Override Float16MaskMax bOp(VectorMask m, MBinOp f) { - boolean[] res = new boolean[vspecies().laneCount()]; + boolean[] res = new boolean[VSPECIES.laneCount()]; boolean[] bits = getBits(); boolean[] mbits = ((Float16MaskMax)m).getBits(); for (int i = 0; i < res.length; i++) { @@ -776,16 +776,16 @@ final class Float16VectorMax extends Float16Vector { @ForceInline public boolean anyTrue() { return VectorSupport.test(BT_ne, Float16MaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, - this, vspecies().maskAll(true), - (m, __) -> anyTrueHelper(((Float16MaskMax)m).getBits())); + this, VSPECIES.maskAll(true), + (m, _) -> anyTrueHelper(((Float16MaskMax)m).getBits())); } @Override @ForceInline public boolean allTrue() { return VectorSupport.test(BT_overflow, Float16MaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, - this, vspecies().maskAll(true), - (m, __) -> allTrueHelper(((Float16MaskMax)m).getBits())); + this, VSPECIES.maskAll(true), + (m, _) -> allTrueHelper(((Float16MaskMax)m).getBits())); } @ForceInline @@ -793,7 +793,7 @@ final class Float16VectorMax extends Float16Vector { static Float16MaskMax maskAll(boolean bit) { return VectorSupport.fromBitsCoerced(Float16MaskMax.class, LANEBITS_TYPE_ORDINAL, VLENGTH, (bit ? -1 : 0), MODE_BROADCAST, null, - (v, __) -> (v != 0 ? TRUE_MASK : FALSE_MASK)); + (v, _) -> (v != 0 ? TRUE_MASK : FALSE_MASK)); } private static final Float16MaskMax TRUE_MASK = new Float16MaskMax(true); private static final Float16MaskMax FALSE_MASK = new Float16MaskMax(false); @@ -801,7 +801,7 @@ final class Float16VectorMax extends Float16Vector { } // Shuffle - + @ValueBased static final class Float16ShuffleMax extends AbstractShuffle { static final int VLENGTH = VSPECIES.laneCount(); // used by the JVM @@ -842,7 +842,7 @@ final class Float16VectorMax extends Float16Vector { @Override @ForceInline public Float16VectorMax toVector() { - return (Float16VectorMax) toBitsVector().castShape(vspecies(), 0); + return (Float16VectorMax) toBitsVector().castShape(VSPECIES, 0); } @Override @@ -853,7 +853,7 @@ final class Float16VectorMax extends Float16Vector { @Override ShortVectorMax toBitsVector0() { - return ((ShortVectorMax) vspecies().asIntegral().dummyVector()).vectorFactory(indices()); + return ((ShortVectorMax) VSPECIES.asIntegral().dummyVector()).vectorFactory(indices()); } @Override @@ -892,7 +892,7 @@ final class Float16VectorMax extends Float16Vector { @ForceInline public final Float16MaskMax laneIsValid() { return (Float16MaskMax) toBitsVector().compare(VectorOperators.GE, 0) - .cast(vspecies()); + .cast(VSPECIES); } @ForceInline @@ -900,7 +900,7 @@ final class Float16VectorMax extends Float16Vector { public final Float16ShuffleMax rearrange(VectorShuffle shuffle) { Float16ShuffleMax concreteShuffle = (Float16ShuffleMax) shuffle; return (Float16ShuffleMax) toBitsVector().rearrange(concreteShuffle.cast(ShortVector.SPECIES_MAX)) - .toShuffle(vspecies(), false); + .toShuffle(VSPECIES, false); } @ForceInline @@ -913,7 +913,7 @@ final class Float16VectorMax extends Float16Vector { v = (ShortVectorMax) v.blend(v.lanewise(VectorOperators.ADD, length()), v.compare(VectorOperators.LT, 0)); } - return (Float16ShuffleMax) v.toShuffle(vspecies(), false); + return (Float16ShuffleMax) v.toShuffle(VSPECIES, false); } private static short[] prepare(int[] indices, int offset) {