[GR-70364] Use boolean sequence storage, always preallocate sequence storage.

PullRequest: graalpython/4040

Author: steve-s

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

@@ -72,6 +72,14 @@ def test_appending_doubles():
     check_strategy(l, "DoubleSequenceStorage")
 
 
+def test_appending_bools():
+    l = list()
+    for i in range(10):
+        l.append(i * 0.1)
+    assert l[5] == 0.5
+    check_strategy(l, "DoubleSequenceStorage")
+
+
 def test_generator_int():
     l = [x for x in range(10)]
     assert l[5] == 5
@@ -84,11 +92,10 @@ def test_generator_double():
     check_strategy(l, "DoubleSequenceStorage")
 
 
-# GR-70364
-# def test_generator_bool():
-#     l = [x >= 5 for x in range(10)]
-#     assert l[5] == True
-#     check_strategy(l, "BoolSequenceStorage")
+def test_generator_bool():
+    l = [x >= 5 for x in range(10)]
+    assert l[5] == True
+    check_strategy(l, "BoolSequenceStorage")
 
 
 def test_literal_int():
@@ -103,6 +110,12 @@ def test_literal_double():
     check_strategy(l, "DoubleSequenceStorage")
 
 
+def test_literal_bool():
+    l = [True, False, True]
+    assert l[0]
+    check_strategy(l, "BoolSequenceStorage")
+
+
 def test_literal_mixed():
     l = [1,2,3,4,0.5]
     assert l[4] == 0.5

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

@@ -2825,8 +2825,6 @@ public GeneralizationNode create() {
             }
         };
 
-        private static final int DEFAULT_CAPACITY = 8;
-
         @Override
         public final SequenceStorage executeCached(SequenceStorage toGeneralize, Object indicationValue) {
             return execute(this, toGeneralize, indicationValue);
@@ -2842,19 +2840,24 @@ static ObjectSequenceStorage doObject(@SuppressWarnings("unused") ObjectSequence
         @Specialization
         static SequenceStorage doEmptyStorage(Node inliningTarget, @SuppressWarnings("unused") EmptySequenceStorage s, ArrayBasedSequenceStorage other,
                         @Exclusive @Cached InlinedExactClassProfile otherProfile) {
-            return otherProfile.profile(inliningTarget, other).createEmpty(DEFAULT_CAPACITY);
+            return otherProfile.profile(inliningTarget, other).createEmpty(ArrayBasedSequenceStorage.DEFAULT_CAPACITY);
         }
 
         @Specialization
         static ByteSequenceStorage doEmptyByte(@SuppressWarnings("unused") EmptySequenceStorage s, @SuppressWarnings("unused") byte val) {
-            return new ByteSequenceStorage(DEFAULT_CAPACITY);
+            return new ByteSequenceStorage();
         }
 
         @Specialization
         static IntSequenceStorage doEmptyInteger(@SuppressWarnings("unused") EmptySequenceStorage s, @SuppressWarnings("unused") int val) {
             return new IntSequenceStorage();
         }
 
+        @Specialization
+        static BoolSequenceStorage doEmptyBoolean(@SuppressWarnings("unused") EmptySequenceStorage s, @SuppressWarnings("unused") boolean val) {
+            return new BoolSequenceStorage();
+        }
+
         @Specialization
         static LongSequenceStorage doEmptyLong(@SuppressWarnings("unused") EmptySequenceStorage s, @SuppressWarnings("unused") long val) {
             return new LongSequenceStorage();
@@ -2871,7 +2874,7 @@ protected static boolean isKnownType(Object val) {
 
         @Specialization(guards = "!isKnownType(val)")
         static ObjectSequenceStorage doEmptyObject(@SuppressWarnings("unused") EmptySequenceStorage s, @SuppressWarnings("unused") Object val) {
-            return new ObjectSequenceStorage(DEFAULT_CAPACITY);
+            return new ObjectSequenceStorage();
         }
 
         @Specialization

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ArrayBasedSequenceStorage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2024, 2025, 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
@@ -45,6 +45,8 @@
 
 public abstract class ArrayBasedSequenceStorage extends SequenceStorage {
 
+    public static final int DEFAULT_CAPACITY = 8;
+
     public abstract Object getInternalArrayObject();
 
     public abstract Object getCopyOfInternalArrayObject();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/BoolSequenceStorage.java

@@ -33,7 +33,8 @@ public final class BoolSequenceStorage extends ArrayBasedSequenceStorage {
     private boolean[] values;
 
     public BoolSequenceStorage() {
-        values = new boolean[]{};
+        this.values = new boolean[DEFAULT_CAPACITY];
+        this.capacity = values.length;
     }
 
     public BoolSequenceStorage(boolean[] elements) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ByteSequenceStorage.java

@@ -40,6 +40,11 @@ public final class ByteSequenceStorage extends ArrayBasedSequenceStorage {
 
     private byte[] values;
 
+    public ByteSequenceStorage() {
+        this.values = new byte[DEFAULT_CAPACITY];
+        this.capacity = values.length;
+    }
+
     public ByteSequenceStorage(byte[] elements) {
         this(elements, elements.length);
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/DoubleSequenceStorage.java

@@ -35,7 +35,8 @@ public final class DoubleSequenceStorage extends ArrayBasedSequenceStorage {
     private double[] values;
 
     public DoubleSequenceStorage() {
-        values = new double[]{};
+        this.values = new double[DEFAULT_CAPACITY];
+        this.capacity = values.length;
     }
 
     public DoubleSequenceStorage(double[] elements) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/EmptySequenceStorage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -36,9 +36,9 @@ public ArrayBasedSequenceStorage generalizeFor(Object value) {
         final ArrayBasedSequenceStorage generalized;
 
         if (value instanceof Byte) {
-            generalized = new ByteSequenceStorage(16);
+            generalized = new ByteSequenceStorage();
         } else if (value instanceof Boolean) {
-            generalized = new BoolSequenceStorage(16);
+            generalized = new BoolSequenceStorage();
         } else if (value instanceof Integer) {
             generalized = new IntSequenceStorage();
         } else if (value instanceof Long) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/IntSequenceStorage.java

@@ -35,7 +35,8 @@ public final class IntSequenceStorage extends ArrayBasedSequenceStorage {
     private int[] values;
 
     public IntSequenceStorage() {
-        values = new int[]{};
+        this.values = new int[DEFAULT_CAPACITY];
+        this.capacity = values.length;
     }
 
     public IntSequenceStorage(int[] elements) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/LongSequenceStorage.java

@@ -35,7 +35,8 @@ public final class LongSequenceStorage extends ArrayBasedSequenceStorage {
     private long[] values;
 
     public LongSequenceStorage() {
-        values = new long[]{};
+        this.values = new long[DEFAULT_CAPACITY];
+        this.capacity = values.length;
     }
 
     public LongSequenceStorage(long[] elements) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ObjectSequenceStorage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -37,6 +37,11 @@ public final class ObjectSequenceStorage extends ArrayBasedSequenceStorage {
 
     private Object[] values;
 
+    public ObjectSequenceStorage() {
+        this.values = new Object[DEFAULT_CAPACITY];
+        this.capacity = values.length;
+    }
+
     public ObjectSequenceStorage(Object[] elements) {
         this.values = elements;
         this.capacity = elements.length;