test/jdk/jdk/incubator/vector/benchmark/src/main/java/benchmark/jdk/incubator/vector/Merge.java

rev 55894 : 8222897: [vector] Renaming of shift, rotate operations. Few other api changes.
Summary: Renaming of shift, rotate operations. Few other api changes.
Reviewed-by: jrose, briangoetz

@@ -23,11 +23,11 @@
  * questions.
  */
 package benchmark.jdk.incubator.vector;
 
 import jdk.incubator.vector.*;
-import jdk.incubator.vector.Vector.Species;
+import jdk.incubator.vector.VectorSpecies;
 import org.openjdk.jmh.annotations.*;
 
 import java.util.concurrent.TimeUnit;
 
 import static org.junit.jupiter.api.Assertions.*;

@@ -83,11 +83,11 @@
     @Benchmark
     public void merge64_512() {
         merge(I64, I256);
     }
 
-    IntVector merge(Species<Integer> from, Species<Integer> to, int idx) {
+    IntVector merge(VectorSpecies<Integer> from, VectorSpecies<Integer> to, int idx) {
         assert from.length() <= to.length();
 
         int vlenFrom = from.length();
         int vlenTo   =   to.length();
 

@@ -101,11 +101,11 @@
             return join(stepDown, to, lo, hi);
         }
     }
 
 
-    void merge(Species<Integer> from, Species<Integer> to) {
+    void merge(VectorSpecies<Integer> from, VectorSpecies<Integer> to) {
         int vlenTo = to.length();
         for (int i = 0; i < in.length; i += vlenTo) {
             var r = merge(from, to, i);
             r.intoArray(out, i);
         }