Refactor str.__lt/le/gt/ge__

Author: otethal

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java

@@ -121,7 +121,6 @@
 import com.oracle.graal.python.builtins.objects.slice.SliceNodes.ComputeIndices;
 import com.oracle.graal.python.builtins.objects.str.StringBuiltinsClinicProviders.FormatNodeClinicProviderGen;
 import com.oracle.graal.python.builtins.objects.str.StringBuiltinsClinicProviders.SplitNodeClinicProviderGen;
-import com.oracle.graal.python.builtins.objects.str.StringBuiltinsFactory.LtNodeFactory;
 import com.oracle.graal.python.builtins.objects.str.StringNodes.CastToJavaStringCheckedNode;
 import com.oracle.graal.python.builtins.objects.str.StringNodes.CastToTruffleStringCheckedNode;
 import com.oracle.graal.python.builtins.objects.str.StringNodes.JoinInternalNode;
@@ -164,6 +163,7 @@
 import com.oracle.graal.python.runtime.formatting.StringFormatProcessor;
 import com.oracle.graal.python.runtime.formatting.TextFormatter;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
+import com.oracle.graal.python.util.IntPredicate;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
@@ -177,7 +177,6 @@
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.ImportStatic;
-import com.oracle.truffle.api.dsl.NeverDefault;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -385,20 +384,23 @@ static Object doGeneric(Node inliningTarget, Object self, Object other, boolean
         }
     }
 
-    abstract static class StringCmpOpBaseNode extends PythonBinaryBuiltinNode {
+    @GenerateInline
+    @GenerateCached(false)
+    abstract static class StringCmpOpHelperNode extends Node {
+
+        abstract Object execute(Node inliningTarget, Object self, Object other, IntPredicate resultProcessor);
+
         @Specialization
-        boolean doStrings(TruffleString self, TruffleString other,
-                        @Shared("compareIntsUtf32") @Cached TruffleString.CompareIntsUTF32Node compareIntsUTF32Node) {
-            return processResult(StringUtils.compareStrings(self, other, compareIntsUTF32Node));
+        static boolean doStrings(TruffleString self, TruffleString other, IntPredicate resultProcessor,
+                        @Shared @Cached(inline = false) TruffleString.CompareIntsUTF32Node compareIntsUTF32Node) {
+            return resultProcessor.test(StringUtils.compareStrings(self, other, compareIntsUTF32Node));
         }
 
         @Specialization
-        @SuppressWarnings("truffle-static-method")
-        Object doGeneric(Object self, Object other,
-                        @Bind("this") Node inliningTarget,
+        static Object doGeneric(Node inliningTarget, Object self, Object other, IntPredicate resultProcessor,
                         @Cached CastToTruffleStringCheckedNode castSelfNode,
                         @Cached CastToTruffleStringNode castOtherNode,
-                        @Shared("compareIntsUtf32") @Cached TruffleString.CompareIntsUTF32Node compareIntsUTF32Node,
+                        @Shared @Cached(inline = false) TruffleString.CompareIntsUTF32Node compareIntsUTF32Node,
                         @Cached InlinedBranchProfile noStringBranch) {
             TruffleString selfStr = castSelfNode.cast(inliningTarget, self, ErrorMessages.REQUIRES_STR_OBJECT_BUT_RECEIVED_P, T___EQ__, self);
             TruffleString otherStr;
@@ -408,13 +410,7 @@ Object doGeneric(Object self, Object other,
                 noStringBranch.enter(inliningTarget);
                 return PNotImplemented.NOT_IMPLEMENTED;
             }
-            return doStrings(selfStr, otherStr, compareIntsUTF32Node);
-        }
-
-        @SuppressWarnings("unused")
-        boolean processResult(int cmpResult) {
-            CompilerAsserts.neverPartOfCompilation();
-            throw new IllegalStateException("should not be reached");
+            return doStrings(selfStr, otherStr, resultProcessor, compareIntsUTF32Node);
         }
     }
 
@@ -461,42 +457,49 @@ static Object doIt(Object self, Object other,
 
     @Builtin(name = J___LT__, minNumOfPositionalArgs = 2)
     @GenerateNodeFactory
-    public abstract static class LtNode extends StringCmpOpBaseNode {
-        @Override
-        boolean processResult(int cmpResult) {
-            return cmpResult < 0;
-        }
+    public abstract static class LtNode extends PythonBinaryBuiltinNode {
 
-        @NeverDefault
-        public static LtNode create() {
-            return LtNodeFactory.create();
+        @Specialization
+        static Object doIt(Object self, Object other,
+                        @Bind("this") Node inliningTarget,
+                        @Cached StringCmpOpHelperNode stringCmpOpHelperNode) {
+            return stringCmpOpHelperNode.execute(inliningTarget, self, other, r -> r < 0);
         }
     }
 
     @Builtin(name = J___LE__, minNumOfPositionalArgs = 2)
     @GenerateNodeFactory
-    public abstract static class LeNode extends StringCmpOpBaseNode {
-        @Override
-        boolean processResult(int cmpResult) {
-            return cmpResult <= 0;
+    public abstract static class LeNode extends PythonBinaryBuiltinNode {
+
+        @Specialization
+        static Object doIt(Object self, Object other,
+                        @Bind("this") Node inliningTarget,
+                        @Cached StringCmpOpHelperNode stringCmpOpHelperNode) {
+            return stringCmpOpHelperNode.execute(inliningTarget, self, other, r -> r <= 0);
         }
     }
 
     @Builtin(name = J___GT__, minNumOfPositionalArgs = 2)
     @GenerateNodeFactory
-    public abstract static class GtNode extends StringCmpOpBaseNode {
-        @Override
-        boolean processResult(int cmpResult) {
-            return cmpResult > 0;
+    public abstract static class GtNode extends PythonBinaryBuiltinNode {
+
+        @Specialization
+        static Object doIt(Object self, Object other,
+                        @Bind("this") Node inliningTarget,
+                        @Cached StringCmpOpHelperNode stringCmpOpHelperNode) {
+            return stringCmpOpHelperNode.execute(inliningTarget, self, other, r -> r > 0);
         }
     }
 
     @Builtin(name = J___GE__, minNumOfPositionalArgs = 2)
     @GenerateNodeFactory
-    public abstract static class GeNode extends StringCmpOpBaseNode {
-        @Override
-        boolean processResult(int cmpResult) {
-            return cmpResult >= 0;
+    public abstract static class GeNode extends PythonBinaryBuiltinNode {
+
+        @Specialization
+        static Object doIt(Object self, Object other,
+                        @Bind("this") Node inliningTarget,
+                        @Cached StringCmpOpHelperNode stringCmpOpHelperNode) {
+            return stringCmpOpHelperNode.execute(inliningTarget, self, other, r -> r >= 0);
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/IntPredicate.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2023, 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.util;
+
+@FunctionalInterface
+public interface IntPredicate extends java.util.function.IntPredicate {
+}