Skip to content

8338023: Support two vector selectFrom API #20508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 20 commits into from
Closed

8338023: Support two vector selectFrom API #20508

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
45bfe6c
8338023: Support two vector selectFrom API
Aug 8, 2024
82c0b0a
Adding Benchmark
Aug 8, 2024
055fb22
Review suggestions incorporated.
Aug 19, 2024
e24632c
Pass explicit wrap argument to selectFrom API with default value set …
Aug 21, 2024
d7ad688
Defaulting to index wrapping scheme.
Aug 23, 2024
6cb1a46
Removing redundant checkIndex routine
Aug 23, 2024
408a869
Review comments resolutions.
Aug 27, 2024
8d71f17
Adding descriptive comments
Aug 29, 2024
d3ee310
Review resolutions.
Sep 6, 2024
1c00f41
Documentation suggestions from Paul.
Sep 13, 2024
7c80bfc
Disabling VectorLoadShuffle bypassing optimization to comply with rea…
Sep 16, 2024
d72c82e
Review comments resolution.
Sep 17, 2024
2953004
Jcheck clearance
Sep 17, 2024
31a5864
Incorporating review and documentation suggestions.
Sep 18, 2024
42ca80c
Handling NPOT vector length for AArch64 SVE with vector sizes varying…
Sep 24, 2024
7327736
Review comments resolutions.
Oct 1, 2024
130fa3e
Merge branch 'master' of http://github.com/openjdk/jdk into JDK-8338023
Oct 3, 2024
6215ab9
Review comments resolution.
Oct 3, 2024
1cca8e2
Sharpening intrinsic exit check.
Oct 3, 2024
79ee29c
Updating tests to use floorMod
Oct 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,15 +511,7 @@ public Byte128Vector selectFrom(Vector<Byte> v,
public Byte128Vector selectFrom(Vector<Byte> v1,
Vector<Byte> v2) {
return (Byte128Vector)
super.selectFromTemplate((Byte128Vector) v1, (Byte128Vector) v2, true); // specialize
}

@Override
@ForceInline
public Byte128Vector selectFrom(Vector<Byte> v1,
Vector<Byte> v2, boolean wrap) {
return (Byte128Vector)
super.selectFromTemplate((Byte128Vector) v1, (Byte128Vector) v2, wrap); // specialize
super.selectFromTemplate((Byte128Vector) v1, (Byte128Vector) v2); // specialize
}

@ForceInline
Expand Down
10 changes: 1 addition & 9 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,15 +511,7 @@ public Byte256Vector selectFrom(Vector<Byte> v,
public Byte256Vector selectFrom(Vector<Byte> v1,
Vector<Byte> v2) {
return (Byte256Vector)
super.selectFromTemplate((Byte256Vector) v1, (Byte256Vector) v2, true); // specialize
}

@Override
@ForceInline
public Byte256Vector selectFrom(Vector<Byte> v1,
Vector<Byte> v2, boolean wrap) {
return (Byte256Vector)
super.selectFromTemplate((Byte256Vector) v1, (Byte256Vector) v2, wrap); // specialize
super.selectFromTemplate((Byte256Vector) v1, (Byte256Vector) v2); // specialize
}

@ForceInline
Expand Down
10 changes: 1 addition & 9 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,15 +511,7 @@ public Byte512Vector selectFrom(Vector<Byte> v,
public Byte512Vector selectFrom(Vector<Byte> v1,
Vector<Byte> v2) {
return (Byte512Vector)
super.selectFromTemplate((Byte512Vector) v1, (Byte512Vector) v2, true); // specialize
}

@Override
@ForceInline
public Byte512Vector selectFrom(Vector<Byte> v1,
Vector<Byte> v2, boolean wrap) {
return (Byte512Vector)
super.selectFromTemplate((Byte512Vector) v1, (Byte512Vector) v2, wrap); // specialize
super.selectFromTemplate((Byte512Vector) v1, (Byte512Vector) v2); // specialize
}

@ForceInline
Expand Down
10 changes: 1 addition & 9 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,15 +511,7 @@ public Byte64Vector selectFrom(Vector<Byte> v,
public Byte64Vector selectFrom(Vector<Byte> v1,
Vector<Byte> v2) {
return (Byte64Vector)
super.selectFromTemplate((Byte64Vector) v1, (Byte64Vector) v2, true); // specialize
}

@Override
@ForceInline
public Byte64Vector selectFrom(Vector<Byte> v1,
Vector<Byte> v2, boolean wrap) {
return (Byte64Vector)
super.selectFromTemplate((Byte64Vector) v1, (Byte64Vector) v2, wrap); // specialize
super.selectFromTemplate((Byte64Vector) v1, (Byte64Vector) v2); // specialize
}

@ForceInline
Expand Down
10 changes: 1 addition & 9 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,15 +511,7 @@ public ByteMaxVector selectFrom(Vector<Byte> v,
public ByteMaxVector selectFrom(Vector<Byte> v1,
Vector<Byte> v2) {
return (ByteMaxVector)
super.selectFromTemplate((ByteMaxVector) v1, (ByteMaxVector) v2, true); // specialize
}

@Override
@ForceInline
public ByteMaxVector selectFrom(Vector<Byte> v1,
Vector<Byte> v2, boolean wrap) {
return (ByteMaxVector)
super.selectFromTemplate((ByteMaxVector) v1, (ByteMaxVector) v2, wrap); // specialize
super.selectFromTemplate((ByteMaxVector) v1, (ByteMaxVector) v2); // specialize
}

@ForceInline
Expand Down
15 changes: 2 additions & 13 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2581,22 +2581,11 @@ IndexOutOfBoundsException checkIndexFailed(Vector<?> vix, int length) {
public abstract
ByteVector selectFrom(Vector<Byte> v1, Vector<Byte> v2);

/**
* {@inheritDoc} <!--workaround-->
*/
@Override
public abstract
ByteVector selectFrom(Vector<Byte> v1, Vector<Byte> v2, boolean wrap);

/*package-private*/
@ForceInline
final ByteVector selectFromTemplate(ByteVector v1, ByteVector v2, boolean wrap) {
final ByteVector selectFromTemplate(ByteVector v1, ByteVector v2) {
int twovectorlen = length() * 2;
ByteVector wrapped_indexes = this;
if (!wrap && this.compare(VectorOperators.UNSIGNED_GT, twovectorlen - 1).anyTrue()) {
throw checkIndexFailed(this, twovectorlen);
}
wrapped_indexes = this.lanewise(VectorOperators.AND, twovectorlen - 1);
ByteVector wrapped_indexes = this.lanewise(VectorOperators.AND, twovectorlen - 1);
return (ByteVector)VectorSupport.selectFromTwoVectorOp(getClass(), byte.class, length(), wrapped_indexes, v1, v2,
(vec1, vec2, vec3) -> {
return vec2.rearrange(vec1.toShuffle(), vec3);
Expand Down
10 changes: 1 addition & 9 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,15 +498,7 @@ public Double128Vector selectFrom(Vector<Double> v,
public Double128Vector selectFrom(Vector<Double> v1,
Vector<Double> v2) {
return (Double128Vector)
super.selectFromTemplate((Double128Vector) v1, (Double128Vector) v2, true); // specialize
}

@Override
@ForceInline
public Double128Vector selectFrom(Vector<Double> v1,
Vector<Double> v2, boolean wrap) {
return (Double128Vector)
super.selectFromTemplate((Double128Vector) v1, (Double128Vector) v2, wrap); // specialize
super.selectFromTemplate((Double128Vector) v1, (Double128Vector) v2); // specialize
}

@ForceInline
Expand Down
10 changes: 1 addition & 9 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,15 +498,7 @@ public Double256Vector selectFrom(Vector<Double> v,
public Double256Vector selectFrom(Vector<Double> v1,
Vector<Double> v2) {
return (Double256Vector)
super.selectFromTemplate((Double256Vector) v1, (Double256Vector) v2, true); // specialize
}

@Override
@ForceInline
public Double256Vector selectFrom(Vector<Double> v1,
Vector<Double> v2, boolean wrap) {
return (Double256Vector)
super.selectFromTemplate((Double256Vector) v1, (Double256Vector) v2, wrap); // specialize
super.selectFromTemplate((Double256Vector) v1, (Double256Vector) v2); // specialize
}

@ForceInline
Expand Down
10 changes: 1 addition & 9 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,15 +498,7 @@ public Double512Vector selectFrom(Vector<Double> v,
public Double512Vector selectFrom(Vector<Double> v1,
Vector<Double> v2) {
return (Double512Vector)
super.selectFromTemplate((Double512Vector) v1, (Double512Vector) v2, true); // specialize
}

@Override
@ForceInline
public Double512Vector selectFrom(Vector<Double> v1,
Vector<Double> v2, boolean wrap) {
return (Double512Vector)
super.selectFromTemplate((Double512Vector) v1, (Double512Vector) v2, wrap); // specialize
super.selectFromTemplate((Double512Vector) v1, (Double512Vector) v2); // specialize
}

@ForceInline
Expand Down
10 changes: 1 addition & 9 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,15 +498,7 @@ public Double64Vector selectFrom(Vector<Double> v,
public Double64Vector selectFrom(Vector<Double> v1,
Vector<Double> v2) {
return (Double64Vector)
super.selectFromTemplate((Double64Vector) v1, (Double64Vector) v2, true); // specialize
}

@Override
@ForceInline
public Double64Vector selectFrom(Vector<Double> v1,
Vector<Double> v2, boolean wrap) {
return (Double64Vector)
super.selectFromTemplate((Double64Vector) v1, (Double64Vector) v2, wrap); // specialize
super.selectFromTemplate((Double64Vector) v1, (Double64Vector) v2); // specialize
}

@ForceInline
Expand Down
10 changes: 1 addition & 9 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,15 +498,7 @@ public DoubleMaxVector selectFrom(Vector<Double> v,
public DoubleMaxVector selectFrom(Vector<Double> v1,
Vector<Double> v2) {
return (DoubleMaxVector)
super.selectFromTemplate((DoubleMaxVector) v1, (DoubleMaxVector) v2, true); // specialize
}

@Override
@ForceInline
public DoubleMaxVector selectFrom(Vector<Double> v1,
Vector<Double> v2, boolean wrap) {
return (DoubleMaxVector)
super.selectFromTemplate((DoubleMaxVector) v1, (DoubleMaxVector) v2, wrap); // specialize
super.selectFromTemplate((DoubleMaxVector) v1, (DoubleMaxVector) v2); // specialize
}

@ForceInline
Expand Down
26 changes: 6 additions & 20 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2423,29 +2423,15 @@ IndexOutOfBoundsException checkIndexFailed(Vector<?> vix, int length) {
public abstract
DoubleVector selectFrom(Vector<Double> v1, Vector<Double> v2);

/**
* {@inheritDoc} <!--workaround-->
*/
@Override
public abstract
DoubleVector selectFrom(Vector<Double> v1, Vector<Double> v2, boolean wrap);

/*package-private*/
@ForceInline
final DoubleVector selectFromTemplate(DoubleVector v1, DoubleVector v2, boolean wrap) {
final DoubleVector selectFromTemplate(DoubleVector v1, DoubleVector v2) {
int twovectorlen = length() * 2;
DoubleVector wrapped_indexes = this;
if (!wrap &&
(!this.test(VectorOperators.IS_FINITE).allTrue() ||
this.compare(VectorOperators.LT, 0)
.or(this.compare(VectorOperators.GE, twovectorlen)).anyTrue())) {
throw checkIndexFailed(this, twovectorlen);
}
wrapped_indexes = wrapped_indexes.convert(VectorOperators.D2I, 0)
.lanewise(VectorOperators.AND, twovectorlen - 1)
.reinterpretAsInts()
.convert(VectorOperators.I2D, 0)
.reinterpretAsDoubles();
DoubleVector wrapped_indexes = this.convert(VectorOperators.D2I, 0)
.lanewise(VectorOperators.AND, twovectorlen - 1)
.reinterpretAsInts()
.convert(VectorOperators.I2D, 0)
.reinterpretAsDoubles();
return (DoubleVector)VectorSupport.selectFromTwoVectorOp(getClass(), double.class, length(), wrapped_indexes, v1, v2,
(vec1, vec2, vec3) -> {
return vec2.rearrange(vec1.toShuffle(), vec3);
Expand Down
10 changes: 1 addition & 9 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,15 +498,7 @@ public Float128Vector selectFrom(Vector<Float> v,
public Float128Vector selectFrom(Vector<Float> v1,
Vector<Float> v2) {
return (Float128Vector)
super.selectFromTemplate((Float128Vector) v1, (Float128Vector) v2, true); // specialize
}

@Override
@ForceInline
public Float128Vector selectFrom(Vector<Float> v1,
Vector<Float> v2, boolean wrap) {
return (Float128Vector)
super.selectFromTemplate((Float128Vector) v1, (Float128Vector) v2, wrap); // specialize
super.selectFromTemplate((Float128Vector) v1, (Float128Vector) v2); // specialize
}

@ForceInline
Expand Down
10 changes: 1 addition & 9 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,15 +498,7 @@ public Float256Vector selectFrom(Vector<Float> v,
public Float256Vector selectFrom(Vector<Float> v1,
Vector<Float> v2) {
return (Float256Vector)
super.selectFromTemplate((Float256Vector) v1, (Float256Vector) v2, true); // specialize
}

@Override
@ForceInline
public Float256Vector selectFrom(Vector<Float> v1,
Vector<Float> v2, boolean wrap) {
return (Float256Vector)
super.selectFromTemplate((Float256Vector) v1, (Float256Vector) v2, wrap); // specialize
super.selectFromTemplate((Float256Vector) v1, (Float256Vector) v2); // specialize
}

@ForceInline
Expand Down
10 changes: 1 addition & 9 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,15 +498,7 @@ public Float512Vector selectFrom(Vector<Float> v,
public Float512Vector selectFrom(Vector<Float> v1,
Vector<Float> v2) {
return (Float512Vector)
super.selectFromTemplate((Float512Vector) v1, (Float512Vector) v2, true); // specialize
}

@Override
@ForceInline
public Float512Vector selectFrom(Vector<Float> v1,
Vector<Float> v2, boolean wrap) {
return (Float512Vector)
super.selectFromTemplate((Float512Vector) v1, (Float512Vector) v2, wrap); // specialize
super.selectFromTemplate((Float512Vector) v1, (Float512Vector) v2); // specialize
}

@ForceInline
Expand Down
10 changes: 1 addition & 9 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,15 +498,7 @@ public Float64Vector selectFrom(Vector<Float> v,
public Float64Vector selectFrom(Vector<Float> v1,
Vector<Float> v2) {
return (Float64Vector)
super.selectFromTemplate((Float64Vector) v1, (Float64Vector) v2, true); // specialize
}

@Override
@ForceInline
public Float64Vector selectFrom(Vector<Float> v1,
Vector<Float> v2, boolean wrap) {
return (Float64Vector)
super.selectFromTemplate((Float64Vector) v1, (Float64Vector) v2, wrap); // specialize
super.selectFromTemplate((Float64Vector) v1, (Float64Vector) v2); // specialize
}

@ForceInline
Expand Down
10 changes: 1 addition & 9 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,15 +498,7 @@ public FloatMaxVector selectFrom(Vector<Float> v,
public FloatMaxVector selectFrom(Vector<Float> v1,
Vector<Float> v2) {
return (FloatMaxVector)
super.selectFromTemplate((FloatMaxVector) v1, (FloatMaxVector) v2, true); // specialize
}

@Override
@ForceInline
public FloatMaxVector selectFrom(Vector<Float> v1,
Vector<Float> v2, boolean wrap) {
return (FloatMaxVector)
super.selectFromTemplate((FloatMaxVector) v1, (FloatMaxVector) v2, wrap); // specialize
super.selectFromTemplate((FloatMaxVector) v1, (FloatMaxVector) v2); // specialize
}

@ForceInline
Expand Down
26 changes: 6 additions & 20 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2435,29 +2435,15 @@ IndexOutOfBoundsException checkIndexFailed(Vector<?> vix, int length) {
public abstract
FloatVector selectFrom(Vector<Float> v1, Vector<Float> v2);

/**
* {@inheritDoc} <!--workaround-->
*/
@Override
public abstract
FloatVector selectFrom(Vector<Float> v1, Vector<Float> v2, boolean wrap);

/*package-private*/
@ForceInline
final FloatVector selectFromTemplate(FloatVector v1, FloatVector v2, boolean wrap) {
final FloatVector selectFromTemplate(FloatVector v1, FloatVector v2) {
int twovectorlen = length() * 2;
FloatVector wrapped_indexes = this;
if (!wrap &&
(!this.test(VectorOperators.IS_FINITE).allTrue() ||
this.compare(VectorOperators.LT, 0)
.or(this.compare(VectorOperators.GE, twovectorlen)).anyTrue())) {
throw checkIndexFailed(this, twovectorlen);
}
wrapped_indexes = wrapped_indexes.convert(VectorOperators.F2I, 0)
.lanewise(VectorOperators.AND, twovectorlen - 1)
.reinterpretAsInts()
.convert(VectorOperators.I2F, 0)
.reinterpretAsFloats();
FloatVector wrapped_indexes = this.convert(VectorOperators.F2I, 0)
.lanewise(VectorOperators.AND, twovectorlen - 1)
.reinterpretAsInts()
.convert(VectorOperators.I2F, 0)
.reinterpretAsFloats();
return (FloatVector)VectorSupport.selectFromTwoVectorOp(getClass(), float.class, length(), wrapped_indexes, v1, v2,
(vec1, vec2, vec3) -> {
return vec2.rearrange(vec1.toShuffle(), vec3);
Expand Down
10 changes: 1 addition & 9 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,15 +511,7 @@ public Int128Vector selectFrom(Vector<Integer> v,
public Int128Vector selectFrom(Vector<Integer> v1,
Vector<Integer> v2) {
return (Int128Vector)
super.selectFromTemplate((Int128Vector) v1, (Int128Vector) v2, true); // specialize
}

@Override
@ForceInline
public Int128Vector selectFrom(Vector<Integer> v1,
Vector<Integer> v2, boolean wrap) {
return (Int128Vector)
super.selectFromTemplate((Int128Vector) v1, (Int128Vector) v2, wrap); // specialize
super.selectFromTemplate((Int128Vector) v1, (Int128Vector) v2); // specialize
}

@ForceInline
Expand Down
10 changes: 1 addition & 9 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,15 +511,7 @@ public Int256Vector selectFrom(Vector<Integer> v,
public Int256Vector selectFrom(Vector<Integer> v1,
Vector<Integer> v2) {
return (Int256Vector)
super.selectFromTemplate((Int256Vector) v1, (Int256Vector) v2, true); // specialize
}

@Override
@ForceInline
public Int256Vector selectFrom(Vector<Integer> v1,
Vector<Integer> v2, boolean wrap) {
return (Int256Vector)
super.selectFromTemplate((Int256Vector) v1, (Int256Vector) v2, wrap); // specialize
super.selectFromTemplate((Int256Vector) v1, (Int256Vector) v2); // specialize
}

@ForceInline
Expand Down
Loading