Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8257537: [vector] Cleanup redundant bitwise cases on floating point v… 
…ectors

Reviewed-by: vlivanov
  • Loading branch information
Paul Sandoz committed Dec 2, 2020
1 parent 03f3b8e commit cfd070e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 24 deletions.
8 changes: 0 additions & 8 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java
View file
Expand Up @@ -665,8 +665,6 @@ opc, getClass(), double.class, length(),
v0.bOp(v1, (i, a, b) -> (double)Math.max(a, b));
case VECTOR_OP_MIN: return (v0, v1) ->
v0.bOp(v1, (i, a, b) -> (double)Math.min(a, b));
case VECTOR_OP_OR: return (v0, v1) ->
v0.bOp(v1, (i, a, b) -> fromBits(toBits(a) | toBits(b)));
default: return null;
}}));
}
Expand Down Expand Up @@ -2319,8 +2317,6 @@ opc, getClass(), double.class, length(),
toBits(v.rOp(MAX_OR_INF, (i, a, b) -> (double) Math.min(a, b)));
case VECTOR_OP_MAX: return v ->
toBits(v.rOp(MIN_OR_INF, (i, a, b) -> (double) Math.max(a, b)));
case VECTOR_OP_OR: return v ->
toBits(v.rOp((double)0, (i, a, b) -> fromBits(toBits(a) | toBits(b))));
default: return null;
}})));
}
Expand All @@ -2336,13 +2332,9 @@ DoubleVector reduceIdentityVector(VectorOperators.Associative op) {
= REDUCE_ID_IMPL.find(op, opc, (opc_) -> {
switch (opc_) {
case VECTOR_OP_ADD:
case VECTOR_OP_OR:
case VECTOR_OP_XOR:
return v -> v.broadcast(0);
case VECTOR_OP_MUL:
return v -> v.broadcast(1);
case VECTOR_OP_AND:
return v -> v.broadcast(-1);
case VECTOR_OP_MIN:
return v -> v.broadcast(MAX_OR_INF);
case VECTOR_OP_MAX:
Expand Down
8 changes: 0 additions & 8 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java
View file
Expand Up @@ -665,8 +665,6 @@ opc, getClass(), float.class, length(),
v0.bOp(v1, (i, a, b) -> (float)Math.max(a, b));
case VECTOR_OP_MIN: return (v0, v1) ->
v0.bOp(v1, (i, a, b) -> (float)Math.min(a, b));
case VECTOR_OP_OR: return (v0, v1) ->
v0.bOp(v1, (i, a, b) -> fromBits(toBits(a) | toBits(b)));
default: return null;
}}));
}
Expand Down Expand Up @@ -2339,8 +2337,6 @@ opc, getClass(), float.class, length(),
toBits(v.rOp(MAX_OR_INF, (i, a, b) -> (float) Math.min(a, b)));
case VECTOR_OP_MAX: return v ->
toBits(v.rOp(MIN_OR_INF, (i, a, b) -> (float) Math.max(a, b)));
case VECTOR_OP_OR: return v ->
toBits(v.rOp((float)0, (i, a, b) -> fromBits(toBits(a) | toBits(b))));
default: return null;
}})));
}
Expand All @@ -2356,13 +2352,9 @@ FloatVector reduceIdentityVector(VectorOperators.Associative op) {
= REDUCE_ID_IMPL.find(op, opc, (opc_) -> {
switch (opc_) {
case VECTOR_OP_ADD:
case VECTOR_OP_OR:
case VECTOR_OP_XOR:
return v -> v.broadcast(0);
case VECTOR_OP_MUL:
return v -> v.broadcast(1);
case VECTOR_OP_AND:
return v -> v.broadcast(-1);
case VECTOR_OP_MIN:
return v -> v.broadcast(MAX_OR_INF);
case VECTOR_OP_MAX:
Expand Down
12 changes: 4 additions & 8 deletions src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
View file
Expand Up @@ -731,10 +731,6 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
case VECTOR_OP_URSHIFT: return (v0, v1) ->
v0.bOp(v1, (i, a, n) -> ($type$)((a & LSHR_SETUP_MASK) >>> n));
#end[BITWISE]
#if[FP]
case VECTOR_OP_OR: return (v0, v1) ->
v0.bOp(v1, (i, a, b) -> fromBits(toBits(a) | toBits(b)));
#end[FP]
default: return null;
}}));
}
Expand Down Expand Up @@ -2836,10 +2832,6 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
case VECTOR_OP_XOR: return v ->
toBits(v.rOp(($type$)0, (i, a, b) -> ($type$)(a ^ b)));
#end[BITWISE]
#if[FP]
case VECTOR_OP_OR: return v ->
toBits(v.rOp(($type$)0, (i, a, b) -> fromBits(toBits(a) | toBits(b))));
#end[FP]
default: return null;
}})));
}
Expand All @@ -2855,13 +2847,17 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
= REDUCE_ID_IMPL.find(op, opc, (opc_) -> {
switch (opc_) {
case VECTOR_OP_ADD:
#if[BITWISE]
case VECTOR_OP_OR:
case VECTOR_OP_XOR:
#end[BITWISE]
return v -> v.broadcast(0);
case VECTOR_OP_MUL:
return v -> v.broadcast(1);
#if[BITWISE]
case VECTOR_OP_AND:
return v -> v.broadcast(-1);
#end[BITWISE]
case VECTOR_OP_MIN:
return v -> v.broadcast(MAX_OR_INF);
case VECTOR_OP_MAX:
Expand Down

1 comment on commit cfd070e

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

Please sign in to comment.