remove redundant

Signed-off-by: chentong319 <[email protected]>

Author: chentong319

src/Compiler/CompilerOptions.cpp

@@ -64,8 +64,6 @@ bool VerboseOutput;                                    // onnx-mlir only
 std::vector<std::string> Xopt;                         // onnx-mlir only
 std::vector<std::string> Xllc;                         // onnx-mlir only
 std::string mllvm;                                     // onnx-mlir only
-std::string mllvmopt;                                  // onnx-mlir only
-std::string mllvmllc;                                  // onnx-mlir only
 std::string instrumentOps;                             // onnx-mlir only
 unsigned instrumentControlBits;                        // onnx-mlir only
 std::string parallelizeOps;                            // onnx-mlir only
@@ -409,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);
@@ -427,18 +431,6 @@ static llvm::cl::opt<std::string, true> mllvmOpt("mllvm",
     llvm::cl::location(mllvm), llvm::cl::cat(OnnxMlirOptions), llvm::cl::Hidden,
     llvm::cl::ValueRequired);
 
-static llvm::cl::opt<std::string, true> mllvmoptOpt("mllvmopt",
-    llvm::cl::desc("Arguments to forward to LLVM's 'opt' processing"),
-    llvm::cl::value_desc("A valid LLVM's 'opt' option"),
-    llvm::cl::location(mllvmopt), llvm::cl::cat(OnnxMlirOptions),
-    llvm::cl::Hidden, llvm::cl::ValueRequired);
-
-static llvm::cl::opt<std::string, true> mllvmllcOpt("mllvmllc",
-    llvm::cl::desc("Arguments to forward to LLVM's 'llc' option processing"),
-    llvm::cl::value_desc("A valid LLVM's 'llc' option"),
-    llvm::cl::location(mllvmllc), llvm::cl::cat(OnnxMlirOptions),
-    llvm::cl::Hidden, llvm::cl::ValueRequired);
-
 static llvm::cl::opt<std::string, true> instrumentOpsOpt("instrument-ops",
     llvm::cl::desc("Specify operations to be instrumented:\n"
                    "\"NONE\" or \"\" for no instrument (default),\n"
@@ -939,19 +931,8 @@ static std::vector<std::string> split(std::string &input) {
 std::vector<std::string> getLLVMOptions() {
   if (mllvm == "")
     return std::vector<std::string>();
-  return split(mllvm);
-}
-
-std::vector<std::string> getLLVMOPTOptions() {
-  if (mllvmopt == "")
-    return std::vector<std::string>();
-  return split(mllvmopt);
-}
 
-std::vector<std::string> getLLVMLLCOptions() {
-  if (mllvmllc == "")
-    return std::vector<std::string>();
-  return split(mllvmllc);
+  return split(mllvm);
 }
 
 // Support for model tag

src/Compiler/CompilerOptions.hpp

@@ -109,8 +109,6 @@ extern bool VerboseOutput;                                    // onnx-mlir only
 extern std::vector<std::string> Xopt;                         // onnx-mlir only
 extern std::vector<std::string> Xllc;                         // onnx-mlir only
 extern std::string mllvm;                                     // onnx-mlir only
-extern std::string mllvmopt;                                  // onnx-mlir only
-extern std::string mllvmllc;                                  // onnx-mlir only
 extern std::string instrumentOps;                             // onnx-mlir only
 extern unsigned instrumentControlBits;                        // onnx-mlir only
 extern std::string parallelizeOps;                            // onnx-mlir only

src/Compiler/CompilerUtils.cpp

@@ -459,13 +459,12 @@ static int genLLVMBitcode(const mlir::OwningOpRef<ModuleOp> &module,
   setXoptOption({"--code-model", modelSizeStr[modelSize]});
   int rc = optBitcode
                .appendStr(getOptimizationLevelUniqueOption(
-                   {getLLVMOptions(), getLLVMOPTOptions()}))
+                   {getLLVMOptions(), getXoptOption()}))
                .appendStr(getTargetTripleOption())
                .appendStr(getTargetArchOption())
                .appendStr(getTargetCPUOption())
                .appendList(getXoptOption())
                .appendList(getLLVMOptions())
-               .appendList(getLLVMOPTOptions())
                .appendList({"-o", optimizedBitcodeNameWithExt})
                .appendStr(unoptimizedBitcodeNameWithExt)
                .exec();
@@ -484,13 +483,12 @@ static int genModelObject(
   setXllcOption({"--code-model", modelSizeStr[modelSize]});
   int rc = llvmToObj
                .appendStr(getOptimizationLevelUniqueOption(
-                   {getLLVMOptions(), getLLVMLLCOptions()}))
+                   {getLLVMOptions(), getXllcOption()}))
                .appendStr(getTargetTripleOption())
                .appendStr(getTargetArchOption())
                .appendStr(getTargetCPUOption())
                .appendList(getXllcOption())
                .appendList(getLLVMOptions())
-               .appendList(getLLVMLLCOptions())
                .appendStr("-filetype=obj")
                .appendStr("-relocation-model=pic")
                .appendList({"-o", modelObjNameWithExt})