--- old/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java 2019-05-14 07:09:36.192514049 +0530 +++ new/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java 2019-05-14 07:09:35.952514043 +0530 @@ -1094,48 +1094,63 @@ } @Override + @ForceInline public Long64Vector rotateLanesLeft(int j) { - long[] vec = getElements(); - long[] res = new long[length()]; - for (int i = 0; i < length(); i++){ - res[(j + i) % length()] = vec[i]; - } - return new Long64Vector(res); + int L = length(); + if (j < 0) { + throw new IllegalArgumentException("Index " + j + " must be zero or positive"); + } else { + j = j & (L-1); + VectorShuffle PermMask = VectorShuffle.shuffleIota(SPECIES, L - j); + return this.rearrange(PermMask); + } } @Override + @ForceInline public Long64Vector rotateLanesRight(int j) { - long[] vec = getElements(); - long[] res = new long[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 Long64Vector(res); + int L = length(); + if (j < 0) { + throw new IllegalArgumentException("Index " + j + " must be zero or positive"); + } else { + j = j & (L-1); + VectorShuffle PermMask = VectorShuffle.shuffleIota(SPECIES, j); + return this.rearrange(PermMask); + } } @Override + @ForceInline + @SuppressWarnings("unchecked") public Long64Vector shiftLanesLeft(int j) { - long[] vec = getElements(); - long[] res = new long[length()]; - for (int i = 0; i < length() - j; i++) { - res[i] = vec[i + j]; - } - return new Long64Vector(res); + int L = length(); + if (j < 0) { + throw new IllegalArgumentException("Index " + j + " must be zero or positive"); + } else if ( j >= L ) { + return ZERO; + } else { + Long64Shuffle Iota = (Long64Shuffle)(VectorShuffle.shuffleIota(SPECIES, L-j)); + VectorMask BlendMask = Iota.toVector().lessThan(Long64Vector.broadcast(SPECIES, (long)(L-j))); + Iota = (Long64Shuffle)(VectorShuffle.shuffleIota(SPECIES, L -j)); + return ZERO.blend(this.rearrange(Iota),BlendMask); + } } @Override + @ForceInline + @SuppressWarnings("unchecked") public Long64Vector shiftLanesRight(int j) { - long[] vec = getElements(); - long[] res = new long[length()]; - for (int i = 0; i < length() - j; i++){ - res[i + j] = vec[i]; - } - return new Long64Vector(res); + int L = length(); + if (j < 0) { + throw new IllegalArgumentException("Index " + j + " must be zero or positive"); + } else if ( j >= L ) { + return ZERO; + } else { + Long64Shuffle Iota = (Long64Shuffle)(VectorShuffle.shuffleIota(SPECIES, j)); + VectorMask BlendMask = Iota.toVector().greaterThanEq(Long64Vector.broadcast(SPECIES, (long)(j))); + Iota = (Long64Shuffle)(VectorShuffle.shuffleIota(SPECIES, j)); + return ZERO.blend(this.rearrange(Iota),BlendMask); + } } @Override @@ -1374,8 +1389,7 @@ return SPECIES; } - @Override - public LongVector toVector() { + private LongVector toVector_helper() { long[] va = new long[SPECIES.length()]; for (int i = 0; i < va.length; i++) { va[i] = (long) lane(i); @@ -1385,6 +1399,14 @@ @Override @ForceInline + public LongVector toVector() { + return VectorIntrinsics.shuffleToVector(Long64Vector.class, long.class, Long64Shuffle.class, this, + SPECIES.length(), + (s) -> (((Long64Shuffle)(s)).toVector_helper())); + } + + @Override + @ForceInline @SuppressWarnings("unchecked") public VectorShuffle cast(VectorSpecies species) { if (length() != species.length()) @@ -1408,6 +1430,7 @@ } } + @Override public Long64Shuffle rearrange(VectorShuffle o) { Long64Shuffle s = (Long64Shuffle) o;