test/jdk/jdk/incubator/vector/VectorHash.java

rev 54658 : refactored mask and shuffle creation methods, moved classes to top-level

@@ -26,12 +26,12 @@
  * @modules jdk.incubator.vector
  */
 
 import jdk.incubator.vector.ByteVector;
 import jdk.incubator.vector.IntVector;
-import jdk.incubator.vector.Vector.Shape;
-import jdk.incubator.vector.Vector.Species;
+import jdk.incubator.vector.VectorShape;
+import jdk.incubator.vector.VectorSpecies;
 import jdk.incubator.vector.Vector;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Properties;

@@ -155,12 +155,12 @@
                                           H_COEFF_16);
     }
 
     static int hashCodeVectorGenericShift(
             byte[] a,
-            Species<Byte> bytesForIntsSpecies,
-            Species<Byte> byteSpecies, Species<Integer> intSpecies,
+            VectorSpecies<Byte> bytesForIntsSpecies,
+            VectorSpecies<Byte> byteSpecies, VectorSpecies<Integer> intSpecies,
             int top_h_coeff,
             IntVector v_h_coeff) {
         assert bytesForIntsSpecies.length() == intSpecies.length();
 
         int h = 1;

@@ -182,18 +182,18 @@
             h = 31 * h + a[i];
         }
         return h;
     }
 
-    static final Species<Integer> INT_512_SPECIES = IntVector.SPECIES_512;
-    static final Species<Integer> INT_256_SPECIES = IntVector.SPECIES_256;
+    static final VectorSpecies<Integer> INT_512_SPECIES = IntVector.SPECIES_512;
+    static final VectorSpecies<Integer> INT_256_SPECIES = IntVector.SPECIES_256;
     static final int COEFF_31_TO_16;
     static final IntVector H_COEFF_16;
 
-    static final Species<Byte> BYTE_512_SPECIES = ByteVector.SPECIES_512;
-    static final Species<Byte> BYTE_128_SPECIES = ByteVector.SPECIES_128;
-    static final Species<Byte> BYTE_64_SPECIES = ByteVector.SPECIES_64;
+    static final VectorSpecies<Byte> BYTE_512_SPECIES = ByteVector.SPECIES_512;
+    static final VectorSpecies<Byte> BYTE_128_SPECIES = ByteVector.SPECIES_128;
+    static final VectorSpecies<Byte> BYTE_64_SPECIES = ByteVector.SPECIES_64;
     static final int COEFF_31_TO_8;
     static final IntVector H_COEFF_8;
 
     static {
         int[] a = new int[INT_256_SPECIES.length()];