intrinsified initialize_datetime_capi

Author: tomasstupka

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -70,9 +70,7 @@ POLYGLOT_DECLARE_TYPE(PyDateTime_Delta);
 POLYGLOT_DECLARE_TYPE(PyDateTime_TZInfo);
 
 /** to be used from Java code only; returns the type ID for a PyDateTime_CAPI */
-extern PyObject* set_PyDateTime_typeids(PyTypeObject* dtcapiType, PyTypeObject* dateType, PyTypeObject* dateTimeType, PyTypeObject* timeType, PyTypeObject* deltaType, PyTypeObject* tzinfoType) {
-    polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_Set_SulongType", dtcapiType, polyglot_PyDateTime_CAPI_typeid());
-
+extern polyglot_typeid set_PyDateTime_typeids(PyTypeObject* dateType, PyTypeObject* dateTimeType, PyTypeObject* timeType, PyTypeObject* deltaType, PyTypeObject* tzinfoType) {
     /* safe native get/set descriptors */
     PyGetSetDef* getsets_date= PyDateTime_DateType.tp_getset;
     PyGetSetDef* getsets_time = PyDateTime_TimeType.tp_getset;
@@ -91,7 +89,7 @@ extern PyObject* set_PyDateTime_typeids(PyTypeObject* dtcapiType, PyTypeObject*
     register_native_slots(&PyDateTime_TimeType, getsets_time, NULL);
     register_native_slots(&PyDateTime_DeltaType, NULL, members_delta);
 
-    return Py_True;
+    return polyglot_PyDateTime_CAPI_typeid();
 }
 
 BASICSIZE_GETTER(PyDateTime_Date);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextBuiltins.java

@@ -130,7 +130,6 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.NativeReferenceCacheFactory.ResolveNativeReferenceNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.capi.PThreadState;
 import com.oracle.graal.python.builtins.objects.cext.capi.PyCFunctionDecorator;
-import com.oracle.graal.python.builtins.objects.cext.capi.PyDateTimeCAPIWrapper;
 import com.oracle.graal.python.builtins.objects.cext.capi.PyEvalNodes.PyEvalRestoreThread;
 import com.oracle.graal.python.builtins.objects.cext.capi.PyEvalNodes.PyEvalSaveThread;
 import com.oracle.graal.python.builtins.objects.cext.capi.PyGILStateNodes.PyGILStateEnsure;
@@ -2247,15 +2246,6 @@ int trace(Object ptr, Object classNameObj,
         }
     }
 
-    @Builtin(name = "wrap_PyDateTime_CAPI", minNumOfPositionalArgs = 1)
-    @GenerateNodeFactory
-    abstract static class WrapPyDateTimeCAPI extends PythonBuiltinNode {
-        @Specialization
-        static Object doGeneric(Object object) {
-            return new PyDateTimeCAPIWrapper(object);
-        }
-    }
-
     @ImportStatic(CExtContext.class)
     abstract static class NewClassMethodNode extends Node {
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeCAPISymbol.java

@@ -216,6 +216,15 @@ public enum NativeCAPISymbol implements NativeCExtSymbol {
     FUN_MEMCPY_BYTES("truffle_memcpy_bytes"),
     FUN_UNICODE_SUBTYPE_NEW("unicode_subtype_new"),
 
+    /* PyDateTime_CAPI */
+
+    FUN_SET_PY_DATETIME_IDS("set_PyDateTime_typeids"),
+    FUN_CREATE_DATETIME_CAPSULE("truffle_create_datetime_capsule"),
+    FUN_GET_DATETIME_DATE_BASICSIZE("get_PyDateTime_Date_basicsize"),
+    FUN_GET_DATETIME_TIME_BASICSIZE("get_PyDateTime_Time_basicsize"),
+    FUN_GET_DATETIME_DATETIME_BASICSIZE("get_PyDateTime_DateTime_basicsize"),
+    FUN_GET_DATETIME_DELTA_BASICSIZE("get_PyDateTime_Delta_basicsize"),
+
     // ctypes
     FUN_MEMMOVE("memmove"),
     FUN_MEMSET("memset"),

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyDateTimeCAPIWrapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -130,4 +130,8 @@ Object doGeneric(VirtualFrame frame, Object type, Object key,
             return PNone.NO_VALUE;
         }
     }
+
+    public static PyObjectGetItem getUncached() {
+        return PyObjectGetItemNodeGen.getUncached();
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyObjectGetItem.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -68,14 +68,14 @@
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.Python3Core;
-import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins;
 import com.oracle.graal.python.builtins.modules.ctypes.CtypesModuleBuiltins.CtypesThreadState;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObjectFactory.PInteropGetAttributeNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeClass;
 import com.oracle.graal.python.builtins.objects.cext.capi.CApiContext;
 import com.oracle.graal.python.builtins.objects.cext.capi.PThreadState;
+import com.oracle.graal.python.builtins.objects.cext.capi.PyDateTimeCAPIWrapper;
 import com.oracle.graal.python.builtins.objects.cext.capi.PyTruffleObjectFree.ReleaseHandleNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.PyTruffleObjectFreeFactory.ReleaseHandleNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.capi.PythonNativeNull;
@@ -102,7 +102,6 @@
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
 import com.oracle.graal.python.nodes.call.CallNode;
-import com.oracle.graal.python.nodes.call.special.CallUnaryMethodNode;
 import com.oracle.graal.python.nodes.object.SetDictNode;
 import com.oracle.graal.python.nodes.util.CastToJavaIntLossyNode;
 import com.oracle.graal.python.runtime.AsyncHandler.AsyncAction;
@@ -2074,10 +2073,7 @@ public void setCapiWasLoaded(CApiContext capiContext) {
         assert this.cApiContext == null : "tried to create new C API context but it was already created";
         this.cApiContext = capiContext;
 
-        ReadAttributeFromObjectNode readNode = ReadAttributeFromObjectNode.getUncached();
-        PythonModule builtinModule = lookupBuiltinModule(PythonCextBuiltins.PYTHON_CEXT);
-        CallUnaryMethodNode callNode = CallUnaryMethodNode.getUncached();
-        callNode.executeObject(null, readNode.execute(builtinModule, INITIALIZE_DATETIME_CAPI), capiContext.getLLVMLibrary());
+        PyDateTimeCAPIWrapper.initWrapper(capiContext);
 
         for (Runnable capiHook : capiHooks) {
             capiHook.run();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

@@ -52,58 +52,3 @@ def may_raise(error_result=native_null):
         def decorator(fun):
             return make_may_raise_wrapper(fun, error_result)
         return decorator
-
-##################### C EXT HELPERS
-
-def initialize_datetime_capi(capi_library):
-    import datetime
-
-    class PyDateTime_CAPI:
-        DateType = datetime.date
-        DateTimeType = datetime.datetime
-        TimeType = datetime.time
-        DeltaType = datetime.timedelta
-        TZInfoType = datetime.tzinfo
-
-        @staticmethod
-        def Date_FromDate(y, m, d, typ):
-            return typ(y, month=m, day=d)
-
-        @staticmethod
-        def DateTime_FromDateAndTime(y, mon, d, h, m, s, usec, tzinfo, typ):
-            return PyDateTime_CAPI.DateTime_FromDateAndTimeAndFold(y, mon, d, h, m, s, usec, tzinfo, 0, typ)
-
-        @staticmethod
-        def Time_FromTime(h, m, s, usec, tzinfo, typ):
-            return PyDateTime_CAPI.Time_FromTimeAndFold(h, m, s, usec, tzinfo, 0, typ)
-
-        @staticmethod
-        def Delta_FromDelta(d, s, microsec, normalize, typ):
-            return typ(days=d, seconds=s, microseconds=microsec)
-
-        @staticmethod
-        def DateTime_FromTimestamp(cls, args, kwds):
-            return cls(*args, **kwds)
-
-        @staticmethod
-        def Date_FromTimestamp(cls, args):
-            return cls(*args)
-
-        @staticmethod
-        def DateTime_FromDateAndTimeAndFold(y, mon, d, h, m, s, usec, tz, fold, typ):
-            return typ(y, month=mon, day=d, hour=h, minute=m, second=s, microseconds=usec, tzinfo=tz, fold=fold)
-
-        @staticmethod
-        def Time_FromTimeAndFold(h, m, s, us, tz, fold, typ):
-            return typ(hour=h, minute=m, second=s, microsecond=us, tzinfo=tz, fold=fold)
-
-    import_c_func("set_PyDateTime_typeids", capi_library)(PyDateTime_CAPI, PyDateTime_CAPI.DateType, PyDateTime_CAPI.DateTimeType, PyDateTime_CAPI.TimeType, PyDateTime_CAPI.DeltaType, PyDateTime_CAPI.TZInfoType)
-    datetime.datetime_CAPI = import_c_func("truffle_create_datetime_capsule", capi_library)(wrap_PyDateTime_CAPI(PyDateTime_CAPI()))
-    assert datetime.datetime_CAPI is not native_null
-    datetime.date.__basicsize__ = import_c_func("get_PyDateTime_Date_basicsize", capi_library)()
-    datetime.time.__basicsize__ = import_c_func("get_PyDateTime_Time_basicsize", capi_library)()
-    datetime.datetime.__basicsize__ = import_c_func("get_PyDateTime_DateTime_basicsize", capi_library)()
-    datetime.timedelta.__basicsize__ = import_c_func("get_PyDateTime_Delta_basicsize", capi_library)()
-
-
-