lower to llvm

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

Author: chentong319

src/Conversion/KrnlToLLVM/KrnlCall.cpp

@@ -68,10 +68,27 @@ class KrnlCallOpLowering : public ConversionPattern {
           rewriter, op, namedAttr.getValue(), parameterTypeList, parameterList);
     }
 
-    FlatSymbolRefAttr callRef =
-        create.llvm.getOrInsertSymbolRef(module, krnlCallOp.getFuncName(),
-            LLVM::LLVMVoidType::get(module.getContext()), parameterTypeList);
-    create.llvm.call({}, callRef, parameterList);
+    ValueRange returns = op->getResults();
+    if (returns.size() == 0) {
+      // There is no return
+      FlatSymbolRefAttr callRef =
+          create.llvm.getOrInsertSymbolRef(module, krnlCallOp.getFuncName(),
+              LLVM::LLVMVoidType::get(module.getContext()), parameterTypeList);
+      create.llvm.call({}, callRef, parameterList);
+
+      rewriter.eraseOp(op);
+    } else {
+      assert(returns.size() == 1 &&
+             "Only one return value is allowed for krnl.call now");
+      Type llvmReturnType =
+          llvmTypeConverter->convertType(returns[0].getType());
+
+      FlatSymbolRefAttr callRef = create.llvm.getOrInsertSymbolRef(
+          module, krnlCallOp.getFuncName(), llvmReturnType, parameterTypeList);
+      auto llvmCall =
+          create.llvm.call({llvmReturnType}, callRef, parameterList);
+      rewriter.replaceOp(op, llvmCall.getDefiningOp()->getResults()[0]);
+    }
 
     // Destroy OMTensor wrappers of parameters.
     const auto &apiRegistry =
@@ -81,7 +98,6 @@ class KrnlCallOpLowering : public ConversionPattern {
           rewriter, loc, apiRegistry, RuntimeAPI::API::DESTROY_OMTENSOR, {omt});
     }
 
-    rewriter.eraseOp(op);
     return success();
   }
 

src/Dialect/Krnl/Krnl.td

@@ -94,7 +94,7 @@ def KrnlCallOp : Op<Krnl_Dialect, "call",
   // Only scalar type is supported now.
   // In future, return of memref can be supported with pointer of OMTensor.
   // The returned memref will be created inside the call. 
-  let results = (outs Variadic<AnyTypeOf<[F32, F64, I32, I64]>>:$returnValue);
+  let results = (outs Variadic<AnyTypeOf<[AnyFloat, AnyInteger]>>:$returnValue);
 
   // builders to build KrnlCallOp from op and operands, helping conversion from
   // onnx to krnl.

src/Dialect/Krnl/KrnlOps.cpp

@@ -156,12 +156,12 @@ void KrnlCallOp::build(OpBuilder &builder, ::mlir::OperationState &odsState,
 
 void KrnlCallOp::build(OpBuilder &builder, ::mlir::OperationState &odsState,
     std::string funcName, int64_t numOfOutput, ValueRange operands) {
-    build(builder, odsState, {}, funcName, numOfOutput, operands);
+  build(builder, odsState, {}, funcName, numOfOutput, operands);
 }
 
 void KrnlCallOp::build(OpBuilder &builder, ::mlir::OperationState &odsState,
     StringAttr funcName, IntegerAttr numOfOutput, ValueRange operands) {
-    build(builder, odsState, {}, funcName, numOfOutput, operands);
+  build(builder, odsState, {}, funcName, numOfOutput, operands);
 }
 
 void KrnlCallOp::getEffects(