first iteration for linking and running "executables"

Author: timfel

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

@@ -33,7 +33,9 @@
 import java.lang.management.ManagementFactory;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -75,6 +77,7 @@ public static void main(String[] args) {
     private boolean stdinIsInteractive = System.console() != null;
     private boolean runCC = false;
     private boolean runLD = false;
+    private boolean runLLI = false;
     private VersionAction versionAction = VersionAction.None;
 
     @Override
@@ -147,6 +150,9 @@ protected List<String> preprocessArguments(List<String> arguments, Map<String, S
                     runLD = true;
                     programArgs.addAll(arguments.subList(i + 1, arguments.size()));
                     return unrecognized;
+                case "-LLI":
+                    runLLI = true;
+                    break;
                 case "-debug-perf":
                     subprocessArgs.add("Dgraal.TraceTruffleCompilation=true");
                     subprocessArgs.add("Dgraal.TraceTrufflePerformanceWarnings=true");
@@ -212,6 +218,16 @@ protected void launch(Builder contextBuilder) {
         } else if (runCC) {
             launchCC();
             return;
+        } else if (runLLI) {
+            assert inputFile != null : "lli needs an input file";
+            try (Context context = contextBuilder.build()) {
+                try {
+                    context.eval(Source.newBuilder("llvm", new File(inputFile)).build());
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            return;
         }
 
         if (!ignoreEnv) {
@@ -385,7 +401,7 @@ private void exec(String[] cmdarray) {
                     System.err.print(cmd);
                     System.err.print(" ");
                 }
-                System.err.println("");
+                System.err.println();
             }
             processBuilder.command(cmdarray);
             int status = processBuilder.start().waitFor();
@@ -402,9 +418,22 @@ private void launchCC() {
 
         // if we are started without -c, we need to run the linker later
         boolean runLinker = false;
+        boolean linkExecutable = false;
         if (!programArgs.contains("-c")) {
             runLinker = true;
             programArgs.add(0, "-c");
+            if (!programArgs.contains("-shared")) {
+                assert !programArgs.contains("-static") : "static linking is not supported";
+                linkExecutable = true;
+            }
+        }
+
+        if (verboseFlag) {
+            System.err.print("[python] [CC] ");
+            if (runLinker) {
+                System.err.print("Running linker.");
+            }
+            System.err.println();
         }
 
         // run the clang compiler to generate bc files
@@ -415,20 +444,29 @@ private void launchCC() {
         }
         String[] combine = combine(clangPrefix, args);
 
+        String output = getOutputFilename();
+
+        if (output != null && Files.exists(Paths.get(output))) {
+            try {
+                Files.delete(Paths.get(output));
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
         exec(combine);
 
-        String output = getOutputFilename();
         ArrayList<String> outputFiles = new ArrayList<>();
-        if (output == null) {
-            // if no explicit output filename was given, we search the commandline for files for
-            // which now
-            // have a bc file and optimize those
+        if (output == null || !Files.exists(Paths.get(output))) {
+            // if no explicit output filename was given or produced, we search the commandline for
+            // files for which now have a bc file and optimize those
             for (String f : programArgs) {
                 if (Files.exists(Paths.get(f))) {
                     String bcFile = bcFileFromFilename(f);
                     if (Files.exists(Paths.get(bcFile))) {
                         outputFiles.add(bcFile);
                         exec(combine(optPrefix, new String[]{bcFile, bcFile}));
+                    } else {
+                        outputFiles.add(f);
                     }
                 }
             }
@@ -440,12 +478,34 @@ private void launchCC() {
             }
         }
         if (runLinker) {
-            link(outputFiles);
+            if (linkExecutable) {
+                assert !outputFiles.contains(getOutputFilename());
+                String linkOutput = linkShared(outputFiles);
+                try {
+                    Path linkedBCfile = Files.move(Paths.get(linkOutput), Paths.get(bcFileFromFilename(linkOutput)), StandardCopyOption.REPLACE_EXISTING);
+                    linkExecutable(linkOutput, linkedBCfile.toString());
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            } else {
+                linkShared(outputFiles);
+            }
         }
     }
 
+    private static void linkExecutable(String output, String bc) throws IOException {
+        List<String> cmdline = getCmdline(Arrays.asList(), Arrays.asList());
+        cmdline.add(bc);
+        Files.write(Paths.get(output), ("#!" + String.join(" ", cmdline)).getBytes());
+    }
+
     private static String bcFileFromFilename(String f) {
-        return f.substring(0, f.lastIndexOf('.') + 1) + "bc";
+        int dotIdx = f.lastIndexOf('.');
+        if (dotIdx > 1) {
+            return f.substring(0, dotIdx + 1) + "bc";
+        } else {
+            return f + ".bc";
+        }
     }
 
     private void launchLD() {
@@ -475,15 +535,25 @@ private void launchLD() {
             System.err.print("Dropped linker arguments because we're using llvm-link:");
             System.err.println(droppedArgs.toString());
         }
-        link(objectFiles);
+        if (verboseFlag) {
+            System.err.print("[python] [LD]");
+            System.err.println();
+        }
+        linkShared(objectFiles);
     }
 
-    private void link(ArrayList<String> objectFiles) {
+    private String linkShared(ArrayList<String> objectFiles) {
+        String output = getOutputForLinking();
+        exec(combine(combine(linkPrefix, new String[]{output}), objectFiles.toArray(new String[0])));
+        return output;
+    }
+
+    private String getOutputForLinking() {
         String output = getOutputFilename();
         if (output == null) {
             output = "a.out";
         }
-        exec(combine(combine(linkPrefix, new String[]{output}), objectFiles.toArray(new String[0])));
+        return output;
     }
 
     private String getOutputFilename() {
@@ -722,6 +792,16 @@ private void setupREPL(Context context, ConsoleHandler consoleHandler) {
      * re-execute the process with the additional options.
      */
     private static void subExec(List<String> args, List<String> subProcessDefs) {
+        List<String> cmd = getCmdline(args, subProcessDefs);
+        try {
+            System.exit(new ProcessBuilder(cmd.toArray(new String[0])).inheritIO().start().waitFor());
+        } catch (IOException | InterruptedException e) {
+            System.err.println(e.getMessage());
+            System.exit(-1);
+        }
+    }
+
+    private static List<String> getCmdline(List<String> args, List<String> subProcessDefs) {
         List<String> cmd = new ArrayList<>();
         if (isAOT()) {
             cmd.add(ProcessProperties.getExecutableName());
@@ -754,12 +834,7 @@ private static void subExec(List<String> args, List<String> subProcessDefs) {
         }
 
         cmd.addAll(args);
-        try {
-            System.exit(new ProcessBuilder(cmd.toArray(new String[0])).inheritIO().start().waitFor());
-        } catch (IOException | InterruptedException e) {
-            System.err.println(e.getMessage());
-            System.exit(-1);
-        }
+        return cmd;
     }
 
     private static final class ExitException extends RuntimeException {