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

8278414: Replace binding recipe customization using MH combinators with bytecode spinning #635

Closed
wants to merge 10 commits into from
+1,219 −519
Closed

8278414: Replace binding recipe customization using MH combinators with bytecode spinning #635

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8c8e641
WIP - ASM spec - Squashed
JornVernee Nov 11, 2021
12a6218
Remove JFR events
JornVernee Jan 25, 2022
bd23dd1
Compilation fixes
JornVernee Jan 25, 2022
31e8e26
Minor cleanups
JornVernee Jan 31, 2022
ffe7f58
Code comments
JornVernee Jan 31, 2022
22641e2
Remove whitespace
JornVernee Jan 31, 2022
c4ebc32
Change ValueLayout toString
JornVernee Feb 1, 2022
af981a6
Address review comments
JornVernee Feb 1, 2022
6510e2b
Except class instances directly instead of internal names. Remove unu…
JornVernee Feb 1, 2022
4696330
Remove spurious import
JornVernee Feb 1, 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
10 changes: 6 additions & 4 deletions src/java.base/share/classes/java/lang/foreign/ValueLayout.java
View file
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@
import java.lang.constant.DynamicConstantDesc;
import java.lang.invoke.VarHandle;
import java.nio.ByteOrder;
import java.util.Locale;
import java.util.Objects;
import java.util.Optional;
import java.util.OptionalLong;
@@ -104,10 +105,11 @@ public ValueLayout withOrder(ByteOrder order) {

@Override
public String toString() {
return decorateLayoutString(String.format("%s%d(%s)",
order == ByteOrder.BIG_ENDIAN ? "B" : "b",
bitSize(),
carrier == MemoryAddress.class ? "MA" : carrier.descriptorString()));
char descriptor = carrier == MemoryAddress.class ? 'A' : carrier.descriptorString().charAt(0);
if (order == ByteOrder.LITTLE_ENDIAN) {
descriptor = Character.toLowerCase(descriptor);
}
return decorateLayoutString(String.format("%s%d", descriptor, bitSize()));
}

@Override
105 changes: 0 additions & 105 deletions src/java.base/share/classes/jdk/internal/foreign/abi/Binding.java
View file
Original file line number Diff line number Diff line change
@@ -201,29 +201,6 @@
* --------------------
*/
public abstract class Binding {
private static final MethodHandle MH_UNBOX_ADDRESS;
private static final MethodHandle MH_BOX_ADDRESS;
private static final MethodHandle MH_COPY_BUFFER;
private static final MethodHandle MH_ALLOCATE_BUFFER;
private static final MethodHandle MH_TO_SEGMENT;

static {
try {
MethodHandles.Lookup lookup = MethodHandles.lookup();
MH_UNBOX_ADDRESS = lookup.findVirtual(MemoryAddress.class, "toRawLongValue",
methodType(long.class));
MH_BOX_ADDRESS = lookup.findStatic(MemoryAddress.class, "ofLong",
methodType(MemoryAddress.class, long.class));
MH_COPY_BUFFER = lookup.findStatic(Copy.class, "copyBuffer",
methodType(MemorySegment.class, MemorySegment.class, long.class, long.class, Context.class));
MH_ALLOCATE_BUFFER = lookup.findStatic(Allocate.class, "allocateBuffer",
methodType(MemorySegment.class, long.class, long.class, Context.class));
MH_TO_SEGMENT = lookup.findStatic(ToSegment.class, "toSegment",
methodType(MemorySegment.class, MemoryAddress.class, long.class, Context.class));
} catch (ReflectiveOperationException e) {
throw new RuntimeException(e);
}
}

/**
* A binding context is used as an helper to carry out evaluation of certain bindings; for instance,
@@ -336,8 +313,6 @@ public Tag tag() {
public abstract void interpret(Deque<Object> stack, BindingInterpreter.StoreFunc storeFunc,
BindingInterpreter.LoadFunc loadFunc, Context context);

public abstract MethodHandle specialize(MethodHandle specializedHandle, int insertPos, int allocatorPos);

private static void checkType(Class<?> type) {
if (!type.isPrimitive() || type == void.class)
throw new IllegalArgumentException("Illegal type: " + type);
@@ -543,11 +518,6 @@ public void interpret(Deque<Object> stack, BindingInterpreter.StoreFunc storeFun
storeFunc.store(storage(), type(), stack.pop());
}

@Override
public MethodHandle specialize(MethodHandle specializedHandle, int insertPos, int allocatorPos) {
return specializedHandle; // no-op
}

@Override
public String toString() {
return "VMStore{" +
@@ -578,11 +548,6 @@ public void interpret(Deque<Object> stack, BindingInterpreter.StoreFunc storeFun
stack.push(loadFunc.load(storage(), type()));
}

@Override
public MethodHandle specialize(MethodHandle specializedHandle, int insertPos, int allocatorPos) {
return specializedHandle; // no-op
}

@Override
public String toString() {
return "VMLoad{" +
@@ -662,13 +627,6 @@ public void interpret(Deque<Object> stack, BindingInterpreter.StoreFunc storeFun
SharedUtils.write(writeAddress, type(), value);
}

@Override
public MethodHandle specialize(MethodHandle specializedHandle, int insertPos, int allocatorPos) {
MethodHandle setter = varHandle().toMethodHandle(VarHandle.AccessMode.SET);
setter = setter.asType(methodType(void.class, MemorySegment.class, type()));
return collectArguments(specializedHandle, insertPos + 1, setter);
}

@Override
public String toString() {
return "BufferStore{" +
@@ -705,14 +663,6 @@ public void interpret(Deque<Object> stack, BindingInterpreter.StoreFunc storeFun
stack.push(SharedUtils.read(readAddress, type()));
}

@Override
public MethodHandle specialize(MethodHandle specializedHandle, int insertPos, int allocatorPos) {
MethodHandle filter = varHandle()
.toMethodHandle(VarHandle.AccessMode.GET)
.asType(methodType(type(), MemorySegment.class));
return filterArguments(specializedHandle, insertPos, filter);
}

@Override
public String toString() {
return "BufferLoad{" +
@@ -775,13 +725,6 @@ public void interpret(Deque<Object> stack, BindingInterpreter.StoreFunc storeFun
stack.push(copy);
}

@Override
public MethodHandle specialize(MethodHandle specializedHandle, int insertPos, int allocatorPos) {
MethodHandle filter = insertArguments(MH_COPY_BUFFER, 1, size, alignment);
specializedHandle = collectArguments(specializedHandle, insertPos, filter);
return SharedUtils.mergeArguments(specializedHandle, allocatorPos, insertPos + 1);
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
@@ -844,13 +787,6 @@ public void interpret(Deque<Object> stack, BindingInterpreter.StoreFunc storeFun
stack.push(allocateBuffer(size, alignment, context));
}

@Override
public MethodHandle specialize(MethodHandle specializedHandle, int insertPos, int allocatorPos) {
MethodHandle allocateBuffer = insertArguments(MH_ALLOCATE_BUFFER, 0, size, alignment);
specializedHandle = collectArguments(specializedHandle, insertPos, allocateBuffer);
return SharedUtils.mergeArguments(specializedHandle, allocatorPos, insertPos);
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
@@ -907,12 +843,6 @@ public void interpret(Deque<Object> stack, BindingInterpreter.StoreFunc storeFun
stack.push(((Addressable)stack.pop()).address().toRawLongValue());
}

@Override
public MethodHandle specialize(MethodHandle specializedHandle, int insertPos, int allocatorPos) {
return filterArguments(specializedHandle, insertPos,
MethodHandles.filterReturnValue(toAddress, MH_UNBOX_ADDRESS));
}

@Override
public String toString() {
return "UnboxAddress{}";
@@ -943,11 +873,6 @@ public void interpret(Deque<Object> stack, BindingInterpreter.StoreFunc storeFun
stack.push(MemoryAddress.ofLong((long) stack.pop()));
}

@Override
public MethodHandle specialize(MethodHandle specializedHandle, int insertPos, int allocatorPos) {
return filterArguments(specializedHandle, insertPos, MH_BOX_ADDRESS);
}

@Override
public String toString() {
return "BoxAddress{}";
@@ -991,13 +916,6 @@ public void interpret(Deque<Object> stack, BindingInterpreter.StoreFunc storeFun
stack.push(segment);
}

@Override
public MethodHandle specialize(MethodHandle specializedHandle, int insertPos, int allocatorPos) {
MethodHandle toSegmentHandle = insertArguments(MH_TO_SEGMENT, 1, size);
specializedHandle = collectArguments(specializedHandle, insertPos, toSegmentHandle);
return SharedUtils.mergeArguments(specializedHandle, allocatorPos, insertPos + 1);
}

@Override
public String toString() {
return "ToSegemnt{" +
@@ -1042,29 +960,6 @@ public void interpret(Deque<Object> stack, BindingInterpreter.StoreFunc storeFun
stack.push(stack.peekLast());
}

/*
* Fixes up Y-shaped data graphs (produced by DEREFERENCE):
*
* 1. DUP()
* 2. BUFFER_LOAD(0, int.class)
* 3. VM_STORE (ignored)
* 4. BUFFER_LOAD(4, int.class)
* 5. VM_STORE (ignored)
*
* (specialized in reverse!)
*
* 5. (int, int) -> void insertPos = 1
* 4. (MemorySegment, int) -> void insertPos = 1
* 3. (MemorySegment, int) -> void insertPos = 0
* 2. (MemorySegment, MemorySegment) -> void insertPos = 0
* 1. (MemorySegment) -> void insertPos = 0
*
*/
@Override
public MethodHandle specialize(MethodHandle specializedHandle, int insertPos, int allocatorPos) {
return SharedUtils.mergeArguments(specializedHandle, insertPos, insertPos + 1);
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
Loading