by default generate a native executable when asked to do so, so that numpy build tools can introspect

Author: timfel

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonCC.java

@@ -55,13 +55,22 @@ public class GraalPythonCC extends GraalPythonCompiler {
     private String outputFilename;
     private boolean linkExecutable;
     private boolean link;
+    private boolean linkLLI;
     private Boolean compile;
     private List<String> clangArgs;
+    private List<String> execLinkArgs;
     private List<String> fileInputs;
 
     GraalPythonCC() {
     }
 
+    private static List<String> execLinkPrefix = Arrays.asList(new String[]{
+                    "clang",
+                    "-fembed-bitcode",
+                    "-fPIC",
+                    "-ggdb",
+                    "-O1",
+    });
     private static List<String> clangPrefix = Arrays.asList(new String[]{
                     "clang",
                     "-emit-llvm",
@@ -100,10 +109,12 @@ private void run(String[] args) {
     private void parseOptions(String[] args) {
         outputFilename = A_OUT;
         linkExecutable = true;
+        linkLLI = false;
         link = true;
         verbose = false;
         compile = null;
         clangArgs = new ArrayList<>(clangPrefix);
+        execLinkArgs = new ArrayList<>(execLinkPrefix);
         fileInputs = new ArrayList<>();
         for (int i = 0; i < args.length; i++) {
             String arg = args[i];
@@ -123,6 +134,9 @@ private void parseOptions(String[] args) {
                     link = false;
                     linkExecutable = false;
                     break;
+                case "--link-lli-scripts":
+                    linkLLI = true;
+                    continue; // skip adding this to clang args
                 case "-v":
                     if (!verbose) {
                         verbose = true;
@@ -144,6 +158,8 @@ private void parseOptions(String[] args) {
                             throw new RuntimeException("cannot mix source and compiled sources");
                         }
                         fileInputs.add(arg);
+                    } else {
+                        execLinkArgs.add(arg);
                     }
             }
             clangArgs.add(arg);
@@ -173,6 +189,13 @@ private void launchCC() {
                     String bcFile = bcFileFromFilename(f);
                     assert Files.exists(Paths.get(bcFile));
                     optFile(bcFile);
+                    try {
+                        String objFile = objectFileFromFilename(f);
+                        logV("Optimized:", bcFile, "->", objFile);
+                        Files.move(Paths.get(bcFile), Paths.get(objFile));
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
+                    }
                 }
             } else {
                 optFile(outputFilename);
@@ -192,15 +215,21 @@ private void launchCC() {
         }
     }
 
-    private static void linkExecutable(String executableScript, String linkedBcFile) throws IOException {
-        List<String> cmdline = GraalPythonMain.getCmdline(Arrays.asList(), Arrays.asList());
-        cmdline.add("-LLI");
-        cmdline.add(linkedBcFile);
-        Path executablePath = Paths.get(executableScript);
-        Files.write(executablePath, String.join(" ", cmdline).getBytes());
-        HashSet<PosixFilePermission> perms = new HashSet<>(Arrays.asList(new PosixFilePermission[]{PosixFilePermission.OWNER_EXECUTE, PosixFilePermission.GROUP_EXECUTE}));
-        perms.addAll(Files.getPosixFilePermissions(executablePath));
-        Files.setPosixFilePermissions(executablePath, perms);
+    private void linkExecutable(String executableScript, String linkedBcFile) throws IOException {
+        if (linkLLI) {
+            List<String> cmdline = GraalPythonMain.getCmdline(Arrays.asList(), Arrays.asList());
+            cmdline.add("-LLI");
+            cmdline.add(linkedBcFile);
+            Path executablePath = Paths.get(executableScript);
+            Files.write(executablePath, String.join(" ", cmdline).getBytes());
+            HashSet<PosixFilePermission> perms = new HashSet<>(Arrays.asList(new PosixFilePermission[]{PosixFilePermission.OWNER_EXECUTE, PosixFilePermission.GROUP_EXECUTE}));
+            perms.addAll(Files.getPosixFilePermissions(executablePath));
+        } else {
+            execLinkArgs.add(linkedBcFile);
+            execLinkArgs.add("-o");
+            execLinkArgs.add(executableScript);
+            exec(execLinkArgs);
+        }
     }
 
     private void linkShared(List<String> bitcodeFiles) {
@@ -221,4 +250,17 @@ private void optFile(String bcFile) {
         opt.add(bcFile);
         exec(opt);
     }
+
+    private static String bcFileFromFilename(String f) {
+        int dotIdx = f.lastIndexOf('.');
+        if (dotIdx > 1) {
+            return f.substring(0, dotIdx + 1) + "bc";
+        } else {
+            return f + ".bc";
+        }
+    }
+
+    private static String objectFileFromFilename(String f) {
+        return bcFileFromFilename(f).replaceAll("\\.bc$", ".o");
+    }
 }

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonCompiler.java

@@ -41,20 +41,12 @@
 package com.oracle.graal.python.shell;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.List;
 
 public class GraalPythonCompiler {
     protected static final String A_OUT = "a.out";
 
-    protected static String bcFileFromFilename(String f) {
-        int dotIdx = f.lastIndexOf('.');
-        if (dotIdx > 1) {
-            return f.substring(0, dotIdx + 1) + "bc";
-        } else {
-            return f + ".bc";
-        }
-    }
-
     protected boolean verbose;
 
     public GraalPythonCompiler() {
@@ -91,4 +83,7 @@ protected void logV(List<String> args) {
         logV(null, args);
     }
 
+    protected void logV(String... args) {
+        logV(null, Arrays.asList(args));
+    }
 }

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonLD.java

@@ -40,8 +40,6 @@
  */
 package com.oracle.graal.python.shell;
 
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -84,14 +82,7 @@ private void parseOptions(String[] args) {
                     verbose = true;
                     break;
                 default:
-                    if (arg.endsWith(".o")) {
-                        String bc = bcFileFromFilename(arg);
-                        if (Files.exists(Paths.get(bc))) {
-                            fileInputs.add(bc);
-                        } else {
-                            fileInputs.add(arg);
-                        }
-                    } else if (arg.endsWith(".bc")) {
+                    if (arg.endsWith(".o") || arg.endsWith(".bc")) {
                         fileInputs.add(arg);
                     } else {
                         droppedArgs.add(arg);