< prev index next >

test/jdk/jdk/incubator/vector/templates/X-LoadStoreTest.java.template

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

@@ -31,12 +31,13 @@
  * @run testng $vectorteststype$
 #end[MaxBit]
  *
  */
 
-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.VectorMask;
 import jdk.incubator.vector.Vector;
 
 import jdk.incubator.vector.$Type$Vector;
 
 import org.testng.Assert;

@@ -56,22 +57,22 @@
 import java.util.function.IntFunction;
 
 @Test
 public class $vectorteststype$ extends AbstractVectorTest {
 #if[MaxBit]
-    static final Species<$Wideboxtype$> SPECIES =
+    static final VectorSpecies<$Wideboxtype$> SPECIES =
                 $Type$Vector.SPECIES_MAX;
 #else[MaxBit]
-    static final Species<$Wideboxtype$> SPECIES =
+    static final VectorSpecies<$Wideboxtype$> SPECIES =
                 $Type$Vector.SPECIES_$bits$;
 #end[MaxBit]
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 10);
 
 #if[MaxBit]
-    static Shape getMaxBit() {
-        return Shape.S_Max_BIT;
+    static VectorShape getMaxBit() {
+        return VectorShape.S_Max_BIT;
     }
 
 #end[MaxBit]
     static void assertArraysEquals($type$[] a, $type$[] r, boolean[] mask) {
         int i = 0;

@@ -219,11 +220,11 @@
     static void loadStoreMaskArray(IntFunction<$type$[]> fa,
                                    IntFunction<boolean[]> fm) {
         $type$[] a = fa.apply(SPECIES.length());
         $type$[] r = new $type$[a.length];
         boolean[] mask = fm.apply(SPECIES.length());
-        Vector.Mask<$Boxtype$> vmask = $abstractvectortype$.maskFromValues(SPECIES, mask);
+        VectorMask<$Boxtype$> vmask = VectorMask.fromValues(SPECIES, mask);
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 $abstractvectortype$ av = $abstractvectortype$.fromArray(SPECIES, a, i, vmask);
                 av.intoArray(r, i);

@@ -293,11 +294,11 @@
                                         IntFunction<ByteBuffer> fb,
                                         IntFunction<boolean[]> fm) {
         ByteBuffer a = toBuffer(fa.apply(SPECIES.length()), fb);
         ByteBuffer r = fb.apply(a.limit());
         boolean[] mask = fm.apply(SPECIES.length());
-        Vector.Mask<$Boxtype$> vmask = $abstractvectortype$.maskFromValues(SPECIES, mask);
+        VectorMask<$Boxtype$> vmask = VectorMask.fromValues(SPECIES, mask);
 
         int l = a.limit();
         int s = SPECIES.length() * SPECIES.elementSize() / 8;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {

@@ -333,11 +334,11 @@
                                                 IntFunction<boolean[]> fm) {
         ByteBuffer a = toBuffer(fa.apply(SPECIES.length()), fb);
         a = a.asReadOnlyBuffer().order(a.order());
         ByteBuffer r = fb.apply(a.limit());
         boolean[] mask = fm.apply(SPECIES.length());
-        Vector.Mask<$Boxtype$> vmask = $abstractvectortype$.maskFromValues(SPECIES, mask);
+        VectorMask<$Boxtype$> vmask = VectorMask.fromValues(SPECIES, mask);
 
         int l = a.limit();
         int s = SPECIES.length() * SPECIES.elementSize() / 8;
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
< prev index next >