--- old/test/jdk/jdk/incubator/vector/benchmark/src/main/java/benchmark/jdk/incubator/vector/IntScalar.java	2019-04-26 14:56:46.058437700 -0700
+++ new/test/jdk/jdk/incubator/vector/benchmark/src/main/java/benchmark/jdk/incubator/vector/IntScalar.java	2019-04-26 14:56:45.456873300 -0700
@@ -318,7 +318,7 @@
 
 
     @Benchmark
-    public void shiftR(Blackhole bh) {
+    public void shiftLeft(Blackhole bh) {
         int[] as = fa.apply(size);
         int[] bs = fb.apply(size);
         int[] rs = fr.apply(size);
@@ -327,7 +327,7 @@
             for (int i = 0; i < as.length; i++) {
                 int a = as[i];
                 int b = bs[i];
-                rs[i] = (int)((a >>> b));
+                rs[i] = (int)((a << b));
             }
         }
 
@@ -337,7 +337,7 @@
 
 
     @Benchmark
-    public void shiftRMasked(Blackhole bh) {
+    public void shiftLeftMasked(Blackhole bh) {
         int[] as = fa.apply(size);
         int[] bs = fb.apply(size);
         int[] rs = fr.apply(size);
@@ -348,7 +348,7 @@
                 int a = as[i];
                 int b = bs[i];
                 if (ms[i % ms.length]) {
-                    rs[i] = (int)((a >>> b));
+                    rs[i] = (int)((a << b));
                 } else {
                     rs[i] = a;
                 }
@@ -359,8 +359,12 @@
 
 
 
+
+
+
+
     @Benchmark
-    public void shiftL(Blackhole bh) {
+    public void shiftRight(Blackhole bh) {
         int[] as = fa.apply(size);
         int[] bs = fb.apply(size);
         int[] rs = fr.apply(size);
@@ -369,7 +373,7 @@
             for (int i = 0; i < as.length; i++) {
                 int a = as[i];
                 int b = bs[i];
-                rs[i] = (int)((a << b));
+                rs[i] = (int)((a >>> b));
             }
         }
 
@@ -379,7 +383,7 @@
 
 
     @Benchmark
-    public void shiftLMasked(Blackhole bh) {
+    public void shiftRightMasked(Blackhole bh) {
         int[] as = fa.apply(size);
         int[] bs = fb.apply(size);
         int[] rs = fr.apply(size);
@@ -390,7 +394,7 @@
                 int a = as[i];
                 int b = bs[i];
                 if (ms[i % ms.length]) {
-                    rs[i] = (int)((a << b));
+                    rs[i] = (int)((a >>> b));
                 } else {
                     rs[i] = a;
                 }
@@ -401,8 +405,12 @@
 
 
 
+
+
+
+
     @Benchmark
-    public void aShiftR(Blackhole bh) {
+    public void shiftArithmeticRight(Blackhole bh) {
         int[] as = fa.apply(size);
         int[] bs = fb.apply(size);
         int[] rs = fr.apply(size);
@@ -421,7 +429,7 @@
 
 
     @Benchmark
-    public void aShiftRMasked(Blackhole bh) {
+    public void shiftArithmeticRightMasked(Blackhole bh) {
         int[] as = fa.apply(size);
         int[] bs = fb.apply(size);
         int[] rs = fr.apply(size);
@@ -443,8 +451,12 @@
 
 
 
+
+
+
+
     @Benchmark
-    public void aShiftRShift(Blackhole bh) {
+    public void shiftLeftShift(Blackhole bh) {
         int[] as = fa.apply(size);
         int[] bs = fb.apply(size);
         int[] rs = fr.apply(size);
@@ -453,7 +465,7 @@
             for (int i = 0; i < as.length; i++) {
                 int a = as[i];
                 int b = bs[i];
-                rs[i] = (int)((a >> b));
+                rs[i] = (int)((a << b));
             }
         }
 
@@ -463,7 +475,7 @@
 
 
     @Benchmark
-    public void aShiftRMaskedShift(Blackhole bh) {
+    public void shiftLeftMaskedShift(Blackhole bh) {
         int[] as = fa.apply(size);
         int[] bs = fb.apply(size);
         int[] rs = fr.apply(size);
@@ -474,7 +486,7 @@
                 int a = as[i];
                 int b = bs[i];
                 boolean m = ms[i % ms.length];
-                rs[i] = (m ? (int)((a >> b)) : a);
+                rs[i] = (m ? (int)((a << b)) : a);
             }
         }
 
@@ -483,8 +495,12 @@
 
 
 
+
+
+
+
     @Benchmark
-    public void shiftRShift(Blackhole bh) {
+    public void shiftRightShift(Blackhole bh) {
         int[] as = fa.apply(size);
         int[] bs = fb.apply(size);
         int[] rs = fr.apply(size);
@@ -503,7 +519,7 @@
 
 
     @Benchmark
-    public void shiftRMaskedShift(Blackhole bh) {
+    public void shiftRightMaskedShift(Blackhole bh) {
         int[] as = fa.apply(size);
         int[] bs = fb.apply(size);
         int[] rs = fr.apply(size);
@@ -523,8 +539,12 @@
 
 
 
+
+
+
+
     @Benchmark
-    public void shiftLShift(Blackhole bh) {
+    public void shiftArithmeticRightShift(Blackhole bh) {
         int[] as = fa.apply(size);
         int[] bs = fb.apply(size);
         int[] rs = fr.apply(size);
@@ -533,7 +553,7 @@
             for (int i = 0; i < as.length; i++) {
                 int a = as[i];
                 int b = bs[i];
-                rs[i] = (int)((a << b));
+                rs[i] = (int)((a >> b));
             }
         }
 
@@ -543,7 +563,7 @@
 
 
     @Benchmark
-    public void shiftLMaskedShift(Blackhole bh) {
+    public void shiftArithmeticRightMaskedShift(Blackhole bh) {
         int[] as = fa.apply(size);
         int[] bs = fb.apply(size);
         int[] rs = fr.apply(size);
@@ -554,7 +574,7 @@
                 int a = as[i];
                 int b = bs[i];
                 boolean m = ms[i % ms.length];
-                rs[i] = (m ? (int)((a << b)) : a);
+                rs[i] = (m ? (int)((a >> b)) : a);
             }
         }
 
@@ -566,14 +586,6 @@
 
 
 
-
-
-
-
-
-
-
-
     @Benchmark
     public void max(Blackhole bh) {
         int[] as = fa.apply(size);
@@ -610,7 +622,7 @@
 
 
     @Benchmark
-    public void andAll(Blackhole bh) {
+    public void andLanes(Blackhole bh) {
         int[] as = fa.apply(size);
         int r = -1;
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -625,7 +637,7 @@
 
 
     @Benchmark
-    public void orAll(Blackhole bh) {
+    public void orLanes(Blackhole bh) {
         int[] as = fa.apply(size);
         int r = 0;
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -640,7 +652,7 @@
 
 
     @Benchmark
-    public void xorAll(Blackhole bh) {
+    public void xorLanes(Blackhole bh) {
         int[] as = fa.apply(size);
         int r = 0;
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -654,7 +666,7 @@
 
 
     @Benchmark
-    public void addAll(Blackhole bh) {
+    public void addLanes(Blackhole bh) {
         int[] as = fa.apply(size);
         int r = 0;
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -667,7 +679,7 @@
     }
 
     @Benchmark
-    public void mulAll(Blackhole bh) {
+    public void mulLanes(Blackhole bh) {
         int[] as = fa.apply(size);
         int r = 1;
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -680,7 +692,7 @@
     }
 
     @Benchmark
-    public void minAll(Blackhole bh) {
+    public void minLanes(Blackhole bh) {
         int[] as = fa.apply(size);
         int r = Integer.MAX_VALUE;
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
@@ -693,7 +705,7 @@
     }
 
     @Benchmark
-    public void maxAll(Blackhole bh) {
+    public void maxLanes(Blackhole bh) {
         int[] as = fa.apply(size);
         int r = Integer.MIN_VALUE;
         for (int ic = 0; ic < INVOC_COUNT; ic++) {