Edited PR based on comments from Tung

Signed-off-by: Paramvir Sran <[email protected]>

Author: ParamvirSran

src/Compiler/CompilerUtils.cpp

@@ -333,9 +333,8 @@ std::string getTargetFilename(
 // Returns 0 on success, error code on failure.
 static int genLLVMBitcode(const mlir::OwningOpRef<ModuleOp> &module,
     std::string outputNameNoExt, std::string optimizedBitcodeNameWithExt) {
-  auto llvmTiming =
-      rootScope.nest("[onnx-mlir] Compiling to LLVM Optimized Bitcode");
-
+  auto llvmTiming = rootScope.nest(
+      "[onnx-mlir] Compiling MLIR module to LLVM Optimized Bitcode");
   std::error_code error;
 
   // Write bitcode to a file.
@@ -429,7 +428,6 @@ static int genModelObject(
 static int genJniObject(const mlir::OwningOpRef<ModuleOp> &module,
     std::string jniSharedLibPath, std::string jniObjPath) {
   auto jniTiming = rootScope.nest("[onnx-mlir] Compiling JNI Object File");
-
   Command ar(/*exePath=*/getToolPath("ar", true));
   int rc = ar.appendStr("x")
                // old version of ar does not support --output so comment out
@@ -448,7 +446,6 @@ static int genJniObject(const mlir::OwningOpRef<ModuleOp> &module,
 static int genSharedLib(std::string sharedLibNameWithExt,
     std::vector<std::string> opts, std::vector<std::string> objs,
     std::vector<std::string> libs, std::vector<std::string> libDirs) {
-  auto libraryTiming = rootScope.nest("[onnx-mlir] Linking Shared Library");
 #ifdef _WIN32
   std::vector<std::string> outputOpt = {"/Fe:" + sharedLibNameWithExt};
   // link has to be before libpath since they need to be passed through to the
@@ -499,7 +496,6 @@ static int genSharedLib(std::string sharedLibNameWithExt,
 static int genJniJar(const mlir::OwningOpRef<ModuleOp> &module,
     std::string modelSharedLibPath, std::string modelJniJarPath) {
   auto jniJarTiming = rootScope.nest("[onnx-mlir] Creating JNI Jar");
-
   llvm::SmallString<8> libraryPath(getLibraryPath());
   llvm::sys::path::append(libraryPath, "javaruntime.jar");
   std::string javaRuntimeJarPath = llvm::StringRef(libraryPath).str();
@@ -522,7 +518,6 @@ static int genJniJar(const mlir::OwningOpRef<ModuleOp> &module,
 // Return 0 on success, error code on failure
 static int compileModuleToObject(const mlir::OwningOpRef<ModuleOp> &module,
     std::string outputNameWithoutExt, std::string &objectNameWithExt) {
-
   std::string bitcodeNameWithExt = outputNameWithoutExt + ".bc";
   int rc = genLLVMBitcode(module, outputNameWithoutExt, bitcodeNameWithExt);
   if (rc != CompilerSuccess)
@@ -537,7 +532,6 @@ static int compileModuleToObject(const mlir::OwningOpRef<ModuleOp> &module,
 static int compileModuleToSharedLibrary(
     const mlir::OwningOpRef<ModuleOp> &module, std::string outputNameNoExt,
     std::string &libNameWithExt) {
-
   std::string modelObjNameWithExt;
   int rc = compileModuleToObject(module, outputNameNoExt, modelObjNameWithExt);
   if (rc != CompilerSuccess)
@@ -584,8 +578,7 @@ static int compileModuleToJniJar(
 #define NOEXECSTACK                                                            \
   {}
 #else
-#define NOEXECSTACK                                                            \
-  { "-z", "noexecstack" }
+#define NOEXECSTACK {"-z", "noexecstack"}
 #endif
   std::string modelSharedLibPath = getTargetFilename(jniLibBase, EmitLib);
   rc = genSharedLib(modelSharedLibPath, NOEXECSTACK,

src/Dialect/ONNX/ElementsAttr/ElementsAttrBuilder.cpp

@@ -22,6 +22,7 @@
 
 #include <algorithm>
 #include <numeric>
+
 using namespace mlir;
 
 namespace onnx_mlir {
@@ -216,8 +217,6 @@ ElementsAttr ElementsAttrBuilder::combine(ElementsAttr lhs, ElementsAttr rhs,
     WideNum *dst = dstNums.data();
     const WideNum *lhsSrc = lhsNums.get().data();
     const WideNum *rhsSrc = rhsNums.get().data();
-    
-    
     for (auto &idxoffs :
         StridesRange<2>(combinedShape, {xpLhsStrides, xpRhsStrides})) {
       dst[idxoffs.flattenedIndex] =
@@ -1074,8 +1073,8 @@ ElementsAttr ElementsAttrBuilder::nonZero(ElementsAttr elms) {
 }
 
 /*static*/
-auto ElementsAttrBuilder::getElementsProperties(ElementsAttr elements)
-    -> ElementsProperties {
+auto ElementsAttrBuilder::getElementsProperties(
+    ElementsAttr elements) -> ElementsProperties {
   static Transformer nullTransformer = nullptr;
   if (auto disposable = elements.dyn_cast<DisposableElementsAttr>()) {
     ArrayRef<int64_t> strides = disposable.getStrides();

src/onnx-mlir.cpp

@@ -44,11 +44,10 @@ int main(int argc, char *argv[]) {
   }
   initCompilerConfig();
 
-  // timing manager reporting enabled via "--enable-timing" compiler flag
-  // mlir::applyDefaultTimingManagerCLOptions(timingManager);
+  // Timing manager reporting enabled via "--enable-timing" compiler flag
   timingManager.setEnabled(enableTiming);
   rootScope = timingManager.getRootScope();
-  auto setupScope = rootScope.nest("[onnx-mlir] Preparing for Compilation");
+  auto setupTiming = rootScope.nest("[onnx-mlir] Loading Dialects");
 
   // Special handling of outputBaseName to derive output filename.
   // outputBaseName must specify a file, so ignore invalid values
@@ -74,8 +73,9 @@ int main(int argc, char *argv[]) {
     LLVM_DEBUG(llvm::dbgs() << "multithreading is disabled\n");
   }
   loadDialects(context);
-  setupScope.stop();
-  auto inputFileScope = rootScope.nest("[onnx-mlir] Processing of Input File");
+  setupTiming.stop();
+  auto inputFileTiming =
+      rootScope.nest("[onnx-mlir] Importing Input Model to MLIR");
   mlir::OwningOpRef<mlir::ModuleOp> module;
   std::string errorMessage;
   int rc = processInputFile(inputFilename, context, module, &errorMessage);
@@ -84,6 +84,6 @@ int main(int argc, char *argv[]) {
       llvm::errs() << errorMessage << "\n";
     return 1;
   }
-  inputFileScope.stop();
+  inputFileTiming.stop();
   return compileModule(module, context, outputBaseName, emissionTarget);
 }