Added printIr option to OclModuleBuilder

Author: AndreyPavlenko

include/gc/ExecutionEngine/GPURuntime/GpuOclRuntime.h

@@ -240,6 +240,7 @@ struct OclModule {
 
 struct OclModuleBuilderOpts {
   StringRef funcName = {};
+  bool printIr = false;
   bool enableObjectDump = false;
   ArrayRef<StringRef> sharedLibPaths = {};
   void (*pipeline)(OpPassManager &) = nullptr;
@@ -267,6 +268,7 @@ struct OclModuleBuilder {
 
 private:
   ModuleOp mlirModule;
+  const bool printIr;
   const bool enableObjectDump;
   const ArrayRef<StringRef> sharedLibPaths;
   void (*const pipeline)(OpPassManager &);

lib/gc/ExecutionEngine/GPURuntime/ocl/GpuOclRuntime.cpp

@@ -749,7 +749,8 @@ ArrayRef<Type> getArgTypes(const StringRef &funcName, ModuleOp &mod) {
 
 OclModuleBuilder::OclModuleBuilder(ModuleOp module,
                                    const OclModuleBuilderOpts &opts)
-    : mlirModule(module), enableObjectDump(opts.enableObjectDump),
+    : mlirModule(module), printIr(opts.printIr),
+      enableObjectDump(opts.enableObjectDump),
       sharedLibPaths(opts.sharedLibPaths),
       pipeline(opts.pipeline
                    ? opts.pipeline
@@ -799,6 +800,10 @@ OclModuleBuilder::build(const OclRuntime::Ext &ext) {
 
   auto staticMain = createStaticMain(mod, funcName, argTypes);
 
+  if (printIr) {
+    mod.dump();
+  }
+
   ExecutionEngineOptions opts;
   opts.jitCodeGenOptLevel = llvm::CodeGenOptLevel::Aggressive;
   opts.enableObjectDump = enableObjectDump;

src/gc-gpu-runner/GpuRunner.cpp

@@ -58,7 +58,8 @@ struct Options {
       llvm::cl::MiscFlags::CommaSeparated, llvm::cl::desc("<lib1,lib2,...>"),
       llvm::cl::cat(runnerCategory)};
   llvm::cl::opt<bool> printIr{
-      "print-ir", llvm::cl::desc("Print the IR before the execution."),
+      "print-ir",
+      llvm::cl::desc("Print the resulting IR before the execution."),
       llvm::cl::init(false), llvm::cl::cat(runnerCategory)};
   llvm::cl::opt<std::string> objDumpFile{
       "obj-dump-file",
@@ -121,13 +122,6 @@ void findFunc(Options &opts, ModuleOp mod) {
   }
 }
 
-void pipeline(OpPassManager &pm) {
-  gc::GPUPipelineOptions pipelineOpts;
-  pipelineOpts.isUsmArgs = false;
-  pipelineOpts.callFinish = true;
-  populateGPUPipeline(pm, pipelineOpts);
-}
-
 int main(int argc, char **argv) {
   Options opts;
   llvm::cl::ParseCommandLineOptions(argc, argv, "GraphCompiler GPU runner\n");
@@ -148,19 +142,16 @@ int main(int argc, char **argv) {
   SmallVector<StringRef, 4> sharedLibs(opts.sharedLibs.begin(),
                                        opts.sharedLibs.end());
   builderOpts.funcName = opts.mainFuncName;
+  builderOpts.printIr = opts.printIr;
   builderOpts.enableObjectDump = !opts.objDumpFile.getValue().empty();
   builderOpts.sharedLibPaths = sharedLibs;
-  if (opts.skipPipeline) {
-    builderOpts.pipeline =
-        opts.printIr
-            ? [](OpPassManager &pm) { pm.addPass(createPrintIRPass()); }
-            : [](OpPassManager &) {};
-  } else {
-    builderOpts.pipeline = opts.printIr ? [](OpPassManager &pm) {
-      pipeline(pm);
-      pm.addPass(createPrintIRPass());
-    } : pipeline;
-  }
+  builderOpts.pipeline =
+      opts.skipPipeline ? [](OpPassManager &) {} : [](OpPassManager &pm) {
+        gc::GPUPipelineOptions pipelineOpts;
+        pipelineOpts.isUsmArgs = false;
+        pipelineOpts.callFinish = true;
+        populateGPUPipeline(pm, pipelineOpts);
+      };
 
   gc::gpu::OclModuleBuilder builder{mlirMod, builderOpts};
   auto runtime = gcGetOrReport(gc::gpu::OclRuntime::get());