From 23b8684324b0f775dbbdeb146a7ac166677e17e0 Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Fri, 9 Jun 2017 10:38:35 -0700
Subject: [PATCH] switch to zip files for llvm bitcode libraries
---
.../truffle/r/ffi/impl/llvm/LLVM_IR.java | 35 +-
.../truffle/r/ffi/impl/llvm/MachOAccess.java | 450 ------------------
.../r/ffi/impl/llvm/TruffleLLVM_C.java | 1 -
.../r/ffi/impl/llvm/TruffleLLVM_Call.java | 11 +-
.../r/ffi/impl/llvm/TruffleLLVM_DLL.java | 260 +++-------
.../r/ffi/impl/llvm/TruffleLLVM_PkgInit.java | 1 -
.../r/ffi/impl/llvm/TruffleLLVM_Stats.java | 20 -
.../r/ffi/impl/llvm}/tools/ShowLLVMIR.java | 21 +-
.../r/ffi/impl/nfi/TruffleNFI_CAccess.java | 11 +-
com.oracle.truffle.r.native/fficall/Makefile | 17 +-
.../fficall/src/caccess/Makefile | 34 --
.../fficall/src/common/Makefile | 11 +-
.../appl_rffi.c | 0
.../src/{caccess => truffle_common}/caccess.c | 0
.../lapack_rffi.c | 0
.../misc_rffi.c | 0
.../fficall/src/truffle_llvm/Makefile | 44 +-
.../fficall/src/truffle_llvm/caccess.c | 38 --
.../fficall/src/truffle_nfi/Makefile | 14 +-
.../gnur/Makefile.gnur | 13 +-
.../gnur/Makefile.platform | 3 +
com.oracle.truffle.r.native/gnur/edLLVM | 12 +
com.oracle.truffle.r.native/library/lib.mk | 2 +
com.oracle.truffle.r.native/run/Makefile | 3 +
.../run/edMakeconf.etc.llvm | 32 ++
.../urand/Makefile | 1 +
documentation/dev/truffle_llvm_ffi.md | 25 +-
mx.fastr/compilers/fastr-c++ | 2 +-
mx.fastr/compilers/fastr-cc | 2 +-
mx.fastr/compilers/fastr-cpp | 2 +-
mx.fastr/compilers/fastr-fc | 2 +-
mx.fastr/compilers/have_sulong | 2 +-
mx.fastr/mx_copylib.py | 27 +-
mx.fastr/mx_fastr_compile.py | 190 ++------
34 files changed, 263 insertions(+), 1023 deletions(-)
delete mode 100644 com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/MachOAccess.java
rename {com.oracle.truffle.r.test/src/com/oracle/truffle/r/test => com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm}/tools/ShowLLVMIR.java (84%)
delete mode 100644 com.oracle.truffle.r.native/fficall/src/caccess/Makefile
rename com.oracle.truffle.r.native/fficall/src/{truffle_nfi => truffle_common}/appl_rffi.c (100%)
rename com.oracle.truffle.r.native/fficall/src/{caccess => truffle_common}/caccess.c (100%)
rename com.oracle.truffle.r.native/fficall/src/{truffle_nfi => truffle_common}/lapack_rffi.c (100%)
rename com.oracle.truffle.r.native/fficall/src/{truffle_nfi => truffle_common}/misc_rffi.c (100%)
delete mode 100644 com.oracle.truffle.r.native/fficall/src/truffle_llvm/caccess.c
create mode 100644 com.oracle.truffle.r.native/gnur/edLLVM
create mode 100644 com.oracle.truffle.r.native/run/edMakeconf.etc.llvm
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/LLVM_IR.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/LLVM_IR.java
index 03743e3293..76b0bc64a8 100644
--- a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/LLVM_IR.java
+++ b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/LLVM_IR.java
@@ -22,11 +22,8 @@
*/
package com.oracle.truffle.r.ffi.impl.llvm;
-import java.io.IOException;
import java.util.Base64;
-import com.oracle.truffle.r.runtime.RInternalError;
-
public abstract class LLVM_IR {
public static final int TEXT_CODE = 1;
public static final int BINARY_CODE = 2;
@@ -35,19 +32,9 @@ public abstract class LLVM_IR {
* The name of the "module", aka object file, that the IR pertains to.
*/
public final String name;
- /**
- * List of exported symbols.
- */
- public final String[] exports;
- /**
- * List of imported symbols.
- */
- public final String[] imports;
- protected LLVM_IR(String name, String[] exports, String[] imports) {
+ protected LLVM_IR(String name) {
this.name = name;
- this.exports = exports;
- this.imports = imports;
}
@Override
@@ -61,8 +48,8 @@ public abstract class LLVM_IR {
public static final class Text extends LLVM_IR {
public final String text;
- public Text(String name, String text, String[] exports, String[] imports) {
- super(name, exports, imports);
+ public Text(String name, String text) {
+ super(name);
this.text = text;
}
}
@@ -74,23 +61,11 @@ public abstract class LLVM_IR {
public final byte[] binary;
public final String base64;
- public Binary(String name, byte[] binary, String[] exports, String[] imports) {
- super(name, exports, imports);
+ public Binary(String name, byte[] binary) {
+ super(name);
this.binary = binary;
base64 = Base64.getEncoder().encodeToString(binary);
}
}
- /**
- * Return an array of {@link LLVM_IR} instances contained in the library denoted by {@code path}
- * .
- */
- public static LLVM_IR[] getLLVMIR(String path) throws IOException {
- String os = System.getProperty("os.name");
- if (os.contains("Mac OS")) {
- return MachOAccess.getLLVMIR(path);
- } else {
- throw RInternalError.unimplemented("LLVM_IR_Access for Linux");
- }
- }
}
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/MachOAccess.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/MachOAccess.java
deleted file mode 100644
index f8568635e5..0000000000
--- a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/MachOAccess.java
+++ /dev/null
@@ -1,450 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.truffle.r.ffi.impl.llvm;
-
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.util.ArrayList;
-
-import com.oracle.truffle.r.runtime.RInternalError;
-
-/**
- * (Limited) Access to Mach_O 64-bit format files. See /usr/include/mach-o/*.h for source. Note that
- * a file may (unusually) contain multiple binaries for different architectures, see
- * /usr/include/mach-o/fat.h. Such a file is called a universal binary file, (cf an archive file).
- *
- */
-@SuppressWarnings("unused")
-final class MachOAccess implements AutoCloseable {
- private final RandomAccessFile raf;
- private final Header header;
- private final LoadCommand[] loadCommands;
-
- private MachOAccess(RandomAccessFile raf) throws IOException {
- this.raf = raf;
- this.header = new Header();
- this.loadCommands = getLoadCommands();
- }
-
- static LLVM_IR[] getLLVMIR(String path) throws IOException {
- try (MachOAccess ma = new MachOAccess(new RandomAccessFile(path, "r"))) {
- return ma.getLLVMIR();
- }
- }
-
- /**
- * Return an array of {@link LLVM_IR} instances corresponding to the "modules" in the library,
- * or {@code null} of there none.
- */
- private LLVM_IR[] getLLVMIR() throws IOException {
- SymTabLoadCommand symtab = null;
- for (LoadCommand lc : loadCommands) {
- if (lc.cmd == LC_TYPE.LC_SYMTAB) {
- symtab = (SymTabLoadCommand) lc;
- break;
- }
- }
- assert symtab != null;
- ArrayList<LLVM_IR> list = new ArrayList<>();
- NList64[] syms = symtab.getSymbolTable();
- for (NList64 sym : syms) {
- String name = symtab.getSymbolName(sym);
- if (name.startsWith("__llvm_")) {
- String module = name.substring(7);
- getSection(loadCommands, sym.sect);
- raf.seek(sym.value);
- int type = raf.read();
- int len = readInt();
- byte[] buf = new byte[len];
- // exported symbols
- String[] exports = readXXPorts();
- // imported symbols
- String[] imports = readXXPorts();
- raf.read(buf);
- LLVM_IR ir;
- if (type == LLVM_IR.TEXT_CODE) {
- ir = new LLVM_IR.Text(module, new String(buf), exports, imports);
- } else if (type == LLVM_IR.BINARY_CODE) {
- ir = new LLVM_IR.Binary(module, buf, exports, imports);
- } else {
- throw RInternalError.shouldNotReachHere();
- }
- list.add(ir);
- }
- }
- if (list.size() == 0) {
- return null;
- } else {
- LLVM_IR[] result = new LLVM_IR[list.size()];
- list.toArray(result);
- return result;
- }
- }
-
- String[] readXXPorts() throws IOException {
- int numxxports = readInt();
- String[] xxports = new String[numxxports];
- for (int i = 0; i < numxxports; i++) {
- int xxportLen = raf.read();
- byte[] xxportBuf = new byte[xxportLen];
- for (int j = 0; j < xxportLen; j++) {
- xxportBuf[j] = (byte) raf.read();
- }
- xxports[i] = new String(xxportBuf);
- }
- return xxports;
- }
-
- @Override
- public void close() throws IOException {
- raf.close();
- }
-
- private final class Header implements Cloneable {
- private static final int FAT_MAGIC = 0xcafebabe;
- private final int magic;
- private final int cputype;
- private final int cpusubtype;
- private final int filetype;
- private final int ncmds;
- private final int sizeofcmds;
- private final int flags;
- private final int reserved;
-
- private Header() throws IOException {
- this.magic = raf.readInt();
- assert magic != FAT_MAGIC;
- cputype = readInt();
- cpusubtype = readInt();
- filetype = readInt();
- ncmds = readInt();
- sizeofcmds = readInt();
- flags = readInt();
- reserved = readInt();
- }
- }
-
- private enum LC_TYPE {
- LC_SYMTAB(0x2),
- LC_THREAD(0x4),
- LC_DYSYMTAB(0xb),
- LC_LOAD_DYLIB(0xc),
- LC_ID_DYLIB(0xd),
- LC_SUB_FRAMEWORK(0x12),
- LC_LOAD_WEAK_DYLIB(0x18),
- LC_SEGMENT_64(0x19),
- LC_UUID(0x1b),
- LC_RPATH(0x1C),
- LC_DYLD_INFO(0x22),
- LC_VERSION_MIN_MACOSX(0x24),
- LC_FUNCTION_STARTS(0x26),
- LC_DATA_IN_CODE(0x29),
- LC_SOURCE_VERSION(0x2A),
- LC_USER(0x32);
-
- private int code;
-
- LC_TYPE(int code) {
- this.code = code;
- }
-
- static int getCode(int codeIn) {
- return codeIn & ~LoadCommand.LC_REQ_DYLD;
- }
-
- static LC_TYPE getType(int code) {
- for (LC_TYPE lct : LC_TYPE.values()) {
- if (code == lct.code) {
- return lct;
- }
- }
- assert false : "unknown load cmd: " + code;
- return null;
- }
- }
-
- /**
- * Common base class for all Mach-O load command types.
- */
- private class LoadCommand {
- private static final int LC_REQ_DYLD = 0x80000000;
-
- private long cmdFileOffset;
- private final int code;
- private final LC_TYPE cmd;
- private final int cmdsize;
-
- protected LoadCommand(int index) throws IOException {
- cmdFileOffset = raf.getFilePointer();
- this.code = readInt();
- this.cmd = LC_TYPE.getType(LC_TYPE.getCode(this.code));
- this.cmdsize = readInt();
- }
-
- protected LoadCommand(int index, LC_TYPE cmd, int cmdsize) {
- this.cmd = cmd;
- this.code = cmd.code;
- this.cmdsize = cmdsize;
- }
-
- private String typeName() {
- return cmd.name();
- }
- }
-
- /**
- * Reads a load command structure starting at the current file position, invoking the
- * appropriate subclass {@code read} command, based on the {@code cmd} field. Leaves the file
- * pointer at the next load command (if any).
- *
- * @return instance of the appropriate subclass for discovered command type
- * @throws IOException
- */
- private LoadCommand readNextLoadCommand(int index) throws IOException {
- LoadCommand result = null;
- final long ptr = raf.getFilePointer();
- final LC_TYPE cmd = LC_TYPE.getType(LC_TYPE.getCode(readInt()));
- final int cmdsize = readInt();
- /* The LoadCommand class reads the two prior fields again. */
- raf.seek(ptr);
- switch (cmd) {
- case LC_SEGMENT_64:
- result = new Segment64LoadCommand(index);
- break;
- case LC_SYMTAB:
- result = new SymTabLoadCommand(index);
- break;
- default:
- result = new LoadCommand(index);
- break;
- }
- // skip over entire command
- raf.seek(ptr + cmdsize);
- return result;
- }
-
- private LoadCommand[] getLoadCommands() throws IOException {
- LoadCommand[] result = new LoadCommand[header.ncmds];
- for (int i = 0; i < header.ncmds; i++) {
- result[i] = readNextLoadCommand(i);
- }
- return result;
- }
-
- private final class Segment64LoadCommand extends LoadCommand {
- private final String segName;
- private final long vmaddr;
- private final long vmsize;
- private final long fileoff;
- private final long filesize;
- private final int maxprot;
- private final int initprot;
- private final int nsects;
- private final int flags;
- private final Section64[] sections;
-
- private Segment64LoadCommand(int index) throws IOException {
- super(index);
- final byte[] segname = new byte[16];
- for (int i = 0; i < 16; i++) {
- segname[i] = raf.readByte();
- }
- segName = new String(segname);
- vmaddr = readLong();
- vmsize = readLong();
- fileoff = readLong();
- filesize = readLong();
- maxprot = readInt();
- initprot = readInt();
- nsects = readInt();
- flags = readInt();
- sections = new Section64[nsects];
- for (int i = 0; i < nsects; i++) {
- sections[i] = new Section64(this);
- }
- }
- }
-
- private final class Section64 {
- private final String sectname;
- private final String segname;
- private final long addr;
- private final long size;
- private final int offset;
- private final int align;
- private final int reloff;
- private final int nreloc;
- private final int flags;
- private final int reserved1;
- private final int reserved2;
- private final int reserved3;
-
- private Section64(Segment64LoadCommand segment64) throws IOException {
- sectname = readName();
- segname = readName();
- addr = readLong();
- size = readLong();
- offset = readInt();
- align = readInt();
- reloff = readInt();
- nreloc = readInt();
- flags = readInt();
- reserved1 = readInt();
- reserved2 = readInt();
- reserved3 = readInt();
- }
-
- private String readName() throws IOException {
- byte[] nameBytes = new byte[16];
- int length = 0;
- for (int i = 0; i < nameBytes.length; i++) {
- nameBytes[i] = raf.readByte();
- if (nameBytes[i] != 0) {
- length++;
- }
- }
- return new String(nameBytes, 0, length);
- }
-
- private boolean isText() {
- return segname.equals("__TEXT");
- }
- }
-
- private class SymTabLoadCommand extends LoadCommand {
- private final int symoff;
- private final int nsyms;
- private final int stroff;
- private final int strsize;
- /**
- * Lazily created string table.
- */
- private byte[] stringTable;
- /**
- * Lazily created symbol table.
- */
- private NList64[] symbolTable;
-
- SymTabLoadCommand(int index) throws IOException {
- super(index);
- symoff = readInt();
- nsyms = readInt();
- stroff = readInt();
- strsize = readInt();
- }
-
- private NList64[] getSymbolTable() throws IOException {
- if (symbolTable != null) {
- return symbolTable;
- }
- stringTable = new byte[strsize];
- raf.seek(stroff);
- for (int i = 0; i < strsize; i++) {
- stringTable[i] = raf.readByte();
- }
- symbolTable = new NList64[nsyms];
- raf.seek(symoff);
- for (int i = 0; i < nsyms; i++) {
- symbolTable[i] = new NList64();
- }
- return symbolTable;
- }
-
- private String getSymbolName(NList64 nlist64) {
- String symbol = "";
- if (nlist64.strx != 0) {
- byte sb = stringTable[nlist64.strx];
- int sl = 0;
- while (sb != 0) {
- sb = stringTable[nlist64.strx + sl];
- sl++;
- }
- if (sl > 0) {
- symbol = new String(stringTable, nlist64.strx, sl - 1);
- }
- }
- return symbol;
- }
- }
-
- private class NList64 {
- private final int strx;
- private final byte type;
- private final byte sect;
- private final short desc;
- private final long value;
-
- NList64() throws IOException {
- strx = readInt();
- type = raf.readByte();
- sect = raf.readByte();
- desc = readShort();
- value = readLong();
- }
-
- void print() {
-
- }
- }
-
- /**
- * Locates a given section within a given array of load commands. Sections are numbered from 1
- * as they occur within SEGMENT_64 commands.
- *
- * @param loadCommands
- * @param sectToFind
- */
- private static Section64 getSection(LoadCommand[] loadCommands, int sectToFind) {
- int sect = 1;
- for (int i = 0; i < loadCommands.length; i++) {
- if (loadCommands[i].cmd == LC_TYPE.LC_SEGMENT_64) {
- Segment64LoadCommand slc = (Segment64LoadCommand) loadCommands[i];
- if (sectToFind < sect + slc.nsects) {
- return slc.sections[sectToFind - sect];
- }
- sect += slc.nsects;
- }
- }
- return null;
- }
-
- private short readShort() throws IOException {
- final int b1 = raf.read();
- final int b2 = raf.read();
- return (short) (((b2 << 8) | b1) & 0xFFFF);
- }
-
- private int readInt() throws IOException {
- final int b1 = raf.read();
- final int b2 = raf.read();
- final int b3 = raf.read();
- final int b4 = raf.read();
- return (b4 << 24) | (b3 << 16) | (b2 << 8) | b1;
- }
-
- private long readLong() throws IOException {
- final long lw = readInt();
- final long hw = readInt();
- return hw << 32 | (lw & 0xFFFFFFFFL);
- }
-}
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/TruffleLLVM_C.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/TruffleLLVM_C.java
index 765c83668d..ae1c62d397 100644
--- a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/TruffleLLVM_C.java
+++ b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/TruffleLLVM_C.java
@@ -41,7 +41,6 @@ class TruffleLLVM_C implements CRFFI {
@Override
public synchronized void execute(NativeCallInfo nativeCallInfo, Object[] args, boolean hasStrings) {
- TruffleLLVM_DLL.ensureParsed(nativeCallInfo);
Object[] wargs = wrap(args);
try {
if (messageNode == null) {
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/TruffleLLVM_Call.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/TruffleLLVM_Call.java
index a3c9e1975f..c9590c3f7f 100644
--- a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/TruffleLLVM_Call.java
+++ b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/TruffleLLVM_Call.java
@@ -97,7 +97,6 @@ final class TruffleLLVM_Call implements CallRFFI {
private static void initVariables(RContext context) {
// must have parsed the variables module in libR
for (INIT_VAR_FUN initVarFun : INIT_VAR_FUN.values()) {
- TruffleLLVM_DLL.ensureParsed("libR", initVarFun.funName, true);
initVarFun.symbolHandle = new SymbolHandle(context.getEnv().importSymbol("@" + initVarFun.funName));
}
Node executeNode = Message.createExecute(2).createNode();
@@ -128,7 +127,6 @@ final class TruffleLLVM_Call implements CallRFFI {
}
private static void initCallbacks(RContext context, UpCallsRFFI upCallsImpl) {
- TruffleLLVM_DLL.ensureParsed("libR", "Rinternals_addCallback", true);
Node executeNode = Message.createExecute(1).createNode();
SymbolHandle symbolHandle = new SymbolHandle(context.getEnv().importSymbol("@" + "Rinternals_addCallback"));
@@ -148,8 +146,7 @@ final class TruffleLLVM_Call implements CallRFFI {
@Specialization(guards = {"cachedNativeCallInfo.name.equals(nativeCallInfo.name)"})
protected Object invokeCallCached(NativeCallInfo nativeCallInfo, Object[] args,
- @SuppressWarnings("unused") @Cached("nativeCallInfo") NativeCallInfo cachedNativeCallInfo,
- @SuppressWarnings("unused") @Cached("ensureReady(nativeCallInfo)") boolean ready) {
+ @SuppressWarnings("unused") @Cached("nativeCallInfo") NativeCallInfo cachedNativeCallInfo) {
return doInvoke(messageNode, nativeCallInfo, args);
}
@@ -170,12 +167,6 @@ final class TruffleLLVM_Call implements CallRFFI {
}
}
- public static boolean ensureReady(NativeCallInfo nativeCallInfo) {
- TruffleLLVM_DLL.ensureParsed(nativeCallInfo);
- ContextStateImpl contextState = TruffleLLVM_RFFIContextState.getContextState().callState;
- return true;
- }
-
}
private static class TruffleLLVM_InvokeVoidCallNode extends InvokeVoidCallNode {
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/TruffleLLVM_DLL.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/TruffleLLVM_DLL.java
index 49e1405c87..ac0e87d34a 100644
--- a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/TruffleLLVM_DLL.java
+++ b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/TruffleLLVM_DLL.java
@@ -22,47 +22,29 @@
*/
package com.oracle.truffle.r.ffi.impl.llvm;
+import java.io.BufferedInputStream;
+import java.io.IOException;
import java.nio.file.FileSystems;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Enumeration;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
import com.oracle.truffle.api.CallTarget;
-import com.oracle.truffle.api.CompilerAsserts;
-import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.api.source.Source;
import com.oracle.truffle.r.runtime.RInternalError;
import com.oracle.truffle.r.runtime.context.RContext;
import com.oracle.truffle.r.runtime.context.RContext.ContextState;
import com.oracle.truffle.r.runtime.ffi.DLL;
import com.oracle.truffle.r.runtime.ffi.DLL.DLLInfo;
-import com.oracle.truffle.r.runtime.ffi.DLL.DotSymbol;
import com.oracle.truffle.r.runtime.ffi.DLL.SymbolHandle;
import com.oracle.truffle.r.runtime.ffi.DLLRFFI;
-import com.oracle.truffle.r.runtime.ffi.NativeCallInfo;
/**
- * The Truffle version of {@link DLLRFFI}. {@code dlopen} expects to find the LLVM IR embedded in
- * the shared library.
- *
- * The LLVM bitcode is stored (opaquely) in the shared library file, and access through the
- * {@link LLVM_IR} class. The {@link LLVM_IR#getLLVMIR(String)} method will return an array of
- * {@link LLVM_IR} instances for all the modules in the library. These have to be parsed by the
- * Truffle LLVM system (into ASTs) before they can be interpreted/compiled. Note that there is no
- * support in Truffle LLVM itself for resolving references to functions in other LLVM modules. If
- * the function as an LLVM AST cannot be found it is assumed to be a native function. The upshot of
- * this is that, naively, every module in a library has to be parsed before any modules can be
- * executed, and inter-library dependencies also have to be handled explicitly. Most of the
- * inter-library references are to "libR", which is handled specially. If parsing was fast eager
- * parsing of all modules would not be an issue but, currently, is it not fast and some modules
- * exhibit pathologies that can take as long as a minute to parse, so some effort to support lazy
- * parsing has been implemented. Unfortunately this requires additional metadata. Note also that
- * only functions that are invoked explicitly through on of the RFFI interfaces can be handled
- * lazily; any internal calls must already be resolved (this would change if LLVM had the callback
- * facility alluded to above).
- *
- * This code can operate with lazy or eager parsing, but additional metadata has to be provided on
- * the defined/undefined symbols in a module.
+ * The Truffle version of {@link DLLRFFI}. {@code dlopen} expects to find the LLVM IR in a "library"
+ * that is actually a zip file of LLVM bitcode files.
*
* There is one major difference between native and LLVM libraries. There is a single global
* instance of a native library and the symbols are, therefore, accessible from any {@link RContext}
@@ -76,46 +58,8 @@ import com.oracle.truffle.r.runtime.ffi.NativeCallInfo;
* </ol>
*
*/
-class TruffleLLVM_DLL implements DLLRFFI {
- /**
- * Supports lazy parsing of LLVM modules.
- */
- static class ParseStatus {
- /**
- * Name of associated library.
- */
- final String libName;
- /**
- * The LLVM IR (bitcode).
- */
- final LLVM_IR ir;
- /**
- * {@code true} iff the bitcode has been parsed into a Truffle AST.
- */
- boolean parsed;
-
- ParseStatus(String libName, LLVM_IR ir, boolean parsed) {
- this.libName = libName;
- this.ir = ir;
- this.parsed = parsed;
- }
-
- @Override
- public String toString() {
- CompilerAsserts.neverPartOfCompilation();
- return String.format("lib %s, module %s, parsed %b%n", libName, ir.name, parsed);
- }
- }
-
+public class TruffleLLVM_DLL implements DLLRFFI {
static class ContextStateImpl implements RContext.ContextState {
- /**
- * A map from function name to its {@link ParseStatus}, allowing fast determination whether
- * parsing is required in a call, see {@link #ensureParsed}. N.B. parsing happens at the
- * module level, so all exported functions in one module share the same {@link ParseStatus}
- * instance.
- */
- Map<String, ParseStatus> parseStatusMap = new HashMap<>();
-
/**
* When a new {@link RContext} is created we have to re-parse the libR modules,
* unfortunately, as there is no way to propagate the LLVM state created in the initial
@@ -126,7 +70,7 @@ class TruffleLLVM_DLL implements DLLRFFI {
public ContextState initialize(RContext context) {
if (!context.isInitial()) {
for (LLVM_IR ir : truffleDLL.libRModules) {
- addExportsToMap(this, "libR", ir, (name) -> name.endsWith("_llvm"));
+ parseLLVM("libR", ir);
}
}
if (context.getKind() == RContext.ContextKind.SHARE_PARENT_RW) {
@@ -136,7 +80,7 @@ class TruffleLLVM_DLL implements DLLRFFI {
if (dllInfo.handle instanceof LLVM_Handle) {
LLVM_Handle llvmHandle = (LLVM_Handle) dllInfo.handle;
for (LLVM_IR ir : llvmHandle.irs) {
- addExportsToMap(this, llvmHandle.libName, ir, (name) -> true);
+ parseLLVM(llvmHandle.libName, ir);
}
}
}
@@ -144,12 +88,6 @@ class TruffleLLVM_DLL implements DLLRFFI {
return this;
}
- @Override
- public void beforeDestroy(RContext context) {
- if (!context.isInitial()) {
- parseStatusMap = null;
- }
- }
}
private static TruffleLLVM_DLL truffleDLL;
@@ -166,10 +104,12 @@ class TruffleLLVM_DLL implements DLLRFFI {
static class LLVM_Handle {
private final String libName;
private final LLVM_IR[] irs;
+ private final boolean isZip;
- LLVM_Handle(String libName, LLVM_IR[] irs) {
+ LLVM_Handle(String libName, LLVM_IR[] irs, boolean isZip) {
this.libName = libName;
this.irs = irs;
+ this.isZip = isZip;
}
}
@@ -178,6 +118,45 @@ class TruffleLLVM_DLL implements DLLRFFI {
boolean match(String name);
}
+ public static boolean useZip(String path) {
+ String ziplibsProp = System.getenv("FASTR_ZIP_LIBS");
+ if (ziplibsProp == null) {
+ return false;
+ }
+ Path p = Paths.get(path);
+ String fileName = p.getFileName().toString();
+ fileName = fileName.substring(0, fileName.lastIndexOf('.'));
+ String[] ziplibs = ziplibsProp.split(",");
+ for (String ziplib : ziplibs) {
+ if (ziplib.equals(fileName)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public static LLVM_IR[] getZipLLVMIR(String path) {
+ try (ZipFile z = new ZipFile(path)) {
+ int numEntries = z.size();
+ LLVM_IR[] result = new LLVM_IR[numEntries];
+ Enumeration<? extends ZipEntry> entries = z.entries();
+ int index = 0;
+ while (entries.hasMoreElements()) {
+ ZipEntry entry = entries.nextElement();
+ try (BufferedInputStream bis = new BufferedInputStream(z.getInputStream(entry))) {
+ byte[] bc = new byte[(int) entry.getSize()];
+ bis.read(bc);
+ LLVM_IR ir = new LLVM_IR.Binary(entry.getName(), bc);
+ result[index++] = ir;
+ }
+ }
+ return result;
+ } catch (IOException ex) {
+ // not a zip file
+ return null;
+ }
+ }
+
private static class TruffleLLVM_DLOpenNode extends DLOpenNode {
@Child private TruffleLLVM_NativeDLL.TruffleLLVM_NativeDLOpen nativeDLLOpenNode;
@@ -190,22 +169,23 @@ class TruffleLLVM_DLL implements DLLRFFI {
@Override
public Object execute(String path, boolean local, boolean now) {
try {
- LLVM_IR[] irs = LLVM_IR.getLLVMIR(path);
+ boolean isZip = false;
+ LLVM_IR[] irs = getZipLLVMIR(path);
if (irs == null) {
return tryOpenNative(path, local, now);
}
String libName = getLibName(path);
- // libR can't be parsed at this stage in the startup
if (libName.equals("libR")) {
+ // save for new RContexts
truffleDLL.libRModules = irs;
}
- ContextStateImpl contextState = getContextState();
- for (int i = 0; i < irs.length; i++) {
- LLVM_IR ir = irs[i];
- addExportsToMap(contextState, libName, ir, libName.equals("libR") ? (name) -> name.endsWith("_llvm") : (name) -> true);
+ for (LLVM_IR ir : irs) {
+ parseLLVM(libName, ir);
}
- return new LLVM_Handle(libName, irs);
- } catch (Exception ex) {
+ return new LLVM_Handle(libName, irs, isZip);
+ } catch (
+
+ Exception ex) {
throw new UnsatisfiedLinkError(ex.getMessage());
}
}
@@ -222,20 +202,11 @@ class TruffleLLVM_DLL implements DLLRFFI {
@Override
public SymbolHandle execute(Object handle, String symbol) throws UnsatisfiedLinkError {
assert handle instanceof LLVM_Handle;
- // If the symbol exists it will be in the map
- ParseStatus parseStatus = getContextState().parseStatusMap.get(symbol);
- if (parseStatus != null && parseStatus.libName.equals(((LLVM_Handle) handle).libName)) {
- // force a parse so we have a "value"
- if (!parseStatus.parsed) {
- ensureParsed(parseStatus.libName, symbol, true);
- }
- Object symValue = RContext.getInstance().getEnv().importSymbol("@" + symbol);
- assert symValue != null;
- return new SymbolHandle(symValue);
- } else {
- // symbol not found (or not in requested library)
+ Object symValue = RContext.getInstance().getEnv().importSymbol("@" + symbol);
+ if (symValue == null) {
throw new UnsatisfiedLinkError();
}
+ return new SymbolHandle(symValue);
}
}
@@ -263,19 +234,6 @@ class TruffleLLVM_DLL implements DLLRFFI {
return new TruffleLLVM_DLCloseNode();
}
- private static void addExportsToMap(ContextStateImpl contextState, String libName, LLVM_IR ir, ModuleNameMatch moduleNameMatch) {
- ParseStatus parseStatus = new ParseStatus(libName, ir, false);
- for (String export : ir.exports) {
- if (moduleNameMatch.match(ir.name)) {
- ParseStatus exportParseStatus = contextState.parseStatusMap.get(export);
- // libR and graphics both define the same symbols (which should be fixed)
- if (exportParseStatus == null) {
- contextState.parseStatusMap.put(export, parseStatus);
- }
- }
- }
- }
-
private static String getLibName(String path) {
String fileName = FileSystems.getDefault().getPath(path).getFileName().toString();
int ix = fileName.lastIndexOf(".");
@@ -287,93 +245,25 @@ class TruffleLLVM_DLL implements DLLRFFI {
*/
private LLVM_IR[] libRModules;
- private static ContextStateImpl getContextState() {
- return TruffleLLVM_RFFIContextState.getContextState().dllState;
- }
+ private static final String[] PARSE_ERRORS = new String[]{"stats", "ppr"};
- /**
- * About to invoke the (external) function denoted by {@code nativeCallInfo}. Therefore, it must
- * have been parsed (in {code dlsym}) AND all dependent modules, recursively, must also be
- * parsed. Evidently since the dependencies are expressed at a module level, this may parse more
- * than strictly necessary.
- *
- * @param nativeCallInfo
- */
- static void ensureParsed(NativeCallInfo nativeCallInfo) {
- ensureParsed(nativeCallInfo.dllInfo.name, nativeCallInfo.name, true);
- }
-
- private static final String[] MustEagerlyParsePackages = new String[]{"grDevices:colors", "graphics:registerBase"};
-
- private static boolean mustEagerlyParse(String libName, String moduleName) {
- for (String pkg : MustEagerlyParsePackages) {
- String[] parts = pkg.split(":");
- if (parts[0].equals(libName) && parts[1].equals(moduleName)) {
+ private static boolean parseFails(String libName, LLVM_IR ir) {
+ for (int i = 0; i < PARSE_ERRORS.length / 2; i++) {
+ String plibName = PARSE_ERRORS[i * 2];
+ String pModule = PARSE_ERRORS[i * 2 + 1];
+ if (libName.equals(plibName) && ir.name.equals(pModule)) {
return true;
}
}
return false;
}
- /**
- * Called from {@link TruffleLLVM_PkgInit} to catch internal (aka non-exported) symbols that may
- * nevertheless be invoked.
- */
- static void registerSymbols(DLLInfo dllInfo, DotSymbol[] dotSymbols) {
- ContextStateImpl contextState = getContextState();
- Map<String, ParseStatus> parseStatusMap = contextState.parseStatusMap;
- for (DotSymbol ds : dotSymbols) {
- ParseStatus parseStatus = parseStatusMap.get(ds.name);
- if (parseStatus == null) {
- parseStatusMap.put(ds.name, new ParseStatus(dllInfo.name, null, true));
- }
- }
- }
-
- /**
- * Similar to {@link #ensureParsed(NativeCallInfo)} but with a function specified as a string
- * (for internal use) and an optional check whether the function must exist.
- */
- @TruffleBoundary
- static void ensureParsed(String libName, String name, boolean fatalIfMissing) {
- ContextStateImpl contextState = getContextState();
- Map<String, ParseStatus> parseStatusMap = contextState.parseStatusMap;
- ParseStatus parseStatus = parseStatusMap.get(name);
- assert parseStatus != null || !fatalIfMissing;
- if (parseStatus != null && !parseStatus.parsed) {
- parseLLVM(libName, parseStatus.ir);
- parseStatus.parsed = true;
- boolean isPackageInit = isPackageInit(libName, name);
- for (String importee : parseStatus.ir.imports) {
- /*
- * If we are resolving a package init call, we do not want to resolve all the
- * imports of functions in the same library as this will cause everything in the
- * library to be parsed eagerly! However, any package that actually invokes an
- * imported symbol in the R_init_package function must do eager parsing.
- * Unfortunately, we can't easily tell if that is the case, so we have a backlist of
- * known problem packages.
- */
- ParseStatus importeeParseStatus = parseStatusMap.get(importee);
- boolean internal = isPackageInit && importeeParseStatus.libName.equals(libName);
- if (importeeParseStatus != null && (!internal || mustEagerlyParse(libName, importee))) {
- ensureParsed(importeeParseStatus.libName, importee, false);
- }
- }
- }
- }
-
- private static boolean isPackageInit(@SuppressWarnings("unused") String libName, String name) {
- if (name.startsWith(DLL.R_INIT_PREFIX)) {
- return true;
- } else {
- return false;
- }
- }
-
private static void parseLLVM(String libName, LLVM_IR ir) {
if (ir instanceof LLVM_IR.Binary) {
LLVM_IR.Binary bir = (LLVM_IR.Binary) ir;
- parseBinary(libName, bir);
+ if (!parseFails(libName, ir)) {
+ parseBinary(libName, bir);
+ }
} else {
throw RInternalError.unimplemented("LLVM text IR");
}
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/TruffleLLVM_PkgInit.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/TruffleLLVM_PkgInit.java
index 34a4bc9b59..def16936df 100644
--- a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/TruffleLLVM_PkgInit.java
+++ b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/TruffleLLVM_PkgInit.java
@@ -69,7 +69,6 @@ class TruffleLLVM_PkgInit {
array[i] = (DotSymbol) sym;
}
dllInfo.setNativeSymbols(nstOrd, array);
- TruffleLLVM_DLL.registerSymbols(dllInfo, array);
}
private static Object setSymbol(int nstOrd, long routines, int index, SymbolHandle symbolHandle) {
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/TruffleLLVM_Stats.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/TruffleLLVM_Stats.java
index 6de6f46056..9ec5f57cff 100644
--- a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/TruffleLLVM_Stats.java
+++ b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/TruffleLLVM_Stats.java
@@ -52,26 +52,6 @@ public class TruffleLLVM_Stats implements StatsRFFI {
static class ContextStateImpl implements RContext.ContextState {
@Override
public ContextState initialize(RContext context) {
- /*
- * In the case of a SHARE_PARENT_RW context, there is no dlopen call for stats, so the
- * fft_work/fft_factor functions will not be added into the context symbol map, so we do
- * it here.
- */
- if (context.getKind() == RContext.ContextKind.SHARE_PARENT_RW) {
- TruffleLLVM_DLL.ContextStateImpl contextState = TruffleLLVM_RFFIContextState.getContextState().dllState;
- TruffleLLVM_DLL.ContextStateImpl parentDLLContextState = TruffleLLVM_RFFIContextState.getContextState(context.getParent()).dllState;
- TruffleLLVM_DLL.ParseStatus parseStatus = null;
- for (FFT_FUN f : FFT_FUN.values()) {
- String funName = f.name();
- TruffleLLVM_DLL.ParseStatus parentParseStatus = parentDLLContextState.parseStatusMap.get(funName);
- if (parentParseStatus != null) {
- if (parseStatus == null) {
- parseStatus = new TruffleLLVM_DLL.ParseStatus("stats", parentParseStatus.ir, false);
- }
- contextState.parseStatusMap.put(f.name(), parseStatus);
- }
- }
- }
return this;
}
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tools/ShowLLVMIR.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/tools/ShowLLVMIR.java
similarity index 84%
rename from com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tools/ShowLLVMIR.java
rename to com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/tools/ShowLLVMIR.java
index 733d2ecb48..91acc85892 100644
--- a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tools/ShowLLVMIR.java
+++ b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/llvm/tools/ShowLLVMIR.java
@@ -20,13 +20,14 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-package com.oracle.truffle.r.test.tools;
+package com.oracle.truffle.r.ffi.impl.llvm.tools;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import com.oracle.truffle.r.ffi.impl.llvm.LLVM_IR;
+import com.oracle.truffle.r.ffi.impl.llvm.TruffleLLVM_DLL;
import com.oracle.truffle.r.runtime.ProcessOutputManager;
public class ShowLLVMIR {
@@ -34,7 +35,6 @@ public class ShowLLVMIR {
String objPath = null;
String llpart = null;
boolean list = false;
- boolean xxports = false;
boolean dis = false;
int i = 0;
while (i < args.length) {
@@ -53,9 +53,6 @@ public class ShowLLVMIR {
case "--list":
list = true;
break;
- case "--xxports":
- xxports = true;
- break;
case "--dis":
dis = true;
break;
@@ -67,7 +64,7 @@ public class ShowLLVMIR {
usage();
}
try {
- LLVM_IR[] irs = LLVM_IR.getLLVMIR(objPath);
+ LLVM_IR[] irs = TruffleLLVM_DLL.getZipLLVMIR(objPath);
if (irs == null) {
System.out.printf("no llvm ir in %s\n", objPath);
System.exit(1);
@@ -78,18 +75,6 @@ public class ShowLLVMIR {
} else {
if (llpart == null || ir.name.equals(llpart)) {
System.out.printf("Module: %s%n", ir.name);
- if (xxports) {
- System.out.println("Exports");
- System.out.println("=======");
- for (String export : ir.exports) {
- System.out.println(export);
- }
- System.out.println("Imports");
- System.out.println("=======");
- for (String importx : ir.imports) {
- System.out.println(importx);
- }
- }
if (dis) {
String text = null;
if (ir instanceof LLVM_IR.Binary) {
diff --git a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nfi/TruffleNFI_CAccess.java b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nfi/TruffleNFI_CAccess.java
index abf88e618a..5be5a0e670 100644
--- a/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nfi/TruffleNFI_CAccess.java
+++ b/com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/nfi/TruffleNFI_CAccess.java
@@ -27,15 +27,12 @@ import com.oracle.truffle.api.interop.InteropException;
import com.oracle.truffle.api.interop.Message;
import com.oracle.truffle.api.interop.TruffleObject;
import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.r.ffi.impl.common.LibPaths;
import com.oracle.truffle.r.runtime.RInternalError;
import com.oracle.truffle.r.runtime.context.RContext;
import com.oracle.truffle.r.runtime.ffi.DLL;
-import com.oracle.truffle.r.runtime.ffi.DLLRFFI;
+import com.oracle.truffle.r.runtime.ffi.DLL.SymbolHandle;
public class TruffleNFI_CAccess {
- private static TruffleNFI_DLL.NFIHandle handle;
-
public enum Function {
READ_POINTER_INT("(pointer): sint32"),
READ_ARRAY_INT("(pointer, sint64): sint32"),
@@ -47,15 +44,11 @@ public class TruffleNFI_CAccess {
Function(String signature) {
this.signature = signature;
-
}
public TruffleObject getSymbolFunction() {
- if (handle == null) {
- handle = (TruffleNFI_DLL.NFIHandle) DLLRFFI.DLOpenRootNode.create(RContext.getInstance()).call(LibPaths.getBuiltinLibPath("caccess"), true, true);
- }
if (symbolFunction == null) {
- DLL.SymbolHandle symbolHandle = (DLL.SymbolHandle) DLLRFFI.DLSymRootNode.create().getCallTarget().call(handle, cName());
+ SymbolHandle symbolHandle = DLL.findSymbol(cName(), null);
assert symbolHandle != null;
Node bind = Message.createInvoke(1).createNode();
try {
diff --git a/com.oracle.truffle.r.native/fficall/Makefile b/com.oracle.truffle.r.native/fficall/Makefile
index 99d32f1dca..26af0d4dc3 100644
--- a/com.oracle.truffle.r.native/fficall/Makefile
+++ b/com.oracle.truffle.r.native/fficall/Makefile
@@ -39,8 +39,6 @@ R_LIBNAME := libR$(DYLIB_EXT)
R_LIB := $(FASTR_LIB_DIR)/$(R_LIBNAME)
JNIBOOT_LIBNAME := libjniboot$(DYLIB_EXT)
JNIBOOT_LIB := $(FASTR_LIB_DIR)/$(JNIBOOT_LIBNAME)
-CACCESS_LIBNAME := libcaccess$(DYLIB_EXT)
-CACCESS_LIB := $(FASTR_LIB_DIR)/$(CACCESS_LIBNAME)
ifeq ($(OS_NAME), Darwin)
VERSION_FLAGS := -current_version $(R_VERSION) -compatibility_version $(R_VERSION)
@@ -61,11 +59,13 @@ ifeq ($(FASTR_RFFI),managed)
else
ifeq ($(OS_NAME),Darwin)
$(DYLIB_LD) $(DYLIB_LDFLAGS) -Wl,-rpath,@loader_path/ -o $(R_LIB) $(wildcard lib/*.o) -L$(FASTR_LIB_DIR) -lRblas -lRlapack -lpcre -lz $(VERSION_FLAGS)
+ifneq ($(FASTR_RFFI),llvm)
install_name_tool -change libRblas.dylib @rpath/libRblas.dylib $(R_LIB)
install_name_tool -change libRlapack.dylib @rpath/libRlapack.dylib $(R_LIB)
install_name_tool -id @rpath/libR.dylib $(R_LIB)
# check if we captured libpcre/libz, rpath those in libR
mx rupdatelib $(FASTR_LIB_DIR)
+endif
else
$(DYLIB_LD) $(DYLIB_LDFLAGS) $(shell echo $(PKG_LDFLAGS_OVERRIDE)) -Wl,-rpath,'$$ORIGIN' -o $(R_LIB) $(wildcard lib/*.o) -L$(FASTR_LIB_DIR) -lRblas -lRlapack -lpcre -lz
endif
@@ -76,12 +76,13 @@ fficall.done: common.done
touch fficall.done
else
ifeq ($(FASTR_RFFI),nfi)
-fficall.done: common.done $(CACCESS_LIB)
+fficall.done: common.done
$(MAKE) -C src/truffle_nfi all
touch fficall.done
+
else
ifeq ($(FASTR_RFFI),llvm)
-fficall.done: common.done $(CACCESS_LIB)
+fficall.done: common.done
$(MAKE) -C src/truffle_llvm all
touch fficall.done
else
@@ -97,8 +98,10 @@ jniboot.done:
$(JNIBOOT_LIB): jniboot.done
$(DYLIB_LD) $(DYLIB_LDFLAGS) -o $(JNIBOOT_LIB) src/jniboot/jniboot.o $(VERSION_FLAGS)
ifeq ($(OS_NAME),Darwin)
+ifneq ($(FASTR_RFFI),llvm)
install_name_tool -id @rpath/libjniboot.dylib $(JNIBOOT_LIB)
endif
+endif
else
$(error unknown value for FASTR_RFFI)
endif #jni
@@ -109,11 +112,6 @@ endif #managed
common.done:
$(MAKE) -C src/common all
-$(CACCESS_LIB): src/caccess/caccess.o
- $(DYLIB_LD) $(DYLIB_LDFLAGS) -o $(CACCESS_LIB) src/caccess/caccess.o $(VERSION_FLAGS)
-ifeq ($(OS_NAME),Darwin)
- install_name_tool -id @rpath/libcaccess.dylib $(CACCESS_LIB)
-endif
clean:
$(MAKE) -C src/common clean
@@ -128,6 +126,5 @@ endif
endif
rm -rf $(R_LIB)
rm -rf $(JNIBOOT_LIB)
- rm -rf $(CACCESS_LIB)
rm -rf fficall.done
diff --git a/com.oracle.truffle.r.native/fficall/src/caccess/Makefile b/com.oracle.truffle.r.native/fficall/src/caccess/Makefile
deleted file mode 100644
index de9823908e..0000000000
--- a/com.oracle.truffle.r.native/fficall/src/caccess/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 2016, 2017, 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-ifneq ($(MAKECMDGOALS),clean)
-include $(TOPDIR)/platform.mk
-endif
-
-
-.PHONY: all
-
-all: caccess.o
-
-caccess.o: caccess.c
- $(CC) $(CFLAGS) -c caccess.c -o $@
diff --git a/com.oracle.truffle.r.native/fficall/src/common/Makefile b/com.oracle.truffle.r.native/fficall/src/common/Makefile
index da61c6bf96..2a61a6187e 100644
--- a/com.oracle.truffle.r.native/fficall/src/common/Makefile
+++ b/com.oracle.truffle.r.native/fficall/src/common/Makefile
@@ -25,6 +25,7 @@
ifneq ($(MAKECMDGOALS),clean)
include $(FASTR_NATIVE_DIR)/platform.mk
+
endif
.PHONY: all clean
@@ -34,8 +35,12 @@ OBJ = ../../lib
GNUR_APPL_C_FILES = pretty.c interv.c
GNUR_APPL_SRC = $(GNUR_HOME)/src/appl
-# the Fortran sources are not recompiled, just copied
-GNUR_APPL_F_OBJECTS := $(wildcard $(GNUR_APPL_SRC)/d*.o $(GNUR_APPL_SRC)/d*.ll)
+# the Fortran sources are not recompiled (except for LLVM), just copied
+ifneq ($(FASTR_RFFI),llvm)
+GNUR_APPL_F_OBJECTS := $(wildcard $(GNUR_APPL_SRC)/d*.o)
+else
+GNUR_APPL_F_OBJECTS :=
+endif
GNUR_MAIN_C_FILES = colors.c devices.c engine.c format.c graphics.c plot.c plot3d.c plotmath.c rlocale.c sort.c
GNUR_MAIN_SRC = $(GNUR_HOME)/src/main
@@ -64,7 +69,9 @@ endif
all: Makefile $(C_OBJECTS) $(F_OBJECTS) $(GNUR_C_OBJECTS) $(GNUR_F_OBJECTS) $(OBJ)/copy_appl_objects
$(OBJ)/copy_appl_objects: $(GNUR_APPL_F_OBJECTS)
+ifneq ($(FASTR_RFFI),llvm)
cp $(GNUR_APPL_F_OBJECTS) $(OBJ)
+endif
touch $(OBJ)/copy_appl_objects
$(C_OBJECTS): | $(OBJ)
diff --git a/com.oracle.truffle.r.native/fficall/src/truffle_nfi/appl_rffi.c b/com.oracle.truffle.r.native/fficall/src/truffle_common/appl_rffi.c
similarity index 100%
rename from com.oracle.truffle.r.native/fficall/src/truffle_nfi/appl_rffi.c
rename to com.oracle.truffle.r.native/fficall/src/truffle_common/appl_rffi.c
diff --git a/com.oracle.truffle.r.native/fficall/src/caccess/caccess.c b/com.oracle.truffle.r.native/fficall/src/truffle_common/caccess.c
similarity index 100%
rename from com.oracle.truffle.r.native/fficall/src/caccess/caccess.c
rename to com.oracle.truffle.r.native/fficall/src/truffle_common/caccess.c
diff --git a/com.oracle.truffle.r.native/fficall/src/truffle_nfi/lapack_rffi.c b/com.oracle.truffle.r.native/fficall/src/truffle_common/lapack_rffi.c
similarity index 100%
rename from com.oracle.truffle.r.native/fficall/src/truffle_nfi/lapack_rffi.c
rename to com.oracle.truffle.r.native/fficall/src/truffle_common/lapack_rffi.c
diff --git a/com.oracle.truffle.r.native/fficall/src/truffle_nfi/misc_rffi.c b/com.oracle.truffle.r.native/fficall/src/truffle_common/misc_rffi.c
similarity index 100%
rename from com.oracle.truffle.r.native/fficall/src/truffle_nfi/misc_rffi.c
rename to com.oracle.truffle.r.native/fficall/src/truffle_common/misc_rffi.c
diff --git a/com.oracle.truffle.r.native/fficall/src/truffle_llvm/Makefile b/com.oracle.truffle.r.native/fficall/src/truffle_llvm/Makefile
index 6d769d9629..0c6228ce71 100644
--- a/com.oracle.truffle.r.native/fficall/src/truffle_llvm/Makefile
+++ b/com.oracle.truffle.r.native/fficall/src/truffle_llvm/Makefile
@@ -21,13 +21,6 @@
# questions.
#
-# This compiles everything in this directory, plus all the code in ../common,
-# including the code referenced in common from GnuR, with the -DFASTR_LLVM flag.
-# This creates an object file with no compiled C/Fortan code, just the equivalent LLVM IR
-# Since, at present, the resulting shared library (libR) must include both the real and the dummy
-# object files, we have to avoid a name clash on the object file,which we achieve by appending
-# "_llvm" to the name of the object file. The wrapper compilers use this name to create the
-# symbol that is looked up to find the LLVM IR at runtime.
# N.B. -g -O2 (which is the FFLAGS default from platform.mk) is currently suppressed
# due to sulong limitations
@@ -51,26 +44,21 @@ GNUR_MAIN_C_FILES = colors.c devices.c engine.c format.c graphics.c plot.c plot3
GNUR_MAIN_SRC = $(GNUR_HOME)/src/main
GNUR_C_OBJECTS := $(addprefix $(OBJ)/, $(GNUR_APPL_C_FILES:.c=.o) $(GNUR_MAIN_C_FILES:.c=.o))
-LLVM_GNUR_C_OBJECTS := $(GNUR_C_OBJECTS:.o=_llvm.o)
-$(info LLVM_GNUR_C_OBJECTS: $(LLVM_GNUR_C_OBJECTS))
GNUR_F_OBJECTS := $(addprefix $(OBJ)/, $(notdir $(GNUR_APPL_F_FILES:.f=.o)))
-LLVM_GNUR_F_OBJECTS := $(GNUR_F_OBJECTS:.o=_llvm.o)
-$(info LLVM_GNUR_F_OBJECTS: $(LLVM_GNUR_F_OBJECTS))
C_HDRS := $(wildcard *.h)
LOCAL_C_SOURCES := $(wildcard *.c)
COMMON_C_SOURCES := $(wildcard ../common/*.c)
-SHARED_NFI_C_SOURCES := ../truffle_nfi/misc_rffi.c ../truffle_nfi/lapack_rffi.c ../truffle_nfi/appl_rffi.c
-C_SOURCES := $(LOCAL_C_SOURCES) $(COMMON_C_SOURCES) $(SHARED_NFI_C_SOURCES)
-$(info C_SOURCES=$(C_SOURCES))
+TRUFFLE_COMMON_C_SOURCES := $(wildcard ../truffle_common/*.c)
+C_SOURCES := $(LOCAL_C_SOURCES) $(COMMON_C_SOURCES) $(TRUFFLE_COMMON_C_SOURCES)
+#$(info C_SOURCES=$(C_SOURCES))
LOCAL_C_OBJECTS := $(addprefix $(OBJ)/, $(LOCAL_C_SOURCES:.c=.o))
COMMON_C_OBJECTS := $(addprefix $(OBJ)/, $(notdir $(COMMON_C_SOURCES:.c=.o)))
-SHARED_NFI_C_OBJECTS := $(addprefix $(OBJ)/, $(notdir $(SHARED_NFI_C_SOURCES:.c=.o)))
-C_OBJECTS := $(LOCAL_C_OBJECTS) $(COMMON_C_OBJECTS) $(SHARED_NFI_C_OBJECTS)
-LLVM_C_OBJECTS := $(C_OBJECTS:.o=_llvm.o)
-$(info LLVM_C_OBJECTS=$(LLVM_C_OBJECTS))
+TRUFFLE_COMMON_C_OBJECTS := $(addprefix $(OBJ)/, $(notdir $(TRUFFLE_COMMON_C_SOURCES:.c=.o)))
+C_OBJECTS := $(LOCAL_C_OBJECTS) $(COMMON_C_OBJECTS) $(TRUFFLE_COMMON_C_OBJECTS)
+#$(info C_OBJECTS=$(C_OBJECTS))
SULONG_DIR = $(abspath $(FASTR_R_HOME)/../sulong)
@@ -80,14 +68,12 @@ LOCAL_INCLUDES = -I . -I $(abspath ../include)
INCLUDES := $(LOCAL_INCLUDES) $(FFI_INCLUDES) $(SULONG_INCLUDES)
-CFLAGS := $(CFLAGS) -DFASTR_LLVM
-#FFLAGS := $(FFLAGS) -DFASTR_LLVM
-FFLAGS := -DFASTR_LLVM
+FFLAGS :=
# uncomment to see exactly where headers are being read from
#CFLAGS := $(CFLAGS) -H
-all: Makefile $(LLVM_C_OBJECTS) $(LLVM_GNUR_C_OBJECTS) $(LLVM_GNUR_F_OBJECTS)
+all: Makefile $(C_OBJECTS) $(GNUR_C_OBJECTS) $(GNUR_F_OBJECTS)
$(C_OBJECTS): | $(OBJ)
@@ -98,22 +84,22 @@ $(GNUR_F_OBJECTS): | $(OBJ)
$(OBJ):
mkdir -p $(OBJ)
-$(OBJ)/%_llvm.o: $(GNUR_APPL_SRC)/%.c
+$(OBJ)/%.o: $(GNUR_APPL_SRC)/%.c
$(CC) $(CFLAGS) $(INCLUDES) $(GNUR_HEADER_DEFS) $(SUPPRESS_WARNINGS) -c $< -o $@
-$(OBJ)/%_llvm.o: $(GNUR_MAIN_SRC)/%.c
+$(OBJ)/%.o: $(GNUR_MAIN_SRC)/%.c
$(CC) $(CFLAGS) $(INCLUDES) $(GNUR_HEADER_DEFS) $(SUPPRESS_WARNINGS) -c $< -o $@
-$(OBJ)/%_llvm.o: %.c $(FASTR_NATIVE_DIR)/include/Rinternals.h rffiutils.h
+$(OBJ)/%.o: %.c $(FASTR_NATIVE_DIR)/include/Rinternals.h rffiutils.h
$(CC) $(CFLAGS) $(INCLUDES) $(GNUR_HEADER_DEFS) $(SUPPRESS_WARNINGS) -c $< -o $@
-$(OBJ)/%_llvm.o: ../common/%.c $(FASTR_NATIVE_DIR)/include/Rinternals.h
+$(OBJ)/%.o: ../common/%.c $(FASTR_NATIVE_DIR)/include/Rinternals.h
$(CC) $(CFLAGS) $(INCLUDES) $(GNUR_HEADER_DEFS) $(SUPPRESS_WARNINGS) -c $< -o $@
-$(OBJ)/%_llvm.o: ../truffle_nfi/%.c $(FASTR_NATIVE_DIR)/include/Rinternals.h
- $(CC) $(CFLAGS) $(INCLUDES) $(GNUR_HEADER_DEFS) $(SUPPRESS_WARNINGS) -c $< -o $@
+$(OBJ)/%.o: ../truffle_common/%.c
+ $(CC) $(CFLAGS) $(INCLUDES) $(SUPPRESS_WARNINGS) -c $< -o $@
-$(OBJ)/%_llvm.o: $(GNUR_APPL_SRC)/%.f
+$(OBJ)/%.o: $(GNUR_APPL_SRC)/%.f
$(F77) $(FFLAGS) $(FPICFLAGS) -c $< -o $@
clean:
diff --git a/com.oracle.truffle.r.native/fficall/src/truffle_llvm/caccess.c b/com.oracle.truffle.r.native/fficall/src/truffle_llvm/caccess.c
deleted file mode 100644
index 6743e91b48..0000000000
--- a/com.oracle.truffle.r.native/fficall/src/truffle_llvm/caccess.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-int caccess_read_pointer_int(int *address) {
- return *address;
-}
-
-double caccess_read_pointer_double(double *address) {
- return *address;
-}
-
-int caccess_read_array_int(int *address, int index) {
- return address[index];
-}
-
-double caccess_read_array_double(double *address, int index) {
- return address[index];
-}
diff --git a/com.oracle.truffle.r.native/fficall/src/truffle_nfi/Makefile b/com.oracle.truffle.r.native/fficall/src/truffle_nfi/Makefile
index 99b2dffdc1..2139707381 100644
--- a/com.oracle.truffle.r.native/fficall/src/truffle_nfi/Makefile
+++ b/com.oracle.truffle.r.native/fficall/src/truffle_nfi/Makefile
@@ -32,9 +32,13 @@ OBJ = ../../lib
C_HDRS := $(wildcard *.h)
-C_SOURCES = $(wildcard *.c)
+LOCAL_C_SOURCES = $(wildcard *.c)
+TRUFFLE_COMMON_C_SOURCES := $(wildcard ../truffle_common/*.c)
+C_SOURCES := $(LOCAL_C_SOURCES) $(TRUFFLE_COMMON_C_SOURCES)
#$(info C_SOURCES=$(C_SOURCES))
-C_OBJECTS := $(patsubst %.c,$(OBJ)/%.o,$(C_SOURCES))
+TRUFFLE_COMMON_C_OBJECTS := $(addprefix $(OBJ)/, $(notdir $(TRUFFLE_COMMON_C_SOURCES:.c=.o)))
+LOCAL_C_OBJECTS := $(patsubst %.c,$(OBJ)/%.o,$(LOCAL_C_SOURCES))
+C_OBJECTS := $(LOCAL_C_OBJECTS) $(TRUFFLE_COMMON_C_OBJECTS)
#$(info C_OBJECTS=$(C_OBJECTS))
FFI_INCLUDES = -I$(TOPDIR)/include -I$(TOPDIR)/include/R_ext
@@ -56,9 +60,15 @@ $(OBJ):
$(OBJ)/%.o: %.c $(TOPDIR)/include/Rinternals.h ../common/rffi_upcallsindex.h $(C_HDRS)
$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+$(OBJ)/%.o: ../truffle_common/%.c $(TOPDIR)/include/Rinternals.h ../common/rffi_upcallsindex.h $(C_HDRS)
+ $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+
# for debugging, to see what's really being compiled
$(OBJ)/%.E: %.c $(TOPDIR)/include/Rinternals.h
$(CC) -E $(CFLAGS) $(INCLUDES) -c $< > $@
+$(OBJ)/%.E: ../truffle_common/%.c $(TOPDIR)/include/Rinternals.h
+ $(CC) -E $(CFLAGS) $(INCLUDES) -c $< > $@
+
clean:
rm -rf $(OBJ)
diff --git a/com.oracle.truffle.r.native/gnur/Makefile.gnur b/com.oracle.truffle.r.native/gnur/Makefile.gnur
index a6819b2a23..a6ea7375af 100644
--- a/com.oracle.truffle.r.native/gnur/Makefile.gnur
+++ b/com.oracle.truffle.r.native/gnur/Makefile.gnur
@@ -26,13 +26,6 @@
# that it shares, but is simpler and safer to just build all of it. The relevant
# pieces are then copied to other FastR directories.
#
-# The configuration of GnuR for FastR is platform specific and a special step
-# is needed for Linux where, ordinarily, the PCRE library is compiled non-PIC
-# as it is built as a library archive. FastR needs a shared library, which can be
-# enabled by setting --enable-R-shlib, but unfortunately this also sets the visibility
-# of the functions to hidden, so FastR cannot find them. There does not appear to be a
-# way to fix this simply using configure args, so we patch up the Makeconf file.
-
# Portions of the Makeconf file are then extracted to use in building the native
# parts of FastR, especially packages with native code.
@@ -40,13 +33,9 @@
OSNAME := $(shell uname)
-ifeq ($(FASTR_RFFI),llvm)
-FC_DIR := $(abspath $(TOPDIR)/../mx.fastr/compilers)
-FASTR_COMPILERS := CC=$(FC_DIR)/fastr-cc FC=$(FC_DIR)/fastr-fc F77=$(FC_DIR)/fastr-fc CXX=$(FC_DIR)/fastr-c++ CXXCPP=$(FC_DIR)/fastr-cpp OBJC=$(FC_DIR)/fastr-cc
-endif
-
ifneq ($(FASTR_RFFI),llvm)
# LLVM text parser and -g don't get on
+# TODO check still true
OPT_FLAGS := -g -O2
OPT_FLAGS := -O2
diff --git a/com.oracle.truffle.r.native/gnur/Makefile.platform b/com.oracle.truffle.r.native/gnur/Makefile.platform
index 70ab4217cd..8366712be3 100644
--- a/com.oracle.truffle.r.native/gnur/Makefile.platform
+++ b/com.oracle.truffle.r.native/gnur/Makefile.platform
@@ -38,6 +38,9 @@ $(TOPDIR)/platform.mk: sedMakeconf $(GNUR_HOME)/Makeconf Makefile
sed -f sedEtcMakeconf $(GNUR_HOME)/etc/Makeconf > /dev/null 2>&1
cat platform.mk.temp1 platform.mk.temp2 > platform.mk.temp
ed platform.mk.temp < edAddFASTR
+ifeq ($(FASTR_RFFI),llvm)
+ ed platform.mk.temp <edLLVM
+endif
echo OS_NAME = $(OS_NAME) >> platform.mk.temp
ifeq ($(OS_NAME),SunOS)
echo JDK_OS_DIR = solaris >> platform.mk.temp
diff --git a/com.oracle.truffle.r.native/gnur/edLLVM b/com.oracle.truffle.r.native/gnur/edLLVM
new file mode 100644
index 0000000000..8b3e2a29d2
--- /dev/null
+++ b/com.oracle.truffle.r.native/gnur/edLLVM
@@ -0,0 +1,12 @@
+/^CC =/
+d
+i
+CC = $(FASTR_R_HOME)/mx.fastr/compilers/fastr-cc
+.
+/^F77 =/
+d
+i
+F77 = $(FASTR_R_HOME)/mx.fastr/compilers/fastr-fc
+.
+w
+q
diff --git a/com.oracle.truffle.r.native/library/lib.mk b/com.oracle.truffle.r.native/library/lib.mk
index 4f6a44fcb9..997d88708b 100644
--- a/com.oracle.truffle.r.native/library/lib.mk
+++ b/com.oracle.truffle.r.native/library/lib.mk
@@ -109,8 +109,10 @@ $(LIB_PKG): $(C_OBJECTS) $(F_OBJECTS) $(GNUR_C_OBJECTS) $(GNUR_F_OBJECTS) $(PKGD
mkdir -p $(FASTR_LIBRARY_DIR)/$(PKG)/libs
cp $(LIB_PKG) $(FASTR_LIBRARY_DIR)/$(PKG)/libs
ifeq ($(OS_NAME),Darwin)
+ifneq ($(FASTR_RFFI),llvm)
install_name_tool -id @rpath/../library/$(PKG)/libs/$(PKG).so $(FASTR_LIBRARY_DIR)/$(PKG)/libs/$(PKG).so
endif
+endif
$(OBJ)/%.o: $(SRC)/%.c $(H_SOURCES)
$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
diff --git a/com.oracle.truffle.r.native/run/Makefile b/com.oracle.truffle.r.native/run/Makefile
index 30e6a1273d..b874c77c38 100644
--- a/com.oracle.truffle.r.native/run/Makefile
+++ b/com.oracle.truffle.r.native/run/Makefile
@@ -85,6 +85,9 @@ $(FASTR_BIN_DIR)/R: Makefile R.sh Rscript.sh Rscript_exec.sh Rclasspath.sh
cp $(GNUR_HOME)/etc/repositories $(FASTR_ETC_DIR)/repositories
cp $(GNUR_HOME)/etc/ldpaths $(FASTR_ETC_DIR)/ldpaths
ed Makeconf.etc < edMakeconf.etc
+ifeq ($(FASTR_RFFI),llvm)
+ ed Makeconf.etc < edMakeconf.etc.llvm
+endif
cp Makeconf.etc $(FASTR_ETC_DIR)/Makeconf
cp -r $(SHARE_FILES) $(FASTR_SHARE_DIR)
# TODO may need filtering
diff --git a/com.oracle.truffle.r.native/run/edMakeconf.etc.llvm b/com.oracle.truffle.r.native/run/edMakeconf.etc.llvm
new file mode 100644
index 0000000000..cb70e3626b
--- /dev/null
+++ b/com.oracle.truffle.r.native/run/edMakeconf.etc.llvm
@@ -0,0 +1,32 @@
+/^CC =/
+d
+i
+CC = $(R_HOME)/mx.fastr/compilers/fastr-cc
+.
+/^CXX =/
+d
+i
+CXX = $(R_HOME)/mx.fastr/compilers/fastr-c++
+.
+/^CXXCPP =/
+d
+i
+CXXCPP = $(R_HOME)/mx.fastr/compilers/fastr-cpp
+.
+/^FC =/
+d
+i
+FC = $(R_HOME)/mx.fastr/compilers/fastr-fc
+.
+/^F77 =/
+d
+i
+F77 = $(R_HOME)/mx.fastr/compilers/fastr-fc
+.
+/^OBJC =/
+d
+i
+OBJC = $(R_HOME)/mx.fastr/compilers/fastr-cc
+.
+w
+q
diff --git a/com.oracle.truffle.r.test.native/urand/Makefile b/com.oracle.truffle.r.test.native/urand/Makefile
index 1dc8f430e2..f2693f4482 100644
--- a/com.oracle.truffle.r.test.native/urand/Makefile
+++ b/com.oracle.truffle.r.test.native/urand/Makefile
@@ -25,6 +25,7 @@ ifeq ($(TOPDIR),)
TOPDIR = $(abspath ..)
endif
+FASTR_R_HOME := $(abspath $(TOPDIR)/..)
NATIVE_PROJECT = $(subst test.native,native,$(TOPDIR))
ifneq ($(MAKECMDGOALS),clean)
diff --git a/documentation/dev/truffle_llvm_ffi.md b/documentation/dev/truffle_llvm_ffi.md
index 69e408a1ad..469f313bff 100644
--- a/documentation/dev/truffle_llvm_ffi.md
+++ b/documentation/dev/truffle_llvm_ffi.md
@@ -8,7 +8,9 @@ Special setup is required to build FastR to use the Truffle R FFI implementation
## Pre-Requisites
-The DragonEgg plugin requires that `gcc 4.6` and `gfortran 4.6` be available. On Mac OS, these can be installed with MacPorts (recommended) or Brew. Having installed these, set the following environment variables:
+The DragonEgg plugin requires that `gcc 4.6` and `gfortran 4.6` be available.
+
+On Mac OS, these can be installed with MacPorts (recommended) or Brew. Having installed these, set the following environment variables:
export SULONG_GPP=/opt/local/bin/g++-mp-4.6
export SULONG_GFORTRAN=/opt/local/bin/gfortran-mp-4.6
@@ -16,6 +18,8 @@ The DragonEgg plugin requires that `gcc 4.6` and `gfortran 4.6` be available. On
The above definitions assume a MacPorts installation.
+On Linux, the installation is system dependent, but once installed, set the same environment variables.
+
Both GNU R and FastR native code must be compiled to generate LLVM code. This is handled by special "wrapper" compiler scripts that encapsulate the required steps.
To ensure that the wrapper compiler scripts are used in the GNU R build set:
@@ -29,10 +33,15 @@ The `sulong` repository must be cloned to a sibling directory of `fastr` and bui
cd $FASTR_HOME
git clone https://github.com/graalvm/sulong.git
cd sulong
- mx build
mx su-pulldragonegg
-The `mx build` step will clone the `graal` repository, if necessary, and build the `truffle` suite also. The `mx su-pulldragonegg` step is required to be able to compile Fortran code to LLVM, which is required by FastR.
+The `mx su-pulldragonegg` step is required to be able to compile Fortran code to LLVM, which is required by FastR.. As well as downloading DragonEgg this will also download and clang 3.2, which is needed to build DragonEgg. On Linux, it is necessary to use clang 3.2 in preference to any installed clang, e.g., 3.8, as some of the LLVM code generated by DragonEgg is syntax-incompatible with 3.8. The downloaded version is saved in `cache/tools/llvm/bin` and this (absolute) path should be added to `PATH`.
+
+Now the remainder of sulong can be built.
+
+ mx build
+
+The `mx build` step will clone the `graal` repository, if necessary, and build the `truffle` suite also.
## Building FastR
@@ -41,7 +50,15 @@ To ensure that the `llvm` variant of the native build is generated, set:
export FASTR_RFFI=llvm
-If you have an existing build, you must unset any definition of `GNUR_NOCLEAN` then run `mx build -c`. The wrapper scripts add quite a bit of overhead to the build process, particularly the GNU R configure step, but fortunately this only has to be done once.
+N.B. It is necessary to inform the build of the location of the various required libraries, e.g. `libpcre` as these are loaded explicitly from the `lib` directory at runtime. The build copies these libraries from wherever they were installed to the `lib` directory. For example on Ubuntu, set:
+
+ export PKG_LDFLAGS_OVERRIDE=-L/lib/x86_64-linux-gnu
+
+On Mac OS (with MacPorts) set:
+
+ export PKG_LDFLAGS_OVERRIDE="-L/opt/local/lib -L/opt/local/lib/libgcc"
+
+Then run `mx build`.
## Running
diff --git a/mx.fastr/compilers/fastr-c++ b/mx.fastr/compilers/fastr-c++
index 2d8cc481f9..4a2d1badc8 100755
--- a/mx.fastr/compilers/fastr-c++
+++ b/mx.fastr/compilers/fastr-c++
@@ -22,7 +22,7 @@
#
#!/bin/bash
-SOURCE="${BASH_SOURCE[0]}"
+SOURCE="$0"
while [ -h "$SOURCE" ]; do
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
SOURCE="$(readlink "$SOURCE")"
diff --git a/mx.fastr/compilers/fastr-cc b/mx.fastr/compilers/fastr-cc
index ff05a0f750..bd1c573723 100755
--- a/mx.fastr/compilers/fastr-cc
+++ b/mx.fastr/compilers/fastr-cc
@@ -22,7 +22,7 @@
#
#!/bin/bash
-SOURCE="${BASH_SOURCE[0]}"
+SOURCE="$0"
while [ -h "$SOURCE" ]; do
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
SOURCE="$(readlink "$SOURCE")"
diff --git a/mx.fastr/compilers/fastr-cpp b/mx.fastr/compilers/fastr-cpp
index 5e5a24e6cc..10fc355b3f 100755
--- a/mx.fastr/compilers/fastr-cpp
+++ b/mx.fastr/compilers/fastr-cpp
@@ -22,7 +22,7 @@
#
#!/bin/bash
-SOURCE="${BASH_SOURCE[0]}"
+SOURCE="$0"
while [ -h "$SOURCE" ]; do
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
SOURCE="$(readlink "$SOURCE")"
diff --git a/mx.fastr/compilers/fastr-fc b/mx.fastr/compilers/fastr-fc
index e5f506854e..e5d38d6206 100755
--- a/mx.fastr/compilers/fastr-fc
+++ b/mx.fastr/compilers/fastr-fc
@@ -22,7 +22,7 @@
#
#!/bin/bash
-SOURCE="${BASH_SOURCE[0]}"
+SOURCE="$0"
while [ -h "$SOURCE" ]; do
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
SOURCE="$(readlink "$SOURCE")"
diff --git a/mx.fastr/compilers/have_sulong b/mx.fastr/compilers/have_sulong
index a650e87c51..96ff8288a7 100755
--- a/mx.fastr/compilers/have_sulong
+++ b/mx.fastr/compilers/have_sulong
@@ -22,7 +22,7 @@
#
#!/bin/bash
-SOURCE="${BASH_SOURCE[0]}"
+SOURCE="$0"
while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
SOURCE="$(readlink "$SOURCE")"
diff --git a/mx.fastr/mx_copylib.py b/mx.fastr/mx_copylib.py
index 822c169f95..d266242ea5 100644
--- a/mx.fastr/mx_copylib.py
+++ b/mx.fastr/mx_copylib.py
@@ -42,7 +42,7 @@ def _darwin_extract_realpath(lib, libpath):
except subprocess.CalledProcessError:
mx.abort('copylib: otool failed')
-def _copylib(lib, libpath, target):
+def _copylib(lib, libpath, plain_libpath_base, target):
'''
Just copying libxxx.so/dylib isn't sufficient as versioning is involved.
The path is likely a symlink to libxxx.so.n, for example, but what is really
@@ -67,20 +67,19 @@ def _copylib(lib, libpath, target):
# copy both files
shutil.copyfile(real_libpath, os.path.join(target, os.path.basename(real_libpath)))
mx.log('copied ' + lib + ' library from ' + real_libpath + ' to ' + target)
- libpath_base = os.path.basename(libpath)
os.chdir(target)
- mx.log('libpath: ' + libpath + ' real_libpath: ' + real_libpath)
- if os.path.basename(libpath) != os.path.basename(real_libpath):
+ mx.log('plain_libpath_base: ' + plain_libpath_base + ' libpath: ' + libpath + ' real_libpath: ' + real_libpath)
+ if os.path.basename(real_libpath) != plain_libpath_base:
# create a symlink
- if os.path.exists(libpath_base):
- os.remove(libpath_base)
- mx.log('ln -s ' + os.path.basename(real_libpath) + ' ' + libpath_base)
- os.symlink(os.path.basename(real_libpath), libpath_base)
+ if os.path.exists(plain_libpath_base):
+ os.remove(plain_libpath_base)
+ mx.log('ln -s ' + os.path.basename(real_libpath) + ' ' + plain_libpath_base)
+ os.symlink(os.path.basename(real_libpath), plain_libpath_base)
# On Darwin we change the id to use @rpath
if platform.system() == 'Darwin':
try:
- mx.log('install_name_tool -id @rpath/' + libpath_base + ' ' + libpath_base)
- subprocess.check_call(['install_name_tool', '-id', '@rpath/' + libpath_base, libpath_base])
+ mx.log('install_name_tool -id @rpath/' + plain_libpath_base + ' ' + plain_libpath_base)
+ subprocess.check_call(['install_name_tool', '-id', '@rpath/' + plain_libpath_base, plain_libpath_base])
except subprocess.CalledProcessError:
mx.abort('copylib: install_name_tool failed')
@@ -104,17 +103,17 @@ def copylib(args):
parts = os.environ['PKG_LDFLAGS_OVERRIDE'].split(' ')
ext = '.dylib' if platform.system() == 'Darwin' else '.so'
lib_prefix = 'lib' + args[0]
- plain_libpath = lib_prefix + ext
+ plain_libpath_base = lib_prefix + ext
for part in parts:
path = part.strip('"').lstrip('-L')
if os.path.exists(path):
for f in os.listdir(path):
if f.startswith(lib_prefix):
- if os.path.exists(os.path.join(path, plain_libpath)):
- f = plain_libpath
+ if os.path.exists(os.path.join(path, plain_libpath_base)):
+ f = plain_libpath_base
target_dir = args[1]
if not os.path.exists(os.path.join(target_dir, f)):
- _copylib(args[0], os.path.join(path, f), args[1])
+ _copylib(args[0], os.path.join(path, f), plain_libpath_base, args[1])
return 0
if os.environ.has_key('FASTR_RELEASE'):
diff --git a/mx.fastr/mx_fastr_compile.py b/mx.fastr/mx_fastr_compile.py
index 9e62f05ec9..304ebb6c12 100644
--- a/mx.fastr/mx_fastr_compile.py
+++ b/mx.fastr/mx_fastr_compile.py
@@ -26,7 +26,7 @@ When not running with sulong is simply forwards to the default compiler for the
When running under sulong, it uses sulong to do two compilations; first to generate object code
and second to generate LLVM bitcode.
"""
-import os, sys
+import os, sys, zipfile
import mx
import mx_fastr
@@ -128,30 +128,17 @@ def cc(args):
sulong = _sulong()
if sulong:
analyzed_args = _analyze_args(args)
- if _is_linux():
- rc = sulong.compileWithGCC(analyzed_args.compile_args)
- if rc == 0 and analyzed_args.llvm_ir_file:
- if not analyzed_args.is_link:
- rc = sulong.compileWithGCC(analyzed_args.emit_llvm_args)
- elif _is_darwin():
- rc = sulong.compileWithClang(analyzed_args.compile_args)
- if rc == 0 and analyzed_args.llvm_ir_file:
- if not analyzed_args.is_link:
- rc = sulong.compileWithClang(analyzed_args.emit_llvm_args)
+ rc = 0
+ if analyzed_args.is_link:
+ rc = _create_bc_lib(args)
else:
- mx.abort('unsupported platform')
+ if analyzed_args.llvm_ir_file:
+ rc = sulong.compileWithClang(analyzed_args.emit_llvm_args)
if rc == 0 and not analyzed_args.is_link and analyzed_args.llvm_ir_file:
rc = _mem2reg_opt(analyzed_args.llvm_ir_file)
- if rc == 0:
- rc = _embed_ir(analyzed_args.llvm_ir_file)
+ _fake_obj(analyzed_args.llvm_ir_file.replace('.bc', '.o'))
else:
- if _is_linux():
- compiler = 'gcc'
- elif _is_darwin():
- compiler = 'clang'
- else:
- mx.abort('unsupported platform')
-
+ compiler = 'clang'
rc = mx.run([compiler] + args, nonZeroIsFatal=False)
return rc
@@ -162,17 +149,16 @@ def fc(args):
sulong = _sulong()
if sulong:
analyzed_args = _analyze_args(args, dragonEgg=True)
- rc = mx.run([sulong.getGFortran()] + analyzed_args.compile_args, nonZeroIsFatal=False)
- if rc == 0:
- rc = sulong.dragonEggGFortran(analyzed_args.emit_llvm_args)
- if rc == 0 and analyzed_args.llvm_ir_file:
- # create bitcode from textual IR
- llvm_as = sulong.findLLVMProgram('llvm-as')
- llvm_bc_file = os.path.splitext(analyzed_args.llvm_ir_file)[0] + '.bc'
- rc = mx.run([llvm_as, analyzed_args.llvm_ir_file, '-o', llvm_bc_file])
- rc = _mem2reg_opt(llvm_bc_file)
- if rc == 0:
- rc = _embed_ir(llvm_bc_file)
+ rc = 0
+ rc = sulong.dragonEggGFortran(analyzed_args.emit_llvm_args)
+ if rc == 0 and analyzed_args.llvm_ir_file:
+ # create bitcode from textual IR
+ llvm_as = sulong.findLLVMProgram('llvm-as')
+ llvm_bc_file = os.path.splitext(analyzed_args.llvm_ir_file)[0] + '.bc'
+ rc = mx.run([llvm_as, analyzed_args.llvm_ir_file, '-o', llvm_bc_file])
+ os.remove(analyzed_args.llvm_ir_file)
+ rc = _mem2reg_opt(llvm_bc_file)
+ _fake_obj(llvm_bc_file.replace('.bc', '.o'))
else:
compiler = 'gfortran'
rc = mx.run([compiler] + args, nonZeroIsFatal=False)
@@ -194,8 +180,6 @@ def cpp(args):
rc = sulong.compileWithClangPP(analyzed_args.emit_llvm_args)
else:
mx.abort('unsupported platform')
- if rc == 0 and not analyzed_args.is_link:
- rc = _embed_ir(analyzed_args.llvm_ir_file)
else:
compiler = 'g++'
rc = mx.run([compiler] + args, nonZeroIsFatal=False)
@@ -218,125 +202,33 @@ def _mem2reg_opt(llvm_ir_file):
os.rename(opt_filename, llvm_ir_file)
return rc
-def _embed_ir(llvm_ir_file):
- '''
- Given an llvm_ir_file, generates an assembler file containing the content as a sequence
- of .byte directives, then uses ld to merge that with the original .o file, replacing
- the original .o file.
- '''
-
- def write_hexbyte(f, b):
- f.write("0x%0.2X" % b)
-
- def write_int(f, n):
- write_hexbyte(f, n & 255)
- f.write(',')
- write_hexbyte(f, (n >> 8) & 255)
- f.write(',')
- write_hexbyte(f, (n >> 16) & 255)
- f.write(',')
- write_hexbyte(f, (n >> 24) & 255)
-
- def write_symbol(f, sym):
- write_dot_byte(f)
- write_hexbyte(f, len(sym))
- f.write(', ')
- first = True
- for ch in sym:
- if first:
- first = False
- else:
- f.write(', ')
- write_hexbyte(f, ord(ch))
- f.write('\n')
-
- def write_dot_byte(f):
- f.write(' .byte ')
-
- def checkchars(s):
- return s.replace("-", "_")
-
- # find the exported symbols
- llvm_nm = _sulong().findLLVMProgram("llvm-nm")
-
- class NMOutputCapture:
- def __init__(self):
- self.exports = []
- self.imports = []
-
- def __call__(self, data):
- # T name
- s = data.strip()
- if s[0] == 'T':
- self.exports.append(s[2:])
- elif s[0] == 'U':
- self.imports.append(s[2:])
-
- llvm_nm_out = NMOutputCapture()
- mx.run([llvm_nm, llvm_ir_file], out=llvm_nm_out)
-
- with open(llvm_ir_file) as f:
- content = bytearray(f.read())
- filename = os.path.splitext(llvm_ir_file)[0]
- ext = os.path.splitext(llvm_ir_file)[1]
- as_file = llvm_ir_file + '.s'
- gsym = "__llvm_" + checkchars(os.path.basename(filename))
- with open(as_file, 'w') as f:
- f.write(' .const\n')
- f.write(' .globl ' + gsym + '\n')
- f.write(gsym + ':\n')
- count = 0
- lenc = len(content)
- write_dot_byte(f)
- # 1 for text, 2 for binary, followed by length
- write_hexbyte(f, 1 if ext == '.ll' else 2)
- f.write(',')
- write_int(f, lenc)
- f.write('\n')
- # now the exported symbols
- write_dot_byte(f)
- write_int(f, len(llvm_nm_out.exports))
- f.write('\n')
- for sym in llvm_nm_out.exports:
- write_symbol(f, sym)
- # now the imported symbols
- write_dot_byte(f)
- write_int(f, len(llvm_nm_out.imports))
- f.write('\n')
- for sym in llvm_nm_out.imports:
- write_symbol(f, sym)
- # now the content
- write_dot_byte(f)
- first = True
- for b in content:
- if first:
- first = False
- else:
- f.write(',')
- write_hexbyte(f, b)
- count = count + 1
- if count % 20 == 0 and count < lenc:
- f.write('\n')
- write_dot_byte(f)
- first = True
- f.write('\n')
-
- ll_o_file = llvm_ir_file + '.o'
- rc = mx.run(['gcc', '-c', as_file, '-o', ll_o_file], nonZeroIsFatal=False)
- if rc == 0:
- # combine
- o_file = filename + '.o'
- dot_o_file = o_file + '.o'
- os.rename(o_file, dot_o_file)
- rc = mx.run(['ld', '-r', dot_o_file, ll_o_file, '-o', o_file], nonZeroIsFatal=False)
- os.remove(dot_o_file)
- os.remove(as_file)
- os.remove(ll_o_file)
- return rc
+def _fake_obj(name):
+ '''create an empty object file to keep make happy'''
+# print 'creating ' + name
+ open(name, 'w').close()
def mem2reg(args):
_mem2reg_opt(args[0])
+def _create_bc_lib(args):
+ i = 0
+ bcfiles = []
+ while i < len(args):
+ arg = args[i]
+ if arg == '-o' :
+ # library file
+ i = i + 1
+ lib = args[i]
+ else:
+ if '.o' in arg:
+ bcfiles.append(arg.replace('.o', '.bc'))
+ i = i + 1
+
+ with zipfile.ZipFile(lib, 'w') as arc:
+ for bcfile in bcfiles:
+ arc.write(bcfile, os.path.basename(bcfile).replace('.bc', ''))
+ return 0
+
_commands = {
'fastr-cc' : [cc, '[options]'],
'fastr-fc' : [fc, '[options]'],
--
GitLab