Make cython's array.resize_smart work

Author: msimacek

graalpython/com.oracle.graal.python.cext/include/listobject.h

@@ -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
@@ -45,6 +45,11 @@ PyAPI_FUNC(int) PyList_Sort(PyObject *);
 PyAPI_FUNC(int) PyList_Reverse(PyObject *);
 PyAPI_FUNC(PyObject *) PyList_AsTuple(PyObject *);
 
+/*
+ * GraalPy-specific, used to implement cython's array.resize_smart
+ */
+PyAPI_FUNC(int) _PyArray_Resize(PyObject* array, Py_ssize_t new_size);
+
 #ifndef Py_LIMITED_API
 #  define Py_CPYTHON_LISTOBJECT_H
 #  include  "cpython/listobject.h"

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_array.py

@@ -0,0 +1,80 @@
+# Copyright (c) 2023, 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
+#
+# Subject to the condition set forth below, permission is hereby granted to any
+# person obtaining a copy of this software, associated documentation and/or
+# data (collectively the "Software"), free of charge and under any and all
+# copyright rights in the Software, and any and all patent rights owned or
+# freely licensable by each licensor hereunder covering either (i) the
+# unmodified Software as contributed to or provided by such licensor, or (ii)
+# the Larger Works (as defined below), to deal in both
+#
+# (a) the Software, and
+#
+# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+# one is included with the Software each a "Larger Work" to which the Software
+# is contributed by such licensors),
+#
+# without restriction, including without limitation the rights to copy, create
+# derivative works of, display, perform, and distribute the Software and make,
+# use, sell, offer for sale, import, export, have made, and have sold the
+# Software and the Larger Work(s), and to sublicense the foregoing rights on
+# either these or other terms.
+#
+# This license is subject to the following condition:
+#
+# The above copyright notice and either this complete permission notice or at a
+# minimum a reference to the UPL must be included in all copies or substantial
+# portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+import sys
+from array import array
+
+from tests.cpyext import CPyExtTestCase, CPyExtFunction, unhandled_error_compare
+
+
+def reference_array_resize(args):
+    a, n = args
+    if n < len(a):
+        del a[n:]
+    else:
+        a.extend([0 for i in range(n - len(a))])
+    return a
+
+
+class TestPyArray(CPyExtTestCase):
+
+    def compile_module(self, name):
+        type(self).mro()[1].__dict__["test_%s" % name].create_module(name)
+        super().compile_module(name)
+
+    if sys.implementation.name == 'graalpy':
+        test__PyArray_Resize = CPyExtFunction(
+            reference_array_resize,
+            lambda: (
+                (array('i', [1, 2, 3]), 1),
+                (array('i'), 3),
+            ),
+            code="""
+                PyObject* wrap__PyArray_Resize(PyObject* array, Py_ssize_t new_size) {
+                    if (_PyArray_Resize(array, new_size) < 0)
+                        return NULL;
+                    Py_INCREF(array);
+                    return array;
+                }
+            """,
+            callfunction="wrap__PyArray_Resize",
+            resultspec="O",
+            argspec='On',
+            arguments=["PyObject* array", "Py_ssize_t new_size"],
+            cmpfunc=unhandled_error_compare,
+        )

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

@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2023, 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
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.graal.python.builtins.modules.cext;
+
+import static com.oracle.graal.python.builtins.PythonBuiltinClassType.MemoryError;
+import static com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiCallPath.Direct;
+import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Int;
+import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.PyObject;
+import static com.oracle.graal.python.builtins.objects.cext.capi.transitions.ArgDescriptor.Py_ssize_t;
+
+import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiBinaryBuiltinNode;
+import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiBuiltin;
+import com.oracle.graal.python.builtins.objects.array.PArray;
+import com.oracle.graal.python.util.OverflowException;
+import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.dsl.Specialization;
+
+public final class PythonCextArrayBuiltins {
+
+    /**
+     * Graalpy-specific function implemented for Cython
+     */
+    @CApiBuiltin(ret = Int, args = {PyObject, Py_ssize_t}, call = Direct)
+    abstract static class _PyArray_Resize extends CApiBinaryBuiltinNode {
+        @Specialization
+        int resize(PArray object, long newSize) {
+            try {
+                object.resize((int) newSize);
+            } catch (OverflowException e) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                throw raise(MemoryError);
+            }
+            return 0;
+        }
+    }
+}

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

@@ -550,7 +550,7 @@ public static boolean assertBuiltins(Object capiLibrary) {
                     "_PyASCIIObject_STATE_COMPACT", "_PyASCIIObject_STATE_KIND", "_PyASCIIObject_STATE_READY", "_PyASCIIObject_WSTR", "_PyByteArray_Start", "_PyEval_SetCoroutineOriginTrackingDepth",
                     "_PyFrame_SetLineNumber", "_PyMemoryView_GetBuffer", "_PySequence_Fast_ITEMS", "_PySequence_ITEM", "_PyUnicodeObject_DATA", "_PyUnicode_get_wstr_length", "_Py_REFCNT",
                     "_Py_SET_REFCNT", "_Py_SET_SIZE", "_Py_SET_TYPE", "_Py_SIZE", "_Py_TYPE", "_PyTuple_SET_ITEM", "_PyCFunction_GetModule", "_PyCFunction_GetMethodDef",
-                    "PyCode_GetName", "PyCode_GetFileName", "_PyList_SET_ITEM",
+                    "PyCode_GetName", "PyCode_GetFileName", "_PyList_SET_ITEM", "_PyArray_Resize",
                     // TODO GR-46546 The following are backports from 3.11. Remove when updating
                     "PyFrame_GetLasti", "PyFrame_GetLocals", "PyFrame_GetGlobals", "PyFrame_GetBuiltins"};
 

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

@@ -189,6 +189,7 @@
 import java.util.List;
 
 import com.oracle.graal.python.builtins.modules.cext.PythonCextAbstractBuiltins;
+import com.oracle.graal.python.builtins.modules.cext.PythonCextArrayBuiltins;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBoolBuiltins;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins;
 import com.oracle.graal.python.builtins.modules.cext.PythonCextBuiltins.CApiBuiltin;
@@ -1383,6 +1384,7 @@ static List<CApiBuiltinDesc> getOtherBuiltinDefinitions() {
     static List<CApiBuiltinDesc> getJavaBuiltinDefinitions() {
         ArrayList<CApiBuiltinDesc> result = new ArrayList<>();
         addCApiBuiltins(result, PythonCextAbstractBuiltins.class);
+        addCApiBuiltins(result, PythonCextArrayBuiltins.class);
         addCApiBuiltins(result, PythonCextBoolBuiltins.class);
         addCApiBuiltins(result, PythonCextBuiltins.class);
         addCApiBuiltins(result, PythonCextBytesBuiltins.class);

graalpython/lib-graalpython/patches/Cython/Cython-0.29.32.patch

@@ -268,3 +268,40 @@ index 98b5e26..0f44675 100644
      return PyObject_RichCompareBool(s1, s2, equals);
  #else
      if (s1 == s2) {
+diff --git a/Cython/Utility/arrayarray.h b/Cython/Utility/arrayarray.h
+index a9e4923..ac9a2bd 100644
+--- a/Cython/Utility/arrayarray.h
++++ b/Cython/Utility/arrayarray.h
+@@ -109,6 +109,9 @@ PyObject* newarrayobject(PyTypeObject *type, Py_ssize_t size,
+ // fast resize (reallocation to the point)
+ // not designed for filing small increments (but for fast opaque array apps)
+ static CYTHON_INLINE int resize(arrayobject *self, Py_ssize_t n) {
++#ifdef GRAALVM_PYTHON
++    return _PyArray_Resize((PyObject*)self, n);
++#else
+     void *items = (void*) self->data.ob_item;
+     PyMem_Resize(items, char, (size_t)(n * self->ob_descr->itemsize));
+     if (items == NULL) {
+@@ -119,10 +122,14 @@ static CYTHON_INLINE int resize(arrayobject *self, Py_ssize_t n) {
+     __Pyx_SET_SIZE(self, n);
+     self->allocated = n;
+     return 0;
++#endif
+ }
+ 
+ // suitable for small increments; over allocation 50% ;
+ static CYTHON_INLINE int resize_smart(arrayobject *self, Py_ssize_t n) {
++#ifdef GRAALVM_PYTHON
++    return _PyArray_Resize((PyObject*)self, n);
++#else
+     void *items = (void*) self->data.ob_item;
+     Py_ssize_t newsize;
+     if (n < self->allocated && n*4 > self->allocated) {
+@@ -143,6 +150,7 @@ static CYTHON_INLINE int resize_smart(arrayobject *self, Py_ssize_t n) {
+     __Pyx_SET_SIZE(self, n);
+     self->allocated = newsize;
+     return 0;
++#endif
+ }
+ 
+ #endif