Changeset 5776

Timestamp:

Dec 12, 2017, 8:27:47 AM (10 months ago)

Author:

cameron

Message:

ShowPablo?=filename option

Location:

icGREP/icgrep-devel/icgrep/pablo

Files:

• pablo_toolchain.cpp (modified) (3 diffs)
• pablo_toolchain.h (modified) (1 diff)

icGREP/icgrep-devel/icgrep/pablo/pablo_toolchain.cpp

@@ -31 +31 @@
     
 static cl::bits<PabloDebugFlags> 
-DebugOptions(cl::values(clEnumVal(ShowPablo, "Print generated Pablo code"),
-                        clEnumVal(ShowOptimizedPablo, "Print optimizeed Pablo code"),
-                        clEnumVal(VerifyPablo, "Run the Pablo verifier"),
+DebugOptions(cl::values(clEnumVal(VerifyPablo, "Run the Pablo verifier"),
                         clEnumVal(DumpTrace, "Generate dynamic traces of executed Pablo assignments.")
                         CL_ENUM_VAL_SENTINEL), cl::cat(PabloOptions));
     
-static cl::opt<std::string> PabloOutputFilename("print-pablo-output", cl::init(""), cl::desc("output Pablo filename"), cl::cat(PabloOptions));
+std::string ShowPabloOption = codegen::OmittedOption;
+static cl::opt<std::string, true> PabloOutputOption("ShowPablo", cl::location(ShowPabloOption), cl::ValueOptional,
+                                                    cl::desc("Print generated Pablo code to stderr (by omitting =<filename>) or a file"), cl::value_desc("filename"), cl::cat(PabloOptions));
+sys::fs::OpenFlags PabloOutputFileFlag = sys::fs::OpenFlags::F_None;
+    
+std::string ShowOptimizedPabloOption = codegen::OmittedOption;
+static cl::opt<std::string, true> OptimizedPabloOutputOption("ShowOptimizedPablo", cl::location(ShowOptimizedPabloOption), cl::ValueOptional,
+                                                    cl::desc("Print optimized Pablo code to stderr (by omitting =<filename>) or a file"), cl::value_desc("filename"), cl::cat(PabloOptions));
+sys::fs::OpenFlags PabloOptimizedOutputFileFlag = sys::fs::OpenFlags::F_None;
+
 static cl::opt<bool> Flatten("flatten-if", cl::init(false), cl::desc("Flatten all the Ifs in the Pablo AST"), cl::cat(PabloOptions));
 
@@ -51 +58 @@
     
 bool CompileOptionIsSet(const PabloCompilationFlags flag) {return PabloOptimizationsOptions.isSet(flag);}
+    
+
 
 void pablo_function_passes(PabloKernel * kernel) {
 
-    if (DebugOptions.isSet(ShowPablo)) {
+    if (ShowPabloOption != codegen::OmittedOption) {
         //Print to the terminal the AST that was generated by the pararallel bit-stream compiler.
-        errs() << "Initial Pablo AST:\n";
-        PabloPrinter::print(kernel, errs());
+        if (ShowPabloOption.empty()) {
+            errs() << "Initial Pablo AST:\n";
+            PabloPrinter::print(kernel, errs());
+        } else {
+            std::error_code error;
+            llvm::raw_fd_ostream out(ShowPabloOption, error, PabloOutputFileFlag);
+            PabloPrinter::print(kernel, out);
+            PabloOutputFileFlag = sys::fs::OpenFlags::F_Append;   // append subsequent Pablo kernels
+        }
     }
 
@@ -84 +100 @@
         SchedulingPrePass::optimize(kernel);
     }
-    if (DebugOptions.isSet(ShowOptimizedPablo)) {
-        if (PabloOutputFilename.empty()) {
-            //Print to the terminal the AST that was generated by the pararallel bit-stream compiler.
+    if (ShowOptimizedPabloOption != codegen::OmittedOption) {
+        if (ShowOptimizedPabloOption.empty()) {
+            //Print to the terminal the final Pablo AST after optimization.
             errs() << "Final Pablo AST:\n";
             PabloPrinter::print(kernel, errs());
         } else {
             std::error_code error;
-            llvm::raw_fd_ostream out(PabloOutputFilename, error, sys::fs::OpenFlags::F_None);
+            llvm::raw_fd_ostream out(ShowOptimizedPabloOption, error, PabloOptimizedOutputFileFlag);
             PabloPrinter::print(kernel, out);
+            PabloOptimizedOutputFileFlag = sys::fs::OpenFlags::F_Append;  // append subsequent Pablo kernels
         }
     }

icGREP/icgrep-devel/icgrep/pablo/pablo_toolchain.h

@@ -14 +14 @@
 
 enum PabloDebugFlags {
-    ShowPablo, ShowOptimizedPablo, VerifyPablo, DumpTrace,
+    VerifyPablo, DumpTrace,
 };
+extern std::string ShowOptimizedPabloOption;
+extern std::string ShowPabloOption;
 
 enum PabloCompilationFlags {