fix output paths

add gemm test

src/PIM/Compiler/PimCodeGen.cpp

@@ -433,14 +433,7 @@ std::string getMemorySizeAsString(size_t size) {
   return std::to_string(size) + " Bytes";
 }
 
-OnnxMlirCompilerErrorCodes compileModuleToPIMJSON(const OwningOpRef<ModuleOp>& moduleOpRef, std::string& outputDirPath) {
-  ModuleOp moduleOp = moduleOpRef.get();
-
-  if (pimEmissionTarget != EmitPimCodegen) {
-    moduleOp.dump();
-    return CompilerSuccess;
-  }
-
+OnnxMlirCompilerErrorCodes compileModuleToPIMJSON(ModuleOp& moduleOp, std::string& outputDirPath) {
   if (!outputDirPath.empty()) {
     if (auto error = llvm::sys::fs::create_directory(outputDirPath)) {
       llvm::errs() << "Error creating output directory: " << outputDirPath << ": " << error.message() << '\n';
@@ -696,8 +689,6 @@ OnnxMlirCompilerErrorCodes compileModuleToPIMJSON(const OwningOpRef<ModuleOp>& m
   jsonOS << llvm::json::Value(std::move(configJson)) << '\n';
   jsonOS.close();
 
-  showCompilePhase("Code generated into " + configPath);
-
   return CompilerSuccess;
 }
 

src/PIM/Compiler/PimCodeGen.hpp

@@ -36,7 +36,7 @@ public:
   void allocateCore(Operation* op);
 
   size_t getFirstAvailableAddress() const { return firstAvailableAddress; }
-  MemEntry getMemEntry(Value value) const ;
+  MemEntry getMemEntry(Value value) const;
 };
 
 class PimAcceleratorMemory {

src/PIM/Compiler/PimCompilerOptions.cpp

@@ -17,11 +17,6 @@
 
 namespace onnx_mlir {
 
-llvm::cl::opt<std::string> pimOutputDir("pim-output-dir",
-                                        llvm::cl::desc("Directory where pim json code will be emitted"),
-                                        llvm::cl::init("pim"),
-                                        llvm::cl::cat(OnnxMlirOptions));
-
 llvm::cl::opt<PimEmissionTargetType> pimEmissionTarget(
   llvm::cl::desc("[Optional] Choose PIM-related target to emit (once selected it will cancel the other targets):"),
   llvm::cl::values(clEnumVal(EmitSpatial, "Lower model to spatial IR")),

src/PIM/Compiler/PimCompilerOptions.hpp

@@ -21,7 +21,6 @@ typedef enum {
 } PimEmissionTargetType;
 
 extern llvm::cl::OptionCategory OnnxMlirOptions;
-extern llvm::cl::opt<std::string> pimOutputDir;
 extern llvm::cl::opt<PimEmissionTargetType> pimEmissionTarget;
 
 extern llvm::cl::opt<bool> pimOnlyCodegen;

src/PIM/Compiler/PimCompilerUtils.cpp

@@ -1,18 +1,11 @@
-#include "mlir/Dialect/Bufferization/IR/BufferizableOpInterface.h"
-#include "mlir/Dialect/Bufferization/Transforms/BufferViewFlowAnalysis.h"
-#include "mlir/Dialect/MemRef/IR/MemRef.h"
-#include "mlir/IR/BuiltinTypes.h"
 #include "mlir/Transforms/Passes.h"
+
 #include "src/Accelerators/PIM/Compiler/PimCompilerOptions.hpp"
 #include "src/Accelerators/PIM/Compiler/PimCompilerUtils.hpp"
 #include "src/Accelerators/PIM/Dialect/PIM/PimOps.hpp"
 #include "src/Accelerators/PIM/Pass/PimPasses.hpp"
 #include "src/Compiler/CompilerPasses.hpp"
-
-#include "llvm/Support/JSON.h"
-
-#include <cassert>
-#include <cstddef>
+#include "src/Compiler/CompilerUtils.hpp"
 
 #define DEBUG_TYPE "PimCompilerUtils"
 
@@ -37,19 +30,25 @@ void addPassesPim(OwningOpRef<ModuleOp>& module,
   if (pimEmissionTarget >= EmitSpatial) {
     pm.addPass(createONNXToSpatialPass());
     // pm.addPass(createCountInstructionPass());
-    pm.addPass(createMessagePass("ONNX lowered to SPATIAL"));
+    pm.addPass(createMessagePass("Onnx lowered to Spatial"));
   }
 
   if (pimEmissionTarget >= EmitPim) {
     pm.addPass(createSpatialToPIMPass());
     // pm.addPass(createCountInstructionPass());
-    pm.addPass(createMessagePass("SPATIAL lowered to PIM"));
+    pm.addPass(createMessagePass("Spatial lowered to Pim"));
   }
 
   if (pimEmissionTarget >= EmitPimBufferized) {
     pm.addPass(createBufferizePimPass());
     // pm.addPass(createCountInstructionPass());
-    pm.addPass(createMessagePass("PIM bufferized"));
+    pm.addPass(createMessagePass("Pim bufferized"));
+  }
+
+  if (pimEmissionTarget >= EmitPimCodegen) {
+    pm.addPass(createEmitPimJsonPass());
+    // pm.addPass(createCountInstructionPass());
+    pm.addPass(createMessagePass("Pim json code emitted"));
   }
 }
 

src/PIM/Compiler/PimCompilerUtils.hpp

@@ -13,7 +13,6 @@ void addPassesPim(mlir::OwningOpRef<mlir::ModuleOp>& module,
                   EmissionTargetType& emissionTarget,
                   std::string outputNameNoExt);
 
-OnnxMlirCompilerErrorCodes compileModuleToPIMJSON(const mlir::OwningOpRef<mlir::ModuleOp>& moduleOpRef,
-                                                  std::string& outputDirName);
+OnnxMlirCompilerErrorCodes compileModuleToPIMJSON(mlir::ModuleOp& moduleOpRef, std::string& outputDirName);
 
 } // namespace onnx_mlir