Changeset 5745

Timestamp:

Nov 26, 2017, 12:09:25 PM (15 months ago)

Author:

cameron

Message:

ShowIR, ShowASM, ShowUnoptimizedIR options can set filename: -ShowIR=myIRfile

Location:

icGREP/icgrep-devel/icgrep/toolchain

Files:

• cpudriver.cpp (modified) (3 diffs)
• toolchain.cpp (modified) (4 diffs)
• toolchain.h (modified) (2 diffs)

icGREP/icgrep-devel/icgrep/toolchain/cpudriver.cpp

@@ -148 +148 @@
 
     legacy::PassManager PM;
-    if (LLVM_UNLIKELY(codegen::DebugOptionIsSet(codegen::ShowUnoptimizedIR))) {
+    if (LLVM_UNLIKELY(codegen::ShowUnoptimizedIROption != codegen::OmittedOption)) {
         if (LLVM_LIKELY(mIROutputStream == nullptr)) {
-            if (codegen::IROutputFilename) {
+            if (codegen::ShowUnoptimizedIROption != "") {
                 std::error_code error;
-                mIROutputStream = new raw_fd_ostream(codegen::IROutputFilename, error, sys::fs::OpenFlags::F_None);
+                mIROutputStream = new raw_fd_ostream(codegen::ShowUnoptimizedIROption, error, sys::fs::OpenFlags::F_None);
             } else {
                 mIROutputStream = new raw_fd_ostream(STDERR_FILENO, false, true);
@@ -170 +170 @@
     PM.add(createCFGSimplificationPass());          // Repeat CFG Simplification to "clean up" any newly found redundant phi nodes
 
-    if (LLVM_UNLIKELY(codegen::DebugOptionIsSet(codegen::ShowIR))) {
+    if (LLVM_UNLIKELY(codegen::ShowIROption != codegen::OmittedOption)) {
         if (LLVM_LIKELY(mIROutputStream == nullptr)) {
-            if (codegen::IROutputFilename) {
+            if (codegen::ShowIROption != "") {
                 std::error_code error;
-                mIROutputStream = new raw_fd_ostream(codegen::IROutputFilename, error, sys::fs::OpenFlags::F_None);
+                mIROutputStream = new raw_fd_ostream(codegen::ShowIROption, error, sys::fs::OpenFlags::F_None);
             } else {
                 mIROutputStream = new raw_fd_ostream(STDERR_FILENO, false, true);
@@ -183 +183 @@
 
 #if LLVM_VERSION_INTEGER >= LLVM_3_7_0
-    if (LLVM_UNLIKELY(codegen::DebugOptionIsSet(codegen::ShowASM))) {
-        if (codegen::ASMOutputFilename) {
+    if (LLVM_UNLIKELY(codegen::ShowASMOption != codegen::OmittedOption)) {
+        if (codegen::ShowASMOption != "") {
             std::error_code error;
-            mASMOutputStream = new raw_fd_ostream(codegen::ASMOutputFilename, error, sys::fs::OpenFlags::F_None);
+            mASMOutputStream = new raw_fd_ostream(codegen::ShowASMOption, error, sys::fs::OpenFlags::F_None);
         } else {
             mASMOutputStream = new raw_fd_ostream(STDERR_FILENO, false, true);

icGREP/icgrep-devel/icgrep/toolchain/toolchain.cpp

@@ -23 +23 @@
 
 static cl::bits<DebugFlags>
-DebugOptions(cl::values(clEnumVal(ShowUnoptimizedIR, "Print generated LLVM IR."),
-                        clEnumVal(ShowIR, "Print optimized LLVM IR."),
-                        clEnumVal(VerifyIR, "Run the IR verification pass."),
-#if LLVM_VERSION_INTEGER >= LLVM_3_7_0
-                        clEnumVal(ShowASM, "Print assembly code."),
-#endif
+DebugOptions(cl::values(clEnumVal(VerifyIR, "Run the IR verification pass."),
                         clEnumVal(SerializeThreads, "Force segment threads to run sequentially."),
                         clEnumVal(TraceCounts, "Show kernel processed and produced item counts."),
@@ -36 +31 @@
                         CL_ENUM_VAL_SENTINEL), cl::cat(CodeGenOptions));
 
-static cl::opt<std::string> IROutputFilenameOption("dump-generated-IR-output", cl::init(""),
-                                                       cl::desc("output IR filename"), cl::cat(CodeGenOptions));
+std::string ShowIROption = OmittedOption;
+static cl::opt<std::string, true> IROutputOption("ShowIR", cl::location(ShowIROption), cl::ValueOptional,
+                                                         cl::desc("Print optimized LLVM IR to stderr (by omitting =<filename>) or a file"), cl::value_desc("filename"), cl::cat(CodeGenOptions));
+
+std::string ShowUnoptimizedIROption = OmittedOption;
+static cl::opt<std::string, true> UnoptimizedIROutputOption("ShowUnoptimizedIR", cl::location(ShowUnoptimizedIROption), cl::ValueOptional,
+                                                         cl::desc("Print generated LLVM IR to stderr (by omitting =<filename> or a file"), cl::value_desc("filename"), cl::cat(CodeGenOptions));
 
 #if LLVM_VERSION_INTEGER >= LLVM_3_7_0
-static cl::opt<std::string> ASMOutputFilenameOption("asm-output", cl::init(""),
-                                                    cl::desc("output ASM filename"), cl::cat(CodeGenOptions));
-
-static cl::opt<bool> AsmVerbose("asm-verbose", cl::init(true),
-                                cl::desc("Add comments to directives."), cl::cat(CodeGenOptions));
+std::string ShowASMOption = OmittedOption;
+static cl::opt<std::string, true> ASMOutputFilenameOption("ShowASM", cl::location(ShowASMOption), cl::ValueOptional,
+                                                         cl::desc("Print generated assembly code to stderr (by omitting =<filename> or a file"), cl::value_desc("filename"), cl::cat(CodeGenOptions));
 #endif
 
@@ -90 +88 @@
 
 bool SegmentPipelineParallel;
-
-const char * ASMOutputFilename;
-
-const char * IROutputFilename;
 
 const char * ObjectCacheDir;
@@ -160 +154 @@
 #endif
     cl::ParseCommandLineOptions(argc, argv);
-    if (DebugOptions.getBits()) {
+    if (DebugOptions.getBits() || (ShowIROption != OmittedOption) || (ShowUnoptimizedIROption != OmittedOption) || (ShowASMOption != OmittedOption)) {
         EnableObjectCache = false;
     }
     ObjectCacheDir = ObjectCacheDirOption.empty() ? nullptr : ObjectCacheDirOption.data();
-    IROutputFilename = IROutputFilenameOption.empty() ? nullptr : IROutputFilenameOption.data();
-    ASMOutputFilename = ASMOutputFilenameOption.empty() ? nullptr : ASMOutputFilenameOption.data();
     Options = InitTargetOptionsFromCodeGenFlags();
 #if LLVM_VERSION_INTEGER >= LLVM_3_7_0
-    Options.MCOptions.AsmVerbose = AsmVerbose;
+    Options.MCOptions.AsmVerbose = true;
 #endif
     switch (OptLevelOption) {

icGREP/icgrep-devel/icgrep/toolchain/toolchain.h

@@ -42 +42 @@
 // Command Parameters
 enum DebugFlags {
-    ShowUnoptimizedIR,
-    ShowIR,
     VerifyIR,
-#if LLVM_VERSION_INTEGER >= LLVM_3_7_0
-    ShowASM,
-#endif
     SerializeThreads,
     TraceCounts,
@@ -60 +55 @@
 extern bool PipelineParallel;
 extern bool SegmentPipelineParallel;
+    
+// Options for generating IR or ASM to files
+const std::string OmittedOption = ".";
+extern std::string ShowUnoptimizedIROption;
+extern std::string ShowIROption;
 #if LLVM_VERSION_INTEGER >= LLVM_3_7_0
-extern const char * ASMOutputFilename;
+extern std::string ShowASMOption;
 #endif
-extern const char * IROutputFilename;
 extern const char * ObjectCacheDir;
 extern llvm::CodeGenOpt::Level OptLevel;  // set from command line