[GR-2798] Implement XYZ_NO_NA and XYZ_IS_SORTED, add test heapdump.R, improve configure_fastr.

PullRequest: fastr/2480

Author: steve-s

CHANGELOG.md

@@ -5,6 +5,10 @@ Bug fixes:
 * FastR cleans-up the temporary directory created for internal implementation of the R input handlers
 * Improve performance of `unique` #154
 
+Added missing R builtins and C APIs
+
+* Dummy implementations of `X_IS_SORTED` and `X_NO_NA` for `X = STRING,INTEGER,REAL` #156
+
 # 20.1.0
 
 New features:

com.oracle.truffle.r.native/fficall/src/truffle_common/Rinternals_truffle_common.h

@@ -1969,14 +1969,43 @@ const SEXP *(STRING_PTR_RO)(SEXP x) {
 }
 
 // The ALTREP framework is not implemented on FastR yet
-
-#define ALTREP_UNIMPLEMENTED { UNIMPLEMENTED; }
+// Dummy implementations:
 
 int (ALTREP)(SEXP x) {
     // there can be no ALTREP objects on FastR
     return 0;
 }
 
+int STRING_NO_NA(SEXP x) {
+    return 0;
+}
+
+int REAL_NO_NA(SEXP x) {
+    return 0;
+}
+
+int INTEGER_NO_NA(SEXP x) {
+    return 0;
+}
+
+int INTEGER_IS_SORTED(SEXP x) {
+    return UNKNOWN_SORTEDNESS;
+}
+
+int REAL_IS_SORTED(SEXP x) {
+    return UNKNOWN_SORTEDNESS;
+}
+
+int STRING_IS_SORTED(SEXP x) {
+    return UNKNOWN_SORTEDNESS;
+}
+
+// Looks like there are not implemented even in GNU-R:
+#define ALTREP_UNIMPLEMENTED { UNIMPLEMENTED; }
+SEXP REAL_IS_NA(SEXP x) ALTREP_UNIMPLEMENTED
+SEXP INTEGER_IS_NA(SEXP x) ALTREP_UNIMPLEMENTED
+
+// Functions that we cannot implement without ALTREP support:
 SEXP R_altrep_data1(SEXP x) ALTREP_UNIMPLEMENTED
 SEXP R_altrep_data2(SEXP x) ALTREP_UNIMPLEMENTED
 void R_set_altrep_data1(SEXP x, SEXP v) ALTREP_UNIMPLEMENTED
@@ -2010,23 +2039,15 @@ void ALTCOMPLEX_SET_ELT(SEXP x, R_xlen_t i, Rcomplex v) ALTREP_UNIMPLEMENTED
 Rbyte ALTRAW_ELT(SEXP x, R_xlen_t i) ALTREP_UNIMPLEMENTED
 void ALTRAW_SET_ELT(SEXP x, R_xlen_t i, Rbyte v) ALTREP_UNIMPLEMENTED
 R_xlen_t INTEGER_GET_REGION(SEXP sx, R_xlen_t i, R_xlen_t n, int *buf) ALTREP_UNIMPLEMENTED
-int INTEGER_IS_SORTED(SEXP x) ALTREP_UNIMPLEMENTED
-int INTEGER_NO_NA(SEXP x) ALTREP_UNIMPLEMENTED
 SEXP ALTINTEGER_SUM(SEXP x, Rboolean narm) ALTREP_UNIMPLEMENTED
 SEXP ALTREAL_SUM(SEXP x, Rboolean narm) ALTREP_UNIMPLEMENTED
 SEXP ALTINTEGER_MIN(SEXP x, Rboolean narm) ALTREP_UNIMPLEMENTED
 SEXP ALTINTEGER_MAX(SEXP x, Rboolean narm) ALTREP_UNIMPLEMENTED
 SEXP ALTREAL_MIN(SEXP x, Rboolean narm) ALTREP_UNIMPLEMENTED
 SEXP ALTREAL_MAX(SEXP x, Rboolean narm) ALTREP_UNIMPLEMENTED
 SEXP INTEGER_MATCH(SEXP a, SEXP b, int c, SEXP d, SEXP e, Rboolean f) ALTREP_UNIMPLEMENTED
-SEXP INTEGER_IS_NA(SEXP x) ALTREP_UNIMPLEMENTED
 SEXP REAL_MATCH(SEXP a, SEXP b, int c, SEXP d, SEXP e, Rboolean f) ALTREP_UNIMPLEMENTED
 R_xlen_t REAL_GET_REGION(SEXP sx, R_xlen_t i, R_xlen_t n, double *buf) ALTREP_UNIMPLEMENTED
-int REAL_IS_SORTED(SEXP x) ALTREP_UNIMPLEMENTED
-int REAL_NO_NA(SEXP x) ALTREP_UNIMPLEMENTED
-SEXP REAL_IS_NA(SEXP x) ALTREP_UNIMPLEMENTED
-int STRING_IS_SORTED(SEXP x) ALTREP_UNIMPLEMENTED
-int STRING_NO_NA(SEXP x) ALTREP_UNIMPLEMENTED
 SEXP R_compact_intrange(R_xlen_t n1, R_xlen_t n2) ALTREP_UNIMPLEMENTED
 SEXP R_deferred_coerceToString(SEXP v, SEXP sp) ALTREP_UNIMPLEMENTED
 SEXP R_virtrep_vec(SEXP x, SEXP y) ALTREP_UNIMPLEMENTED

com.oracle.truffle.r.native/run/fastr_tools/configure_fastr

@@ -67,7 +67,7 @@ done
     res=0
     if ! ldconfig -p | grep --quiet "libgomp.so.1"; then
       echo "Error: could not find OpenMP runtime library: libgomp.so.1"
-      echo "Please install the OpenMP runtime library runtime libraries:"
+      echo "Please install the OpenMP runtime library:"
       echo "    On Debian based systems: apt-get install libgomp1"
       echo "    On Oracle Linux: yum install libgomp"
       echo "    Note: Oracle Linux 8 should contain libgomp by default"
@@ -86,7 +86,7 @@ done
       echo "    On Oracle Linux: yum groupinstall 'Development Tools' && yum install gcc-gfortran"
     fi
   elif [[ "$OSTYPE" == "darwin"* ]]; then
-    echo "The basic configuration of FastR was successfull."
+    echo "FastR should not have any requirements on MacOS."
     echo ""
     echo "Note: if you intend to install R packages you may need additional dependencies."
     echo "The most common dependency is GFortran, which must be of version 8.3.0 or later."
@@ -104,7 +104,8 @@ done
   R_LIBS_USER=`"$FASTR_HOME_DIR/bin/R" --slave -e 'cat(path.expand(Sys.getenv("R_LIBS_USER")))'`
   if [ ! -d "$R_LIBS_USER" ]; then
     echo
-    read -p "Default personal library directory ($R_LIBS_USER) does exist. Do you wish to create it? (Yy/Nn) " -n 1 -r
+    echo "Default personal library directory ($R_LIBS_USER) does not exist."
+    read -p "Do you wish to create it now? (Yy/Nn) " -n 1 -r
     echo
     if [[ $REPLY =~ ^[Yy]$ ]]; then
       echo "Creating personal library directory: $R_LIBS_USER"

com.oracle.truffle.r.native/version.source

@@ -1 +1 @@
-66
+67

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

@@ -35,6 +35,7 @@
 import com.oracle.truffle.r.nodes.binary.BinaryBooleanNodeGen;
 import com.oracle.truffle.r.nodes.binary.BinaryBooleanScalarNodeGen;
 import com.oracle.truffle.r.nodes.binary.BinaryBooleanSpecial;
+import com.oracle.truffle.r.nodes.builtin.RBuiltinNode;
 import com.oracle.truffle.r.nodes.builtin.RBuiltinPackage;
 import com.oracle.truffle.r.nodes.builtin.base.ConnectionFunctions.SockSelect;
 import com.oracle.truffle.r.nodes.builtin.base.ConnectionFunctionsFactory.SockSelectNodeGen;
@@ -880,15 +881,56 @@ private void addGridIntrinsics() {
     }
 
     private void addBinaryArithmetic(Class<?> builtinClass, BinaryArithmeticFactory binaryFactory, UnaryArithmeticFactory unaryFactory) {
-        add(builtinClass, () -> BinaryArithmeticNodeGen.create(binaryFactory, unaryFactory), BinaryArithmeticSpecial.createSpecialFactory(binaryFactory, unaryFactory));
+        add(builtinClass, new BinaryArithmeticBuiltinFactory(binaryFactory, unaryFactory), BinaryArithmeticSpecial.createSpecialFactory(binaryFactory, unaryFactory));
     }
 
     private void addUnaryArithmetic(Class<?> builtinClass, UnaryArithmeticFactory unaryFactory) {
-        add(builtinClass, () -> new UnaryArithmeticBuiltinNode(unaryFactory), UnaryArithmeticSpecial.createSpecialFactory(unaryFactory));
+        add(builtinClass, new UnaryArithmeticBuiltinFactory(unaryFactory), UnaryArithmeticSpecial.createSpecialFactory(unaryFactory));
     }
 
     private void addBinaryCompare(Class<?> builtinClass, BooleanOperationFactory factory) {
-        add(builtinClass, () -> BinaryBooleanNodeGen.create(factory), BinaryBooleanSpecial.createSpecialFactory(factory));
+        add(builtinClass, new BinaryCompareBuiltinFactory(factory), BinaryBooleanSpecial.createSpecialFactory(factory));
+    }
+
+    private static final class BinaryArithmeticBuiltinFactory implements Supplier<RBuiltinNode> {
+        private final BinaryArithmeticFactory binaryFactory;
+        private final UnaryArithmeticFactory unaryFactory;
+
+        BinaryArithmeticBuiltinFactory(BinaryArithmeticFactory binaryFactory, UnaryArithmeticFactory unaryFactory) {
+            this.binaryFactory = binaryFactory;
+            this.unaryFactory = unaryFactory;
+        }
+
+        @Override
+        public RBuiltinNode get() {
+            return BinaryArithmeticNodeGen.create(binaryFactory, unaryFactory);
+        }
+    }
+
+    private static final class UnaryArithmeticBuiltinFactory implements Supplier<RBuiltinNode> {
+        private final UnaryArithmeticFactory unaryFactory;
+
+        UnaryArithmeticBuiltinFactory(UnaryArithmeticFactory unaryFactory) {
+            this.unaryFactory = unaryFactory;
+        }
+
+        @Override
+        public RBuiltinNode get() {
+            return new UnaryArithmeticBuiltinNode(unaryFactory);
+        }
+    }
+
+    private static final class BinaryCompareBuiltinFactory implements Supplier<RBuiltinNode> {
+        private final BooleanOperationFactory factory;
+
+        BinaryCompareBuiltinFactory(BooleanOperationFactory factory) {
+            this.factory = factory;
+        }
+
+        @Override
+        public RBuiltinNode get() {
+            return BinaryBooleanNodeGen.create(factory);
+        }
     }
 
     private static void addFastPath(MaterializedFrame baseFrame, String name, FastPathFactory factory) {

com.oracle.truffle.r.test.native/packages/package.mk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -54,4 +54,5 @@ $(RIN_R_FILES): $(RIN_FILES)
 
 clean:
 	rm -f $(PKG_TAR) $(RIN_R_FILES)
-
+	$(shell find $(PACKAGE) -name '*.o' -delete)
+	$(shell find $(PACKAGE) -name '*.so' -delete)

com.oracle.truffle.r.test.native/packages/testrffi/testrffi/R/testrffi.R

@@ -38,6 +38,22 @@ rffi.populateIntVector <- function(n) {
 	.Call("populateIntVector", as.integer(n), PACKAGE = "testrffi")
 }
 
+rffi.populateCharacterVector <- function(n) {
+	.Call("populateCharacterVector", as.integer(n), PACKAGE = "testrffi")
+}
+
+rffi.populateDoubleVector <- function(n) {
+	.Call("populateDoubleVector", as.integer(n), PACKAGE = "testrffi")
+}
+
+rffi.populateComplexVector <- function(n) {
+	.Call("populateComplexVector", as.integer(n), PACKAGE = "testrffi")
+}
+
+rffi.populateRawVector <- function(n) {
+	.Call("populateRawVector", as.integer(n), PACKAGE = "testrffi")
+}
+
 rffi.populateLogicalVector <- function(n) {
 	.Call("populateLogicalVector", as.integer(n), PACKAGE = "testrffi")
 }

com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/init.c

@@ -53,6 +53,10 @@ static const R_CallMethodDef CallEntries[] = {
         CALLDEF(addInt, 2),
         CALLDEF(addDouble, 2),
         CALLDEF(populateIntVector, 1),
+        CALLDEF(populateDoubleVector, 1),
+        CALLDEF(populateComplexVector, 1),
+        CALLDEF(populateCharacterVector, 1),
+        CALLDEF(populateRawVector, 1),
         CALLDEF(populateLogicalVector, 1),
         CALLDEF(createExternalPtr, 3),
         CALLDEF(getExternalPtrAddr, 1),

com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/testrffi.c

@@ -91,6 +91,56 @@ SEXP populateLogicalVector(SEXP n) {
     return v;
 }
 
+SEXP populateRawVector(SEXP n) {
+    SEXP v;
+    int intN = INTEGER_VALUE(n);
+    PROTECT(v = allocVector(RAWSXP, intN));
+    int i;
+    for (i = 0; i < intN; i++) {
+    	RAW(v)[i] = i;
+    }
+    UNPROTECT(1);
+    return v;
+}
+
+SEXP populateDoubleVector(SEXP n) {
+    SEXP v;
+    int intN = INTEGER_VALUE(n);
+    PROTECT(v = allocVector(REALSXP, intN));
+    int i;
+    for (i = 0; i < intN; i++) {
+    	REAL(v)[i] = i;
+    }
+    UNPROTECT(1);
+    return v;
+}
+
+SEXP populateComplexVector(SEXP n) {
+    SEXP v;
+    int intN = INTEGER_VALUE(n);
+    PROTECT(v = allocVector(CPLXSXP, intN));
+    int i;
+    for (i = 0; i < intN; i++) {
+        double d = i;
+    	COMPLEX(v)[i] = (Rcomplex) {d, d};
+    }
+    UNPROTECT(1);
+    return v;
+}
+
+SEXP populateCharacterVector(SEXP n) {
+    SEXP v, item;
+    int intN = INTEGER_VALUE(n);
+    PROTECT(v = allocVector(STRSXP, intN));
+    PROTECT(item = mkChar("A"));
+    int i;
+    for (i = 0; i < intN; i++) {
+    	SET_STRING_ELT(v, i, item);
+    }
+    UNPROTECT(2);
+    return v;
+}
+
 SEXP createExternalPtr(SEXP addr, SEXP tag, SEXP prot) {
 	return R_MakeExternalPtr((void *) (long) INTEGER_VALUE(addr), tag, prot);
 }

com.oracle.truffle.r.test.native/packages/testrffi/testrffi/src/testrffi.h

@@ -29,6 +29,14 @@ extern SEXP addDouble(SEXP a, SEXP b);
 
 extern SEXP populateIntVector(SEXP n);
 
+extern SEXP populateRawVector(SEXP n);
+
+extern SEXP populateCharacterVector(SEXP n);
+
+extern SEXP populateComplexVector(SEXP n);
+
+extern SEXP populateDoubleVector(SEXP n);
+
 extern SEXP populateLogicalVector(SEXP n);
 
 extern SEXP createExternalPtr(SEXP addr, SEXP tag, SEXP prot);