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

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

@@ -22,12 +22,13 @@
  */
 
 package benchmark.jdk.incubator.vector;
 
 import jdk.incubator.vector.Vector;
-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.$Type$Vector;
 
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiFunction;
 import java.util.function.IntFunction;

@@ -41,13 +42,13 @@
 @Warmup(iterations = 3, time = 1)
 @Measurement(iterations = 5, time = 1)
 @Fork(value = 1, jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
 public class $vectorbenchtype$ extends AbstractVectorBenchmark {
 #if[MaxBit]
-    static final Species<$Wideboxtype$> SPECIES = $Type$Vector.SPECIES_MAX;
+    static final VectorSpecies<$Wideboxtype$> SPECIES = $Type$Vector.SPECIES_MAX;
 #else[MaxBit]
-    static final Species<$Wideboxtype$> SPECIES = $Type$Vector.SPECIES_$bits$;
+    static final VectorSpecies<$Wideboxtype$> SPECIES = $Type$Vector.SPECIES_$bits$;
 #end[MaxBit]
 
     static final int INVOC_COUNT = 1; // get rid of outer loop
 
     @Param("1024")