Skip to content

Commit cfd070e

Browse files
author
Paul Sandoz
committed
8257537: [vector] Cleanup redundant bitwise cases on floating point vectors
Reviewed-by: vlivanov
1 parent 03f3b8e commit cfd070e

File tree

3 files changed

+4
-24
lines changed

3 files changed

+4
-24
lines changed

src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -665,8 +665,6 @@ opc, getClass(), double.class, length(),
665665
v0.bOp(v1, (i, a, b) -> (double)Math.max(a, b));
666666
case VECTOR_OP_MIN: return (v0, v1) ->
667667
v0.bOp(v1, (i, a, b) -> (double)Math.min(a, b));
668-
case VECTOR_OP_OR: return (v0, v1) ->
669-
v0.bOp(v1, (i, a, b) -> fromBits(toBits(a) | toBits(b)));
670668
default: return null;
671669
}}));
672670
}
@@ -2319,8 +2317,6 @@ opc, getClass(), double.class, length(),
23192317
toBits(v.rOp(MAX_OR_INF, (i, a, b) -> (double) Math.min(a, b)));
23202318
case VECTOR_OP_MAX: return v ->
23212319
toBits(v.rOp(MIN_OR_INF, (i, a, b) -> (double) Math.max(a, b)));
2322-
case VECTOR_OP_OR: return v ->
2323-
toBits(v.rOp((double)0, (i, a, b) -> fromBits(toBits(a) | toBits(b))));
23242320
default: return null;
23252321
}})));
23262322
}
@@ -2336,13 +2332,9 @@ DoubleVector reduceIdentityVector(VectorOperators.Associative op) {
23362332
= REDUCE_ID_IMPL.find(op, opc, (opc_) -> {
23372333
switch (opc_) {
23382334
case VECTOR_OP_ADD:
2339-
case VECTOR_OP_OR:
2340-
case VECTOR_OP_XOR:
23412335
return v -> v.broadcast(0);
23422336
case VECTOR_OP_MUL:
23432337
return v -> v.broadcast(1);
2344-
case VECTOR_OP_AND:
2345-
return v -> v.broadcast(-1);
23462338
case VECTOR_OP_MIN:
23472339
return v -> v.broadcast(MAX_OR_INF);
23482340
case VECTOR_OP_MAX:

src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -665,8 +665,6 @@ opc, getClass(), float.class, length(),
665665
v0.bOp(v1, (i, a, b) -> (float)Math.max(a, b));
666666
case VECTOR_OP_MIN: return (v0, v1) ->
667667
v0.bOp(v1, (i, a, b) -> (float)Math.min(a, b));
668-
case VECTOR_OP_OR: return (v0, v1) ->
669-
v0.bOp(v1, (i, a, b) -> fromBits(toBits(a) | toBits(b)));
670668
default: return null;
671669
}}));
672670
}
@@ -2339,8 +2337,6 @@ opc, getClass(), float.class, length(),
23392337
toBits(v.rOp(MAX_OR_INF, (i, a, b) -> (float) Math.min(a, b)));
23402338
case VECTOR_OP_MAX: return v ->
23412339
toBits(v.rOp(MIN_OR_INF, (i, a, b) -> (float) Math.max(a, b)));
2342-
case VECTOR_OP_OR: return v ->
2343-
toBits(v.rOp((float)0, (i, a, b) -> fromBits(toBits(a) | toBits(b))));
23442340
default: return null;
23452341
}})));
23462342
}
@@ -2356,13 +2352,9 @@ FloatVector reduceIdentityVector(VectorOperators.Associative op) {
23562352
= REDUCE_ID_IMPL.find(op, opc, (opc_) -> {
23572353
switch (opc_) {
23582354
case VECTOR_OP_ADD:
2359-
case VECTOR_OP_OR:
2360-
case VECTOR_OP_XOR:
23612355
return v -> v.broadcast(0);
23622356
case VECTOR_OP_MUL:
23632357
return v -> v.broadcast(1);
2364-
case VECTOR_OP_AND:
2365-
return v -> v.broadcast(-1);
23662358
case VECTOR_OP_MIN:
23672359
return v -> v.broadcast(MAX_OR_INF);
23682360
case VECTOR_OP_MAX:

src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -731,10 +731,6 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
731731
case VECTOR_OP_URSHIFT: return (v0, v1) ->
732732
v0.bOp(v1, (i, a, n) -> ($type$)((a & LSHR_SETUP_MASK) >>> n));
733733
#end[BITWISE]
734-
#if[FP]
735-
case VECTOR_OP_OR: return (v0, v1) ->
736-
v0.bOp(v1, (i, a, b) -> fromBits(toBits(a) | toBits(b)));
737-
#end[FP]
738734
default: return null;
739735
}}));
740736
}
@@ -2836,10 +2832,6 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
28362832
case VECTOR_OP_XOR: return v ->
28372833
toBits(v.rOp(($type$)0, (i, a, b) -> ($type$)(a ^ b)));
28382834
#end[BITWISE]
2839-
#if[FP]
2840-
case VECTOR_OP_OR: return v ->
2841-
toBits(v.rOp(($type$)0, (i, a, b) -> fromBits(toBits(a) | toBits(b))));
2842-
#end[FP]
28432835
default: return null;
28442836
}})));
28452837
}
@@ -2855,13 +2847,17 @@ public abstract class $abstractvectortype$ extends AbstractVector<$Boxtype$> {
28552847
= REDUCE_ID_IMPL.find(op, opc, (opc_) -> {
28562848
switch (opc_) {
28572849
case VECTOR_OP_ADD:
2850+
#if[BITWISE]
28582851
case VECTOR_OP_OR:
28592852
case VECTOR_OP_XOR:
2853+
#end[BITWISE]
28602854
return v -> v.broadcast(0);
28612855
case VECTOR_OP_MUL:
28622856
return v -> v.broadcast(1);
2857+
#if[BITWISE]
28632858
case VECTOR_OP_AND:
28642859
return v -> v.broadcast(-1);
2860+
#end[BITWISE]
28652861
case VECTOR_OP_MIN:
28662862
return v -> v.broadcast(MAX_OR_INF);
28672863
case VECTOR_OP_MAX:

0 commit comments

Comments
 (0)