[Backport] 8267969: Add vectorized implementation for VectorMask.eq()

Summary: [Backport] 8267969: Add vectorized implementation for VectorMask.eq() Test Plan: ci jtreg Reviewed-by: JoshuaZhuwj Issue: #587
dragonwell-project · Nov 13, 2023 · 6262964 · 6262964
1 parent 77aecab
commit 6262964
Show file tree

Hide file tree

Showing 32 changed files with 248 additions and 6 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
@@ -114,12 +114,6 @@ <F> VectorMask<F> check(VectorSpecies<F> species) {
         return (VectorMask<F>) this;
     }
 
-    @Override
-    public VectorMask<E> eq(VectorMask<E> m) {
-        // FIXME: Generate good code here.
-        return bOp(m, (i, a, b) -> a == b);
-    }
-
     @Override
     public VectorMask<E> andNot(VectorMask<E> m) {
         return and(m.not());

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java
@@ -645,6 +645,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public Byte128Mask eq(VectorMask<Byte> mask) {
+            Objects.requireNonNull(mask);
+            Byte128Mask m = (Byte128Mask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java
@@ -677,6 +677,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public Byte256Mask eq(VectorMask<Byte> mask) {
+            Objects.requireNonNull(mask);
+            Byte256Mask m = (Byte256Mask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java
@@ -741,6 +741,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public Byte512Mask eq(VectorMask<Byte> mask) {
+            Objects.requireNonNull(mask);
+            Byte512Mask m = (Byte512Mask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java
@@ -629,6 +629,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public Byte64Mask eq(VectorMask<Byte> mask) {
+            Objects.requireNonNull(mask);
+            Byte64Mask m = (Byte64Mask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java
@@ -615,6 +615,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public ByteMaxMask eq(VectorMask<Byte> mask) {
+            Objects.requireNonNull(mask);
+            ByteMaxMask m = (ByteMaxMask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java
@@ -613,6 +613,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public Double128Mask eq(VectorMask<Double> mask) {
+            Objects.requireNonNull(mask);
+            Double128Mask m = (Double128Mask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java
@@ -617,6 +617,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public Double256Mask eq(VectorMask<Double> mask) {
+            Objects.requireNonNull(mask);
+            Double256Mask m = (Double256Mask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java
@@ -625,6 +625,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public Double512Mask eq(VectorMask<Double> mask) {
+            Objects.requireNonNull(mask);
+            Double512Mask m = (Double512Mask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java
@@ -611,6 +611,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public Double64Mask eq(VectorMask<Double> mask) {
+            Objects.requireNonNull(mask);
+            Double64Mask m = (Double64Mask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java
@@ -610,6 +610,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public DoubleMaxMask eq(VectorMask<Double> mask) {
+            Objects.requireNonNull(mask);
+            DoubleMaxMask m = (DoubleMaxMask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java
@@ -617,6 +617,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public Float128Mask eq(VectorMask<Float> mask) {
+            Objects.requireNonNull(mask);
+            Float128Mask m = (Float128Mask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java
@@ -625,6 +625,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public Float256Mask eq(VectorMask<Float> mask) {
+            Objects.requireNonNull(mask);
+            Float256Mask m = (Float256Mask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java
@@ -641,6 +641,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public Float512Mask eq(VectorMask<Float> mask) {
+            Objects.requireNonNull(mask);
+            Float512Mask m = (Float512Mask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java
@@ -613,6 +613,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public Float64Mask eq(VectorMask<Float> mask) {
+            Objects.requireNonNull(mask);
+            Float64Mask m = (Float64Mask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java
@@ -610,6 +610,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public FloatMaxMask eq(VectorMask<Float> mask) {
+            Objects.requireNonNull(mask);
+            FloatMaxMask m = (FloatMaxMask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java
@@ -621,6 +621,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public Int128Mask eq(VectorMask<Integer> mask) {
+            Objects.requireNonNull(mask);
+            Int128Mask m = (Int128Mask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java
@@ -629,6 +629,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public Int256Mask eq(VectorMask<Integer> mask) {
+            Objects.requireNonNull(mask);
+            Int256Mask m = (Int256Mask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java
@@ -645,6 +645,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public Int512Mask eq(VectorMask<Integer> mask) {
+            Objects.requireNonNull(mask);
+            Int512Mask m = (Int512Mask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int64Vector.java
@@ -617,6 +617,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public Int64Mask eq(VectorMask<Integer> mask) {
+            Objects.requireNonNull(mask);
+            Int64Mask m = (Int64Mask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java
@@ -615,6 +615,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public IntMaxMask eq(VectorMask<Integer> mask) {
+            Objects.requireNonNull(mask);
+            IntMaxMask m = (IntMaxMask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java
@@ -607,6 +607,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public Long128Mask eq(VectorMask<Long> mask) {
+            Objects.requireNonNull(mask);
+            Long128Mask m = (Long128Mask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long256Vector.java
@@ -611,6 +611,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public Long256Mask eq(VectorMask<Long> mask) {
+            Objects.requireNonNull(mask);
+            Long256Mask m = (Long256Mask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java
@@ -619,6 +619,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public Long512Mask eq(VectorMask<Long> mask) {
+            Objects.requireNonNull(mask);
+            Long512Mask m = (Long512Mask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java
@@ -605,6 +605,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public Long64Mask eq(VectorMask<Long> mask) {
+            Objects.requireNonNull(mask);
+            Long64Mask m = (Long64Mask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongMaxVector.java
@@ -605,6 +605,14 @@ public <E> VectorMask<E> cast(VectorSpecies<E> dsp) {
             return this.defaultMaskCast(species);
         }
 
+        @Override
+        @ForceInline
+        public LongMaxMask eq(VectorMask<Long> mask) {
+            Objects.requireNonNull(mask);
+            LongMaxMask m = (LongMaxMask)mask;
+            return xor(m.not());
+        }
+
         // Unary operations
 
         @Override