Merge branch 'main' into mem_reduction_stickified

Author: imaihal

src/Compiler/CompilerOptions.cpp

@@ -407,13 +407,19 @@ static llvm::cl::opt<bool, true> VerboseOutputOpt("v",
     llvm::cl::init(false), llvm::cl::cat(OnnxMlirOptions));
 
 static llvm::cl::list<std::string, std::vector<std::string>> XoptOpt("Xopt",
-    llvm::cl::desc("Arguments to forward to LLVM's 'opt' option processing"),
+    llvm::cl::desc(
+        "Arguments to forward to LLVM's 'opt' option processing"
+        "Multiple arguments to 'opt' need to be pass with seperate 'Xopt'"
+        "For example, '-Xopt opt1 -Xopt opt2 ...'"),
     llvm::cl::value_desc("A valid LLVM's 'opt' option"),
     llvm::cl::location(Xopt), llvm::cl::cat(OnnxMlirOptions), llvm::cl::Hidden,
     llvm::cl::ValueRequired, llvm::cl::ZeroOrMore, llvm::cl::CommaSeparated);
 
 static llvm::cl::list<std::string, std::vector<std::string>> XllcOpt("Xllc",
-    llvm::cl::desc("Arguments to forward to LLVM's 'llc' option processing"),
+    llvm::cl::desc(
+        "Arguments to forward to LLVM's 'llc' option processing"
+        "Multiple arguments to 'llc' need to be pass with seperate 'Xllc'"
+        "For example, '-Xllc opt1 -Xllc opt2 ...'"),
     llvm::cl::value_desc("A valid LLVM's 'llc' option"),
     llvm::cl::location(Xllc), llvm::cl::cat(OnnxMlirOptions), llvm::cl::Hidden,
     llvm::cl::ValueRequired, llvm::cl::ZeroOrMore, llvm::cl::CommaSeparated);
@@ -914,6 +920,21 @@ void setLLVMOption(const std::string &flag) { mllvm = flag; }
 void clearLLVMOption() { mllvm.clear(); }
 std::string getLLVMOption() { return (mllvm != "") ? mllvm : std::string(); }
 
+static std::vector<std::string> split(std::string &input) {
+  std::stringstream ss(input);
+  std::istream_iterator<std::string> begin(ss);
+  std::istream_iterator<std::string> end;
+  std::vector<std::string> vstrings(begin, end);
+  return vstrings;
+}
+
+std::vector<std::string> getLLVMOptions() {
+  if (mllvm == "")
+    return std::vector<std::string>();
+
+  return split(mllvm);
+}
+
 // Support for model tag
 void setModelTag(const std::string &str) { modelTag = str; }
 void clearModelTag() { modelTag = ""; }

src/Compiler/CompilerOptions.hpp

@@ -183,6 +183,10 @@ std::vector<std::string> getXllcOption();
 void setLLVMOption(const std::string &flag);
 void clearLLVMOption();
 std::string getLLVMOption();
+// Break down the result of getLLVMOption into substrings
+std::vector<std::string> getLLVMOptions();
+std::vector<std::string> getLLVMOPTOptions();
+std::vector<std::string> getLLVMLLCOptions();
 
 // Options support for OMCompilerOptions.
 using CompilerOptionList =

src/Compiler/CompilerUtils.cpp

@@ -72,6 +72,26 @@ enum class KeepFilesOfType { All, MLIR, LLVMIR, Bitcode, Object, None };
 // flags.
 static constexpr KeepFilesOfType overridePreserveFiles = KeepFilesOfType::None;
 
+// Get optimization level from onnx-mlir only when it is not specified
+std::string getOptimizationLevelUniqueOption(
+    std::vector<std::vector<std::string>> specialOptionsList) {
+  if (std::any_of(specialOptionsList.begin(), specialOptionsList.end(),
+          [](std::vector<std::string> specialOptions) {
+            if (std::any_of(specialOptions.begin(), specialOptions.end(),
+                    [](std::string str) {
+                      std::regex optimization("^-O[0-9]");
+                      std::smatch m;
+                      return std::regex_match(str, m, optimization);
+                    })) // End of one options
+              return true;
+            else
+              return false;
+          }))
+    return std::string();
+  else
+    return getOptimizationLevelOption();
+}
+
 static bool keepFiles(KeepFilesOfType preserve) {
   // When wanting to preserve all files, do it regardless of isBitcode.
   if (overridePreserveFiles == KeepFilesOfType::All)
@@ -437,12 +457,14 @@ static int genLLVMBitcode(const mlir::OwningOpRef<ModuleOp> &module,
   std::string optPath = getToolPath("opt");
   Command optBitcode(/*exePath=*/optPath);
   setXoptOption({"--code-model", modelSizeStr[modelSize]});
-  int rc = optBitcode.appendStr(getOptimizationLevelOption())
+  int rc = optBitcode
+               .appendStr(getOptimizationLevelUniqueOption(
+                   {getLLVMOptions(), getXoptOption()}))
                .appendStr(getTargetTripleOption())
                .appendStr(getTargetArchOption())
                .appendStr(getTargetCPUOption())
                .appendList(getXoptOption())
-               .appendStr(getLLVMOption())
+               .appendList(getLLVMOptions())
                .appendList({"-o", optimizedBitcodeNameWithExt})
                .appendStr(unoptimizedBitcodeNameWithExt)
                .exec();
@@ -459,12 +481,14 @@ static int genModelObject(
   std::string llcPath = getToolPath("llc");
   Command llvmToObj(/*exePath=*/llcPath);
   setXllcOption({"--code-model", modelSizeStr[modelSize]});
-  int rc = llvmToObj.appendStr(getOptimizationLevelOption())
+  int rc = llvmToObj
+               .appendStr(getOptimizationLevelUniqueOption(
+                   {getLLVMOptions(), getXllcOption()}))
                .appendStr(getTargetTripleOption())
                .appendStr(getTargetArchOption())
                .appendStr(getTargetCPUOption())
                .appendList(getXllcOption())
-               .appendStr(getLLVMOption())
+               .appendList(getLLVMOptions())
                .appendStr("-filetype=obj")
                .appendStr("-relocation-model=pic")
                .appendList({"-o", modelObjNameWithExt})
@@ -558,6 +582,9 @@ static int genJniJar(const mlir::OwningOpRef<ModuleOp> &module,
 
   // Copy javaruntime.jar to model jar.
   llvm::sys::fs::copy_file(javaRuntimeJarPath, modelJniJarPath);
+  if (VerboseOutput)
+    llvm::outs() << "cp " << javaRuntimeJarPath << " " << modelJniJarPath
+                 << "\n";
 
   // Add shared library to model jar.
   Command jar(getToolPath("jar", true));
@@ -774,8 +801,8 @@ static int emitOutputFiles(std::string outputNameNoExt,
         return rc;
     }
     if (VerboseOutput)
-      printf(
-          "Object file '%s' has been compiled.\n", modelObjNameWithExt.c_str());
+      llvm::outs() << "Object file '" << modelObjNameWithExt
+                   << "' has been compiled.\n";
   } break;
   case EmitLib: {
     std::string sharedLibNameWithExt;
@@ -789,8 +816,8 @@ static int emitOutputFiles(std::string outputNameNoExt,
         return rc;
     }
     if (VerboseOutput)
-      printf("Shared library '%s' has been compiled.\n",
-          sharedLibNameWithExt.c_str());
+      llvm::outs() << "Shared library '" << sharedLibNameWithExt
+                   << "' has been compiled.\n";
   } break;
   case EmitJNI: {
     int rc = compileModuleToJniJar(module, outputNameNoExt);
@@ -802,16 +829,17 @@ static int emitOutputFiles(std::string outputNameNoExt,
         return rc;
     }
     if (VerboseOutput)
-      printf(
-          "JNI archive '%s.jar' has been compiled.\n", outputNameNoExt.c_str());
+      llvm::outs() << "JNI archive '" << outputNameNoExt
+                   << ".jar' has been compiled.\n";
   } break;
   default: {
     // Emit the version with all constants included.
-    std::string ouputNameWithExt =
+    std::string outputNameWithExt =
         getTargetFilename(outputNameNoExt, emissionTarget);
-    int rc = outputCode(module, ouputNameWithExt);
+    int rc = outputCode(module, outputNameWithExt);
     if (VerboseOutput)
-      printf("Full MLIR code written to: \n\t%s\n\n", ouputNameWithExt.c_str());
+      llvm::outs() << "Full MLIR code written to:\n"
+                   << "\t" << outputNameWithExt << "\n\n";
     if (rc != CompilerSuccess)
       return rc;
 
@@ -821,10 +849,11 @@ static int emitOutputFiles(std::string outputNameNoExt,
       std::string tempNameWithExt = outputNameNoExt + ".tmp";
       int rc = outputCode(module, tempNameWithExt, /*largeElementLimit=*/100);
       if (VerboseOutput) {
-        printf("Constant-free MLIR Code written to: \n\t%s\n\n",
-            tempNameWithExt.c_str());
-        printf("Use:\n\t%s\nto continue lowering the code to other dialects.\n",
-            ouputNameWithExt.c_str());
+        llvm::outs() << "Constant-free MLIR Code written to:\n"
+                     << "\t" << tempNameWithExt << "\n\n";
+        llvm::outs() << "Use:\n"
+                     << "\t" << outputNameWithExt
+                     << "\nto continue lowering the code to other dialects.\n";
       }
       if (rc != CompilerSuccess)
         return rc;