Add IntNativeStorage strategy

Author: horakivo

graalpython/com.oracle.graal.python.test/src/tests/test_arrow_storage_array.py

@@ -0,0 +1,64 @@
+from tests.util import storage_to_arrow
+
+def test_access():
+    a = [1, 2, 3]
+    storage_to_arrow(a)
+
+    assert a[0] == 1
+    assert a[1] == 2
+    assert a[2] == 3
+
+def test_modify():
+    a = [1, 2, 3]
+    storage_to_arrow(a)
+    a[0] = 11
+
+    assert a[0] == 11
+
+
+def test_add():
+    a = [1, 2, 3]
+    storage_to_arrow(a)
+    a.append(4)
+
+    assert a[0] == 1
+    assert a[1] == 2
+    assert a[2] == 3
+    assert a[3] == 4
+
+def test_remove():
+    a = [1, 2, 3]
+    storage_to_arrow(a)
+    a.remove(2)
+
+    assert a[0] == 1
+    assert a[1] == 3
+
+    assert a.pop(0) == 1
+
+    assert len(a) == 1
+    assert a[0] == 3
+
+
+def test_slice():
+    a = [1, 2, 3, 4]
+    storage_to_arrow(a)
+    b = a[1:3]
+
+    assert len(b) == 2
+    assert b[0] == 2
+    assert b[1] == 3
+
+
+def test_reverse():
+    a = [1, 2, 3]
+    storage_to_arrow(a)
+    b = a.reverse()
+
+    assert b is None
+    assert a[0] == 3
+    assert a[1] == 2
+    assert a[2] == 1
+
+
+

graalpython/com.oracle.graal.python.test/src/tests/util.py

@@ -44,3 +44,9 @@ def storage_to_native(s):
     if sys.implementation.name == 'graalpy':
         assert hasattr(__graalpython__, 'storage_to_native'), "Needs to be run with --python.EnableDebuggingBuiltins"
         __graalpython__.storage_to_native(s)
+
+
+def storage_to_arrow(s):
+    if sys.implementation.name == 'graalpy':
+        assert hasattr(__graalpython__, 'storage_to_arrow')
+        __graalpython__.storage_to_arrow(s)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/GraalPythonModuleBuiltins.java

@@ -78,6 +78,8 @@
 import java.util.List;
 import java.util.logging.Level;
 
+import com.oracle.graal.python.runtime.sequence.storage.native2.ArrowSequenceStorage;
+import com.oracle.graal.python.runtime.sequence.storage.native2.ToArrowStorageNode;
 import org.graalvm.home.Version;
 import org.graalvm.nativeimage.ImageInfo;
 
@@ -163,6 +165,7 @@
 import com.oracle.truffle.api.TruffleLogger;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NeverDefault;
@@ -845,6 +848,29 @@ Object toNative(PSequence sequence) {
         }
     }
 
+    @Builtin(name = "storage_to_arrow", minNumOfPositionalArgs = 1)
+    @GenerateNodeFactory
+    abstract static class StorageToArrow extends PythonUnaryBuiltinNode {
+
+        @Specialization
+        static Object doArray(PArray array,
+                        @Shared @Cached ToArrowStorageNode toArrowStorageNode,
+                        @Bind("this") Node inliningTarget) {
+            ArrowSequenceStorage newStorage = toArrowStorageNode.execute(inliningTarget, array.getSequenceStorage());
+            array.setSequenceStorage(newStorage);
+            return array;
+        }
+
+        @Specialization
+        Object doSequence(PSequence sequence,
+                        @Shared @Cached ToArrowStorageNode toArrowStorageNode,
+                        @Bind("this") Node inliningTarget) {
+            ArrowSequenceStorage newStorage = toArrowStorageNode.execute(inliningTarget, sequence.getSequenceStorage());
+            sequence.setSequenceStorage(newStorage);
+            return sequence;
+        }
+    }
+
     @Builtin(name = J_EXTEND, minNumOfPositionalArgs = 1, doc = "Extends Java class and return HostAdapterCLass")
     @GenerateNodeFactory
     public abstract static class JavaExtendNode extends PythonUnaryBuiltinNode {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesCommonBuiltins.java

@@ -446,6 +446,7 @@ abstract static class PrefixSuffixBaseNode extends PythonQuaternaryClinicBuiltin
         // common and specialized cases --------------------
 
         @Specialization
+        @SuppressWarnings("truffle-static-method")
         boolean doIt(VirtualFrame frame, Object self, Object substrs, int start, int end,
                         @Bind("this") Node inliningTarget,
                         @Cached GetBytesStorage getBytesStorage,

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

@@ -54,6 +54,7 @@
 import com.oracle.graal.python.runtime.sequence.storage.MroSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.NativeSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
+import com.oracle.graal.python.runtime.sequence.storage.native2.ArrowSequenceStorage;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.TruffleLogger;
@@ -83,7 +84,9 @@ public static NativeSequenceStorage executeUncached(SequenceStorage object, bool
             return ToNativeStorageNodeGen.getUncached().execute(null, object, isBytesLike);
         }
 
+        // TODO Ivo REMOVE warning
         @Specialization(guards = "!isMroSequenceStorage(s)")
+        @SuppressWarnings("truffle-sharing")
         static NativeSequenceStorage doManaged(Node inliningTarget, ArrayBasedSequenceStorage s, boolean isBytesLike,
                         @Exclusive @Cached SequenceStorageNodes.StorageToNativeNode storageToNativeNode,
                         @Cached SequenceStorageNodes.GetInternalObjectArrayNode getInternalArrayNode) {
@@ -97,6 +100,16 @@ static NativeSequenceStorage doManaged(Node inliningTarget, ArrayBasedSequenceSt
             return storageToNativeNode.execute(inliningTarget, array, s.length());
         }
 
+        // TODO Ivo TEMPORAL
+        @Specialization
+        @SuppressWarnings("truffle-sharing")
+        static NativeSequenceStorage doArrow(Node inliningTarget, ArrowSequenceStorage s, boolean isBytesLike,
+                        @Exclusive @Cached SequenceStorageNodes.StorageToNativeNode storageToNativeNode,
+                        @Cached SequenceStorageNodes.GetInternalObjectArrayNode getInternalArrayNode) {
+            Object array = getInternalArrayNode.execute(inliningTarget, s);
+            return storageToNativeNode.execute(inliningTarget, array, s.length());
+        }
+
         /*
          * This specialization uses a TruffleBoundary because we assume that there is a fixed number
          * of types (and therefore MroSequenceStorages). If types are created on a fast path, this