Bytecode DSL: construct native int storage for list literals if --python.UseNativePrimitiveStorageStrategy=true

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -395,6 +395,7 @@ public boolean isSingleContext() {
 
     @CompilationFinal(dimensions = 1) private volatile Object[] engineOptionsStorage;
     @CompilationFinal private volatile OptionValues engineOptions;
+    @CompilationFinal private boolean useNativePrimitiveStorage;
 
     /** For fast access to the PythonThreadState object by the owning thread. */
     private final ContextThreadLocal<PythonThreadState> threadState = locals.createContextThreadLocal(PythonContext.PythonThreadState::new);
@@ -476,6 +477,7 @@ protected PythonContext createContext(Env env) {
         } else {
             assert areOptionsCompatible(options, PythonOptions.createEngineOptions(env)) : "invalid engine options";
         }
+        this.useNativePrimitiveStorage = getEngineOption(PythonOptions.UseNativePrimitiveStorageStrategy);
 
         return context;
     }
@@ -490,6 +492,10 @@ public <T> T getEngineOption(OptionKey<T> key) {
         }
     }
 
+    public boolean useNativePrimitiveStorage() {
+        return useNativePrimitiveStorage;
+    }
+
     @Override
     protected OptionDescriptors getOptionDescriptors() {
         return PythonOptions.DESCRIPTORS;
@@ -1101,6 +1107,7 @@ private Shape createBuiltinShape(PythonBuiltinClassType type, int ordinal) {
             shapeBuilder.shapeFlags(PythonObject.HAS_SLOTS_BUT_NO_DICT_FLAG);
         }
         shape = shapeBuilder.build();
+        VarHandle.storeStoreFence();
         builtinTypeInstanceShapes[ordinal] = shape;
         return shape;
     }

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

@@ -3968,10 +3968,6 @@ static boolean isObjectSequenceStorage(SequenceStorage s) {
     @ImportStatic(PInt.class)
     public abstract static class InsertItemArrayBasedStorageNode extends Node {
 
-        public static SequenceStorage executeUncached(ArrayBasedSequenceStorage storage, int index, Object value) {
-            return SequenceStorageNodesFactory.InsertItemArrayBasedStorageNodeGen.getUncached().execute(null, storage, index, value);
-        }
-
         protected abstract SequenceStorage execute(Node inliningTarget, ArrayBasedSequenceStorage storage, int index, Object value);
 
         @Specialization
@@ -4037,6 +4033,40 @@ static SequenceStorage doGeneralization(Node inliningTarget, ArrayBasedSequenceS
         }
     }
 
+    @GenerateUncached
+    @GenerateInline
+    public abstract static class InsertItemNativePrimitiveBasedStorageNode extends Node {
+        protected abstract SequenceStorage execute(Node inliningTarget, NativePrimitiveSequenceStorage storage, int index, Object value);
+
+        @Specialization
+        static SequenceStorage doIntStorage(Node inliningTarget, NativeIntSequenceStorage storage, int index, int value,
+                        @Cached EnsureCapacityNode ensureCapacity) {
+            int length = storage.length();
+            var context = PythonContext.get(inliningTarget);
+            var unsafe = context.getUnsafe();
+            long itemSize = storage.getItemSize();
+            ensureCapacity.execute(inliningTarget, storage, length + 1);
+            // shifting tail to the right by one slot
+            long startAddr = storage.getValueBufferAddr() + (index * itemSize);
+            long endAddr = startAddr + itemSize;
+            long sizeInBytes = (length - index) * itemSize;
+            unsafe.copyMemory(startAddr, endAddr, sizeInBytes);
+
+            storage.setIntItemNormalized(index, value);
+            storage.incLength();
+            return storage;
+        }
+
+        @Fallback
+        static SequenceStorage doGeneralization(Node inliningTarget, NativePrimitiveSequenceStorage storage, int idx, Object value,
+                        @Cached GetInternalObjectArrayNode getInternalObjectArrayNode) {
+            Object[] values = getInternalObjectArrayNode.execute(inliningTarget, storage);
+            ObjectSequenceStorage newStorage = new ObjectSequenceStorage(values);
+            newStorage.insertItem(idx, value);
+            return newStorage;
+        }
+    }
+
     @GenerateUncached
     @GenerateInline
     @GenerateCached(false)
@@ -4062,24 +4092,10 @@ static SequenceStorage doArrayBasedStorage(Node inliningTarget, ArrayBasedSequen
 
         }
 
-        // TODO introduce something similar to InsertItemArrayBasedStorageNode
         @Specialization
-        static SequenceStorage doNativeInt(Node inliningTarget, NativeIntSequenceStorage storage, int index, int value,
-                        @Exclusive @Cached EnsureCapacityNode ensureCapacity) {
-            int length = storage.length();
-            var context = PythonContext.get(inliningTarget);
-            var unsafe = context.getUnsafe();
-            long itemSize = storage.getItemSize();
-            ensureCapacity.execute(inliningTarget, storage, length + 1);
-            // shifting tail to the right by one slot
-            long startAddr = storage.getValueBufferAddr() + (index * itemSize);
-            long endAddr = startAddr + itemSize;
-            long sizeInBytes = (length - index) * itemSize;
-            unsafe.copyMemory(startAddr, endAddr, sizeInBytes);
-
-            storage.setIntItemNormalized(index, value);
-            storage.incLength();
-            return storage;
+        static SequenceStorage doNativeStorage(Node inliningTarget, NativeIntSequenceStorage storage, int index, Object value,
+                        @Cached InsertItemNativePrimitiveBasedStorageNode insertNativeStorageNode) {
+            return insertNativeStorageNode.execute(inliningTarget, storage, index, value);
         }
 
         @Specialization

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java

@@ -1682,8 +1682,18 @@ public static final class MakeConstantIntList {
         @Specialization
         public static PList perform(int[] array,
                         @Bind PBytecodeDSLRootNode rootNode) {
-            SequenceStorage storage = new IntSequenceStorage(PythonUtils.arrayCopyOf(array, array.length));
-            return PFactory.createList(rootNode.getLanguage(), storage);
+            PythonLanguage language = rootNode.getLanguage();
+            if (!language.useNativePrimitiveStorage()) {
+                return PFactory.createList(language, new IntSequenceStorage(PythonUtils.arrayCopyOf(array, array.length)));
+            } else {
+                return createNativeList(array, rootNode, language);
+            }
+        }
+
+        @InliningCutoff
+        private static PList createNativeList(int[] array, PBytecodeDSLRootNode rootNode, PythonLanguage language) {
+            SequenceStorage storage = PythonContext.get(rootNode).nativeBufferContext.toNativeIntStorage(array);
+            return PFactory.createList(language, storage);
         }
     }