Fixed the vector access support.

Palez · Palez · commit e3c5a401d9c5 · 2018-10-18T10:55:28.000+02:00
diff --git a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/PPSum.java b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/PPSum.java
@@ -46,7 +46,7 @@ public abstract static class PPSumExternal extends RExternalBuiltinNode.Arg2 {
             casts.arg(1).asIntegerVector().findFirst();
         }
 
-        @Specialization(guards = {"uAccess.supports(u)", "LIMIT_1_GUARD"})
+        @Specialization(guards = "uAccess.supports(u)", limit = "getVectorAccessCacheSize()")
         protected RDoubleVector doPPSum(RAbstractDoubleVector u, int sl,
                         @Cached("create()") VectorFactory factory,
                         @Cached("u.access()") VectorAccess uAccess) {
diff --git a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/RMultinomNode.java b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/stats/RMultinomNode.java
@@ -81,7 +81,7 @@ public RBaseNode getErrorContext() {
         return RError.SHOW_CALLER;
     }
 
-    @Specialization(guards = {"probsAccess.supports(probs)", "LIMIT_1_GUARD"})
+    @Specialization(guards = "probsAccess.supports(probs)", limit = "getVectorAccessCacheSize()")
     protected RIntVector doMultinom(int n, int size, RAbstractDoubleVector probs,
                     @Cached("probs.access()") VectorAccess probsAccess) {
         try (SequentialIterator probsIter = probsAccess.access(probs)) {
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AnyNA.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/AnyNA.java
@@ -109,7 +109,7 @@ protected byte isNA(@SuppressWarnings("unused") RNull value, @SuppressWarnings("
         return RRuntime.LOGICAL_FALSE;
     }
 
-    @Specialization(guards = {"xAccess.supports(x)", "LIMIT_1_GUARD"})
+    @Specialization(guards = "xAccess.supports(x)", limit = "getVectorAccessCacheSize()")
     protected byte anyNACached(RAbstractAtomicVector x, @SuppressWarnings("unused") boolean recursive,
                     @Cached("x.access()") VectorAccess xAccess) {
         switch (xAccess.getType()) {
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/ConnectionFunctions.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/ConnectionFunctions.java
@@ -1072,7 +1072,7 @@ private static byte[] encodeString(String s) {
             return s.getBytes(StandardCharsets.UTF_8);
         }
 
-        @Specialization(guards = {"objectAccess.supports(object)", "LIMIT_1_GUARD"})
+        @Specialization(guards = "objectAccess.supports(object)", limit = "getVectorAccessCacheSize()")
         protected ByteBuffer write(RAbstractVector object, @SuppressWarnings("unused") int size, boolean swap, @SuppressWarnings("unused") boolean useBytes,
                         @Cached("object.access()") VectorAccess objectAccess) {
             try (SequentialIterator iter = objectAccess.access(object)) {
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/CumProd.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/CumProd.java
@@ -68,7 +68,7 @@ protected RDoubleVector cumNull(@SuppressWarnings("unused") RNull x) {
         return RDataFactory.createEmptyDoubleVector();
     }
 
-    @Specialization(guards = {"xAccess.supports(x)", "LIMIT_1_GUARD"})
+    @Specialization(guards = "xAccess.supports(x)", limit = "getVectorAccessCacheSize()")
     protected RDoubleVector cumprodDouble(RAbstractDoubleVector x,
                     @Cached("x.access()") VectorAccess xAccess) {
         try (SequentialIterator iter = xAccess.access(x)) {
@@ -97,7 +97,7 @@ protected RDoubleVector cumprodDoubleGeneric(RAbstractDoubleVector x) {
         return cumprodDouble(x, x.slowPathAccess());
     }
 
-    @Specialization(guards = {"xAccess.supports(x)", "LIMIT_1_GUARD"})
+    @Specialization(guards = "xAccess.supports(x)", limit = "getVectorAccessCacheSize()")
     protected RComplexVector cumprodComplex(RAbstractComplexVector x,
                     @Cached("x.access()") VectorAccess xAccess) {
         try (SequentialIterator iter = xAccess.access(x)) {
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/IsNA.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/IsNA.java
@@ -148,7 +148,7 @@ private RLogicalVector isNAVector(RAbstractVector vector, VectorAccess access) {
         }
     }
 
-    @Specialization(guards = {"access.supports(vector)", "LIMIT_1_GUARD"})
+    @Specialization(guards = "access.supports(vector)", limit = "getVectorAccessCacheSize()")
     protected RLogicalVector isNACached(RAbstractVector vector,
                     @Cached("vector.access()") VectorAccess access) {
         return isNAVector(vector, access);
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Split.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Split.java
@@ -282,7 +282,7 @@ private RStringVector[] getNames(RAbstractVector x, VectorAccess fAccess, Sequen
 
         protected abstract void execute(VectorAccess fAccess, SequentialIterator fIter, RStringVector names, String[][] namesArr, int[] resultNamesIdxs);
 
-        @Specialization(guards = {"namesAccess.supports(names)", "LIMIT_1_GUARD"})
+        @Specialization(guards = "namesAccess.supports(names)", limit = "getVectorAccessCacheSize()")
         protected void fillNames(VectorAccess fAccess, SequentialIterator fIter, RStringVector names, String[][] namesArr, int[] resultNamesIdxs,
                         @Cached("names.access()") VectorAccess namesAccess) {
             try (SequentialIterator namesIter = namesAccess.access(names)) {
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/ExtractVectorNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/ExtractVectorNode.java
@@ -194,7 +194,7 @@ protected static String extract(String value) {
             return value;
         }
 
-        @Specialization(guards = {"access.supports(value)", "LIMIT_1_GUARD"})
+        @Specialization(guards = "access.supports(value)", limit = "getVectorAccessCacheSize()")
         protected static String extractCached(RAbstractStringVector value,
                         @Cached("value.access()") VectorAccess access) {
             try (RandomIterator iter = access.randomAccess(value)) {
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastSymbolNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastSymbolNode.java
@@ -110,7 +110,7 @@ protected RSymbol doString(String value) {
         return asSymbol(value);
     }
 
-    @Specialization(guards = {"access.supports(vector)", "LIMIT_1_GUARD"})
+    @Specialization(guards = "access.supports(vector)", limit = "getVectorAccessCacheSize()")
     protected RSymbol doVector(RAbstractAtomicVector vector,
                     @Cached("createBinaryProfile()") ConditionProfile emptyProfile,
                     @Cached("vector.access()") VectorAccess access) {
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/ToStringNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/ToStringNode.java
@@ -185,7 +185,7 @@ private String vectorToString(RAbstractVector vector, String separator, VectorAc
         }
     }
 
-    @Specialization(guards = {"vectorAccess.supports(vector)", "LIMIT_1_GUARD"})
+    @Specialization(guards = "vectorAccess.supports(vector)", limit = "getVectorAccessCacheSize()")
     protected String toStringVectorCached(RAbstractVector vector, String separator,
                     @Cached("vector.access()") VectorAccess vectorAccess) {
         return vectorToString(vector, separator, vectorAccess);
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/UnaryArithmeticReduceNode.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/UnaryArithmeticReduceNode.java
@@ -249,7 +249,7 @@ private Object doInt(RAbstractVector vector, boolean naRm, VectorAccess access)
         return result;
     }
 
-    @Specialization(guards = {"access.supports(vector)", "LIMIT_1_GUARD"})
+    @Specialization(guards = "access.supports(vector)", limit = "getVectorAccessCacheSize()")
     protected Object doIntCached(RAbstractIntVector vector, boolean naRm, @SuppressWarnings("unused") boolean finite,
                     @Cached("vector.access()") VectorAccess access) {
         return doInt(vector, naRm, access);
@@ -260,7 +260,7 @@ protected Object doIntGeneric(RAbstractIntVector vector, boolean naRm, @Suppress
         return doInt(vector, naRm, vector.slowPathAccess());
     }
 
-    @Specialization(guards = {"access.supports(vector)", "LIMIT_1_GUARD"})
+    @Specialization(guards = "access.supports(vector)", limit = "getVectorAccessCacheSize()")
     protected Object doLogicalCached(RAbstractLogicalVector vector, boolean naRm, @SuppressWarnings("unused") boolean finite,
                     @Cached("vector.access()") VectorAccess access) {
         return doInt(vector, naRm, access);
@@ -303,7 +303,7 @@ private double doDouble(RAbstractDoubleVector vector, boolean naRm, boolean fini
         return result;
     }
 
-    @Specialization(guards = {"access.supports(vector)", "LIMIT_1_GUARD"})
+    @Specialization(guards = "access.supports(vector)", limit = "getVectorAccessCacheSize()")
     protected double doDoubleCached(RAbstractDoubleVector vector, boolean naRm, boolean finite,
                     @Cached("createBinaryProfile()") ConditionProfile finiteProfile,
                     @Cached("createBinaryProfile()") ConditionProfile isInfiniteProfile,

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public abstract static class PPSumExternal extends RExternalBuiltinNode.Arg2 {`
`46`	`46`	`casts.arg(1).asIntegerVector().findFirst();`
`47`	`47`	`}`
`48`	`48`
`49`		`- @Specialization(guards = {"uAccess.supports(u)", "LIMIT_1_GUARD"})`
	`49`	`+ @Specialization(guards = "uAccess.supports(u)", limit = "getVectorAccessCacheSize()")`
`50`	`50`	`protected RDoubleVector doPPSum(RAbstractDoubleVector u, int sl,`
`51`	`51`	`@Cached("create()") VectorFactory factory,`
`52`	`52`	`@Cached("u.access()") VectorAccess uAccess) {`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public RBaseNode getErrorContext() {`
`81`	`81`	`return RError.SHOW_CALLER;`
`82`	`82`	`}`
`83`	`83`
`84`		`- @Specialization(guards = {"probsAccess.supports(probs)", "LIMIT_1_GUARD"})`
	`84`	`+ @Specialization(guards = "probsAccess.supports(probs)", limit = "getVectorAccessCacheSize()")`
`85`	`85`	`protected RIntVector doMultinom(int n, int size, RAbstractDoubleVector probs,`
`86`	`86`	`@Cached("probs.access()") VectorAccess probsAccess) {`
`87`	`87`	`try (SequentialIterator probsIter = probsAccess.access(probs)) {`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ protected byte isNA(@SuppressWarnings("unused") RNull value, @SuppressWarnings("`
`109`	`109`	`return RRuntime.LOGICAL_FALSE;`
`110`	`110`	`}`
`111`	`111`
`112`		`- @Specialization(guards = {"xAccess.supports(x)", "LIMIT_1_GUARD"})`
	`112`	`+ @Specialization(guards = "xAccess.supports(x)", limit = "getVectorAccessCacheSize()")`
`113`	`113`	`protected byte anyNACached(RAbstractAtomicVector x, @SuppressWarnings("unused") boolean recursive,`
`114`	`114`	`@Cached("x.access()") VectorAccess xAccess) {`
`115`	`115`	`switch (xAccess.getType()) {`
Original file line number	Diff line number	Diff line change
`@@ -1072,7 +1072,7 @@ private static byte[] encodeString(String s) {`
`1072`	`1072`	`return s.getBytes(StandardCharsets.UTF_8);`
`1073`	`1073`	`}`
`1074`	`1074`
`1075`		`- @Specialization(guards = {"objectAccess.supports(object)", "LIMIT_1_GUARD"})`
	`1075`	`+ @Specialization(guards = "objectAccess.supports(object)", limit = "getVectorAccessCacheSize()")`
`1076`	`1076`	`protected ByteBuffer write(RAbstractVector object, @SuppressWarnings("unused") int size, boolean swap, @SuppressWarnings("unused") boolean useBytes,`
`1077`	`1077`	`@Cached("object.access()") VectorAccess objectAccess) {`
`1078`	`1078`	`try (SequentialIterator iter = objectAccess.access(object)) {`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ private RLogicalVector isNAVector(RAbstractVector vector, VectorAccess access) {`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`
`151`		`- @Specialization(guards = {"access.supports(vector)", "LIMIT_1_GUARD"})`
	`151`	`+ @Specialization(guards = "access.supports(vector)", limit = "getVectorAccessCacheSize()")`
`152`	`152`	`protected RLogicalVector isNACached(RAbstractVector vector,`
`153`	`153`	`@Cached("vector.access()") VectorAccess access) {`
`154`	`154`	`return isNAVector(vector, access);`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ protected static String extract(String value) {`
`194`	`194`	`return value;`
`195`	`195`	`}`
`196`	`196`
`197`		`- @Specialization(guards = {"access.supports(value)", "LIMIT_1_GUARD"})`
	`197`	`+ @Specialization(guards = "access.supports(value)", limit = "getVectorAccessCacheSize()")`
`198`	`198`	`protected static String extractCached(RAbstractStringVector value,`
`199`	`199`	`@Cached("value.access()") VectorAccess access) {`
`200`	`200`	`try (RandomIterator iter = access.randomAccess(value)) {`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ protected RSymbol doString(String value) {`
`110`	`110`	`return asSymbol(value);`
`111`	`111`	`}`
`112`	`112`
`113`		`- @Specialization(guards = {"access.supports(vector)", "LIMIT_1_GUARD"})`
	`113`	`+ @Specialization(guards = "access.supports(vector)", limit = "getVectorAccessCacheSize()")`
`114`	`114`	`protected RSymbol doVector(RAbstractAtomicVector vector,`
`115`	`115`	`@Cached("createBinaryProfile()") ConditionProfile emptyProfile,`
`116`	`116`	`@Cached("vector.access()") VectorAccess access) {`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ private String vectorToString(RAbstractVector vector, String separator, VectorAc`
`185`	`185`	`}`
`186`	`186`	`}`
`187`	`187`
`188`		`- @Specialization(guards = {"vectorAccess.supports(vector)", "LIMIT_1_GUARD"})`
	`188`	`+ @Specialization(guards = "vectorAccess.supports(vector)", limit = "getVectorAccessCacheSize()")`
`189`	`189`	`protected String toStringVectorCached(RAbstractVector vector, String separator,`
`190`	`190`	`@Cached("vector.access()") VectorAccess vectorAccess) {`
`191`	`191`	`return vectorToString(vector, separator, vectorAccess);`