[GR-40247] Reduce C API boundary overhead

PullRequest: graalpython/2694

Author: lukasstadler

graalpython/com.oracle.graal.python.cext/include/cpython/tupleobject.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+/* Copyright (c) 2020, 2023, Oracle and/or its affiliates.
  * Copyright (C) 1996-2020 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -29,7 +29,7 @@ PyAPI_FUNC(void) _PyTuple_MaybeUntrack(PyObject *);
 #define PyTuple_GET_ITEM(op, i) PyTuple_GetItem(_PyObject_CAST(op), (i))
 
 /* Macro, *only* to be used to fill in brand new tuples */
-// LS: Py_SetItem behaves differently wrt. the existing element...
-#define PyTuple_SET_ITEM(op, i, v) PyTuple_SetItem(_PyObject_CAST(op), (i), (v))
+PyAPI_FUNC(int) _PyTuple_SET_ITEM(PyObject *, Py_ssize_t, PyObject *);
+#define PyTuple_SET_ITEM(op, i, v) _PyTuple_SET_ITEM(_PyObject_CAST(op), (i), (v))
 
 PyAPI_FUNC(void) _PyTuple_DebugMallocStats(FILE *out);

graalpython/com.oracle.graal.python.cext/src/capi.c

@@ -166,6 +166,7 @@ CAPI_BUILTINS
 
 PyAPI_FUNC(void) initialize_builtins(void* (*getBuiltin)(int id)) {
 	int id = 0;
+//#define BUILTIN(NAME, RET, ...) printf("initializing " #NAME "\n"); Graal##NAME = (RET(*)(__VA_ARGS__)) getBuiltin(id++);
 #define BUILTIN(NAME, RET, ...) Graal##NAME = (RET(*)(__VA_ARGS__)) getBuiltin(id++);
 CAPI_BUILTINS
 #undef BUILTIN
@@ -455,6 +456,18 @@ char* get_ob_sval(PyObject* op) {
 	return ((PyBytesObject *)(op))->ob_sval;
 }
 
+// not quite as in CPython, this assumes that x is already a double. The rest of
+// the implementation is in the Float constructor in Java
+PyObject* float_subtype_new(PyTypeObject *type, double x) {
+    PyObject* newobj = type->tp_alloc(type, 0);
+    if (newobj == NULL) {
+        Py_DECREF(newobj);
+        return NULL;
+    }
+    ((PyFloatObject *)newobj)->ob_fval = x;
+    return newobj;
+}
+
 /**
  * To be used from Java code only. Reads native 'PyModuleDef.m_methods' field and
  * returns a typed pointer that can be used as interop array.
@@ -573,26 +586,11 @@ PyAPI_FUNC(Py_ssize_t) PyTruffle_SUBREF(intptr_t ptr, Py_ssize_t value) {
 }
 
 /** to be used from Java code only; calls DECREF */
-PyAPI_FUNC(Py_ssize_t) PyTruffle_bulk_SUBREF(PyObject *ptrArray[], Py_ssize_t values[], int64_t len) {
-    int64_t i;
-    PyObject *obj;
-    Py_ssize_t value;
-
-    for (i = 0; i < len; i++) {
-        obj = ptrArray[i];
-        value = values[i];
-        /* IMPORTANT: 'value == 0' indicates we should not process the reference at all */
-        if (value > 0) {
-            Py_ssize_t new_value = ((obj->ob_refcnt) -= value);
-            if (new_value == 0) {
-                _Py_Dealloc(obj);
-            }
-#ifdef Py_REF_DEBUG
-            else if (new_value < 0) {
-                _Py_NegativeRefcount(filename, lineno, op);
-            }
-#endif
-        }
+PyAPI_FUNC(Py_ssize_t) PyTruffle_bulk_DEALLOC(intptr_t ptrArray[], int64_t len) {
+
+	for (int i = 0; i < len; i++) {
+    	PyObject *obj = (PyObject*) ptrArray[i];
+        _Py_Dealloc(obj);
     }
     return 0;
 }
@@ -606,11 +604,6 @@ PyAPI_FUNC(void) PyTruffle_Free(intptr_t val) {
     PyMem_RawFree((void*) val);
 }
 
-/** to be used from Java code only; creates the deref handle for a sequence wrapper */
-PyAPI_FUNC(void*) NativeHandle_ForArray(void* jobj, Py_ssize_t element_size) {
-    return create_deref_handle(jobj);
-}
-
 PyAPI_FUNC(const char*) PyTruffle_StringToCstr(void* o, int32_t strLen) {
     const char *buffer;
     const char *str;
@@ -911,6 +904,10 @@ void PyTruffle_SetStorageItem(PyObject** ptr, int32_t index, PyObject* newitem)
     Py_XSETREF(ptr[index], newitem);
 }
 
+void PyTruffle_InitializeStorageItem(PyObject** ptr, int32_t index, PyObject* newitem) {
+    ptr[index] = newitem;
+}
+
 PyAPI_FUNC(Py_ssize_t) PyTruffle_Object_Size(PyObject *op) {
     return ((PyVarObject*)op)->ob_size;
 }
@@ -1240,6 +1237,16 @@ void* truffle_get_constant(int entry) {
 	return NULL;
 }
 
+/*
+ * These locations need to be shared between native and Sulong - if the native parts are initialized,
+ * we assign_managed them to share them.
+ */
+PyAPI_FUNC(void) initialize_native_locations(void* allocateMemory, void* maxNativeMemory, void* nativeMemoryGCBarrier) {
+	truffle_assign_managed(&PyTruffle_AllocatedMemory, allocateMemory);
+	truffle_assign_managed(&PyTruffle_MaxNativeMemory, maxNativeMemory);
+	truffle_assign_managed(&PyTruffle_NativeMemoryGCBarrier, nativeMemoryGCBarrier);
+}
+
 // defined in 'exceptions.c'
 void initialize_exceptions();
 // defined in 'pyhash.c'
@@ -1511,10 +1518,6 @@ PyAPI_FUNC(int) PyException_SetTraceback(PyObject* a, PyObject* b) {
 PyAPI_FUNC(int) PyFile_WriteObject(PyObject* a, PyObject* b, int c) {
     return GraalPyFile_WriteObject(a, b, c);
 }
-#undef PyFloat_AsDouble
-PyAPI_FUNC(double) PyFloat_AsDouble(PyObject* a) {
-    return GraalPyFloat_AsDouble(a);
-}
 #undef PyFloat_FromDouble
 PyAPI_FUNC(PyObject*) PyFloat_FromDouble(double a) {
     return GraalPyFloat_FromDouble(a);
@@ -2179,6 +2182,10 @@ PyAPI_FUNC(PyObject*) _PyTruffleObject_Call1(PyObject* a, PyObject* b, PyObject*
 PyAPI_FUNC(PyObject*) _PyTruffleObject_CallMethod1(PyObject* a, const char* b, PyObject* c, int d) {
     return Graal_PyTruffleObject_CallMethod1(a, truffleString(b), c, d);
 }
+#undef _PyTuple_SET_ITEM
+PyAPI_FUNC(int) _PyTuple_SET_ITEM(PyObject* a, Py_ssize_t b, PyObject* c) {
+    return Graal_PyTuple_SET_ITEM(a, b, c);
+}
 #undef _PyType_Lookup
 PyAPI_FUNC(PyObject*) _PyType_Lookup(PyTypeObject* a, PyObject* b) {
     return Graal_PyType_Lookup(a, b);

graalpython/com.oracle.graal.python.cext/src/capi.h

@@ -62,7 +62,7 @@
 #include <graalvm/llvm/polyglot.h>
 #include <truffle.h>
 #include <graalvm/llvm/handles.h>
-#endif
+#endif // EXCLUDE_POLYGLOT_API
 
 #define SRC_CS "utf-8"
 
@@ -153,7 +153,6 @@ typedef struct {
     BUILTIN(PyException_SetContext, void, PyObject*, PyObject*) \
     BUILTIN(PyException_SetTraceback, int, PyObject*, PyObject*) \
     BUILTIN(PyFile_WriteObject, int, PyObject*, PyObject*, int) \
-    BUILTIN(PyFloat_AsDouble, double, PyObject*) \
     BUILTIN(PyFloat_FromDouble, PyObject*, double) \
     BUILTIN(PyFrame_New, PyFrameObject*, PyThreadState*, PyCodeObject*, PyObject*, PyObject*) \
     BUILTIN(PyFrozenSet_New, PyObject*, PyObject*) \
@@ -280,17 +279,27 @@ typedef struct {
     BUILTIN(PyTruffleCMethod_NewEx, PyObject*, PyMethodDef*, const char*, void*, int, int, PyObject*, PyObject*, PyTypeObject*, const char*) \
     BUILTIN(PyTruffleComplex_AsCComplex, PyObject*, PyObject*) \
     BUILTIN(PyTruffleContextVar_Get, PyObject*, PyObject*, PyObject*, void*) \
+    BUILTIN(PyTruffleDateTimeCAPI_DateTime_FromDateAndTime, PyObject*, int, int, int, int, int, int, int, PyObject*, PyTypeObject*) \
+    BUILTIN(PyTruffleDateTimeCAPI_DateTime_FromDateAndTimeAndFold, PyObject*, int, int, int, int, int, int, int, PyObject*, int, PyTypeObject*) \
+    BUILTIN(PyTruffleDateTimeCAPI_DateTime_FromTimestamp, PyObject*, PyObject*, PyObject*, PyObject*) \
+    BUILTIN(PyTruffleDateTimeCAPI_Date_FromDate, PyObject*, int, int, int, PyTypeObject*) \
+    BUILTIN(PyTruffleDateTimeCAPI_Date_FromTimestamp, PyObject*, PyObject*, PyObject*) \
+    BUILTIN(PyTruffleDateTimeCAPI_Delta_FromDelta, PyObject*, int, int, int, int, PyTypeObject*) \
+    BUILTIN(PyTruffleDateTimeCAPI_TimeZone_FromTimeZone, PyObject*, PyObject*, PyObject*) \
+    BUILTIN(PyTruffleDateTimeCAPI_Time_FromTime, PyObject*, int, int, int, int, PyObject*, PyTypeObject*) \
+    BUILTIN(PyTruffleDateTimeCAPI_Time_FromTimeAndFold, PyObject*, int, int, int, int, PyObject*, int, PyTypeObject*) \
     BUILTIN(PyTruffleDescr_NewClassMethod, PyObject*, void*, const char*, const char*, int, int, void*, PyTypeObject*) \
     BUILTIN(PyTruffleDescr_NewGetSet, PyObject*, const char*, PyTypeObject*, void*, void*, const char*, void*) \
     BUILTIN(PyTruffleDict_Next, PyObject*, PyObject*, Py_ssize_t) \
     BUILTIN(PyTruffleErr_Fetch, PyObject*) \
     BUILTIN(PyTruffleErr_GetExcInfo, PyObject*) \
+    BUILTIN(PyTruffleFloat_AsDouble, double, PyObject*) \
     BUILTIN(PyTruffleHash_InitSecret, void, void*) \
     BUILTIN(PyTruffleLong_AsPrimitive, long, PyObject*, int, long) \
     BUILTIN(PyTruffleLong_FromString, PyObject*, const char*, int, int) \
     BUILTIN(PyTruffleLong_One, PyObject*) \
     BUILTIN(PyTruffleLong_Zero, PyObject*) \
-    BUILTIN(PyTruffleModule_AddFunctionToModule, int, void*, PyObject*, const char*, void*, int, int, void*) \
+    BUILTIN(PyTruffleModule_AddFunctionToModule, int, void*, PyObject*, const char*, void*, int, int, const char*) \
     BUILTIN(PyTruffleNumber_BinOp, PyObject*, PyObject*, PyObject*, int) \
     BUILTIN(PyTruffleNumber_InPlaceBinOp, PyObject*, PyObject*, PyObject*, int) \
     BUILTIN(PyTruffleNumber_UnaryOp, PyObject*, PyObject*, int) \
@@ -303,10 +312,10 @@ typedef struct {
     BUILTIN(PyTruffleStructSequence_InitType2, int, PyTypeObject*, void*, void*, int) \
     BUILTIN(PyTruffleStructSequence_NewType, PyTypeObject*, const char*, const char*, void*, void*, int) \
     BUILTIN(PyTruffleToCharPointer, void*, PyObject*) \
-    BUILTIN(PyTruffleType_AddFunctionToType, int, void*, PyTypeObject*, PyObject*, const char*, void*, int, int, void*) \
-    BUILTIN(PyTruffleType_AddGetSet, int, PyTypeObject*, PyObject*, const char*, void*, void*, void*, void*) \
-    BUILTIN(PyTruffleType_AddMember, int, PyTypeObject*, PyObject*, const char*, int, Py_ssize_t, int, void*) \
-    BUILTIN(PyTruffleType_AddSlot, int, PyTypeObject*, PyObject*, const char*, void*, int, int, void*) \
+    BUILTIN(PyTruffleType_AddFunctionToType, int, void*, PyTypeObject*, PyObject*, const char*, void*, int, int, const char*) \
+    BUILTIN(PyTruffleType_AddGetSet, int, PyTypeObject*, PyObject*, const char*, void*, void*, const char*, void*) \
+    BUILTIN(PyTruffleType_AddMember, int, PyTypeObject*, PyObject*, const char*, int, Py_ssize_t, int, const char*) \
+    BUILTIN(PyTruffleType_AddSlot, int, PyTypeObject*, PyObject*, const char*, void*, int, int, const char*) \
     BUILTIN(PyTruffleUnicode_Decode, PyObject*, PyObject*, const char*, const char*) \
     BUILTIN(PyTruffleUnicode_DecodeUTF8Stateful, PyObject*, void*, const char*, int) \
     BUILTIN(PyTruffleUnicode_FromUCS, PyObject*, void*, Py_ssize_t, int) \
@@ -326,20 +335,22 @@ typedef struct {
     BUILTIN(PyTruffle_FileSystemDefaultEncoding, PyObject*) \
     BUILTIN(PyTruffle_Get_Inherited_Native_Slots, void*, PyTypeObject*, const char*) \
     BUILTIN(PyTruffle_HashConstant, long, int) \
+    BUILTIN(PyTruffle_InitialNativeMemory, size_t) \
     BUILTIN(PyTruffle_LogString, void, int, const char*) \
+    BUILTIN(PyTruffle_MaxNativeMemory, size_t) \
     BUILTIN(PyTruffle_MemoryViewFromBuffer, PyObject*, void*, PyObject*, Py_ssize_t, int, Py_ssize_t, const char*, int, void*, void*, void*, void*) \
     BUILTIN(PyTruffle_Native_Options, int) \
     BUILTIN(PyTruffle_NewTypeDict, PyObject*, PyTypeObject*) \
     BUILTIN(PyTruffle_NoValue, PyObject*) \
     BUILTIN(PyTruffle_None, PyObject*) \
     BUILTIN(PyTruffle_NotImplemented, PyObject*) \
-    BUILTIN(PyTruffle_Object_Alloc, int, void*, long) \
     BUILTIN(PyTruffle_Object_Free, int, void*) \
     BUILTIN(PyTruffle_Register_NULL, void, void*) \
     BUILTIN(PyTruffle_Set_Native_Slots, int, PyTypeObject*, void*, void*) \
     BUILTIN(PyTruffle_Set_SulongType, void*, PyTypeObject*, void*) \
     BUILTIN(PyTruffle_ToNative, int, void*) \
     BUILTIN(PyTruffle_Trace_Type, int, void*, void*) \
+    BUILTIN(PyTruffle_TriggerGC, void, size_t) \
     BUILTIN(PyTruffle_True, PyObject*) \
     BUILTIN(PyTruffle_Type, PyTypeObject*, const char*) \
     BUILTIN(PyTruffle_Type_Modified, int, PyTypeObject*, const char*, PyObject*) \
@@ -586,7 +597,7 @@ typedef struct {
     BUILTIN(_PyTruffleObject_MakeTpCall, PyObject*, PyObject*, void*, int, void*, void*) \
     BUILTIN(_PyTruffleSet_NextEntry, PyObject*, PyObject*, Py_ssize_t) \
     BUILTIN(_PyTruffle_HashBytes, Py_hash_t, const char*) \
-    BUILTIN(_PyTruffle_Trace_Free, int, void*, Py_ssize_t) \
+    BUILTIN(_PyTuple_SET_ITEM, int, PyObject*, Py_ssize_t, PyObject*) \
     BUILTIN(_PyType_Lookup, PyObject*, PyTypeObject*, PyObject*) \
     BUILTIN(_PyUnicode_AsASCIIString, PyObject*, PyObject*, const char*) \
     BUILTIN(_PyUnicode_AsLatin1String, PyObject*, PyObject*, const char*) \
@@ -823,6 +834,7 @@ static void PyTruffle_Log(int level, const char* format, ... ) {
 		va_list args;
 		va_start(args, format);
 		vsprintf(buffer,format, args);
+		printf("logg\n");
 #ifndef EXCLUDE_POLYGLOT_API
 		GraalPyTruffle_LogString(level, polyglot_from_string(buffer, SRC_CS));
 #else
@@ -832,7 +844,11 @@ static void PyTruffle_Log(int level, const char* format, ... ) {
 	}
 }
 
-#ifndef EXCLUDE_POLYGLOT_API
+#ifdef EXCLUDE_POLYGLOT_API
+
+#define points_to_py_handle_space(PTR) ((((uintptr_t) (PTR)) & 0x8000000000000000L) != 0)
+
+#else // EXCLUDE_POLYGLOT_API
 
 typedef int (*cache_query_t)(uint64_t);
 typedef PyObject* (*ptr_cache_t)(PyObject*);
@@ -990,4 +1006,8 @@ PyAPI_FUNC(int) _PyArg_VaParseTupleAndKeywords_SizeT(PyObject *, PyObject *,
 
 #endif // !EXCLUDE_POLYGLOT_API
 
+extern size_t PyTruffle_AllocatedMemory;
+extern size_t PyTruffle_MaxNativeMemory;
+extern size_t PyTruffle_NativeMemoryGCBarrier;
+
 #endif // CAPI_H

graalpython/com.oracle.graal.python.cext/src/floatobject.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2018, 2022, Oracle and/or its affiliates.
+/* Copyright (c) 2018, 2023, Oracle and/or its affiliates.
  * Copyright (C) 1996-2017 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -49,19 +49,72 @@ static void init_formats(void) {
     float_format = detected_float_format;
 }
 
-// not quite as in CPython, this assumes that x is already a double. The rest of
-// the implementation is in the Float constructor in Java
-PyObject* float_subtype_new(PyTypeObject *type, double x) {
-    PyObject* newobj = type->tp_alloc(type, 0);
-    if (newobj == NULL) {
-        Py_DECREF(newobj);
-        return NULL;
+
+// Below taken from CPython
+
+
+double
+PyFloat_AsDouble(PyObject *op)
+{
+	if (points_to_py_handle_space(op)) {
+		return GraalPyTruffleFloat_AsDouble(op);
+	}
+    PyNumberMethods *nb;
+    PyObject *res;
+    double val;
+
+    if (op == NULL) {
+        PyErr_BadArgument();
+        return -1;
+    }
+
+    if (PyFloat_Check(op)) {
+        return ((PyFloatObject*) op)->ob_fval;
+    }
+
+    nb = Py_TYPE(op)->tp_as_number;
+    if (nb == NULL || nb->nb_float == NULL) {
+        if (nb && nb->nb_index) {
+            PyObject *res = _PyNumber_Index(op);
+            if (!res) {
+                return -1;
+            }
+            double val = PyLong_AsDouble(res);
+            Py_DECREF(res);
+            return val;
+        }
+        PyErr_Format(PyExc_TypeError, "must be real number, not %.50s",
+                     Py_TYPE(op)->tp_name);
+        return -1;
+    }
+
+    res = (*nb->nb_float) (op);
+    if (res == NULL) {
+        return -1;
+    }
+    if (!PyFloat_CheckExact(res)) {
+        if (!PyFloat_Check(res)) {
+            PyErr_Format(PyExc_TypeError,
+                         "%.50s.__float__ returned non-float (type %.50s)",
+                         Py_TYPE(op)->tp_name, Py_TYPE(res)->tp_name);
+            Py_DECREF(res);
+            return -1;
+        }
+        if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
+                "%.50s.__float__ returned non-float (type %.50s).  "
+                "The ability to return an instance of a strict subclass of float "
+                "is deprecated, and may be removed in a future version of Python.",
+                Py_TYPE(op)->tp_name, Py_TYPE(res)->tp_name)) {
+            Py_DECREF(res);
+            return -1;
+        }
     }
-    ((PyFloatObject *)newobj)->ob_fval = x;
-    return newobj;
+
+    val = PyFloat_AsDouble(res);
+    Py_DECREF(res);
+    return val;
 }
 
-// Below taken from CPython
 
 /*----------------------------------------------------------------------------
  * _PyFloat_{Pack,Unpack}{2,4,8}.  See floatobject.h.