Skip to content

[GR-64940] Shared arena: support vector api signatures. #11185

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

Closed
wants to merge 1 commit into from
Closed

[GR-64940] Shared arena: support vector api signatures. #11185

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 44 additions & 5 deletions ...m/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/SharedGraphBuilderPhase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import java.util.List;
import java.util.Objects;

import com.oracle.svm.hosted.substitute.SubstitutionType;
import org.graalvm.nativeimage.AnnotationAccess;

import com.oracle.graal.pointsto.constraints.TypeInstantiationException;
Expand Down Expand Up @@ -180,6 +181,7 @@ public abstract static class SharedBytecodeParser extends BytecodeParser {
private static final Class<?> SCOPED_SUBSTRATE_ANNOTATION;
private static final Executable SESSION_EXCEPTION_HANDLER_METHOD;
private static final Class<?> MAPPED_MEMORY_UTILS_PROXY_CLASS;
private static final Class<?> ABSTRACT_MEMORY_SEGMENT_IMPL_CLASS;

static {
SCOPED_SUBSTRATE_ANNOTATION = ReflectionUtil.lookupClass(true, "com.oracle.svm.core.foreign.Target_jdk_internal_misc_ScopedMemoryAccess_Scoped");
Expand All @@ -188,6 +190,7 @@ public abstract static class SharedBytecodeParser extends BytecodeParser {
? ReflectionUtil.lookupMethod(substrateForeignUtilClass, "sessionExceptionHandler", MemorySessionImpl.class, Object.class, long.class)
: null;
MAPPED_MEMORY_UTILS_PROXY_CLASS = ReflectionUtil.lookupClass(true, "jdk.internal.access.foreign.MappedMemoryUtilsProxy");
ABSTRACT_MEMORY_SEGMENT_IMPL_CLASS = ReflectionUtil.lookupClass(true, "jdk.internal.foreign.AbstractMemorySegmentImpl");
}

protected List<ValueNode> scopedMemorySessions;
Expand Down Expand Up @@ -420,12 +423,16 @@ private static List<SessionCheck> getSessionArguments(ResolvedJavaMethod method,
assert method != null;
final ResolvedJavaType sessionType = ((AnalysisType) metaAccess.lookupJavaType(MemorySessionImpl.class)).getWrapped();
assert sessionType != null;
final ResolvedJavaType abstractSegmentImpl = ((AnalysisType) metaAccess.lookupJavaType(ABSTRACT_MEMORY_SEGMENT_IMPL_CLASS)).getWrapped();
assert abstractSegmentImpl != null;
final ResolvedJavaType baseType = ((AnalysisType) metaAccess.lookupJavaType(Object.class)).getWrapped();
assert baseType != null;
final ResolvedJavaType offsetType = ((AnalysisType) metaAccess.lookupJavaType(long.class)).getWrapped();
assert offsetType != null;
final ResolvedJavaType utilsType = ((AnalysisType) metaAccess.lookupJavaType(MAPPED_MEMORY_UTILS_PROXY_CLASS)).getWrapped();
assert utilsType != null;
final ResolvedJavaType classType = ((SubstitutionType) ((AnalysisType) metaAccess.lookupJavaType(Class.class)).getWrapped()).getOriginal();
assert classType != null;

Parameter[] p = method.getParameters();
if (!p[0].getType().equals(sessionType)) {
Expand Down Expand Up @@ -464,11 +471,43 @@ private static List<SessionCheck> getSessionArguments(ResolvedJavaMethod method,
} else {
// 1 session case
ValueNode session = graph.getParameter(pIndex++);
ValueNode base = graph.getParameter(pIndex++);
ValueNode offset = graph.getParameter(pIndex++);
SessionCheck check = new SessionCheck(session, base, offset);
verifySession(sessionType, baseType, offsetType, check, metaAccess);
return List.of(check);
if (p[1].getType().equals(classType)) {
// example with a vmClass -
// storeIntoMemorySegmentScopedInternal(MemorySessionImpl session,
// Class<? extends V> vmClass, Class<E> e, int length,V v,
// AbstractMemorySegmentImpl msp, long offset,

/*
* For all patterns involving a vmClass the following holds: session is always
* p[0], and vmClass is always p[1]. However, in between we can have Class<E> e,
* int length, V v, M m then msp, offset, M m, S s, offsetInRange etc.
*
* We always map AbstractMemorySegmentImpl msp to base and offset to offset
* (which always comes after). There can be arguments after offset which we
* ignore. And we skip all arguments between vmClass and msp. So any arg between
* vmClass and msp can be skipped.
*
* If any of these invariants stops holding the verifySession call below will
* fail hard and we will be noticed of new/changed API.
*/
while (!p[pIndex].getType().equals(abstractSegmentImpl)) {
pIndex++;
}

// use msp as base and offset as offset
ValueNode base = graph.getParameter(pIndex++); // use msp
ValueNode offset = graph.getParameter(pIndex++);

SessionCheck check = new SessionCheck(session, base, offset);
verifySession(sessionType, baseType, offsetType, check, metaAccess);
return List.of(check);
} else {
ValueNode base = graph.getParameter(pIndex++);
ValueNode offset = graph.getParameter(pIndex++);
SessionCheck check = new SessionCheck(session, base, offset);
verifySession(sessionType, baseType, offsetType, check, metaAccess);
return List.of(check);
}
}
}

Expand Down
Loading