Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8296417: Make memory session a pure lifetime abstraction #750

Closed
wants to merge 10 commits into from
+1,741 −1,909
Closed

8296417: Make memory session a pure lifetime abstraction #750

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6d5898d
Initial push
mcimadamore Oct 20, 2022
1c91660
Add missing copyrights
mcimadamore Nov 4, 2022
00ec10b
Fix stale references to MemorySession
mcimadamore Nov 4, 2022
8ee48e8
Tweak javadoc for VaList
mcimadamore Nov 4, 2022
9f390bf
Fix vector tests
mcimadamore Nov 4, 2022
a780109
Address review comments
mcimadamore Nov 4, 2022
3183bfc
Unseal Arena
mcimadamore Nov 4, 2022
a81734f
Fix SegmentAllocator.slicingAllocator to throw IIOBE
mcimadamore Nov 4, 2022
0809daa
Address more review comments
mcimadamore Nov 7, 2022
e08af8b
Update test/micro/org/openjdk/bench/java/lang/foreign/StrLenTest.java
mcimadamore Nov 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/java.base/share/classes/jdk/internal/foreign/abi/Binding.java
View file
Original file line number Diff line number Diff line change
@@ -25,7 +25,6 @@
package jdk.internal.foreign.abi;

import jdk.internal.foreign.NativeMemorySegmentImpl;
import jdk.internal.org.objectweb.asm.Handle;

import java.lang.foreign.Arena;
import java.lang.foreign.MemoryLayout;
5 changes: 2 additions & 3 deletions test/jdk/jdk/incubator/vector/AbstractVectorLoadStoreTest.java
View file
Original file line number Diff line number Diff line change
@@ -43,15 +43,15 @@ public class AbstractVectorLoadStoreTest extends AbstractVectorTest {
ByteBuffer.allocateDirect(s)
.order(ByteOrder.nativeOrder())),
withToString("MS:RW:NE", (int s) ->
MemorySegment.allocateNative(s)
MemorySegment.allocateNative(s, MemorySession.implicit())
.asByteBuffer()
.order(ByteOrder.nativeOrder())
)
);

static final List<IntFunction<MemorySegment>> MEMORY_SEGMENT_GENERATORS = List.of(
withToString("HMS", (int s) ->
MemorySegment.allocateNative(s)
MemorySegment.allocateNative(s, MemorySession.implicit())
),
withToString("DMS", (int s) -> {
byte[] b = new byte[s];
@@ -60,4 +60,3 @@ public class AbstractVectorLoadStoreTest extends AbstractVectorTest {
);

}

16 changes: 8 additions & 8 deletions test/jdk/jdk/incubator/vector/Byte128VectorLoadStoreTests.java
View file
Original file line number Diff line number Diff line change
@@ -479,8 +479,8 @@ static void loadStoreMemorySegment(IntFunction<byte[]> fa,

@Test(dataProvider = "byteByteProviderForIOOBE")
static void loadMemorySegmentIOOBE(IntFunction<byte[]> fa, IntFunction<Integer> fi) {
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE);
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE, MemorySession.implicit()));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE, MemorySession.implicit());

int l = (int) a.byteSize();
int s = SPECIES.vectorByteSize();
@@ -508,8 +508,8 @@ static void loadMemorySegmentIOOBE(IntFunction<byte[]> fa, IntFunction<Integer>

@Test(dataProvider = "byteByteProviderForIOOBE")
static void storeMemorySegmentIOOBE(IntFunction<byte[]> fa, IntFunction<Integer> fi) {
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE);
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE, MemorySession.implicit()));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE, MemorySession.implicit());

int l = (int) a.byteSize();
int s = SPECIES.vectorByteSize();
@@ -572,8 +572,8 @@ static void loadStoreMemorySegmentMask(IntFunction<byte[]> fa,

@Test(dataProvider = "byteByteMaskProviderForIOOBE")
static void loadMemorySegmentMaskIOOBE(IntFunction<byte[]> fa, IntFunction<Integer> fi, IntFunction<boolean[]> fm) {
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE);
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE, MemorySession.implicit()));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE, MemorySession.implicit());
boolean[] mask = fm.apply(SPECIES.length());
VectorMask<Byte> vmask = VectorMask.fromValues(SPECIES, mask);

@@ -603,8 +603,8 @@ static void loadMemorySegmentMaskIOOBE(IntFunction<byte[]> fa, IntFunction<Integ

@Test(dataProvider = "byteByteMaskProviderForIOOBE")
static void storeMemorySegmentMaskIOOBE(IntFunction<byte[]> fa, IntFunction<Integer> fi, IntFunction<boolean[]> fm) {
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE);
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE, MemorySession.implicit()));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE, MemorySession.implicit());
boolean[] mask = fm.apply(SPECIES.length());
VectorMask<Byte> vmask = VectorMask.fromValues(SPECIES, mask);

16 changes: 8 additions & 8 deletions test/jdk/jdk/incubator/vector/Byte256VectorLoadStoreTests.java
View file
Original file line number Diff line number Diff line change
@@ -479,8 +479,8 @@ static void loadStoreMemorySegment(IntFunction<byte[]> fa,

@Test(dataProvider = "byteByteProviderForIOOBE")
static void loadMemorySegmentIOOBE(IntFunction<byte[]> fa, IntFunction<Integer> fi) {
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE);
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE, MemorySession.implicit()));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE, MemorySession.implicit());

int l = (int) a.byteSize();
int s = SPECIES.vectorByteSize();
@@ -508,8 +508,8 @@ static void loadMemorySegmentIOOBE(IntFunction<byte[]> fa, IntFunction<Integer>

@Test(dataProvider = "byteByteProviderForIOOBE")
static void storeMemorySegmentIOOBE(IntFunction<byte[]> fa, IntFunction<Integer> fi) {
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE);
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE, MemorySession.implicit()));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE, MemorySession.implicit());

int l = (int) a.byteSize();
int s = SPECIES.vectorByteSize();
@@ -572,8 +572,8 @@ static void loadStoreMemorySegmentMask(IntFunction<byte[]> fa,

@Test(dataProvider = "byteByteMaskProviderForIOOBE")
static void loadMemorySegmentMaskIOOBE(IntFunction<byte[]> fa, IntFunction<Integer> fi, IntFunction<boolean[]> fm) {
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE);
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE, MemorySession.implicit()));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE, MemorySession.implicit());
boolean[] mask = fm.apply(SPECIES.length());
VectorMask<Byte> vmask = VectorMask.fromValues(SPECIES, mask);

@@ -603,8 +603,8 @@ static void loadMemorySegmentMaskIOOBE(IntFunction<byte[]> fa, IntFunction<Integ

@Test(dataProvider = "byteByteMaskProviderForIOOBE")
static void storeMemorySegmentMaskIOOBE(IntFunction<byte[]> fa, IntFunction<Integer> fi, IntFunction<boolean[]> fm) {
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE);
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE, MemorySession.implicit()));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE, MemorySession.implicit());
boolean[] mask = fm.apply(SPECIES.length());
VectorMask<Byte> vmask = VectorMask.fromValues(SPECIES, mask);

16 changes: 8 additions & 8 deletions test/jdk/jdk/incubator/vector/Byte512VectorLoadStoreTests.java
View file
Original file line number Diff line number Diff line change
@@ -479,8 +479,8 @@ static void loadStoreMemorySegment(IntFunction<byte[]> fa,

@Test(dataProvider = "byteByteProviderForIOOBE")
static void loadMemorySegmentIOOBE(IntFunction<byte[]> fa, IntFunction<Integer> fi) {
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE);
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE, MemorySession.implicit()));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE, MemorySession.implicit());

int l = (int) a.byteSize();
int s = SPECIES.vectorByteSize();
@@ -508,8 +508,8 @@ static void loadMemorySegmentIOOBE(IntFunction<byte[]> fa, IntFunction<Integer>

@Test(dataProvider = "byteByteProviderForIOOBE")
static void storeMemorySegmentIOOBE(IntFunction<byte[]> fa, IntFunction<Integer> fi) {
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE);
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE, MemorySession.implicit()));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE, MemorySession.implicit());

int l = (int) a.byteSize();
int s = SPECIES.vectorByteSize();
@@ -572,8 +572,8 @@ static void loadStoreMemorySegmentMask(IntFunction<byte[]> fa,

@Test(dataProvider = "byteByteMaskProviderForIOOBE")
static void loadMemorySegmentMaskIOOBE(IntFunction<byte[]> fa, IntFunction<Integer> fi, IntFunction<boolean[]> fm) {
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE);
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE, MemorySession.implicit()));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE, MemorySession.implicit());
boolean[] mask = fm.apply(SPECIES.length());
VectorMask<Byte> vmask = VectorMask.fromValues(SPECIES, mask);

@@ -603,8 +603,8 @@ static void loadMemorySegmentMaskIOOBE(IntFunction<byte[]> fa, IntFunction<Integ

@Test(dataProvider = "byteByteMaskProviderForIOOBE")
static void storeMemorySegmentMaskIOOBE(IntFunction<byte[]> fa, IntFunction<Integer> fi, IntFunction<boolean[]> fm) {
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE);
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE, MemorySession.implicit()));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE, MemorySession.implicit());
boolean[] mask = fm.apply(SPECIES.length());
VectorMask<Byte> vmask = VectorMask.fromValues(SPECIES, mask);

16 changes: 8 additions & 8 deletions test/jdk/jdk/incubator/vector/Byte64VectorLoadStoreTests.java
View file
Original file line number Diff line number Diff line change
@@ -479,8 +479,8 @@ static void loadStoreMemorySegment(IntFunction<byte[]> fa,

@Test(dataProvider = "byteByteProviderForIOOBE")
static void loadMemorySegmentIOOBE(IntFunction<byte[]> fa, IntFunction<Integer> fi) {
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE);
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE, MemorySession.implicit()));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE, MemorySession.implicit());

int l = (int) a.byteSize();
int s = SPECIES.vectorByteSize();
@@ -508,8 +508,8 @@ static void loadMemorySegmentIOOBE(IntFunction<byte[]> fa, IntFunction<Integer>

@Test(dataProvider = "byteByteProviderForIOOBE")
static void storeMemorySegmentIOOBE(IntFunction<byte[]> fa, IntFunction<Integer> fi) {
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE);
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE, MemorySession.implicit()));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE, MemorySession.implicit());

int l = (int) a.byteSize();
int s = SPECIES.vectorByteSize();
@@ -572,8 +572,8 @@ static void loadStoreMemorySegmentMask(IntFunction<byte[]> fa,

@Test(dataProvider = "byteByteMaskProviderForIOOBE")
static void loadMemorySegmentMaskIOOBE(IntFunction<byte[]> fa, IntFunction<Integer> fi, IntFunction<boolean[]> fm) {
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE);
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE, MemorySession.implicit()));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE, MemorySession.implicit());
boolean[] mask = fm.apply(SPECIES.length());
VectorMask<Byte> vmask = VectorMask.fromValues(SPECIES, mask);

@@ -603,8 +603,8 @@ static void loadMemorySegmentMaskIOOBE(IntFunction<byte[]> fa, IntFunction<Integ

@Test(dataProvider = "byteByteMaskProviderForIOOBE")
static void storeMemorySegmentMaskIOOBE(IntFunction<byte[]> fa, IntFunction<Integer> fi, IntFunction<boolean[]> fm) {
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE);
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE, MemorySession.implicit()));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE, MemorySession.implicit());
boolean[] mask = fm.apply(SPECIES.length());
VectorMask<Byte> vmask = VectorMask.fromValues(SPECIES, mask);

16 changes: 8 additions & 8 deletions test/jdk/jdk/incubator/vector/ByteMaxVectorLoadStoreTests.java
View file
Original file line number Diff line number Diff line change
@@ -486,8 +486,8 @@ static void loadStoreMemorySegment(IntFunction<byte[]> fa,

@Test(dataProvider = "byteByteProviderForIOOBE")
static void loadMemorySegmentIOOBE(IntFunction<byte[]> fa, IntFunction<Integer> fi) {
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE);
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE, MemorySession.implicit()));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE, MemorySession.implicit());

int l = (int) a.byteSize();
int s = SPECIES.vectorByteSize();
@@ -515,8 +515,8 @@ static void loadMemorySegmentIOOBE(IntFunction<byte[]> fa, IntFunction<Integer>

@Test(dataProvider = "byteByteProviderForIOOBE")
static void storeMemorySegmentIOOBE(IntFunction<byte[]> fa, IntFunction<Integer> fi) {
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE);
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE, MemorySession.implicit()));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE, MemorySession.implicit());

int l = (int) a.byteSize();
int s = SPECIES.vectorByteSize();
@@ -579,8 +579,8 @@ static void loadStoreMemorySegmentMask(IntFunction<byte[]> fa,

@Test(dataProvider = "byteByteMaskProviderForIOOBE")
static void loadMemorySegmentMaskIOOBE(IntFunction<byte[]> fa, IntFunction<Integer> fi, IntFunction<boolean[]> fm) {
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE);
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE, MemorySession.implicit()));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE, MemorySession.implicit());
boolean[] mask = fm.apply(SPECIES.length());
VectorMask<Byte> vmask = VectorMask.fromValues(SPECIES, mask);

@@ -610,8 +610,8 @@ static void loadMemorySegmentMaskIOOBE(IntFunction<byte[]> fa, IntFunction<Integ

@Test(dataProvider = "byteByteMaskProviderForIOOBE")
static void storeMemorySegmentMaskIOOBE(IntFunction<byte[]> fa, IntFunction<Integer> fi, IntFunction<boolean[]> fm) {
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE);
MemorySegment a = toSegment(fa.apply(SPECIES.length()), i -> MemorySegment.allocateNative(i, Byte.SIZE, MemorySession.implicit()));
MemorySegment r = MemorySegment.allocateNative(a.byteSize(), Byte.SIZE, MemorySession.implicit());
boolean[] mask = fm.apply(SPECIES.length());
VectorMask<Byte> vmask = VectorMask.fromValues(SPECIES, mask);

Loading