feat: Removed increaseCapacityExactWithCopy and move ensureCapacity to leaf classes

Author: horakivo

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/nodes/storage/GetItemSliceNodeTests.java

@@ -1,3 +1,43 @@
+/*
+ * Copyright (c) 2024, 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
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
 package com.oracle.graal.python.test.nodes.storage;
 
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.GetItemSliceNode;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/json/JSONScannerBuiltins.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2020, 2023, Oracle and/or its affiliates.
+/* Copyright (c) 2020, 2024, Oracle and/or its affiliates.
  * Copyright (C) 1996-2020 Python Software Foundation
  *
  * Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2

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

@@ -3004,11 +3004,12 @@ public abstract static class CreateEmptyNode extends SequenceStorageBaseNode {
 
         @Specialization
         static BasicSequenceStorage doIt(Node inliningTarget, SequenceStorage s, int cap, int len,
+                        @Cached EnsureCapacityNode ensureCapacityNode,
                         @Cached GetElementType getElementType,
                         @Cached CreateEmptyForTypeNode createEmptyForTypeNode) {
             BasicSequenceStorage ss = createEmptyForTypeNode.execute(inliningTarget, getElementType.execute(inliningTarget, s), cap);
             if (len != -1) {
-                ss.ensureCapacity(len);
+                ensureCapacityNode.execute(inliningTarget, ss, len);
                 ss.setNewLength(len);
             }
             return ss;
@@ -3064,16 +3065,34 @@ static void doEmpty(EmptySequenceStorage s, @SuppressWarnings("unused") int cap)
             // do nothing
         }
 
-        @Specialization(limit = "MAX_BASIC_STORAGES", guards = "s.getClass() == cachedClass")
-        static void doManaged(Node inliningTarget, BasicSequenceStorage s, int cap,
-                        @Cached PRaiseNode.Lazy raiseNode,
-                        @Cached("s.getClass()") Class<? extends BasicSequenceStorage> cachedClass) {
-            try {
-                BasicSequenceStorage profiled = cachedClass.cast(s);
-                profiled.ensureCapacity(cap);
-            } catch (OutOfMemoryError | ArithmeticException e) {
-                throw raiseNode.get(inliningTarget).raise(MemoryError);
-            }
+        @Specialization
+        static void doInt(IntSequenceStorage storage, int cap) {
+            storage.ensureCapacity(cap);
+        }
+
+        @Specialization
+        static void doLong(LongSequenceStorage storage, int cap) {
+            storage.ensureCapacity(cap);
+        }
+
+        @Specialization
+        static void doDouble(DoubleSequenceStorage storage, int cap) {
+            storage.ensureCapacity(cap);
+        }
+
+        @Specialization
+        static void doByte(ByteSequenceStorage storage, int cap) {
+            storage.ensureCapacity(cap);
+        }
+
+        @Specialization
+        static void doObject(ObjectSequenceStorage storage, int cap) {
+            storage.ensureCapacity(cap);
+        }
+
+        @Specialization
+        static void doBool(BoolSequenceStorage storage, int cap) {
+            storage.ensureCapacity(cap);
         }
 
         @Specialization
@@ -3083,6 +3102,11 @@ static void doNative(NativeSequenceStorage s, int cap,
             helper.execute(s, cap);
         }
 
+        @Specialization
+        static void doMro(MroSequenceStorage storage, int cap) {
+            throw CompilerDirectives.shouldNotReachHere();
+        }
+
         @GenerateInline(false)
         @GenerateUncached
         abstract static class EnsureCapacityNativeNode extends Node {

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

@@ -51,22 +51,10 @@ public final void incLength() {
     /**
      * The capacity we should allocate for a given length.
      */
-    private static int capacityFor(int length) throws ArithmeticException {
+    protected static int capacityFor(int length) throws ArithmeticException {
         return Math.max(16, Math.multiplyExact(length, 2));
     }
 
-    /**
-     * Ensure that the current capacity is big enough. If not, we increase capacity to the next
-     * designated size (not necessarily the requested one).
-     */
-    public final void ensureCapacity(int newCapacity) throws ArithmeticException {
-        if (CompilerDirectives.injectBranchProbability(CompilerDirectives.UNLIKELY_PROBABILITY, newCapacity > capacity)) {
-            increaseCapacityExactWithCopy(capacityFor(newCapacity));
-        }
-    }
-
-    protected abstract void increaseCapacityExactWithCopy(int newCapacity);
-
     public void minimizeCapacity() {
         capacity = length;
     }

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

@@ -25,6 +25,8 @@
  */
 package com.oracle.graal.python.runtime.sequence.storage;
 
+import com.oracle.truffle.api.CompilerDirectives;
+
 import java.util.Arrays;
 
 public final class BoolSequenceStorage extends ArrayBasedSequenceStorage {
@@ -51,12 +53,17 @@ public BoolSequenceStorage(int capacity) {
         this.length = 0;
     }
 
-    @Override
-    protected void increaseCapacityExactWithCopy(int newCapacity) {
+    private void increaseCapacityExactWithCopy(int newCapacity) {
         values = Arrays.copyOf(values, newCapacity);
         capacity = values.length;
     }
 
+    public void ensureCapacity(int newCapacity) throws ArithmeticException {
+        if (CompilerDirectives.injectBranchProbability(CompilerDirectives.UNLIKELY_PROBABILITY, newCapacity > capacity)) {
+            increaseCapacityExactWithCopy(capacityFor(newCapacity));
+        }
+    }
+
     @Override
     public BoolSequenceStorage createEmpty(int newLength) {
         return new BoolSequenceStorage(newLength);

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

@@ -36,6 +36,7 @@
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.ArrayUtils;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 
@@ -60,12 +61,17 @@ public ByteSequenceStorage(int capacity) {
         this.length = 0;
     }
 
-    @Override
-    protected void increaseCapacityExactWithCopy(int newCapacity) {
+    private void increaseCapacityExactWithCopy(int newCapacity) {
         values = Arrays.copyOf(values, newCapacity);
         capacity = values.length;
     }
 
+    public void ensureCapacity(int newCapacity) throws ArithmeticException {
+        if (CompilerDirectives.injectBranchProbability(CompilerDirectives.UNLIKELY_PROBABILITY, newCapacity > capacity)) {
+            increaseCapacityExactWithCopy(capacityFor(newCapacity));
+        }
+    }
+
     @Override
     public ByteSequenceStorage createEmpty(int newCapacity) {
         return new ByteSequenceStorage(newCapacity);

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

@@ -25,6 +25,8 @@
  */
 package com.oracle.graal.python.runtime.sequence.storage;
 
+import com.oracle.truffle.api.CompilerDirectives;
+
 import java.util.Arrays;
 
 public final class DoubleSequenceStorage extends ArrayBasedSequenceStorage {
@@ -53,12 +55,17 @@ public DoubleSequenceStorage(int capacity) {
         this.length = 0;
     }
 
-    @Override
-    protected void increaseCapacityExactWithCopy(int newCapacity) {
+    private void increaseCapacityExactWithCopy(int newCapacity) {
         values = Arrays.copyOf(values, newCapacity);
         capacity = values.length;
     }
 
+    public void ensureCapacity(int newCapacity) throws ArithmeticException {
+        if (CompilerDirectives.injectBranchProbability(CompilerDirectives.UNLIKELY_PROBABILITY, newCapacity > capacity)) {
+            increaseCapacityExactWithCopy(capacityFor(newCapacity));
+        }
+    }
+
     @Override
     public ArrayBasedSequenceStorage createEmpty(int newCapacity) {
         return new DoubleSequenceStorage(newCapacity);

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

@@ -25,6 +25,8 @@
  */
 package com.oracle.graal.python.runtime.sequence.storage;
 
+import com.oracle.truffle.api.CompilerDirectives;
+
 import java.util.Arrays;
 
 public final class IntSequenceStorage extends ArrayBasedSequenceStorage {
@@ -53,12 +55,17 @@ public IntSequenceStorage(int capacity) {
         this.length = 0;
     }
 
-    @Override
-    protected void increaseCapacityExactWithCopy(int newCapacity) {
+    private void increaseCapacityExactWithCopy(int newCapacity) {
         values = Arrays.copyOf(values, newCapacity);
         capacity = values.length;
     }
 
+    public void ensureCapacity(int newCapacity) throws ArithmeticException {
+        if (CompilerDirectives.injectBranchProbability(CompilerDirectives.UNLIKELY_PROBABILITY, newCapacity > capacity)) {
+            increaseCapacityExactWithCopy(capacityFor(newCapacity));
+        }
+    }
+
     @Override
     public IntSequenceStorage createEmpty(int newCapacity) {
         return new IntSequenceStorage(newCapacity);

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

@@ -29,6 +29,7 @@
 import java.util.Arrays;
 
 import com.oracle.graal.python.builtins.objects.ints.PInt;
+import com.oracle.truffle.api.CompilerDirectives;
 
 public final class LongSequenceStorage extends ArrayBasedSequenceStorage {
 
@@ -56,12 +57,17 @@ public LongSequenceStorage(int capacity) {
         this.length = 0;
     }
 
-    @Override
-    protected void increaseCapacityExactWithCopy(int newCapacity) {
+    private void increaseCapacityExactWithCopy(int newCapacity) {
         values = Arrays.copyOf(values, newCapacity);
         capacity = values.length;
     }
 
+    public void ensureCapacity(int newCapacity) throws ArithmeticException {
+        if (CompilerDirectives.injectBranchProbability(CompilerDirectives.UNLIKELY_PROBABILITY, newCapacity > capacity)) {
+            increaseCapacityExactWithCopy(capacityFor(newCapacity));
+        }
+    }
+
     @Override
     public LongSequenceStorage createEmpty(int newCapacity) {
         return new LongSequenceStorage(newCapacity);

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

@@ -132,12 +132,6 @@ public PythonAbstractClass[] getInternalClassArray() {
         return values;
     }
 
-    @SuppressWarnings("unused")
-    @Override
-    public void increaseCapacityExactWithCopy(int newCapacity) {
-        throw CompilerDirectives.shouldNotReachHere();
-    }
-
     @Override
     public Object getIndicativeValue() {
         return null;