Improve array initializer for byte-like objects.

Author: fangerer

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

@@ -38,6 +38,7 @@
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.array.PArray;
 import com.oracle.graal.python.builtins.objects.common.SequenceNodes;
+import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
 import com.oracle.graal.python.builtins.objects.range.PRange;
 import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 import com.oracle.graal.python.nodes.control.GetIteratorExpressionNode.GetIteratorNode;
@@ -152,26 +153,10 @@ PArray arrayByteInitializer(VirtualFrame frame, LazyPythonClass cls, @SuppressWa
 
         @Specialization(guards = "isCharArray(typeCode)")
         PArray arrayCharInitializer(VirtualFrame frame, LazyPythonClass cls, @SuppressWarnings("unused") String typeCode, PSequence initializer,
-                        @Cached("createCast()") CastToByteNode castToByteNode,
-                        @Cached("create()") GetIteratorNode getIterator,
-                        @Cached("create()") GetNextNode next,
-                        @Cached("create()") IsBuiltinClassProfile errorProfile,
-                        @Cached("create()") SequenceNodes.LenNode lenNode) {
-            Object iter = getIterator.executeWith(frame, initializer);
-            int i = 0;
-            byte[] byteArray = new byte[lenNode.execute(initializer)];
-
-            while (true) {
-                Object nextValue;
-                try {
-                    nextValue = next.execute(frame, iter);
-                } catch (PException e) {
-                    e.expectStopIteration(errorProfile);
-                    break;
-                }
-                byteArray[i++] = castToByteNode.execute(nextValue);
-            }
+                        @Cached SequenceNodes.GetSequenceStorageNode getSequenceStorageNode,
+                        @Cached SequenceStorageNodes.ToByteArrayNode toByteArrayNode) {
 
+            byte[] byteArray = toByteArrayNode.execute(getSequenceStorageNode.execute(initializer));
             return factory().createArray(cls, byteArray);
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java

@@ -161,6 +161,7 @@
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.interop.UnsupportedTypeException;
 import com.oracle.truffle.api.library.CachedLibrary;
+import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
@@ -2009,15 +2010,28 @@ byte[] doNativeByte(NativeSequenceStorage s) {
             return barr;
         }
 
-        @Specialization
+        @Specialization(guards = { "len(lenNode, s) == cachedLen", "cachedLen <= 32"})
+        @ExplodeLoop
+        byte[] doGenericLenCached(SequenceStorage s,
+                                  @Cached CastToByteNode castToByteNode,
+                                  @Cached @SuppressWarnings("unused") LenNode lenNode,
+                                  @Cached("len(lenNode, s)") int cachedLen) {
+            byte[] barr = new byte[cachedLen];
+            for (int i = 0; i < cachedLen; i++) {
+                barr[i] = castToByteNode.execute(getGetItemNode().execute(s, i));
+            }
+            return barr;
+        }
+
+        @Specialization(replaces = "doGenericLenCached")
         byte[] doGeneric(SequenceStorage s,
-                        @Cached PRaiseNode raiseNode) {
-            if (s instanceof ByteSequenceStorage) {
-                return doByteSequenceStorage((ByteSequenceStorage) s);
-            } else if (s instanceof NativeSequenceStorage && isByteStorage((NativeSequenceStorage) s)) {
-                return doNativeByte((NativeSequenceStorage) s);
+                        @Cached CastToByteNode castToByteNode,
+                        @Cached LenNode lenNode) {
+            byte[] barr = new byte[lenNode.execute(s)];
+            for (int i = 0; i < barr.length; i++) {
+                barr[i] = castToByteNode.execute(getGetItemNode().execute(s, i));
             }
-            throw raiseNode.raise(TypeError, "expected a bytes-like object");
+            return barr;
         }
 
         private static byte[] exactCopy(byte[] barr, int len) {
@@ -2032,6 +2046,10 @@ protected GetItemScalarNode getGetItemNode() {
             return getItemNode;
         }
 
+        protected static int len(LenNode lenNode, SequenceStorage s) {
+            return lenNode.execute(s);
+        }
+
         public static ToByteArrayNode create() {
             return ToByteArrayNodeGen.create(true);
         }