[GR-10710] A bit more limit configs.

PullRequest: fastr/1751

Author: Palez

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Colon.java

@@ -85,8 +85,6 @@ public static RNode special(ArgumentsSignature signature, RNode[] arguments, boo
     @Child private ColonCastNode rightCast = ColonCastNodeGen.create();
     @Child private ColonInternal internal = ColonInternalNodeGen.create();
 
-    private static final double FLT_EPSILON = 1.19209290e-7;
-
     static {
         Casts.noCasts(Colon.class);
     }
@@ -163,7 +161,7 @@ protected RSequence colonAscending(int left, double right,
             if (isDouble.profile(right > Integer.MAX_VALUE)) {
                 return RDataFactory.createAscendingRange(left, right);
             } else {
-                return RDataFactory.createIntSequence(left, 1, effectiveLength(left, right));
+                return RDataFactory.createIntSequence(left, 1, RDataFactory.effectiveLength(left, right));
             }
         }
 
@@ -176,7 +174,7 @@ protected RSequence colonDescending(int left, double right,
             if (isDouble.profile(right <= Integer.MIN_VALUE)) {
                 return RDataFactory.createDescendingRange(left, right);
             } else {
-                return RDataFactory.createIntSequence(left, -1, effectiveLength(left, right));
+                return RDataFactory.createIntSequence(left, -1, RDataFactory.effectiveLength(left, right));
             }
         }
 
@@ -216,11 +214,6 @@ private void checkVecLength(double from, double to) {
                 throw error(RError.Message.TOO_LONG_VECTOR);
             }
         }
-
-        private static int effectiveLength(double start, double end) {
-            double r = Math.abs(end - start);
-            return (int) (r + 1 + FLT_EPSILON);
-        }
     }
 
     @NodeInfo(cost = NodeCost.NONE)

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/IsListFactor.java

@@ -25,17 +25,20 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
+import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
 import com.oracle.truffle.r.nodes.builtin.base.IsListFactorNodeGen.IsListFactorInternalNodeGen;
 import com.oracle.truffle.r.nodes.unary.IsFactorNode;
+import com.oracle.truffle.r.runtime.DSLConfig;
 import com.oracle.truffle.r.runtime.RRuntime;
 import com.oracle.truffle.r.runtime.builtins.RBuiltin;
 import com.oracle.truffle.r.runtime.data.model.RAbstractListVector;
 
 // from apply.c
 
+@ImportStatic({DSLConfig.class})
 @RBuiltin(name = "islistfactor", kind = INTERNAL, parameterNames = {"x", "recursive"}, behavior = PURE)
 public abstract class IsListFactor extends RBuiltinNode.Arg2 {
 
@@ -87,7 +90,7 @@ protected static IsListFactorInternal createNode(boolean recursive) {
     }
 
     // Note: the limit should never be reached
-    @Specialization(guards = "recursive == node.recursive", limit = "2")
+    @Specialization(guards = "recursive == node.recursive", limit = "99")
     protected byte isListFactor(Object value, @SuppressWarnings("unused") boolean recursive,
                     @Cached("createNode(recursive)") IsListFactorInternal node) {
         return RRuntime.asLogical(node.execute(value));

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/infix/ProfiledSpecialsUtils.java

@@ -40,7 +40,7 @@ public class ProfiledSpecialsUtils {
     @NodeChild(value = "index", type = ConvertIndex.class)
     protected abstract static class ProfiledSubscriptSpecialBase extends RNode {
 
-        protected static final int CACHE_LIMIT = 3;
+        protected static final int CACHE_LIMIT = DSLConfig.getCacheSize(3);
         protected final boolean inReplacement;
 
         @Child protected SubscriptSpecialBase defaultAccessNode;
@@ -158,7 +158,7 @@ protected SubscriptSpecial2Base createAccessNode() {
     @NodeChild(value = "value", type = ConvertValue.class)
     public abstract static class ProfiledUpdateSubscriptSpecialBase extends RNode {
 
-        protected static final int CACHE_LIMIT = 3;
+        protected static final int CACHE_LIMIT = DSLConfig.getCacheSize(3);
         protected final boolean inReplacement;
 
         public abstract Object execute(VirtualFrame frame, Object vector, Object index, Object value);
@@ -196,7 +196,7 @@ public Object accessGeneric(VirtualFrame frame, Object vector, Object index, Obj
     @NodeChild(value = "value", type = ConvertValue.class)
     public abstract static class ProfiledUpdateSubscriptSpecial2 extends RNode {
 
-        protected static final int CACHE_LIMIT = 3;
+        protected static final int CACHE_LIMIT = DSLConfig.getCacheSize(3);
         protected final boolean inReplacement;
 
         public abstract Object execute(VirtualFrame frame, Object vector, Object index1, Object index2, Object value);

com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/ReplaceVectorNode.java

@@ -37,6 +37,7 @@
 import com.oracle.truffle.r.nodes.builtin.CastBuilder.Predef;
 import com.oracle.truffle.r.nodes.objects.GetS4DataSlot;
 import com.oracle.truffle.r.nodes.profile.TruffleBoundaryNode;
+import com.oracle.truffle.r.runtime.DSLConfig;
 import com.oracle.truffle.r.runtime.RError;
 import com.oracle.truffle.r.runtime.RInternalError;
 import com.oracle.truffle.r.runtime.RRuntime;
@@ -61,7 +62,7 @@
 @ImportStatic({RRuntime.class, com.oracle.truffle.api.interop.Message.class})
 public abstract class ReplaceVectorNode extends RBaseNode {
 
-    protected static final int CACHE_LIMIT = 5;
+    protected static final int CACHE_LIMIT = DSLConfig.getCacheSize(5);
 
     protected final ElementAccessMode mode;
     private final boolean recursive;

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RDataFactory.java

@@ -1006,7 +1006,7 @@ public static RIntSequence createIntSequence(int start, int stride, int length)
 
     private static final double FLT_EPSILON = 1.19209290e-7;
 
-    private static int effectiveLength(double start, double end) {
+    public static int effectiveLength(double start, double end) {
         double r = Math.abs(end - start);
         return (int) (r + 1 + FLT_EPSILON);
     }

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/S4/TestS4.java

@@ -124,7 +124,8 @@ public void testMethods() {
 
         assertEval("{ setGeneric(\"gen\", function(o) standardGeneric(\"gen\")); res<-print(setGeneric(\"gen\", function(o) standardGeneric(\"gen\"))); removeGeneric(\"gen\"); res }");
 
-        assertEval("{ setClass(\"foo\"); setMethod(\"diag<-\", \"foo\", function(x, value) 42); removeMethod(\"diag<-\", \"foo\"); removeGeneric(\"diag<-\"); removeClass(\"foo\") }");
+        assertEval(Output.IgnoreWarningMessage,
+                        "{ setClass(\"foo\"); setMethod(\"diag<-\", \"foo\", function(x, value) 42); removeMethod(\"diag<-\", \"foo\"); removeGeneric(\"diag<-\"); removeClass(\"foo\") }");
 
         assertEval("{ setClass('A'); setClass('A1', contains = 'A'); setClass('A2', contains = 'A1'); setGeneric('foo', function(a, b) standardGeneric('foo')); setMethod('foo', signature('A1', 'A2'), function(a, b) '1-2'); setMethod('foo', signature('A2', 'A1'), function(a, b) '2-1'); foo(new('A2'), new('A2')) }");