[llvm-commits] [llvm] r53119 - in /llvm/trunk: include/llvm-c/lto.h tools/lto/LTOCodeGenerator.cpp tools/lto/LTOCodeGenerator.h tools/lto/lto.cpp

[Devang Patel]

Author: dpatel
Date: Thu Jul  3 17:53:14 2008
New Revision: 53119

URL: http://llvm.org/viewvc/llvm-project?rev=53119&view=rev
Log:
Provide a  hook to set the code generation debug options to investigate lto failures.

Modified:
    llvm/trunk/include/llvm-c/lto.h
    llvm/trunk/tools/lto/LTOCodeGenerator.cpp
    llvm/trunk/tools/lto/LTOCodeGenerator.h
    llvm/trunk/tools/lto/lto.cpp

Modified: llvm/trunk/include/llvm-c/lto.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm-c/lto.h?rev=53119&r1=53118&r2=53119&view=diff

==============================================================================
--- llvm/trunk/include/llvm-c/lto.h (original)
+++ llvm/trunk/include/llvm-c/lto.h Thu Jul  3 17:53:14 2008
@@ -227,6 +227,11 @@
 lto_codegen_compile(lto_code_gen_t cg, size_t* length);
 
 
+/**
+ * Sets options to help debug codegen bugs.
+ */
+extern void
+lto_codegen_debug_options(lto_code_gen_t cg, const char *);
 #ifdef __cplusplus
 }
 #endif

Modified: llvm/trunk/tools/lto/LTOCodeGenerator.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/LTOCodeGenerator.cpp?rev=53119&r1=53118&r2=53119&view=diff

==============================================================================
--- llvm/trunk/tools/lto/LTOCodeGenerator.cpp (original)
+++ llvm/trunk/tools/lto/LTOCodeGenerator.cpp Thu Jul  3 17:53:14 2008
@@ -40,6 +40,7 @@
 #include "llvm/Target/TargetAsmInfo.h"
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/Scalar.h"
+#include "llvm/ADT/StringExtras.h"
 #include "llvm/Config/config.h"
 
 
@@ -116,7 +117,6 @@
     return true;
 }
 
-
 void LTOCodeGenerator::addMustPreserveSymbol(const char* sym)
 {
     _mustPreserveSymbols[sym] = 1;
@@ -334,6 +334,18 @@
             break;
     }
 
+    for (unsigned opt_index = 0, opt_size = _codegenOptions.size();
+         opt_index < opt_size; ++opt_index) {
+      std::vector<const char *> cgOpts;
+      std::string &optString = _codegenOptions[opt_index];
+      for (std::string Opt = getToken(optString);
+           !Opt.empty(); Opt = getToken(optString))
+        cgOpts.push_back(Opt.c_str());
+     
+      int pseudo_argc = cgOpts.size()-1;
+      cl::ParseCommandLineOptions(pseudo_argc, (char**)&cgOpts[0]);
+     }
+
     // Instantiate the pass manager to organize the passes.
     PassManager passes;
 

Modified: llvm/trunk/tools/lto/LTOCodeGenerator.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/LTOCodeGenerator.h?rev=53119&r1=53118&r2=53119&view=diff

==============================================================================
--- llvm/trunk/tools/lto/LTOCodeGenerator.h (original)
+++ llvm/trunk/tools/lto/LTOCodeGenerator.h Thu Jul  3 17:53:14 2008
@@ -17,6 +17,7 @@
 
 #include "llvm/Linker.h"
 #include "llvm/ADT/StringMap.h"
+#include "llvm/ADT/SmallVector.h"
 
 #include <string>
 
@@ -38,7 +39,9 @@
     bool                writeMergedModules(const char* path, 
                                                            std::string& errMsg);
     const void*         compile(size_t* length, std::string& errMsg);
-    
+    void                setCodeGenDebugOptions(const char *opts) {
+                          _codegenOptions.push_back(std::string(opts)); 
+                        }
 private:
     bool                generateAssemblyCode(std::ostream& out, 
                                                         std::string& errMsg);
@@ -56,6 +59,7 @@
     lto_codegen_model           _codeModel;
     StringSet                   _mustPreserveSymbols;
     llvm::MemoryBuffer*         _nativeObjectFile;
+    llvm::SmallVector<std::string, 4> _codegenOptions;
 };
 
 #endif // LTO_CODE_GENERATOR_H

Modified: llvm/trunk/tools/lto/lto.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/lto.cpp?rev=53119&r1=53118&r2=53119&view=diff

==============================================================================
--- llvm/trunk/tools/lto/lto.cpp (original)
+++ llvm/trunk/tools/lto/lto.cpp Thu Jul  3 17:53:14 2008
@@ -237,5 +237,11 @@
     return cg->compile(length, sLastErrorString);
 }
 
+extern void
+lto_codegen_debug_options(lto_code_gen_t cg, const char * opt)
+{
+  cg->setCodeGenDebugOptions(opt);
+}
+