test/jdk/jdk/incubator/vector/templates/Unit-header.template

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

@@ -25,12 +25,14 @@
  * @test
  * @modules jdk.incubator.vector
  * @run testng/othervm -ea -esa $vectorteststype$
  */
 
-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.VectorShuffle;
+import jdk.incubator.vector.VectorMask;
 import jdk.incubator.vector.Vector;
 
 #if[Byte]
 import jdk.incubator.vector.ByteVector;
 #end[Byte]

@@ -66,22 +68,22 @@
 
 @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", 100);
 
 #if[MaxBit]
-    static Shape getMaxBit() {
-        return Shape.S_Max_BIT;
+    static VectorShape getMaxBit() {
+        return VectorShape.S_Max_BIT;
     }
 
 #end[MaxBit]
     interface FUnOp {
         $type$ apply($type$ a);