-
Notifications
You must be signed in to change notification settings - Fork 61
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.
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
8301360: Add dereference layout paths to memory layout API #776
Closed
mcimadamore
wants to merge
3
commits into
openjdk:foreign-memaccess+abi
from
mcimadamore:deref_handles_new
+246
−13
Closed
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| /* | ||
| * Copyright (c) 2023, 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. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| * | ||
| */ | ||
|
|
||
| /* | ||
| * @test | ||
| * @enablePreview | ||
| * @run testng TestDereferencePath | ||
| */ | ||
|
|
||
| import java.lang.foreign.Arena; | ||
| import java.lang.foreign.MemoryLayout; | ||
| import java.lang.foreign.MemoryLayout.PathElement; | ||
| import java.lang.foreign.MemorySegment; | ||
|
|
||
| import java.lang.foreign.ValueLayout; | ||
|
|
||
| import org.testng.annotations.*; | ||
|
|
||
| import java.lang.invoke.VarHandle; | ||
| import static org.testng.Assert.*; | ||
|
|
||
| public class TestDereferencePath { | ||
|
|
||
| static final MemoryLayout C = MemoryLayout.structLayout( | ||
| ValueLayout.JAVA_INT.withName("x") | ||
| ); | ||
|
|
||
| static final MemoryLayout B = MemoryLayout.structLayout( | ||
| ValueLayout.ADDRESS.withName("c") | ||
| .withTargetLayout(C) | ||
| ); | ||
|
|
||
| static final MemoryLayout A = MemoryLayout.structLayout( | ||
| ValueLayout.ADDRESS.withName("b") | ||
| .withTargetLayout(B) | ||
| ); | ||
|
|
||
| static final VarHandle abcx = A.varHandle( | ||
| PathElement.groupElement("b"), PathElement.dereferenceElement(), | ||
| PathElement.groupElement("c"), PathElement.dereferenceElement(), | ||
| PathElement.groupElement("x")); | ||
|
|
||
| @Test | ||
| public void testSingle() { | ||
| try (Arena arena = Arena.openConfined()) { | ||
| // init structs | ||
| MemorySegment a = arena.allocate(A); | ||
| MemorySegment b = arena.allocate(B); | ||
| MemorySegment c = arena.allocate(C); | ||
| // init struct fields | ||
| a.set(ValueLayout.ADDRESS, 0, b); | ||
| b.set(ValueLayout.ADDRESS, 0, c); | ||
| c.set(ValueLayout.JAVA_INT, 0, 42); | ||
| // dereference | ||
| int val = (int) abcx.get(a); | ||
| assertEquals(val, 42); | ||
| } | ||
| } | ||
|
|
||
| static final MemoryLayout B_MULTI = MemoryLayout.structLayout( | ||
| ValueLayout.ADDRESS.withName("cs") | ||
| .withTargetLayout(MemoryLayout.sequenceLayout(2, C)) | ||
| ); | ||
|
|
||
| static final MemoryLayout A_MULTI = MemoryLayout.structLayout( | ||
| ValueLayout.ADDRESS.withName("bs") | ||
| .withTargetLayout(MemoryLayout.sequenceLayout(2, B_MULTI)) | ||
| ); | ||
|
|
||
| static final VarHandle abcx_multi = A_MULTI.varHandle( | ||
| PathElement.groupElement("bs"), PathElement.dereferenceElement(), PathElement.sequenceElement(), | ||
| PathElement.groupElement("cs"), PathElement.dereferenceElement(), PathElement.sequenceElement(), | ||
| PathElement.groupElement("x")); | ||
|
|
||
| @Test | ||
| public void testMulti() { | ||
| try (Arena arena = Arena.openConfined()) { | ||
| // init structs | ||
| MemorySegment a = arena.allocate(A); | ||
| MemorySegment b = arena.allocateArray(B, 2); | ||
| MemorySegment c = arena.allocateArray(C, 4); | ||
| // init struct fields | ||
| a.set(ValueLayout.ADDRESS, 0, b); | ||
| b.set(ValueLayout.ADDRESS, 0, c); | ||
| b.setAtIndex(ValueLayout.ADDRESS, 1, c.asSlice(C.byteSize() * 2)); | ||
| c.setAtIndex(ValueLayout.JAVA_INT, 0, 1); | ||
| c.setAtIndex(ValueLayout.JAVA_INT, 1, 2); | ||
| c.setAtIndex(ValueLayout.JAVA_INT, 2, 3); | ||
| c.setAtIndex(ValueLayout.JAVA_INT, 3, 4); | ||
| // dereference | ||
| int val00 = (int) abcx_multi.get(a, 0, 0); // a->b[0]->c[0] = 1 | ||
| assertEquals(val00, 1); | ||
| int val10 = (int) abcx_multi.get(a, 1, 0); // a->b[1]->c[0] = 3 | ||
| assertEquals(val10, 3); | ||
| int val01 = (int) abcx_multi.get(a, 0, 1); // a->b[0]->c[1] = 2 | ||
| assertEquals(val01, 2); | ||
| int val11 = (int) abcx_multi.get(a, 1, 1); // a->b[1]->c[1] = 4 | ||
| assertEquals(val11, 4); | ||
| } | ||
| } | ||
|
|
||
| @Test(expectedExceptions = IllegalArgumentException.class) | ||
| void testBadDerefInSelect() { | ||
| A.select(PathElement.groupElement("b"), PathElement.dereferenceElement()); | ||
| } | ||
|
|
||
| @Test(expectedExceptions = IllegalArgumentException.class) | ||
| void testBadDerefInOffset() { | ||
| A.byteOffset(PathElement.groupElement("b"), PathElement.dereferenceElement()); | ||
| } | ||
|
|
||
| static final MemoryLayout A_MULTI_NO_TARGET = MemoryLayout.structLayout( | ||
| ValueLayout.ADDRESS.withName("bs") | ||
| ); | ||
|
|
||
| @Test(expectedExceptions = IllegalArgumentException.class) | ||
| void badDerefAddressNoTarget() { | ||
| A_MULTI_NO_TARGET.varHandle(PathElement.groupElement("bs"), PathElement.dereferenceElement()); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This IAE should be specified on
varHandleas well.