--- old/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java	2019-05-14 07:09:38.216514097 +0530
+++ new/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java	2019-05-14 07:09:37.980514091 +0530
@@ -1056,48 +1056,63 @@
 
 
     @Override
+    @ForceInline
     public Short256Vector rotateLanesLeft(int j) {
-        short[] vec = getElements();
-        short[] res = new short[length()];
-        for (int i = 0; i < length(); i++){
-            res[(j + i) % length()] = vec[i];
-        }
-        return new Short256Vector(res);
+      int L = length();
+      if (j < 0) {
+         throw new IllegalArgumentException("Index " + j + " must be zero or positive");
+      } else {
+        j = j & (L-1);
+        VectorShuffle<Short> PermMask  = VectorShuffle.shuffleIota(SPECIES, L - j);
+        return this.rearrange(PermMask);
+      }
     }
 
     @Override
+    @ForceInline
     public Short256Vector rotateLanesRight(int j) {
-        short[] vec = getElements();
-        short[] res = new short[length()];
-        for (int i = 0; i < length(); i++){
-            int z = i - j;
-            if(j < 0) {
-                res[length() + z] = vec[i];
-            } else {
-                res[z] = vec[i];
-            }
-        }
-        return new Short256Vector(res);
+      int L = length();
+      if (j < 0) {
+         throw new IllegalArgumentException("Index " + j + " must be zero or positive");
+      } else {
+        j = j & (L-1);
+        VectorShuffle<Short> PermMask = VectorShuffle.shuffleIota(SPECIES, j);
+        return this.rearrange(PermMask);
+      }
     }
 
     @Override
+    @ForceInline
+    @SuppressWarnings("unchecked")
     public Short256Vector shiftLanesLeft(int j) {
-        short[] vec = getElements();
-        short[] res = new short[length()];
-        for (int i = 0; i < length() - j; i++) {
-            res[i] = vec[i + j];
-        }
-        return new Short256Vector(res);
+       int L = length();
+       if (j < 0) {
+         throw new IllegalArgumentException("Index " + j + " must be zero or positive");
+       } else if ( j >= L ) {
+         return ZERO;
+       } else {
+         Short256Shuffle     Iota    = (Short256Shuffle)(VectorShuffle.shuffleIota(SPECIES, L-j));
+         VectorMask<Short> BlendMask = Iota.toVector().lessThan(Short256Vector.broadcast(SPECIES, (short)(L-j)));
+         Iota    = (Short256Shuffle)(VectorShuffle.shuffleIota(SPECIES, L -j));
+         return ZERO.blend(this.rearrange(Iota),BlendMask);
+       }
     }
 
     @Override
+    @ForceInline
+    @SuppressWarnings("unchecked")
     public Short256Vector shiftLanesRight(int j) {
-        short[] vec = getElements();
-        short[] res = new short[length()];
-        for (int i = 0; i < length() - j; i++){
-            res[i + j] = vec[i];
-        }
-        return new Short256Vector(res);
+       int L = length();
+       if (j < 0) {
+         throw new IllegalArgumentException("Index " + j + " must be zero or positive");
+       } else if ( j >= L ) {
+         return ZERO;
+       } else {
+         Short256Shuffle     Iota    = (Short256Shuffle)(VectorShuffle.shuffleIota(SPECIES, j));
+         VectorMask<Short> BlendMask = Iota.toVector().greaterThanEq(Short256Vector.broadcast(SPECIES, (short)(j)));
+         Iota    = (Short256Shuffle)(VectorShuffle.shuffleIota(SPECIES, j));
+         return ZERO.blend(this.rearrange(Iota),BlendMask);
+       }
     }
 
     @Override
@@ -1336,8 +1351,7 @@
             return SPECIES;
         }
 
-        @Override
-        public ShortVector toVector() {
+        private ShortVector toVector_helper() {
             short[] va = new short[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
               va[i] = (short) lane(i);
@@ -1347,6 +1361,14 @@
 
         @Override
         @ForceInline
+        public ShortVector toVector() {
+            return VectorIntrinsics.shuffleToVector(Short256Vector.class, short.class, Short256Shuffle.class, this,
+                                                    SPECIES.length(), 
+                                                    (s) -> (((Short256Shuffle)(s)).toVector_helper()));
+        }
+
+        @Override
+        @ForceInline
         @SuppressWarnings("unchecked")
         public <F> VectorShuffle<F> cast(VectorSpecies<F> species) {
             if (length() != species.length())
@@ -1370,6 +1392,7 @@
             }
         }
 
+
         @Override
         public Short256Shuffle rearrange(VectorShuffle<Short> o) {
             Short256Shuffle s = (Short256Shuffle) o;