Implement native fast path for ctx_Long_FromLong

Author: fangerer

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

@@ -63,7 +63,6 @@
 #include "common/runtime/ctx_tracker.h"
 
 static JNIEnv* jniEnv;
-static jobject contextInstance;
 
 #define ALL_UPCALLS \
     UPCALL(New, SIG_HPY SIG_PTR, SIG_HPY) \
@@ -72,7 +71,8 @@ static jobject contextInstance;
     UPCALL(Close, SIG_HPY, SIG_VOID) \
     UPCALL(FloatFromDouble, SIG_DOUBLE, SIG_HPY) \
     UPCALL(FloatAsDouble, SIG_HPY, SIG_DOUBLE) \
-    UPCALL(LongAsLong, SIG_LONG, SIG_HPY) \
+    UPCALL(LongAsLong, SIG_HPY, SIG_LONG) \
+    UPCALL(LongFromLong, SIG_LONG, SIG_HPY) \
     UPCALL(Dup, SIG_HPY, SIG_HPY) \
     UPCALL(GetItemi, SIG_HPY SIG_SIZE_T, SIG_HPY) \
     UPCALL(NumberCheck, SIG_HPY, SIG_INT) \
@@ -118,6 +118,10 @@ static long ctx_LongAsLong_jni(HPyContext ctx, HPy h) {
     return DO_UPCALL_LONG(CONTEXT_INSTANCE(ctx), LongAsLong, HPY_UP(h));
 }
 
+static HPy ctx_LongFromLong_jni(HPyContext ctx, long l) {
+    return DO_UPCALL_HPY(CONTEXT_INSTANCE(ctx), LongFromLong, l);
+}
+
 static HPy ctx_New_jni(HPyContext ctx, HPy type, void** data) {
     return DO_UPCALL_HPY(CONTEXT_INSTANCE(ctx), New, HPY_UP(type), (SIZE_T_UP) data);
 }
@@ -216,6 +220,7 @@ static HPy (*original_Dup)(HPyContext ctx, HPy h);
 static HPy (*original_FloatFromDouble)(HPyContext ctx, double v);
 static double (*original_FloatAsDouble)(HPyContext ctx, HPy h);
 static long (*original_LongAsLong)(HPyContext ctx, HPy h);
+static HPy (*original_LongFromLong)(HPyContext ctx, long l);
 static int (*original_ListCheck)(HPyContext ctx, HPy h);
 static int (*original_NumberCheck)(HPyContext ctx, HPy h);
 static void (*original_Close)(HPyContext ctx, HPy h);
@@ -255,6 +260,15 @@ static long augment_LongAsLong(HPyContext ctx, HPy h) {
     }
 }
 
+static HPy augment_LongFromLong(HPyContext ctx, long l) {
+	int32_t i = (int32_t) l;
+	if (l == i) {
+        return toPtr(boxInt(i));
+    } else {
+        return original_LongFromLong(ctx, l);
+    }
+}
+
 static void augment_Close(HPyContext ctx, HPy h) {
     uint64_t bits = toBits(h);
     if (isBoxedHandle(bits)) {
@@ -302,6 +316,9 @@ void initDirectFastPaths(HPyContext context) {
     original_LongAsLong = context->ctx_Long_AsLong;
     context->ctx_Long_AsLong = augment_LongAsLong;
 
+    original_LongFromLong = context->ctx_Long_FromLong;
+    context->ctx_Long_FromLong = augment_LongFromLong;
+
     original_Close = context->ctx_Close;
     context->ctx_Close = augment_Close;
 

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

@@ -1287,6 +1287,7 @@ public enum Counter {
         UpcallLength,
         UpcallListCheck,
         UpcallLongAsLong,
+        UpcallLongFromLong,
         UpcallFloatAsDouble,
         UpcallFloatFromDouble;
 
@@ -1357,6 +1358,15 @@ public final long ctxLongAsLong(long handle) {
         }
     }
 
+    public final long ctxLongFromLong(long l) {
+        Counter.UpcallLongFromLong.increment();
+
+        if (com.oracle.graal.python.builtins.objects.ints.PInt.isIntRange(l)) {
+            return GraalHPyBoxing.boxInt((int) l);
+        }
+        return createHandle(l).getId(this, ConditionProfile.getUncached());
+    }
+
     public final long ctxCast(long handle) {
         Counter.UpcallCast.increment();
 

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

@@ -11,6 +11,7 @@
     {"name":"ctxLength","parameterTypes":["long"] }, 
     {"name":"ctxListCheck","parameterTypes":["long"] }, 
     {"name":"ctxLongAsLong","parameterTypes":["long"] }, 
+    {"name":"ctxLongFromLong","parameterTypes":["long"] },
     {"name":"ctxNew","parameterTypes":["long","long"] }, 
     {"name":"ctxNumberCheck","parameterTypes":["long"] }, 
     {"name":"ctxTypeGenericNew","parameterTypes":["long"] }