Implement JNI upcall for ctx_Tuple_FromArray

Author: fangerer

graalpython/com.oracle.graal.python.jni/src/hpy_jni.c

@@ -88,6 +88,7 @@ static JNIEnv* jniEnv;
     UPCALL(UnicodeFromJCharArray, SIG_JCHARARRAY, SIG_HPY) \
     UPCALL(DictNew, , SIG_HPY) \
     UPCALL(ListNew, SIG_SIZE_T, SIG_HPY) \
+    UPCALL(TupleFromArray, SIG_JLONGARRAY SIG_BOOL, SIG_HPY) \
 
 #define UPCALL(name, jniSigArgs, jniSigRet) static jmethodID jniMethod_ ## name;
 ALL_UPCALLS
@@ -267,6 +268,7 @@ static int (*original_NumberCheck)(HPyContext *ctx, HPy h);
 static int (*original_TypeCheck)(HPyContext *ctx, HPy h, HPy type);
 static void (*original_Close)(HPyContext *ctx, HPy h);
 static HPy (*original_UnicodeFromWideChar)(HPyContext *ctx, const wchar_t *arr, HPy_ssize_t size);
+static HPy (*original_TupleFromArray)(HPyContext *ctx, HPy *items, HPy_ssize_t nitems);
 
 static void *augment_AsStruct(HPyContext *ctx, HPy h) {
     uint64_t bits = toBits(h);
@@ -428,6 +430,17 @@ static HPy augment_UnicodeFromWideChar(HPyContext *ctx, const wchar_t *u, HPy_ss
     }
 }
 
+static HPy augment_TupleFromArray(HPyContext *ctx, HPy *items, HPy_ssize_t nitems) {
+    jarray jLongArray = (*jniEnv)->NewLongArray(jniEnv, (jsize) nitems);
+    jlong *content = (*jniEnv)->GetPrimitiveArrayCritical(jniEnv, jLongArray, 0);
+    HPy_ssize_t i;
+    for (i = 0; i < nitems; i++) {
+        content[i] = (jlong) toBits(items[i]);
+    }
+    (*jniEnv)->ReleasePrimitiveArrayCritical(jniEnv, jLongArray, content, 0);
+    return DO_UPCALL_HPY(CONTEXT_INSTANCE(ctx), TupleFromArray, jLongArray, JNI_FALSE);
+}
+
 void initDirectFastPaths(HPyContext *context) {
     LOG("%p", context);
     context->name = "HPy Universal ABI (GraalVM backend, JNI)";
@@ -437,10 +450,10 @@ void initDirectFastPaths(HPyContext *context) {
 
     original_FloatAsDouble = context->ctx_Float_AsDouble;
     context->ctx_Float_AsDouble = augment_FloatAsDouble;
-    
+
     original_LongAsLong = context->ctx_Long_AsLong;
     context->ctx_Long_AsLong = augment_LongAsLong;
-    
+
     original_LongAsDouble = context->ctx_Long_AsDouble;
     context->ctx_Long_AsDouble = augment_LongAsDouble;
 
@@ -467,6 +480,9 @@ void initDirectFastPaths(HPyContext *context) {
 
     original_UnicodeFromWideChar = context->ctx_Unicode_FromWideChar;
     context->ctx_Unicode_FromWideChar = augment_UnicodeFromWideChar;
+
+    original_TupleFromArray = context->ctx_Tuple_FromArray;
+    context->ctx_Tuple_FromArray = augment_TupleFromArray;
 }
 
 void setHPyContextNativeSpace(HPyContext *context, void** nativeSpace) {
@@ -524,11 +540,13 @@ JNIEXPORT jint JNICALL Java_com_oracle_graal_python_builtins_objects_cext_hpy_Gr
 #define SIG_SIZE_T "J"
 #define SIG_PTR "J"
 #define SIG_VOID "V"
+#define SIG_BOOL "Z"
 #define SIG_INT "I"
 #define SIG_LONG "J"
 #define SIG_DOUBLE "D"
 #define SIG_TRACKER "J"
 #define SIG_JCHARARRAY "[C"
+#define SIG_JLONGARRAY "[J"
 
 #define UPCALL(name, jniSigArgs, jniSigRet) \
     jniMethod_ ## name = (*env)->GetMethodID(env, clazz, "ctx" #name, "(" jniSigArgs ")" jniSigRet); \

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContext.java

@@ -187,6 +187,7 @@
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.list.PList;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
+import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
@@ -1369,7 +1370,8 @@ public enum Counter {
         UpcallUnicodeFromWideChar,
         UpcallUnicodeFromJCharArray,
         UpcallDictNew,
-        UpcallListNew;
+        UpcallListNew,
+        UpcallTupleFromArray;
 
         long count;
 
@@ -1535,13 +1537,20 @@ public final long ctxTypeGenericNew(long typeHandle) {
         throw CompilerDirectives.shouldNotReachHere("not implemented");
     }
 
-    public final void ctxClose(long handle) {
-        Counter.UpcallClose.increment();
+    /**
+     * Close a native handle received from a JNI upcall (hence represented by a Java {code long}).
+     */
+    private void closeNativeHandle(long handle) {
         if (GraalHPyBoxing.isBoxedHandle(handle)) {
             getObjectForHPyHandle(GraalHPyBoxing.unboxHandle(handle)).closeAndInvalidate(this);
         }
     }
 
+    public final void ctxClose(long handle) {
+        Counter.UpcallClose.increment();
+        closeNativeHandle(handle);
+    }
+
     public final long ctxDup(long handle) {
         Counter.UpcallDup.increment();
         if (GraalHPyBoxing.isBoxedHandle(handle)) {
@@ -1843,7 +1852,7 @@ public final long ctxListNew(long llen) {
             int len = CastToJavaIntExactNode.getUncached().execute(llen);
             Object[] data = new Object[len];
             Arrays.fill(data, PNone.NONE);
-            PList list = PythonObjectFactory.getUncached().createList(data);
+            PList list = getSlowPathFactory().createList(data);
             return createHandle(list).getId(this, ConditionProfile.getUncached());
         } catch (PException e) {
             HPyTransformExceptionToNativeNodeGen.getUncached().execute(this, e);
@@ -1852,6 +1861,26 @@ public final long ctxListNew(long llen) {
         }
     }
 
+    /**
+     * Implementation of context function {@code ctx_Tuple_FromArray} (JNI upcall). This method can
+     * optionally steal the item handles in order to avoid repeated upcalls just to close them. This
+     * is useful to implement, e.g., tuple builder.
+     */
+    public final long ctxTupleFromArray(long[] hItems, boolean steal) {
+        Counter.UpcallTupleFromArray.increment();
+
+        Object[] objects = new Object[hItems.length];
+        for (int i = 0; i < hItems.length; i++) {
+            long hBits = hItems[i];
+            objects[i] = HPyAsPythonObjectNodeGen.getUncached().execute(this, hBits);
+            if (steal) {
+                closeNativeHandle(hBits);
+            }
+        }
+        PTuple tuple = getSlowPathFactory().createTuple(objects);
+        return createHandle(tuple).getId(this, ConditionProfile.getUncached());
+    }
+
     @ExportMessage
     @SuppressWarnings("static-method")
     final boolean hasMembers() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/resources/jni-config.json

@@ -22,7 +22,8 @@
     {"name":"ctxTypeCheck","parameterTypes":["long", "long"] },
     {"name":"ctxTypeGenericNew","parameterTypes":["long"] },
     {"name":"ctxUnicodeFromWideChar","parameterTypes":["long","long"] }, 
-    {"name":"ctxUnicodeFromJCharArray","parameterTypes":["char[]"] }
+    {"name":"ctxUnicodeFromJCharArray","parameterTypes":["char[]"] },
+    {"name":"ctxTupleFromArray","parameterTypes":["long[]", "boolean"] }
   ]
 }
 ]