Changeset 1052:12ea38902e83

Timestamp:

03/07/09 13:38:00 (3 years ago)

Author:

Christian Kamm <kamm incasoftware de>

branch:

default

Message:

Add '-singleobj' command line switch that will tell LDC to link LLVM modules internally and only emit a single object file.

The switch allows the optimizer and inliner to run on all modules at once and opens the door for template instantiation improvements that should lower compile time and executable size.

Files:

• dmd/module.h (modified) (3 diffs)
• gen/main.cpp (modified) (6 diffs)
• gen/toobj.cpp (modified) (7 diffs)
• gen/toobj.h (added)

dmd/module.h

@@ -31 +31 @@
-struct DValue;
-typedef DValue elem;
+namespace llvm { class Module; }
-#else
-#ifdef IN_GCC
@@ -134 +135 @@
-    void genhdrfile();  // generate D import file
-#endif
-    void genobjfile(int multiobj);
-//    void gensymfile();
-    void gendocfile();
@@ -172 +172 @@
-
-    // LDC
+    llvm::Module* genLLVMModule(int multiobj);
-    void buildTargetFiles();
-    File* buildFilePath(char* forcename, char* path, char* ext);

gen/main.cpp

@@ -5 +5 @@
-
-#include "gen/llvm.h"
+#include "llvm/Linker.h"
-#include "llvm/Target/SubtargetFeature.h"
-#include "llvm/Target/TargetMachine.h"
@@ -33 +34 @@
-#include "gen/linker.h"
-#include "gen/irstate.h"
+#include "gen/toobj.h"
-
-#include "gen/cl_options.h"
@@ -41 +43 @@
-extern void backend_init();
-extern void backend_term();
+
+static cl::opt<bool> singleObj("singleobj",
+    cl::desc("Create only a single output object file"),
+    cl::ZeroOrMore);
-
-static cl::opt<bool> noDefaultLib("nodefaultlib",
@@ -797 +803 @@
-        fatal();
-
+    // collects llvm modules to be linked if singleobj is passed
+    std::vector<llvm::Module*> llvmModules;
+
-    // Generate output files
-    for (int i = 0; i < modules.dim; i++)
@@ -805 +814 @@
-        if (global.params.obj)
-        {
-
-
+
+
+
+
+
+
+
+
+
+
-        }
-        if (global.errors)
@@ -816 +833 @@
-        }
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    backend_term();
-    if (global.errors)

gen/toobj.cpp

@@ -71 +71 @@
-//////////////////////////////////////////////////////////////////////////////////////////
-
-void Module::genobjfi
+llvm::Module* Module::genLLVMModu
-{
-    bool logenabled = Logger::enabled();
@@ -85 +85 @@
-
-    assert(!global.errors);
-
-    // start by deleting the old object file
-    deleteObjFile();
-
-    // name the module
@@ -175 +172 @@
-    }
-
+    gIR = NULL;
+    
+    if (llvmForceLogging && !logenabled)
+    {
+        Logger::disable();
+    }
+    
+    return ir.module;
+}
+
+void writeModule(llvm::Module* m, std::string filename)
+{
-    // run optimizer
-ir.module
+m
-
-    // verify the llvm
@@ -183 +192 @@
-        Logger::println("Verifying module... again...");
-        LOG_SCOPE;
-ir.module
+m
-        {
-
+//
-            fatal();
-        }
@@ -198 +207 @@
-    // write LLVM bitcode
-    if (global.params.output_bc) {
-objfile->name->toChars()
+filename
-        bcpath.eraseSuffix();
-        bcpath.appendSuffix(std::string(global.bc_ext));
-        Logger::println("Writing LLVM bitcode to: %s\n", bcpath.c_str());
-        std::ofstream bos(bcpath.c_str(), std::ios::binary);
-ir.module
+m
-    }
-
-    // write LLVM IR
-    if (global.params.output_ll) {
-objfile->name->toChars()
+filename
-        llpath.eraseSuffix();
-        llpath.appendSuffix(std::string(global.ll_ext));
-        Logger::println("Writing LLVM asm to: %s\n", llpath.c_str());
-        std::ofstream aos(llpath.c_str());
-ir.module
+m
-    }
-
-    // write native assembly
-    if (global.params.output_s || global.params.output_o) {
-objfile->name->toChars()
+filename
-        spath.eraseSuffix();
-        spath.appendSuffix(std::string(global.s_ext));
@@ -228 +237 @@
-        {
-            llvm::raw_fd_ostream out(spath.c_str(), false, err);
-ir.module
+m
-        }
-
-        // call gcc to convert assembly to object file
-        if (global.params.output_o) {
-objfile->name->toChars()
+filename
-            assemble(spath, objpath);
-        }
@@ -240 +249 @@
-            spath.eraseFromDisk();
-        }
-    }
-
-    delete ir.module;
-    gIR = NULL;
-    
-    if (llvmForceLogging && !logenabled)
-    {
-        Logger::disable();
-    }
-}