< prev index next >

test/jdk/jdk/incubator/vector/Short512VectorLoadStoreTests.java

Print this page
@@ -1,7 +1,7 @@
  /*
-  * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+  * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

@@ -28,23 +28,23 @@
   *
   */
  
  // -- This file was mechanically generated: Do not edit! -- //
  
+ import jdk.incubator.foreign.MemorySegment;
+ import jdk.incubator.foreign.ResourceScope;
+ import jdk.incubator.foreign.ValueLayout;
  import jdk.incubator.vector.ShortVector;
  import jdk.incubator.vector.VectorMask;
  import jdk.incubator.vector.VectorSpecies;
  import jdk.incubator.vector.VectorShuffle;
  import jdk.internal.vm.annotation.DontInline;
  import org.testng.Assert;
  import org.testng.annotations.DataProvider;
  import org.testng.annotations.Test;
  
- import java.nio.ByteBuffer;
- import java.nio.ShortBuffer;
  import java.nio.ByteOrder;
- import java.nio.ReadOnlyBufferException;
  import java.util.List;
  import java.util.function.*;
  
  @Test
  public class Short512VectorLoadStoreTests extends AbstractVectorLoadStoreTest {

@@ -65,21 +65,10 @@
          } catch (AssertionError e) {
              Assert.assertEquals(r[i], mask[i % SPECIES.length()] ? a[i] : (short) 0, "at index #" + i);
          }
      }
  
-     static void assertArraysEquals(byte[] r, byte[] a, boolean[] mask) {
-         int i = 0;
-         try {
-             for (; i < a.length; i++) {
-                 Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0);
-             }
-         } catch (AssertionError e) {
-             Assert.assertEquals(r[i], mask[(i*8/SPECIES.elementSize()) % SPECIES.length()] ? a[i] : (byte) 0, "at index #" + i);
-         }
-     }
- 
      static final List<IntFunction<short[]>> SHORT_GENERATORS = List.of(
              withToString("short[i * 5]", (int s) -> {
                  return fill(s * BUFFER_REPS,
                              i -> (short)(i * 5));
              }),

@@ -115,11 +104,11 @@
              withToString("l + speciesl + 1", (int l) -> {
                  return l + SPECIES.length() + 1;
              })
      );
  
-     // Relative to byte[] array.length or ByteBuffer.limit()
+     // Relative to byte[] array.length or MemorySegment.byteSize()
      static final List<IntFunction<Integer>> BYTE_INDEX_GENERATORS = List.of(
              withToString("-1", (int l) -> {
                  return -1;
              }),
              withToString("l", (int l) -> {

@@ -186,49 +175,30 @@
                  })).
                  toArray(Object[][]::new);
      }
  
      @DataProvider
-     public Object[][] shortByteBufferProvider() {
+     public Object[][] shortMemorySegmentProvider() {
          return SHORT_GENERATORS.stream().
-                 flatMap(fa -> BYTE_BUFFER_GENERATORS.stream().
+                 flatMap(fa -> MEMORY_SEGMENT_GENERATORS.stream().
                          flatMap(fb -> BYTE_ORDER_VALUES.stream().map(bo -> {
                              return new Object[]{fa, fb, bo};
                          }))).
                  toArray(Object[][]::new);
      }
  
      @DataProvider
-     public Object[][] shortByteBufferMaskProvider() {
+     public Object[][] shortMemorySegmentMaskProvider() {
          return BOOLEAN_MASK_GENERATORS.stream().
                  flatMap(fm -> SHORT_GENERATORS.stream().
-                         flatMap(fa -> BYTE_BUFFER_GENERATORS.stream().
+                         flatMap(fa -> MEMORY_SEGMENT_GENERATORS.stream().
                                  flatMap(fb -> BYTE_ORDER_VALUES.stream().map(bo -> {
                              return new Object[]{fa, fb, fm, bo};
                          })))).
                  toArray(Object[][]::new);
      }
  
-     @DataProvider
-     public Object[][] shortByteArrayProvider() {
-         return SHORT_GENERATORS.stream().
-                 flatMap(fa -> BYTE_ORDER_VALUES.stream().map(bo -> {
-                     return new Object[]{fa, bo};
-                 })).
-                 toArray(Object[][]::new);
-     }
- 
-     @DataProvider
-     public Object[][] shortByteArrayMaskProvider() {
-         return BOOLEAN_MASK_GENERATORS.stream().
-                 flatMap(fm -> SHORT_GENERATORS.stream().
-                     flatMap(fa -> BYTE_ORDER_VALUES.stream().map(bo -> {
-                         return new Object[]{fa, fm, bo};
-                     }))).
-                 toArray(Object[][]::new);
-     }
- 
      @DataProvider
      public Object[][] shortByteProviderForIOOBE() {
          var f = SHORT_GENERATORS.get(0);
          return BYTE_INDEX_GENERATORS.stream().map(fi -> {
                      return new Object[] {f, fi};

@@ -244,32 +214,20 @@
                      return new Object[] {f, fi, fm};
                  })).
                  toArray(Object[][]::new);
      }
  
-     static ByteBuffer toBuffer(short[] a, IntFunction<ByteBuffer> fb) {
-         ByteBuffer bb = fb.apply(a.length * SPECIES.elementSize() / 8);
-         for (short v : a) {
-             bb.putShort(v);
+     static MemorySegment toSegment(short[] a, IntFunction<MemorySegment> fb) {
+         MemorySegment ms = fb.apply(a.length * SPECIES.elementSize() / 8);
+         for (int i = 0; i < a.length; i++) {
+             ms.set(ValueLayout.JAVA_SHORT, i * SPECIES.elementSize() / 8 , a[i]);
          }
-         return bb.clear();
+         return ms;
      }
  
-     static short[] bufferToArray(ByteBuffer bb) {
-         ShortBuffer db = bb.asShortBuffer();
-         short[] d = new short[db.capacity()];
-         db.get(0, d);
-         return d;
-     }
- 
-     static byte[] toByteArray(short[] a, IntFunction<byte[]> fb, ByteOrder bo) {
-         byte[] b = fb.apply(a.length * SPECIES.elementSize() / 8);
-         ShortBuffer bb = ByteBuffer.wrap(b, 0, b.length).order(bo).asShortBuffer();
-         for (short v : a) {
-             bb.put(v);
-         }
-         return b;
+     static short[] segmentToArray(MemorySegment ms) {
+         return ms.toArray(ValueLayout.JAVA_SHORT);
      }
  
  
      interface ToShortF {
          short apply(int i);

@@ -305,50 +263,29 @@
      static void intoArray(ShortVector v, short[] a, int i, VectorMask<Short> m) {
          v.intoArray(a, i, m);
      }
  
      @DontInline
-     static ShortVector fromByteArray(byte[] a, int i, ByteOrder bo) {
-         return ShortVector.fromByteArray(SPECIES, a, i, bo);
-     }
- 
-     @DontInline
-     static ShortVector fromByteArray(byte[] a, int i, ByteOrder bo, VectorMask<Short> m) {
-         return ShortVector.fromByteArray(SPECIES, a, i, bo, m);
-     }
- 
-     @DontInline
-     static void intoByteArray(ShortVector v, byte[] a, int i, ByteOrder bo) {
-         v.intoByteArray(a, i, bo);
-     }
- 
-     @DontInline
-     static void intoByteArray(ShortVector v, byte[] a, int i, ByteOrder bo, VectorMask<Short> m) {
-         v.intoByteArray(a, i, bo, m);
-     }
- 
-     @DontInline
-     static ShortVector fromByteBuffer(ByteBuffer a, int i, ByteOrder bo) {
-         return ShortVector.fromByteBuffer(SPECIES, a, i, bo);
+     static ShortVector fromMemorySegment(MemorySegment a, int i, ByteOrder bo) {
+         return ShortVector.fromMemorySegment(SPECIES, a, i, bo);
      }
  
      @DontInline
-     static ShortVector fromByteBuffer(ByteBuffer a, int i, ByteOrder bo, VectorMask<Short> m) {
-         return ShortVector.fromByteBuffer(SPECIES, a, i, bo, m);
+     static ShortVector fromMemorySegment(MemorySegment a, int i, ByteOrder bo, VectorMask<Short> m) {
+         return ShortVector.fromMemorySegment(SPECIES, a, i, bo, m);
      }
  
      @DontInline
-     static void intoByteBuffer(ShortVector v, ByteBuffer a, int i, ByteOrder bo) {
-         v.intoByteBuffer(a, i, bo);
+     static void intoMemorySegment(ShortVector v, MemorySegment a, int i, ByteOrder bo) {
+         v.intoMemorySegment(a, i, bo);
      }
  
      @DontInline
-     static void intoByteBuffer(ShortVector v, ByteBuffer a, int i, ByteOrder bo, VectorMask<Short> m) {
-         v.intoByteBuffer(a, i, bo, m);
+     static void intoMemorySegment(ShortVector v, MemorySegment a, int i, ByteOrder bo, VectorMask<Short> m) {
+         v.intoMemorySegment(a, i, bo, m);
      }
  
- 
      @Test(dataProvider = "shortProvider")
      static void loadStoreArray(IntFunction<short[]> fa) {
          short[] a = fa.apply(SPECIES.length());
          short[] r = new short[a.length];
  

@@ -515,52 +452,49 @@
          }
          Assert.assertEquals(r, mask);
      }
  
  
-     @Test(dataProvider = "shortByteBufferProvider")
-     static void loadStoreByteBuffer(IntFunction<short[]> fa,
-                                     IntFunction<ByteBuffer> fb,
-                                     ByteOrder bo) {
-         ByteBuffer a = toBuffer(fa.apply(SPECIES.length()), fb);
-         ByteBuffer r = fb.apply(a.limit());
+     @Test(dataProvider = "shortMemorySegmentProvider")
+     static void loadStoreMemorySegment(IntFunction<short[]> fa,
+                                        IntFunction<MemorySegment> fb,
+                                        ByteOrder bo) {
+         MemorySegment a = toSegment(fa.apply(SPECIES.length()), fb);
+         MemorySegment r = fb.apply((int) a.byteSize());
  
-         int l = a.limit();
+         int l = (int) a.byteSize();
          int s = SPECIES.vectorByteSize();
  
          for (int ic = 0; ic < INVOC_COUNT; ic++) {
              for (int i = 0; i < l; i += s) {
-                 ShortVector av = ShortVector.fromByteBuffer(SPECIES, a, i, bo);
-                 av.intoByteBuffer(r, i, bo);
+                 ShortVector av = ShortVector.fromMemorySegment(SPECIES, a, i, bo);
+                 av.intoMemorySegment(r, i, bo);
              }
          }
-         Assert.assertEquals(a.position(), 0, "Input buffer position changed");
-         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
-         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
-         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-         Assert.assertEquals(r, a, "Buffers not equal");
+         long m = r.mismatch(a);
+         Assert.assertEquals(m, -1, "Segments not equal");
      }
  
      @Test(dataProvider = "shortByteProviderForIOOBE")
-     static void loadByteBufferIOOBE(IntFunction<short[]> fa, IntFunction<Integer> fi) {
-         ByteBuffer a = toBuffer(fa.apply(SPECIES.length()), ByteBuffer::allocateDirect);
-         ByteBuffer r = ByteBuffer.allocateDirect(a.limit());
+     static void loadMemorySegmentIOOBE(IntFunction<short[]> fa, IntFunction<Integer> fi) {
+         MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, ResourceScope.newImplicitScope()));
+         MemorySegment r = MemorySegment.allocateNative(a.byteSize(), ResourceScope.newImplicitScope());
  
-         int l = a.limit();
+         int l = (int) a.byteSize();
          int s = SPECIES.vectorByteSize();
  
          for (int ic = 0; ic < INVOC_COUNT; ic++) {
              for (int i = 0; i < l; i += s) {
-                 ShortVector av = fromByteBuffer(a, i, ByteOrder.nativeOrder());
-                 av.intoByteBuffer(r, i, ByteOrder.nativeOrder());
+                 ShortVector av = fromMemorySegment(a, i, ByteOrder.nativeOrder());
+                 av.intoMemorySegment(r, i, ByteOrder.nativeOrder());
              }
          }
  
-         int index = fi.apply(a.limit());
-         boolean shouldFail = isIndexOutOfBounds(SPECIES.vectorByteSize(), index, a.limit());
+         int index = fi.apply((int) a.byteSize());
+         boolean shouldFail = isIndexOutOfBounds(SPECIES.vectorByteSize(), index, (int) a.byteSize());
          try {
-             fromByteBuffer(a, index, ByteOrder.nativeOrder());
+             fromMemorySegment(a, index, ByteOrder.nativeOrder());
              if (shouldFail) {
                  Assert.fail("Failed to throw IndexOutOfBoundsException");
              }
          } catch (IndexOutOfBoundsException e) {
              if (!shouldFail) {

@@ -568,103 +502,94 @@
              }
          }
      }
  
      @Test(dataProvider = "shortByteProviderForIOOBE")
-     static void storeByteBufferIOOBE(IntFunction<short[]> fa, IntFunction<Integer> fi) {
-         ByteBuffer a = toBuffer(fa.apply(SPECIES.length()), ByteBuffer::allocateDirect);
-         ByteBuffer r = ByteBuffer.allocateDirect(a.limit());
+     static void storeMemorySegmentIOOBE(IntFunction<short[]> fa, IntFunction<Integer> fi) {
+         MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, ResourceScope.newImplicitScope()));
+         MemorySegment r = MemorySegment.allocateNative(a.byteSize(), ResourceScope.newImplicitScope());
  
-         int l = a.limit();
+         int l = (int) a.byteSize();
          int s = SPECIES.vectorByteSize();
  
          for (int ic = 0; ic < INVOC_COUNT; ic++) {
              for (int i = 0; i < l; i += s) {
-                 ShortVector av = ShortVector.fromByteBuffer(SPECIES, a, i, ByteOrder.nativeOrder());
-                 intoByteBuffer(av, r, i, ByteOrder.nativeOrder());
+                 ShortVector av = ShortVector.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+                 intoMemorySegment(av, r, i, ByteOrder.nativeOrder());
              }
          }
  
-         int index = fi.apply(a.limit());
-         boolean shouldFail = isIndexOutOfBounds(SPECIES.vectorByteSize(), index, a.limit());
+         int index = fi.apply((int) a.byteSize());
+         boolean shouldFail = isIndexOutOfBounds(SPECIES.vectorByteSize(), index, (int) a.byteSize());
          try {
-             ShortVector av = ShortVector.fromByteBuffer(SPECIES, a, 0, ByteOrder.nativeOrder());
-             intoByteBuffer(av, r, index, ByteOrder.nativeOrder());
+             ShortVector av = ShortVector.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+             intoMemorySegment(av, r, index, ByteOrder.nativeOrder());
              if (shouldFail) {
                  Assert.fail("Failed to throw IndexOutOfBoundsException");
              }
          } catch (IndexOutOfBoundsException e) {
              if (!shouldFail) {
                  Assert.fail("Unexpected IndexOutOfBoundsException");
              }
          }
      }
  
- 
-     @Test(dataProvider = "shortByteBufferMaskProvider")
-     static void loadStoreByteBufferMask(IntFunction<short[]> fa,
-                                         IntFunction<ByteBuffer> fb,
-                                         IntFunction<boolean[]> fm,
-                                         ByteOrder bo) {
+     @Test(dataProvider = "shortMemorySegmentMaskProvider")
+     static void loadStoreMemorySegmentMask(IntFunction<short[]> fa,
+                                            IntFunction<MemorySegment> fb,
+                                            IntFunction<boolean[]> fm,
+                                            ByteOrder bo) {
          short[] _a = fa.apply(SPECIES.length());
-         ByteBuffer a = toBuffer(_a, fb);
-         ByteBuffer r = fb.apply(a.limit());
+         MemorySegment a = toSegment(_a, fb);
+         MemorySegment r = fb.apply((int) a.byteSize());
          boolean[] mask = fm.apply(SPECIES.length());
          VectorMask<Short> vmask = VectorMask.fromValues(SPECIES, mask);
  
-         int l = a.limit();
+         int l = (int) a.byteSize();
          int s = SPECIES.vectorByteSize();
  
          for (int ic = 0; ic < INVOC_COUNT; ic++) {
              for (int i = 0; i < l; i += s) {
-                 ShortVector av = ShortVector.fromByteBuffer(SPECIES, a, i, bo, vmask);
-                 av.intoByteBuffer(r, i, bo);
+                 ShortVector av = ShortVector.fromMemorySegment(SPECIES, a, i, bo, vmask);
+                 av.intoMemorySegment(r, i, bo);
              }
          }
-         Assert.assertEquals(a.position(), 0, "Input buffer position changed");
-         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
-         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
-         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-         assertArraysEquals(bufferToArray(r), _a, mask);
+         assertArraysEquals(segmentToArray(r), _a, mask);
  
  
-         r = fb.apply(a.limit());
+         r = fb.apply((int) a.byteSize());
  
          for (int ic = 0; ic < INVOC_COUNT; ic++) {
              for (int i = 0; i < l; i += s) {
-                 ShortVector av = ShortVector.fromByteBuffer(SPECIES, a, i, bo);
-                 av.intoByteBuffer(r, i, bo, vmask);
+                 ShortVector av = ShortVector.fromMemorySegment(SPECIES, a, i, bo);
+                 av.intoMemorySegment(r, i, bo, vmask);
              }
          }
-         Assert.assertEquals(a.position(), 0, "Input buffer position changed");
-         Assert.assertEquals(a.limit(), l, "Input buffer limit changed");
-         Assert.assertEquals(r.position(), 0, "Result buffer position changed");
-         Assert.assertEquals(r.limit(), l, "Result buffer limit changed");
-         assertArraysEquals(bufferToArray(r), _a, mask);
+         assertArraysEquals(segmentToArray(r), _a, mask);
      }
  
      @Test(dataProvider = "shortByteMaskProviderForIOOBE")
-     static void loadByteBufferMaskIOOBE(IntFunction<short[]> fa, IntFunction<Integer> fi, IntFunction<boolean[]> fm) {
-         ByteBuffer a = toBuffer(fa.apply(SPECIES.length()), ByteBuffer::allocateDirect);
-         ByteBuffer r = ByteBuffer.allocateDirect(a.limit());
+     static void loadMemorySegmentMaskIOOBE(IntFunction<short[]> fa, IntFunction<Integer> fi, IntFunction<boolean[]> fm) {
+         MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, ResourceScope.newImplicitScope()));
+         MemorySegment r = MemorySegment.allocateNative(a.byteSize(), ResourceScope.newImplicitScope());
          boolean[] mask = fm.apply(SPECIES.length());
          VectorMask<Short> vmask = VectorMask.fromValues(SPECIES, mask);
  
-         int l = a.limit();
+         int l = (int) a.byteSize();
          int s = SPECIES.vectorByteSize();
  
          for (int ic = 0; ic < INVOC_COUNT; ic++) {
              for (int i = 0; i < l; i += s) {
-                 ShortVector av = fromByteBuffer(a, i, ByteOrder.nativeOrder(), vmask);
-                 av.intoByteBuffer(r, i, ByteOrder.nativeOrder());
+                 ShortVector av = fromMemorySegment(a, i, ByteOrder.nativeOrder(), vmask);
+                 av.intoMemorySegment(r, i, ByteOrder.nativeOrder());
              }
          }
  
-         int index = fi.apply(a.limit());
-         boolean shouldFail = isIndexOutOfBoundsForMask(mask, index, a.limit(), SPECIES.elementSize() / 8);
+         int index = fi.apply((int) a.byteSize());
+         boolean shouldFail = isIndexOutOfBoundsForMask(mask, index, (int) a.byteSize(), SPECIES.elementSize() / 8);
          try {
-             fromByteBuffer(a, index, ByteOrder.nativeOrder(), vmask);
+             fromMemorySegment(a, index, ByteOrder.nativeOrder(), vmask);
              if (shouldFail) {
                  Assert.fail("Failed to throw IndexOutOfBoundsException");
              }
          } catch (IndexOutOfBoundsException e) {
              if (!shouldFail) {

@@ -672,248 +597,70 @@
              }
          }
      }
  
      @Test(dataProvider = "shortByteMaskProviderForIOOBE")
-     static void storeByteBufferMaskIOOBE(IntFunction<short[]> fa, IntFunction<Integer> fi, IntFunction<boolean[]> fm) {
-         ByteBuffer a = toBuffer(fa.apply(SPECIES.length()), ByteBuffer::allocateDirect);
-         ByteBuffer r = ByteBuffer.allocateDirect(a.limit());
+     static void storeMemorySegmentMaskIOOBE(IntFunction<short[]> fa, IntFunction<Integer> fi, IntFunction<boolean[]> fm) {
+         MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, ResourceScope.newImplicitScope()));
+         MemorySegment r = MemorySegment.allocateNative(a.byteSize(), ResourceScope.newImplicitScope());
          boolean[] mask = fm.apply(SPECIES.length());
          VectorMask<Short> vmask = VectorMask.fromValues(SPECIES, mask);
  
-         int l = a.limit();
-         int s = SPECIES.vectorByteSize();
- 
-         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-             for (int i = 0; i < l; i += s) {
-                 ShortVector av = ShortVector.fromByteBuffer(SPECIES, a, i, ByteOrder.nativeOrder());
-                 intoByteBuffer(av, r, i, ByteOrder.nativeOrder(), vmask);
-             }
-         }
- 
-         int index = fi.apply(a.limit());
-         boolean shouldFail = isIndexOutOfBoundsForMask(mask, index, a.limit(), SPECIES.elementSize() / 8);
-         try {
-             ShortVector av = ShortVector.fromByteBuffer(SPECIES, a, 0, ByteOrder.nativeOrder());
-             intoByteBuffer(av, a, index, ByteOrder.nativeOrder(), vmask);
-             if (shouldFail) {
-                 Assert.fail("Failed to throw IndexOutOfBoundsException");
-             }
-         } catch (IndexOutOfBoundsException e) {
-             if (!shouldFail) {
-                 Assert.fail("Unexpected IndexOutOfBoundsException");
-             }
-         }
-     }
- 
- 
-     @Test(dataProvider = "shortByteBufferProvider")
-     static void loadStoreReadonlyByteBuffer(IntFunction<short[]> fa,
-                                     IntFunction<ByteBuffer> fb,
-                                     ByteOrder bo) {
-         ByteBuffer a = toBuffer(fa.apply(SPECIES.length()), fb).asReadOnlyBuffer();
- 
-         try {
-             SPECIES.zero().intoByteBuffer(a, 0, bo);
-             Assert.fail("ReadOnlyBufferException expected");
-         } catch (ReadOnlyBufferException e) {
-         }
- 
-         try {
-             SPECIES.zero().intoByteBuffer(a, 0, bo, SPECIES.maskAll(true));
-             Assert.fail("ReadOnlyBufferException expected");
-         } catch (ReadOnlyBufferException e) {
-         }
- 
-         try {
-             SPECIES.zero().intoByteBuffer(a, 0, bo, SPECIES.maskAll(false));
-             Assert.fail("ReadOnlyBufferException expected");
-         } catch (ReadOnlyBufferException e) {
-         }
- 
-         try {
-             VectorMask<Short> m = SPECIES.shuffleFromOp(i -> i % 2 == 0 ? 1 : -1)
-                     .laneIsValid();
-             SPECIES.zero().intoByteBuffer(a, 0, bo, m);
-             Assert.fail("ReadOnlyBufferException expected");
-         } catch (ReadOnlyBufferException e) {
-         }
-     }
- 
- 
-     @Test(dataProvider = "shortByteArrayProvider")
-     static void loadStoreByteArray(IntFunction<short[]> fa,
-                                     ByteOrder bo) {
-         byte[] a = toByteArray(fa.apply(SPECIES.length()), byte[]::new, bo);
-         byte[] r = new byte[a.length];
- 
-         int s = SPECIES.vectorByteSize();
-         int l = a.length;
- 
-         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-             for (int i = 0; i < l; i += s) {
-                 ShortVector av = ShortVector.fromByteArray(SPECIES, a, i, bo);
-                 av.intoByteArray(r, i, bo);
-             }
-         }
-         Assert.assertEquals(r, a, "Byte arrays not equal");
-     }
- 
-     @Test(dataProvider = "shortByteProviderForIOOBE")
-     static void loadByteArrayIOOBE(IntFunction<short[]> fa, IntFunction<Integer> fi) {
-         byte[] a = toByteArray(fa.apply(SPECIES.length()), byte[]::new, ByteOrder.nativeOrder());
-         byte[] r = new byte[a.length];
- 
+         int l = (int) a.byteSize();
          int s = SPECIES.vectorByteSize();
-         int l = a.length;
  
          for (int ic = 0; ic < INVOC_COUNT; ic++) {
              for (int i = 0; i < l; i += s) {
-                 ShortVector av = fromByteArray(a, i, ByteOrder.nativeOrder());
-                 av.intoByteArray(r, i, ByteOrder.nativeOrder());
+                 ShortVector av = ShortVector.fromMemorySegment(SPECIES, a, i, ByteOrder.nativeOrder());
+                 intoMemorySegment(av, r, i, ByteOrder.nativeOrder(), vmask);
              }
          }
  
-         int index = fi.apply(a.length);
-         boolean shouldFail = isIndexOutOfBounds(SPECIES.vectorByteSize(), index, a.length);
+         int index = fi.apply((int) a.byteSize());
+         boolean shouldFail = isIndexOutOfBoundsForMask(mask, index, (int) a.byteSize(), SPECIES.elementSize() / 8);
          try {
-             fromByteArray(a, index, ByteOrder.nativeOrder());
+             ShortVector av = ShortVector.fromMemorySegment(SPECIES, a, 0, ByteOrder.nativeOrder());
+             intoMemorySegment(av, a, index, ByteOrder.nativeOrder(), vmask);
              if (shouldFail) {
                  Assert.fail("Failed to throw IndexOutOfBoundsException");
              }
          } catch (IndexOutOfBoundsException e) {
              if (!shouldFail) {
                  Assert.fail("Unexpected IndexOutOfBoundsException");
              }
          }
      }
  
-     @Test(dataProvider = "shortByteProviderForIOOBE")
-     static void storeByteArrayIOOBE(IntFunction<short[]> fa, IntFunction<Integer> fi) {
-         byte[] a = toByteArray(fa.apply(SPECIES.length()), byte[]::new, ByteOrder.nativeOrder());
-         byte[] r = new byte[a.length];
- 
-         int s = SPECIES.vectorByteSize();
-         int l = a.length;
- 
-         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-             for (int i = 0; i < l; i += s) {
-                 ShortVector av = ShortVector.fromByteArray(SPECIES, a, i, ByteOrder.nativeOrder());
-                 intoByteArray(av, r, i, ByteOrder.nativeOrder());
-             }
-         }
- 
-         int index = fi.apply(a.length);
-         boolean shouldFail = isIndexOutOfBounds(SPECIES.vectorByteSize(), index, a.length);
-         try {
-             ShortVector av = ShortVector.fromByteArray(SPECIES, a, 0, ByteOrder.nativeOrder());
-             intoByteArray(av, r, index, ByteOrder.nativeOrder());
-             if (shouldFail) {
-                 Assert.fail("Failed to throw IndexOutOfBoundsException");
-             }
-         } catch (IndexOutOfBoundsException e) {
-             if (!shouldFail) {
-                 Assert.fail("Unexpected IndexOutOfBoundsException");
-             }
-         }
-     }
- 
- 
-     @Test(dataProvider = "shortByteArrayMaskProvider")
-     static void loadStoreByteArrayMask(IntFunction<short[]> fa,
-                                   IntFunction<boolean[]> fm,
-                                   ByteOrder bo) {
-         byte[] a = toByteArray(fa.apply(SPECIES.length()), byte[]::new, bo);
-         byte[] r = new byte[a.length];
-         boolean[] mask = fm.apply(SPECIES.length());
-         VectorMask<Short> vmask = VectorMask.fromValues(SPECIES, mask);
- 
-         int s = SPECIES.vectorByteSize();
-         int l = a.length;
- 
-         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-           for (int i = 0; i < l; i += s) {
-               ShortVector av = ShortVector.fromByteArray(SPECIES, a, i, bo, vmask);
-               av.intoByteArray(r, i, bo);
-           }
-         }
-         assertArraysEquals(r, a, mask);
- 
- 
-         r = new byte[a.length];
- 
-         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-             for (int i = 0; i < l; i += s) {
-                 ShortVector av = ShortVector.fromByteArray(SPECIES, a, i, bo);
-                 av.intoByteArray(r, i, bo, vmask);
-             }
-         }
-         assertArraysEquals(r, a, mask);
-     }
+     @Test(dataProvider = "shortMemorySegmentProvider")
+     static void loadStoreReadonlyMemorySegment(IntFunction<short[]> fa,
+                                                IntFunction<MemorySegment> fb,
+                                                ByteOrder bo) {
+         MemorySegment a = toSegment(fa.apply(SPECIES.length()), fb).asReadOnly();
  
-     @Test(dataProvider = "shortByteMaskProviderForIOOBE")
-     static void loadByteArrayMaskIOOBE(IntFunction<short[]> fa, IntFunction<Integer> fi, IntFunction<boolean[]> fm) {
-         byte[] a = toByteArray(fa.apply(SPECIES.length()), byte[]::new, ByteOrder.nativeOrder());
-         byte[] r = new byte[a.length];
-         boolean[] mask = fm.apply(SPECIES.length());
-         VectorMask<Short> vmask = VectorMask.fromValues(SPECIES, mask);
+         Assert.assertThrows(
+                 UnsupportedOperationException.class,
+                 () -> SPECIES.zero().intoMemorySegment(a, 0, bo)
+         );
  
-         int s = SPECIES.vectorByteSize();
-         int l = a.length;
+         Assert.assertThrows(
+                 UnsupportedOperationException.class,
+                 () -> SPECIES.zero().intoMemorySegment(a, 0, bo, SPECIES.maskAll(true))
+         );
  
-         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-             for (int i = 0; i < l; i += s) {
-                 ShortVector av = fromByteArray(a, i, ByteOrder.nativeOrder(), vmask);
-                 av.intoByteArray(r, i, ByteOrder.nativeOrder());
-             }
-         }
+         Assert.assertThrows(
+                 UnsupportedOperationException.class,
+                 () -> SPECIES.zero().intoMemorySegment(a, 0, bo, SPECIES.maskAll(false))
+         );
  
-         int index = fi.apply(a.length);
-         boolean shouldFail = isIndexOutOfBoundsForMask(mask, index, a.length, SPECIES.elementSize() / 8);
-         try {
-             fromByteArray(a, index, ByteOrder.nativeOrder(), vmask);
-             if (shouldFail) {
-                 Assert.fail("Failed to throw IndexOutOfBoundsException");
-             }
-         } catch (IndexOutOfBoundsException e) {
-             if (!shouldFail) {
-                 Assert.fail("Unexpected IndexOutOfBoundsException");
-             }
-         }
+         VectorMask<Short> m = SPECIES.shuffleFromOp(i -> i % 2 == 0 ? 1 : -1)
+                 .laneIsValid();
+         Assert.assertThrows(
+                 UnsupportedOperationException.class,
+                 () -> SPECIES.zero().intoMemorySegment(a, 0, bo, m)
+         );
      }
  
-     @Test(dataProvider = "shortByteMaskProviderForIOOBE")
-     static void storeByteArrayMaskIOOBE(IntFunction<short[]> fa, IntFunction<Integer> fi, IntFunction<boolean[]> fm) {
-         byte[] a = toByteArray(fa.apply(SPECIES.length()), byte[]::new, ByteOrder.nativeOrder());
-         byte[] r = new byte[a.length];
-         boolean[] mask = fm.apply(SPECIES.length());
-         VectorMask<Short> vmask = VectorMask.fromValues(SPECIES, mask);
- 
-         int s = SPECIES.vectorByteSize();
-         int l = a.length;
- 
-         for (int ic = 0; ic < INVOC_COUNT; ic++) {
-             for (int i = 0; i < l; i += s) {
-                 ShortVector av = ShortVector.fromByteArray(SPECIES, a, i, ByteOrder.nativeOrder());
-                 intoByteArray(av, r, i, ByteOrder.nativeOrder(), vmask);
-             }
-         }
- 
-         int index = fi.apply(a.length);
-         boolean shouldFail = isIndexOutOfBoundsForMask(mask, index, a.length, SPECIES.elementSize() / 8);
-         try {
-             ShortVector av = ShortVector.fromByteArray(SPECIES, a, 0, ByteOrder.nativeOrder());
-             intoByteArray(av, a, index, ByteOrder.nativeOrder(), vmask);
-             if (shouldFail) {
-                 Assert.fail("Failed to throw IndexOutOfBoundsException");
-             }
-         } catch (IndexOutOfBoundsException e) {
-             if (!shouldFail) {
-                 Assert.fail("Unexpected IndexOutOfBoundsException");
-             }
-         }
-     }
  
      @Test(dataProvider = "maskProvider")
      static void loadStoreMask(IntFunction<boolean[]> fm) {
          boolean[] a = fm.apply(SPECIES.length());
          boolean[] r = new boolean[a.length];

@@ -925,10 +672,11 @@
              }
          }
          Assert.assertEquals(r, a);
      }
  
+ 
      @Test
      static void loadStoreShuffle() {
          IntUnaryOperator fn = a -> a + 5;
          for (int ic = 0; ic < INVOC_COUNT; ic++) {
              var shuffle = VectorShuffle.fromOp(SPECIES, fn);
< prev index next >