Push SequenceStorage.getInternalArrayObject down

msimacek · msimacek · commit 6b1f8a4fa67e · 2024-04-16T13:43:14.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PolyglotModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PolyglotModuleBuiltins.java
@@ -64,6 +64,8 @@
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.NotImplementedError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.OSError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.ValueError;
+import static com.oracle.graal.python.util.PythonUtils.EMPTY_BYTE_ARRAY;
+import static com.oracle.graal.python.util.PythonUtils.EMPTY_OBJECT_ARRAY;
 import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
 import static com.oracle.graal.python.util.PythonUtils.tsArray;
 import static com.oracle.graal.python.util.PythonUtils.tsLiteral;
@@ -81,9 +83,9 @@
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
+import com.oracle.graal.python.builtins.objects.bytes.PBytesLike;
 import com.oracle.graal.python.builtins.objects.common.HashingStorage;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes;
-import com.oracle.graal.python.builtins.objects.common.SequenceNodes;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
 import com.oracle.graal.python.builtins.objects.function.PFunction;
@@ -121,6 +123,8 @@
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.runtime.sequence.PSequence;
+import com.oracle.graal.python.runtime.sequence.storage.BasicSequenceStorage;
+import com.oracle.graal.python.runtime.sequence.storage.EmptySequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -1142,11 +1146,19 @@ static boolean keyInfo(Object receiver, long member, TruffleString info,
     @TypeSystemReference(PythonArithmeticTypes.class)
     public abstract static class StorageNode extends PythonUnaryBuiltinNode {
         @Specialization
+        @TruffleBoundary
         static Object doSequence(PSequence seq,
-                        @Bind("this") Node inliningTarget,
-                        @Cached SequenceNodes.GetSequenceStorageNode getSequenceStorageNode) {
-            SequenceStorage storage = getSequenceStorageNode.execute(inliningTarget, seq);
-            return PythonContext.get(inliningTarget).getEnv().asGuestValue(storage.getInternalArrayObject());
+                        @Bind("this") Node inliningTarget) {
+            SequenceStorage storage = seq.getSequenceStorage();
+            Object arrayObject;
+            if (storage instanceof EmptySequenceStorage) {
+                arrayObject = seq instanceof PBytesLike ? EMPTY_BYTE_ARRAY : EMPTY_OBJECT_ARRAY;
+            } else if (storage instanceof BasicSequenceStorage basicStorage) {
+                arrayObject = basicStorage.getInternalArrayObject();
+            } else {
+                throw PRaiseNode.raiseUncached(inliningTarget, PythonBuiltinClassType.NotImplementedError, ErrorMessages.GETTING_POLYGLOT_STORAGE_FOR_NATIVE_STORAGE_NOT_IMPLEMENTED);
+            }
+            return PythonContext.get(inliningTarget).getEnv().asGuestValue(arrayObject);
         }
 
         @Fallback
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PySequenceArrayWrapper.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PySequenceArrayWrapper.java
@@ -48,6 +48,8 @@
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodesFactory.StorageToNativeNodeGen;
 import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
 import com.oracle.graal.python.runtime.sequence.PSequence;
+import com.oracle.graal.python.runtime.sequence.storage.BasicSequenceStorage;
+import com.oracle.graal.python.runtime.sequence.storage.ByteSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.EmptySequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.MroSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.NativeSequenceStorage;
@@ -62,7 +64,6 @@
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.profiles.InlinedConditionProfile;
 
 /**
  * Wraps a sequence object (like a list) such that it behaves like a bare C array.
@@ -82,16 +83,16 @@ public static NativeSequenceStorage executeUncached(SequenceStorage object, bool
             return ToNativeStorageNodeGen.getUncached().execute(null, object, isBytesLike);
         }
 
-        @Specialization(guards = {"!isNative(s)", "!isEmptySequenceStorage(s)", "!isMroSequenceStorage(s)"})
-        static NativeSequenceStorage doManaged(Node inliningTarget, SequenceStorage s, boolean isBytesLike,
-                        @Cached InlinedConditionProfile isObjectArrayProfile,
+        @Specialization(guards = "!isMroSequenceStorage(s)")
+        static NativeSequenceStorage doManaged(Node inliningTarget, BasicSequenceStorage s, boolean isBytesLike,
                         @Shared("storageToNativeNode") @Cached SequenceStorageNodes.StorageToNativeNode storageToNativeNode,
-                        @Cached SequenceStorageNodes.GetInternalArrayNode getInternalArrayNode) {
-            Object array = getInternalArrayNode.execute(inliningTarget, s);
+                        @Cached SequenceStorageNodes.GetInternalObjectArrayNode getInternalArrayNode) {
+            Object array;
             if (isBytesLike) {
-                assert array instanceof byte[];
-            } else if (!isObjectArrayProfile.profile(inliningTarget, array instanceof Object[])) {
-                array = generalize(s);
+                ByteSequenceStorage byteStorage = (ByteSequenceStorage) s;
+                array = byteStorage.getInternalByteArray();
+            } else {
+                array = getInternalArrayNode.execute(inliningTarget, s);
             }
             return storageToNativeNode.execute(inliningTarget, array, s.length());
         }
@@ -116,11 +117,6 @@ static NativeSequenceStorage doMroSequenceStorage(Node inliningTarget, MroSequen
             }
         }
 
-        @TruffleBoundary
-        private static Object generalize(SequenceStorage s) {
-            return s.getInternalArray();
-        }
-
         @Specialization
         static NativeSequenceStorage doNative(NativeSequenceStorage s, @SuppressWarnings("unused") boolean isBytesLike) {
             return s;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java
@@ -1701,9 +1701,8 @@ protected static boolean isSimple(Object bytes) {
         }
 
         @Specialization(guards = "isByteSequenceStorage(bytes)")
-        static byte[] doBytes(Node inliningTarget, PBytesLike bytes,
-                        @Cached SequenceStorageNodes.GetInternalArrayNode internalArray) {
-            return (byte[]) internalArray.execute(inliningTarget, bytes.getSequenceStorage());
+        static byte[] doBytes(PBytesLike bytes) {
+            return ((ByteSequenceStorage) bytes.getSequenceStorage()).getInternalByteArray();
         }
 
         @Specialization(guards = "!isSimple(bytes)")
@@ -1838,10 +1837,10 @@ static SequenceStorage doRightEmpty(@SuppressWarnings("unused") EmptySequenceSto
         @Specialization(guards = {"dest == left", "left.getClass() == right.getClass()", "cachedClass == left.getClass()"}, limit = "1")
         static SequenceStorage doManagedManagedSameTypeInplace(@SuppressWarnings("unused") BasicSequenceStorage dest, BasicSequenceStorage left, BasicSequenceStorage right,
                         @Bind("this") Node inliningTarget,
-                        @Cached("left.getClass()") Class<? extends SequenceStorage> cachedClass,
+                        @Cached("left.getClass()") Class<? extends BasicSequenceStorage> cachedClass,
                         @Shared @Cached SetLenNode setLenNode) {
-            SequenceStorage leftProfiled = cachedClass.cast(left);
-            SequenceStorage rightProfiled = cachedClass.cast(right);
+            BasicSequenceStorage leftProfiled = cachedClass.cast(left);
+            BasicSequenceStorage rightProfiled = cachedClass.cast(right);
             Object arr1 = leftProfiled.getInternalArrayObject();
             int len1 = leftProfiled.length();
             Object arr2 = rightProfiled.getInternalArrayObject();
@@ -1854,11 +1853,11 @@ static SequenceStorage doManagedManagedSameTypeInplace(@SuppressWarnings("unused
         @Specialization(guards = {"dest != left", "dest.getClass() == left.getClass()", "left.getClass() == right.getClass()", "cachedClass == dest.getClass()"}, limit = "1")
         static SequenceStorage doManagedManagedSameType(BasicSequenceStorage dest, BasicSequenceStorage left, BasicSequenceStorage right,
                         @Bind("this") Node inliningTarget,
-                        @Cached("left.getClass()") Class<? extends SequenceStorage> cachedClass,
+                        @Cached("left.getClass()") Class<? extends BasicSequenceStorage> cachedClass,
                         @Shared @Cached SetLenNode setLenNode) {
-            SequenceStorage destProfiled = cachedClass.cast(dest);
-            SequenceStorage leftProfiled = cachedClass.cast(left);
-            SequenceStorage rightProfiled = cachedClass.cast(right);
+            BasicSequenceStorage destProfiled = cachedClass.cast(dest);
+            BasicSequenceStorage leftProfiled = cachedClass.cast(left);
+            BasicSequenceStorage rightProfiled = cachedClass.cast(right);
             Object arr1 = leftProfiled.getInternalArrayObject();
             int len1 = leftProfiled.length();
             Object arr2 = rightProfiled.getInternalArrayObject();
@@ -1871,10 +1870,10 @@ static SequenceStorage doManagedManagedSameType(BasicSequenceStorage dest, Basic
         @Specialization(guards = {"dest.getClass() == right.getClass()", "cachedClass == dest.getClass()"}, limit = "1")
         static SequenceStorage doEmptyManagedSameType(BasicSequenceStorage dest, @SuppressWarnings("unused") EmptySequenceStorage left, BasicSequenceStorage right,
                         @Bind("this") Node inliningTarget,
-                        @Cached("dest.getClass()") Class<? extends SequenceStorage> cachedClass,
+                        @Cached("dest.getClass()") Class<? extends BasicSequenceStorage> cachedClass,
                         @Shared @Cached SetLenNode setLenNode) {
-            SequenceStorage destProfiled = cachedClass.cast(dest);
-            SequenceStorage rightProfiled = cachedClass.cast(right);
+            BasicSequenceStorage destProfiled = cachedClass.cast(dest);
+            BasicSequenceStorage rightProfiled = cachedClass.cast(right);
             Object arr2 = rightProfiled.getInternalArrayObject();
             int len2 = rightProfiled.length();
             PythonUtils.arraycopy(arr2, 0, destProfiled.getInternalArrayObject(), 0, len2);
@@ -1885,10 +1884,10 @@ static SequenceStorage doEmptyManagedSameType(BasicSequenceStorage dest, @Suppre
         @Specialization(guards = {"dest.getClass() == left.getClass()", "cachedClass == dest.getClass()"}, limit = "1")
         static SequenceStorage doManagedEmptySameType(BasicSequenceStorage dest, BasicSequenceStorage left, @SuppressWarnings("unused") EmptySequenceStorage right,
                         @Bind("this") Node inliningTarget,
-                        @Cached("left.getClass()") Class<? extends SequenceStorage> cachedClass,
+                        @Cached("left.getClass()") Class<? extends BasicSequenceStorage> cachedClass,
                         @Shared @Cached SetLenNode setLenNode) {
-            SequenceStorage destProfiled = cachedClass.cast(dest);
-            SequenceStorage leftProfiled = cachedClass.cast(left);
+            BasicSequenceStorage destProfiled = cachedClass.cast(dest);
+            BasicSequenceStorage leftProfiled = cachedClass.cast(left);
             Object arr1 = leftProfiled.getInternalArrayObject();
             int len1 = leftProfiled.length();
             PythonUtils.arraycopy(arr1, 0, destProfiled.getInternalArrayObject(), 0, len1);
@@ -2842,27 +2841,6 @@ static NativeSequenceStorage doNativeByte(Node inliningTarget, NativeSequenceSto
         }
     }
 
-    @GenerateUncached
-    @GenerateInline
-    @GenerateCached(false)
-    @ImportStatic(SequenceStorageBaseNode.class)
-    public abstract static class GetInternalArrayNode extends Node {
-
-        public abstract Object execute(Node inliningTarget, SequenceStorage s);
-
-        @Specialization(limit = "MAX_SEQUENCE_STORAGES", guards = "s.getClass() == cachedClass")
-        static Object doSpecial(SequenceStorage s,
-                        @Cached("s.getClass()") Class<? extends SequenceStorage> cachedClass) {
-            return cachedClass.cast(s).getInternalArrayObject();
-        }
-
-        @Specialization(replaces = "doSpecial")
-        @TruffleBoundary
-        static Object doGeneric(SequenceStorage s) {
-            return s.getInternalArrayObject();
-        }
-    }
-
     @GenerateUncached
     @GenerateInline
     @GenerateCached(false)
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/PList.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/list/PList.java
@@ -80,9 +80,9 @@ public final void setSequenceStorage(SequenceStorage newStorage) {
     }
 
     @Override
-    public final String toString() {
+    public String toString() {
         CompilerAsserts.neverPartOfCompilation();
-        return store.toString();
+        return String.format("list(%s)", store);
     }
 
     @Ignore
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/tuple/PTuple.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/tuple/PTuple.java
@@ -61,27 +61,7 @@ public PTuple(Object cls, Shape instanceShape, SequenceStorage store) {
     @Override
     public String toString() {
         CompilerAsserts.neverPartOfCompilation();
-        if (store instanceof ObjectSequenceStorage) {
-            StringBuilder buf = new StringBuilder("(");
-            Object[] array = store.getInternalArray();
-            for (int i = 0; i < array.length - 1; i++) {
-                buf.append(array[i]);
-                buf.append(", ");
-            }
-
-            if (array.length > 0) {
-                buf.append(array[array.length - 1]);
-            }
-
-            if (array.length == 1) {
-                buf.append(",");
-            }
-
-            buf.append(")");
-            return buf.toString();
-        } else {
-            return String.format("tuple(%s)", store);
-        }
+        return String.format("tuple(%s)", store);
     }
 
     @Override
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java
@@ -970,6 +970,7 @@ public abstract class ErrorMessages {
     public static final TruffleString COPYREG_SLOTNAMES_DIDN_T_RETURN_A_LIST_OR_NONE = tsLiteral("copyreg._slotnames didn't return a list or None");
     public static final TruffleString CASTING_A_NATIVE_INT_OBJECT_IS_NOT_IMPLEMENTED_YET = tsLiteral("casting a native int object is not implemented yet");
     public static final TruffleString PUTTING_NON_MODULE_OBJECTS_IN_SYS_MODULES_IS_NOT_SUPPORTED = tsLiteral("Putting non-module objects in sys.modules is not supported");
+    public static final TruffleString GETTING_POLYGLOT_STORAGE_FOR_NATIVE_STORAGE_NOT_IMPLEMENTED = tsLiteral("Getting polyglot storage for native storage not implemented");
 
     // SSL errors
     public static final TruffleString SSL_SESSION_CLOSED = tsLiteral("SSL/TLS session closed cleanly.");
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/BasicSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/BasicSequenceStorage.java
@@ -40,6 +40,12 @@ public abstract class BasicSequenceStorage extends SequenceStorage {
 
     public abstract SequenceStorage copy();
 
+    /**
+     * Get internal array object without copying. Note: The length must be taken from the sequence
+     * storage object.
+     */
+    public abstract Object getInternalArrayObject();
+
     public abstract Object getCopyOfInternalArrayObject();
 
     public abstract void setInternalArrayObject(Object arrayObject);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/EmptySequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/EmptySequenceStorage.java
@@ -93,11 +93,6 @@ public boolean equals(SequenceStorage other) {
         return other == EmptySequenceStorage.INSTANCE;
     }
 
-    @Override
-    public Object getInternalArrayObject() {
-        return null;
-    }
-
     @Override
     public ListStorageType getElementType() {
         return ListStorageType.Empty;
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/NativeSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/NativeSequenceStorage.java
@@ -127,11 +127,6 @@ public final Object getIndicativeValue() {
         return null;
     }
 
-    @Override
-    public final Object getInternalArrayObject() {
-        return ptr;
-    }
-
     @Override
     public String toString() {
         return getClass().getSimpleName() + "(ptr=" + CApiContext.asHex(ptr) + ", length=" + length + ", capacity=" + capacity + ", ownsMemory=" + hasReference() + ")";
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/SequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/SequenceStorage.java
@@ -77,12 +77,6 @@ public final int getCapacity() {
         return capacity;
     }
 
-    /**
-     * Get internal array object without copying. Note: The length must be taken from the sequence
-     * storage object.
-     */
-    public abstract Object getInternalArrayObject();
-
     public abstract ListStorageType getElementType();
 
     public abstract Object[] getInternalArray();

Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,9 @@ public final void setSequenceStorage(SequenceStorage newStorage) {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`@Override`
`83`		`- public final String toString() {`
	`83`	`+ public String toString() {`
`84`	`84`	`CompilerAsserts.neverPartOfCompilation();`
`85`		`- return store.toString();`
	`85`	`+ return String.format("list(%s)", store);`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`@Ignore`