Skip to content
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

8291118: [vectorapi] Optimize the implementation of lanewise FIRST_NONZERO #9683

Closed
wants to merge 1 commit into from
+48 −77
Closed

8291118: [vectorapi] Optimize the implementation of lanewise FIRST_NONZERO #9683

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 6 additions & 10 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
View file
Original file line number Diff line number Diff line change
@@ -759,11 +759,9 @@ ByteVector lanewiseTemplate(VectorOperators.Binary op,

if (opKind(op, VO_SPECIAL | VO_SHIFT)) {
if (op == FIRST_NONZERO) {
// FIXME: Support this in the JIT.
VectorMask<Byte> thisNZ
= this.viewAsIntegralLanes().compare(NE, (byte) 0);
that = that.blend((byte) 0, thisNZ.cast(vspecies()));
op = OR_UNCHECKED;
VectorMask<Byte> mask
= this.compare(EQ, (byte) 0);
return this.blend(that, mask);
}
if (opKind(op, VO_SHIFT)) {
// As per shift specification for Java, mask the shift count.
@@ -809,11 +807,9 @@ ByteVector lanewiseTemplate(VectorOperators.Binary op,

if (opKind(op, VO_SPECIAL | VO_SHIFT)) {
if (op == FIRST_NONZERO) {
// FIXME: Support this in the JIT.
VectorMask<Byte> thisNZ
= this.viewAsIntegralLanes().compare(NE, (byte) 0);
that = that.blend((byte) 0, thisNZ.cast(vspecies()));
op = OR_UNCHECKED;
VectorMask<Byte> mask
= this.compare(EQ, (byte) 0, m);
return this.blend(that, mask);
}
if (opKind(op, VO_SHIFT)) {
// As per shift specification for Java, mask the shift count.
17 changes: 7 additions & 10 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java
View file
Original file line number Diff line number Diff line change
@@ -764,15 +764,9 @@ DoubleVector lanewiseTemplate(VectorOperators.Binary op,

if (opKind(op, VO_SPECIAL )) {
if (op == FIRST_NONZERO) {
// FIXME: Support this in the JIT.
VectorMask<Long> thisNZ
= this.viewAsIntegralLanes().compare(NE, (long) 0);
that = that.blend((double) 0, thisNZ.cast(vspecies()));
op = OR_UNCHECKED;
// FIXME: Support OR_UNCHECKED on float/double also!
return this.viewAsIntegralLanes()
.lanewise(op, that.viewAsIntegralLanes())
.viewAsFloatingLanes();
VectorMask<Long> mask
= this.viewAsIntegralLanes().compare(EQ, (long) 0);
return this.blend(that, mask.cast(vspecies()));
}
}

@@ -803,7 +797,10 @@ DoubleVector lanewiseTemplate(VectorOperators.Binary op,

if (opKind(op, VO_SPECIAL )) {
if (op == FIRST_NONZERO) {
return blend(lanewise(op, v), m);
LongVector bits = this.viewAsIntegralLanes();
VectorMask<Long> mask
= bits.compare(EQ, (long) 0, m.cast(bits.vspecies()));
return this.blend(that, mask.cast(vspecies()));
}
}

17 changes: 7 additions & 10 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java
View file
Original file line number Diff line number Diff line change
@@ -764,15 +764,9 @@ FloatVector lanewiseTemplate(VectorOperators.Binary op,

if (opKind(op, VO_SPECIAL )) {
if (op == FIRST_NONZERO) {
// FIXME: Support this in the JIT.
VectorMask<Integer> thisNZ
= this.viewAsIntegralLanes().compare(NE, (int) 0);
that = that.blend((float) 0, thisNZ.cast(vspecies()));
op = OR_UNCHECKED;
// FIXME: Support OR_UNCHECKED on float/double also!
return this.viewAsIntegralLanes()
.lanewise(op, that.viewAsIntegralLanes())
.viewAsFloatingLanes();
VectorMask<Integer> mask
= this.viewAsIntegralLanes().compare(EQ, (int) 0);
return this.blend(that, mask.cast(vspecies()));
}
}

@@ -803,7 +797,10 @@ FloatVector lanewiseTemplate(VectorOperators.Binary op,

if (opKind(op, VO_SPECIAL )) {
if (op == FIRST_NONZERO) {
return blend(lanewise(op, v), m);
IntVector bits = this.viewAsIntegralLanes();
VectorMask<Integer> mask
= bits.compare(EQ, (int) 0, m.cast(bits.vspecies()));
return this.blend(that, mask.cast(vspecies()));
}
}

16 changes: 6 additions & 10 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java
View file
Original file line number Diff line number Diff line change
@@ -759,11 +759,9 @@ IntVector lanewiseTemplate(VectorOperators.Binary op,

if (opKind(op, VO_SPECIAL | VO_SHIFT)) {
if (op == FIRST_NONZERO) {
// FIXME: Support this in the JIT.
VectorMask<Integer> thisNZ
= this.viewAsIntegralLanes().compare(NE, (int) 0);
that = that.blend((int) 0, thisNZ.cast(vspecies()));
op = OR_UNCHECKED;
VectorMask<Integer> mask
= this.compare(EQ, (int) 0);
return this.blend(that, mask);
}
if (opKind(op, VO_SHIFT)) {
// As per shift specification for Java, mask the shift count.
@@ -809,11 +807,9 @@ IntVector lanewiseTemplate(VectorOperators.Binary op,

if (opKind(op, VO_SPECIAL | VO_SHIFT)) {
if (op == FIRST_NONZERO) {
// FIXME: Support this in the JIT.
VectorMask<Integer> thisNZ
= this.viewAsIntegralLanes().compare(NE, (int) 0);
that = that.blend((int) 0, thisNZ.cast(vspecies()));
op = OR_UNCHECKED;
VectorMask<Integer> mask
= this.compare(EQ, (int) 0, m);
return this.blend(that, mask);
}
if (opKind(op, VO_SHIFT)) {
// As per shift specification for Java, mask the shift count.
16 changes: 6 additions & 10 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java
View file
Original file line number Diff line number Diff line change
@@ -717,11 +717,9 @@ LongVector lanewiseTemplate(VectorOperators.Binary op,

if (opKind(op, VO_SPECIAL | VO_SHIFT)) {
if (op == FIRST_NONZERO) {
// FIXME: Support this in the JIT.
VectorMask<Long> thisNZ
= this.viewAsIntegralLanes().compare(NE, (long) 0);
that = that.blend((long) 0, thisNZ.cast(vspecies()));
op = OR_UNCHECKED;
VectorMask<Long> mask
= this.compare(EQ, (long) 0);
return this.blend(that, mask);
}
if (opKind(op, VO_SHIFT)) {
// As per shift specification for Java, mask the shift count.
@@ -767,11 +765,9 @@ LongVector lanewiseTemplate(VectorOperators.Binary op,

if (opKind(op, VO_SPECIAL | VO_SHIFT)) {
if (op == FIRST_NONZERO) {
// FIXME: Support this in the JIT.
VectorMask<Long> thisNZ
= this.viewAsIntegralLanes().compare(NE, (long) 0);
that = that.blend((long) 0, thisNZ.cast(vspecies()));
op = OR_UNCHECKED;
VectorMask<Long> mask
= this.compare(EQ, (long) 0, m);
return this.blend(that, mask);
}
if (opKind(op, VO_SHIFT)) {
// As per shift specification for Java, mask the shift count.
16 changes: 6 additions & 10 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
View file
Original file line number Diff line number Diff line change
@@ -759,11 +759,9 @@ ShortVector lanewiseTemplate(VectorOperators.Binary op,

if (opKind(op, VO_SPECIAL | VO_SHIFT)) {
if (op == FIRST_NONZERO) {
// FIXME: Support this in the JIT.
VectorMask<Short> thisNZ
= this.viewAsIntegralLanes().compare(NE, (short) 0);
that = that.blend((short) 0, thisNZ.cast(vspecies()));
op = OR_UNCHECKED;
VectorMask<Short> mask
= this.compare(EQ, (short) 0);
return this.blend(that, mask);
}
if (opKind(op, VO_SHIFT)) {
// As per shift specification for Java, mask the shift count.
@@ -809,11 +807,9 @@ ShortVector lanewiseTemplate(VectorOperators.Binary op,

if (opKind(op, VO_SPECIAL | VO_SHIFT)) {
if (op == FIRST_NONZERO) {
// FIXME: Support this in the JIT.
VectorMask<Short> thisNZ
= this.viewAsIntegralLanes().compare(NE, (short) 0);
that = that.blend((short) 0, thisNZ.cast(vspecies()));
op = OR_UNCHECKED;
VectorMask<Short> mask
= this.compare(EQ, (short) 0, m);
return this.blend(that, mask);
}
if (opKind(op, VO_SHIFT)) {
// As per shift specification for Java, mask the shift count.
27 changes: 10 additions & 17 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
View file
Original file line number Diff line number Diff line change
@@ -839,17 +839,9 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {

if (opKind(op, VO_SPECIAL {#if[!FP]? | VO_SHIFT})) {
if (op == FIRST_NONZERO) {
// FIXME: Support this in the JIT.
VectorMask<$Boxbitstype$> thisNZ
= this.viewAsIntegralLanes().compare(NE, ($bitstype$) 0);
that = that.blend(($type$) 0, thisNZ.cast(vspecies()));
op = OR_UNCHECKED;
#if[FP]
// FIXME: Support OR_UNCHECKED on float/double also!
return this.viewAsIntegralLanes()
.lanewise(op, that.viewAsIntegralLanes())
.viewAsFloatingLanes();
#end[FP]
VectorMask<$Boxbitstype$> mask
= this{#if[FP]?.viewAsIntegralLanes()}.compare(EQ, ($bitstype$) 0);
return this.blend(that, mask{#if[FP]?.cast(vspecies())});
}
#if[BITWISE]
#if[!FP]
@@ -900,13 +892,14 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
if (opKind(op, VO_SPECIAL {#if[!FP]? | VO_SHIFT})) {
if (op == FIRST_NONZERO) {
#if[FP]
return blend(lanewise(op, v), m);
$Bitstype$Vector bits = this.viewAsIntegralLanes();
VectorMask<$Boxbitstype$> mask
= bits.compare(EQ, ($bitstype$) 0, m.cast(bits.vspecies()));
return this.blend(that, mask.cast(vspecies()));
#else[FP]
// FIXME: Support this in the JIT.
VectorMask<$Boxbitstype$> thisNZ
= this.viewAsIntegralLanes().compare(NE, ($bitstype$) 0);
that = that.blend(($type$) 0, thisNZ.cast(vspecies()));
op = OR_UNCHECKED;
VectorMask<$Boxtype$> mask
= this.compare(EQ, ($type$) 0, m);
return this.blend(that, mask);
#end[FP]
}
#if[BITWISE]