Changeset 5745 for icGREP/icgrep-devel/icgrep/toolchain/toolchain.cpp

Timestamp:

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

Author:

cameron

Message:

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

File:

• icGREP/icgrep-devel/icgrep/toolchain/toolchain.cpp (modified) (4 diffs)

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) {