error: 'aisle.GEMM' op operand onnx#1 must be tensor of 32-bit signle…

…ss integer values, but got 'tensor<1x4xi64>
ISOLDE-Project · Jun 19, 2024 · 7e76263 · 7e76263
1 parent 7fe3c35
commit 7e76263
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/src/Conversion/ONNXToAISLE/ConvertONNXToAISLE.cpp b/src/Conversion/ONNXToAISLE/ConvertONNXToAISLE.cpp
@@ -110,6 +110,11 @@ void ONNXToAISLELoweringPass::runOnOperation() {
   // lowering. ONNXNoneOp will be dangling and removed by calling
   // canonicalization after the lowering.
   target.addLegalOp<::mlir::ONNXNoneOp>();
+  target.addLegalOp<mlir::ONNXConstantOp>();
+  target.addLegalOp<mlir::ONNXEntryPointOp>();
+  target.addLegalOp<func::ReturnOp>();
+
+
 
 
 

diff --git a/src/Conversion/ONNXToAISLE/Math/GEMM.cpp b/src/Conversion/ONNXToAISLE/Math/GEMM.cpp
@@ -196,19 +196,24 @@ struct ONNXGEMMOpLowering : public ConversionPattern {
     //auto newResult = tblgen_repl_values[0];//tblgen_newOperation_2->getResult(0);
    // op->replaceAllUsesWith(newResult);
     //op->getResults().replaceAllUsesWith(newResult);
-    //rewriter.eraseOp(op);
+    //
     // Find the func.return operation and update its operand
     for (Operation *user : op->getResult(0).getUsers()) {
       if (auto returnOp = dyn_cast<func::ReturnOp>(user)) {
-
-        returnOp.setOperand(0, tblgen_repl_values[0]);
+         rewriter.setInsertionPoint(returnOp);
+         rewriter.replaceOpWithNewOp<func::ReturnOp>(returnOp, tblgen_repl_values[0]);
+         //rewriter.eraseOp(returnOp);
+       // returnOp.setOperand(0, tblgen_repl_values[0]);
       };
     }
 
 
 
-    spade::dumpBlock(op);
+
     spade::dumpUsers(op);
+    //rewriter.eraseOp(op);
+    spade::dumpBlock(tblgen_newOperation_2);
+
     return ::mlir::success();
   }
 };

diff --git a/test-isolde/common/common.mk b/test-isolde/common/common.mk
@@ -125,11 +125,11 @@ graph.test :  $(ONNX_MODEL)
 
 graph.test.aisle :  $(ONNX_MODEL) 	
 	@echo +++ $(ONNX_INSTALL_DIR)/bin/onnx-mlir 
-	$(ONNX_INSTALL_DIR)/bin/onnx-mlir --mtriple=riscv32-unknown-elf --EmitSPADEIR -o graph  $<
+	$(ONNX_INSTALL_DIR)/bin/onnx-mlir --debug --mtriple=riscv32-unknown-elf --EmitSPADEIR -o graph  $<
 
 graph.test.aismem :  $(ONNX_MODEL) 	
 	@echo +++ $(ONNX_INSTALL_DIR)/bin/onnx-mlir 
-	$(ONNX_INSTALL_DIR)/bin/onnx-mlir --mtriple=riscv32-unknown-elf --EmitSPADEMLIR -o graph  $<
+	$(ONNX_INSTALL_DIR)/bin/onnx-mlir --debug --mtriple=riscv32-unknown-elf --EmitSPADEMLIR -o graph  $<
 
 
 graph.test.onnx :  $(ONNX_MODEL)