Implement CharSXP-specific messages in VectorDataLibrary

Pavel Marek · Pavel Marek · commit 6fbcb8376cc0 · 2021-06-25T13:45:54.000+02:00
(cherry picked from commit c2e4dcf)
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/SetStringEltNode.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/SetStringEltNode.java
@@ -37,8 +37,10 @@ public static SetStringEltNode create() {
 
     @Specialization(limit = "getTypedVectorDataLibraryCacheSize()")
     Object doIt(RStringVector vector, long index, CharSXPWrapper element,
-                    @CachedLibrary("vector.getData()") VectorDataLibrary dataLibrary) {
-        dataLibrary.setStringAt(vector.getData(), (int) index, element.getContents());
+                    @CachedLibrary(limit = "getTypedVectorDataLibraryCacheSize()") VectorDataLibrary dataLibrary) {
+        Object newCharSXPData = dataLibrary.materializeCharSXPStorage(vector.getData());
+        vector.setData(newCharSXPData);
+        dataLibrary.setCharSXPAt(vector.getData(), (int) index, element);
         return null;
     }
 }
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/StringEltNode.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nodes/StringEltNode.java
@@ -22,11 +22,11 @@
  */
 package com.oracle.truffle.r.ffi.impl.nodes;
 
-import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.library.CachedLibrary;
-import com.oracle.truffle.api.profiles.ConditionProfile;
+import com.oracle.truffle.r.runtime.RError;
 import com.oracle.truffle.r.runtime.data.RStringVector;
 import com.oracle.truffle.r.runtime.data.VectorDataLibrary;
 
@@ -36,17 +36,16 @@ public static StringEltNode create() {
         return StringEltNodeGen.create();
     }
 
-    // TODO: Make just one specialization that handles both altrep and non-altrep via
-    // VectorDataLibrary
     @Specialization(limit = "1")
     Object doStringVector(RStringVector stringVector, long index,
-                    @CachedLibrary("stringVector.getData()") VectorDataLibrary dataLibrary,
-                    @Cached("createBinaryProfile()") ConditionProfile isAltrepProfile) {
-        if (isAltrepProfile.profile(stringVector.isAltRep())) {
-            return dataLibrary.getStringAt(stringVector, (int) index);
-        } else {
-            stringVector.wrapStrings();
-            return stringVector.getWrappedDataAt((int) index);
+                    @CachedLibrary(limit = "getTypedVectorDataLibraryCacheSize()") VectorDataLibrary genericDataLib,
+                    @CachedLibrary("stringVector.getData()") VectorDataLibrary stringVecDataLib) {
+        Object newCharSXPData = stringVecDataLib.materializeCharSXPStorage(stringVector.getData());
+        stringVector.setData(newCharSXPData);
+        if (index > Integer.MAX_VALUE) {
+            CompilerDirectives.transferToInterpreter();
+            throw RError.error(RError.NO_CALLER, RError.Message.LONG_VECTORS_NOT_SUPPORTED);
         }
+        return genericDataLib.getCharSXPAt(stringVector.getData(), (int) index);
     }
 }
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RStringArrayVectorData.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RStringArrayVectorData.java
@@ -22,10 +22,6 @@
  */
 package com.oracle.truffle.r.runtime.data;
 
-import static com.oracle.truffle.r.runtime.data.model.RAbstractVector.ENABLE_COMPLETE;
-
-import java.util.Arrays;
-
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.interop.TruffleObject;
@@ -43,6 +39,10 @@
 import com.oracle.truffle.r.runtime.data.VectorDataLibrary.SeqWriteIterator;
 import com.oracle.truffle.r.runtime.ops.na.NACheck;
 
+import java.util.Arrays;
+
+import static com.oracle.truffle.r.runtime.data.model.RAbstractVector.ENABLE_COMPLETE;
+
 @ExportLibrary(VectorDataLibrary.class)
 class RStringArrayVectorData implements TruffleObject, ShareableVectorData {
     private final String[] data;
@@ -84,6 +84,11 @@ public RStringArrayVectorData materialize() {
         return this;
     }
 
+    @ExportMessage
+    public RStringCharSXPData materializeCharSXPStorage() {
+        return wrapStrings();
+    }
+
     @ExportMessage
     public boolean isWriteable() {
         return true;
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RStringCharSXPData.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RStringCharSXPData.java
@@ -35,6 +35,8 @@
 import com.oracle.truffle.r.runtime.data.VectorDataLibrary.SeqWriteIterator;
 import com.oracle.truffle.r.runtime.ops.na.NACheck;
 
+import java.util.Arrays;
+
 @ExportLibrary(VectorDataLibrary.class)
 public class RStringCharSXPData implements ShareableVectorData {
     private final CharSXPWrapper[] data;
@@ -75,6 +77,11 @@ public RStringCharSXPData materialize() {
         return this;
     }
 
+    @ExportMessage
+    public RStringCharSXPData materializeCharSXPStorage() {
+        return this;
+    }
+
     @ExportMessage
     public boolean isWriteable() {
         return true;
@@ -96,6 +103,11 @@ public String[] getStringDataCopy() {
         return result;
     }
 
+    @ExportMessage
+    public CharSXPWrapper[] getCharSXPDataCopy() {
+        return Arrays.copyOf(data, data.length);
+    }
+
     // Data access:
 
     @ExportMessage
@@ -140,6 +152,21 @@ public String getString(@SuppressWarnings("unused") RandomAccessIterator it, int
         return data[index].getContents();
     }
 
+    @ExportMessage
+    public CharSXPWrapper getCharSXPAt(int index) {
+        return data[index];
+    }
+
+    @ExportMessage
+    public CharSXPWrapper getNextCharSXP(SeqIterator it) {
+        return data[it.getIndex()];
+    }
+
+    @ExportMessage
+    public CharSXPWrapper getCharSXP(@SuppressWarnings("unused") RandomAccessIterator it, int index) {
+        return data[index];
+    }
+
     // Write access to the elements:
 
     @ExportMessage
@@ -166,4 +193,19 @@ public void setNextString(SeqWriteIterator it, String value) {
     public void setString(@SuppressWarnings("unused") RandomAccessWriteIterator it, int index, String value) {
         data[index] = CharSXPWrapper.create(value);
     }
+
+    @ExportMessage
+    public void setCharSXPAt(int index, CharSXPWrapper value) {
+        data[index] = value;
+    }
+
+    @ExportMessage
+    public void setNextCharSXP(SeqWriteIterator it, CharSXPWrapper value) {
+        data[it.getIndex()] = value;
+    }
+
+    @ExportMessage
+    public void setCharSXP(@SuppressWarnings("unused") RandomAccessWriteIterator it, int index, CharSXPWrapper value) {
+        data[index] = value;
+    }
 }
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RStringSeqVectorData.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RStringSeqVectorData.java
@@ -117,6 +117,11 @@ public RStringArrayVectorData materialize() {
         return new RStringArrayVectorData(getStringDataCopy(), true);
     }
 
+    @ExportMessage
+    public RStringCharSXPData materializeCharSXPStorage() {
+        return new RStringCharSXPData(getCharSXPDataCopy());
+    }
+
     @ExportMessage
     public RStringSeqVectorData copy(@SuppressWarnings("unused") boolean deep) {
         return new RStringSeqVectorData(prefix, suffix, start, stride, length);
@@ -136,6 +141,15 @@ public String[] getStringDataCopy() {
         return result;
     }
 
+    @ExportMessage
+    public CharSXPWrapper[] getCharSXPDataCopy() {
+        CharSXPWrapper[] result = new CharSXPWrapper[length];
+        for (int i = 0; i < result.length; i++) {
+            result[i] = getCharSXPImpl(i);
+        }
+        return result;
+    }
+
     // Read access to the elements:
 
     @ExportMessage
@@ -179,11 +193,30 @@ public String getString(@SuppressWarnings("unused") RandomAccessIterator it, int
         return getStringImpl(index);
     }
 
+    @ExportMessage
+    public CharSXPWrapper getCharSXPAt(int index) {
+        return getCharSXPImpl(index);
+    }
+
+    @ExportMessage
+    public CharSXPWrapper getNextCharSXP(SeqIterator it) {
+        return getCharSXPImpl(it.getIndex());
+    }
+
+    @ExportMessage
+    public CharSXPWrapper getCharSXP(@SuppressWarnings("unused") RandomAccessIterator it, int index) {
+        return getCharSXPImpl(index);
+    }
+
     // Utility methods:
 
     @TruffleBoundary
     private String getStringImpl(int index) {
         assert index >= 0 && index < getLength();
         return prefix + (start + stride * index) + suffix;
     }
+
+    private CharSXPWrapper getCharSXPImpl(int index) {
+        return CharSXPWrapper.create(getStringImpl(index));
+    }
 }
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/VectorDataClosure.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/VectorDataClosure.java
@@ -352,6 +352,43 @@ public String getString(RandomAccessIterator it, int index,
         return dataLib.getString(data, it, index);
     }
 
+    // CharSXP
+
+    @ExportMessage
+    public CharSXPWrapper[] getCharSXPDataCopy(@CachedLibrary("this.data") VectorDataLibrary dataLib) {
+        assert getTargetType() == RType.Char || getTargetType() == RType.Character;
+        CharSXPWrapper[] result = new CharSXPWrapper[getLength(dataLib)];
+        SeqIterator it = dataLib.iterator(data);
+        while (dataLib.next(data, it)) {
+            result[it.getIndex()] = dataLib.getNextCharSXP(data, it);
+        }
+        return result;
+    }
+
+    @ExportMessage
+    public RStringCharSXPData materializeCharSXPStorage(@CachedLibrary("this.data") VectorDataLibrary dataLib) {
+        assert getTargetType() == RType.Char || getTargetType() == RType.Character;
+        return new RStringCharSXPData(getCharSXPDataCopy(dataLib));
+    }
+
+    @ExportMessage
+    public CharSXPWrapper getCharSXPAt(int index,
+                        @CachedLibrary("this.data") VectorDataLibrary dataLib) {
+        return dataLib.getCharSXPAt(data, index);
+    }
+
+    @ExportMessage
+    public CharSXPWrapper getNextCharSXP(SeqIterator it,
+                        @CachedLibrary("this.data") VectorDataLibrary dataLib) {
+        return dataLib.getNextCharSXP(data, it);
+    }
+
+    @ExportMessage
+    public CharSXPWrapper getCharSXP(RandomAccessIterator it, int index,
+                        @CachedLibrary("this.data") VectorDataLibrary dataLib) {
+        return dataLib.getCharSXP(data, it, index);
+    }
+
     // List
 
     @ExportMessage
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/VectorDataLibrary.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/VectorDataLibrary.java

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,10 @@ public static SetStringEltNode create() {`
`37`	`37`
`38`	`38`	`@Specialization(limit = "getTypedVectorDataLibraryCacheSize()")`
`39`	`39`	`Object doIt(RStringVector vector, long index, CharSXPWrapper element,`
`40`		`- @CachedLibrary("vector.getData()") VectorDataLibrary dataLibrary) {`
`41`		`- dataLibrary.setStringAt(vector.getData(), (int) index, element.getContents());`
	`40`	`+ @CachedLibrary(limit = "getTypedVectorDataLibraryCacheSize()") VectorDataLibrary dataLibrary) {`
	`41`	`+ Object newCharSXPData = dataLibrary.materializeCharSXPStorage(vector.getData());`
	`42`	`+ vector.setData(newCharSXPData);`
	`43`	`+ dataLibrary.setCharSXPAt(vector.getData(), (int) index, element);`
`42`	`44`	`return null;`
`43`	`45`	`}`
`44`	`46`	`}`