test/jdk/jdk/incubator/vector/benchmark/src/main/java/benchmark/jdk/incubator/vector/LongScalar.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

@@ -316,95 +316,103 @@
     }
 
 
 
     @Benchmark
-    public void shiftR(Blackhole bh) {
+    public void shiftLeft(Blackhole bh) {
         long[] as = fa.apply(size);
         long[] bs = fb.apply(size);
         long[] rs = fr.apply(size);
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             for (int i = 0; i < as.length; i++) {
                 long a = as[i];
                 long b = bs[i];
-                rs[i] = (long)((a >>> b));
+                rs[i] = (long)((a << b));
             }
         }
 
         bh.consume(rs);
     }
 
 
 
     @Benchmark
-    public void shiftRMasked(Blackhole bh) {
+    public void shiftLeftMasked(Blackhole bh) {
         long[] as = fa.apply(size);
         long[] bs = fb.apply(size);
         long[] rs = fr.apply(size);
         boolean[] ms = fm.apply(size);
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             for (int i = 0; i < as.length; i++) {
                 long a = as[i];
                 long b = bs[i];
                 if (ms[i % ms.length]) {
-                    rs[i] = (long)((a >>> b));
+                    rs[i] = (long)((a << b));
                 } else {
                     rs[i] = a;
                 }
             }
         }
         bh.consume(rs);
     }
 
 
 
+
+
+
+
     @Benchmark
-    public void shiftL(Blackhole bh) {
+    public void shiftRight(Blackhole bh) {
         long[] as = fa.apply(size);
         long[] bs = fb.apply(size);
         long[] rs = fr.apply(size);
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             for (int i = 0; i < as.length; i++) {
                 long a = as[i];
                 long b = bs[i];
-                rs[i] = (long)((a << b));
+                rs[i] = (long)((a >>> b));
             }
         }
 
         bh.consume(rs);
     }
 
 
 
     @Benchmark
-    public void shiftLMasked(Blackhole bh) {
+    public void shiftRightMasked(Blackhole bh) {
         long[] as = fa.apply(size);
         long[] bs = fb.apply(size);
         long[] rs = fr.apply(size);
         boolean[] ms = fm.apply(size);
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             for (int i = 0; i < as.length; i++) {
                 long a = as[i];
                 long b = bs[i];
                 if (ms[i % ms.length]) {
-                    rs[i] = (long)((a << b));
+                    rs[i] = (long)((a >>> b));
                 } else {
                     rs[i] = a;
                 }
             }
         }
         bh.consume(rs);
     }
 
 
 
+
+
+
+
     @Benchmark
-    public void aShiftR(Blackhole bh) {
+    public void shiftArithmeticRight(Blackhole bh) {
         long[] as = fa.apply(size);
         long[] bs = fb.apply(size);
         long[] rs = fr.apply(size);
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {

@@ -419,11 +427,11 @@
     }
 
 
 
     @Benchmark
-    public void aShiftRMasked(Blackhole bh) {
+    public void shiftArithmeticRightMasked(Blackhole bh) {
         long[] as = fa.apply(size);
         long[] bs = fb.apply(size);
         long[] rs = fr.apply(size);
         boolean[] ms = fm.apply(size);
 

@@ -441,52 +449,60 @@
         bh.consume(rs);
     }
 
 
 
+
+
+
+
     @Benchmark
-    public void aShiftRShift(Blackhole bh) {
+    public void shiftLeftShift(Blackhole bh) {
         long[] as = fa.apply(size);
         long[] bs = fb.apply(size);
         long[] rs = fr.apply(size);
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             for (int i = 0; i < as.length; i++) {
                 long a = as[i];
                 long b = bs[i];
-                rs[i] = (long)((a >> b));
+                rs[i] = (long)((a << b));
             }
         }
 
         bh.consume(rs);
     }
 
 
 
     @Benchmark
-    public void aShiftRMaskedShift(Blackhole bh) {
+    public void shiftLeftMaskedShift(Blackhole bh) {
         long[] as = fa.apply(size);
         long[] bs = fb.apply(size);
         long[] rs = fr.apply(size);
         boolean[] ms = fm.apply(size);
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             for (int i = 0; i < as.length; i++) {
                 long a = as[i];
                 long b = bs[i];
                 boolean m = ms[i % ms.length];
-                rs[i] = (m ? (long)((a >> b)) : a);
+                rs[i] = (m ? (long)((a << b)) : a);
             }
         }
 
         bh.consume(rs);
     }
 
 
 
+
+
+
+
     @Benchmark
-    public void shiftRShift(Blackhole bh) {
+    public void shiftRightShift(Blackhole bh) {
         long[] as = fa.apply(size);
         long[] bs = fb.apply(size);
         long[] rs = fr.apply(size);
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {

@@ -501,11 +517,11 @@
     }
 
 
 
     @Benchmark
-    public void shiftRMaskedShift(Blackhole bh) {
+    public void shiftRightMaskedShift(Blackhole bh) {
         long[] as = fa.apply(size);
         long[] bs = fb.apply(size);
         long[] rs = fr.apply(size);
         boolean[] ms = fm.apply(size);
 

@@ -521,42 +537,46 @@
         bh.consume(rs);
     }
 
 
 
+
+
+
+
     @Benchmark
-    public void shiftLShift(Blackhole bh) {
+    public void shiftArithmeticRightShift(Blackhole bh) {
         long[] as = fa.apply(size);
         long[] bs = fb.apply(size);
         long[] rs = fr.apply(size);
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             for (int i = 0; i < as.length; i++) {
                 long a = as[i];
                 long b = bs[i];
-                rs[i] = (long)((a << b));
+                rs[i] = (long)((a >> b));
             }
         }
 
         bh.consume(rs);
     }
 
 
 
     @Benchmark
-    public void shiftLMaskedShift(Blackhole bh) {
+    public void shiftArithmeticRightMaskedShift(Blackhole bh) {
         long[] as = fa.apply(size);
         long[] bs = fb.apply(size);
         long[] rs = fr.apply(size);
         boolean[] ms = fm.apply(size);
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             for (int i = 0; i < as.length; i++) {
                 long a = as[i];
                 long b = bs[i];
                 boolean m = ms[i % ms.length];
-                rs[i] = (m ? (long)((a << b)) : a);
+                rs[i] = (m ? (long)((a >> b)) : a);
             }
         }
 
         bh.consume(rs);
     }

@@ -564,18 +584,10 @@
 
 
 
 
 
-
-
-
-
-
-
-
-
     @Benchmark
     public void max(Blackhole bh) {
         long[] as = fa.apply(size);
         long[] bs = fb.apply(size);
         long[] rs = fr.apply(size);

@@ -608,11 +620,11 @@
         bh.consume(rs);
     }
 
 
     @Benchmark
-    public void andAll(Blackhole bh) {
+    public void andLanes(Blackhole bh) {
         long[] as = fa.apply(size);
         long r = -1;
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             r = -1;
             for (int i = 0; i < as.length; i++) {

@@ -623,11 +635,11 @@
     }
 
 
 
     @Benchmark
-    public void orAll(Blackhole bh) {
+    public void orLanes(Blackhole bh) {
         long[] as = fa.apply(size);
         long r = 0;
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             r = 0;
             for (int i = 0; i < as.length; i++) {

@@ -638,11 +650,11 @@
     }
 
 
 
     @Benchmark
-    public void xorAll(Blackhole bh) {
+    public void xorLanes(Blackhole bh) {
         long[] as = fa.apply(size);
         long r = 0;
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             r = 0;
             for (int i = 0; i < as.length; i++) {

@@ -652,11 +664,11 @@
         bh.consume(r);
     }
 
 
     @Benchmark
-    public void addAll(Blackhole bh) {
+    public void addLanes(Blackhole bh) {
         long[] as = fa.apply(size);
         long r = 0;
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             r = 0;
             for (int i = 0; i < as.length; i++) {

@@ -665,11 +677,11 @@
         }
         bh.consume(r);
     }
 
     @Benchmark
-    public void mulAll(Blackhole bh) {
+    public void mulLanes(Blackhole bh) {
         long[] as = fa.apply(size);
         long r = 1;
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             r = 1;
             for (int i = 0; i < as.length; i++) {

@@ -678,11 +690,11 @@
         }
         bh.consume(r);
     }
 
     @Benchmark
-    public void minAll(Blackhole bh) {
+    public void minLanes(Blackhole bh) {
         long[] as = fa.apply(size);
         long r = Long.MAX_VALUE;
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             r = Long.MAX_VALUE;
             for (int i = 0; i < as.length; i++) {

@@ -691,11 +703,11 @@
         }
         bh.consume(r);
     }
 
     @Benchmark
-    public void maxAll(Blackhole bh) {
+    public void maxLanes(Blackhole bh) {
         long[] as = fa.apply(size);
         long r = Long.MIN_VALUE;
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             r = Long.MIN_VALUE;
             for (int i = 0; i < as.length; i++) {