feat(mlir): finish "toy.or" lower to StandardOp

OrOp only support int type, to lower toy.or to standardOrOp we need:
\t* insert a FpToInt op before
OrOp;
\t* insert a IntToFp after OrOp.

Author: hunterzju

mlir/mycode/Ch6/mlir/LowerToAffineLoops.cpp

@@ -81,6 +81,10 @@ static void lowerOpToLoops(Operation *op, ArrayRef<Value> operands,
         // and the loop induction variables. This function will return the value
         // to store at the current index.
         Value valueToStore = processIteration(nestedBuilder, operands, ivs);
+        // Patch to support "toy.or" Op
+        if(nestedBuilder.getI64Type() == valueToStore.getType()) {
+          valueToStore = nestedBuilder.create<UIToFPOp>(loc, nestedBuilder.getF64Type(), valueToStore);
+        }
         nestedBuilder.create<AffineStoreOp>(loc, valueToStore, alloc, ivs);
       });
 
@@ -104,7 +108,7 @@ struct BinaryOpLowering : public ConversionPattern {
     auto loc = op->getLoc();
     lowerOpToLoops(
         op, operands, rewriter,
-        [loc](OpBuilder &builder, ValueRange memRefOperands,
+        [loc, op](OpBuilder &builder, ValueRange memRefOperands,
               ValueRange loopIvs) {
           // Generate an adaptor for the remapped operands of the BinaryOp. This
           // allows for using the nice named accessors that are generated by the
@@ -118,6 +122,15 @@ struct BinaryOpLowering : public ConversionPattern {
           auto loadedRhs =
               builder.create<AffineLoadOp>(loc, binaryAdaptor.rhs(), loopIvs);
 
+          // patch to support "toy.or" operation.
+          auto opname = op->getName();
+          if (opname.getStringRef().str() == "toy.or") {
+            auto castLhs = builder.create<FPToUIOp>(loc, builder.getI64Type(), loadedLhs);
+            auto castRhs = builder.create<FPToUIOp>(loc, builder.getI64Type(), loadedRhs);
+            
+            return builder.create<LoweredBinaryOp>(loc, castLhs, castRhs);
+          }
+
           // Create the binary operation performed on the loaded values.
           return builder.create<LoweredBinaryOp>(loc, loadedLhs, loadedRhs);
         });
@@ -126,6 +139,7 @@ struct BinaryOpLowering : public ConversionPattern {
 };
 using AddOpLowering = BinaryOpLowering<toy::AddOp, AddFOp>;
 using MulOpLowering = BinaryOpLowering<toy::MulOp, MulFOp>;
+using OrOpLowering = BinaryOpLowering<toy::OrOp, OrOp>;
 
 //===----------------------------------------------------------------------===//
 // ToyToAffine RewritePatterns: Constant operations
@@ -297,7 +311,7 @@ void ToyToAffineLoweringPass::runOnFunction() {
   // Now that the conversion target has been defined, we just need to provide
   // the set of patterns that will lower the Toy operations.
   RewritePatternSet patterns(&getContext());
-  patterns.add<AddOpLowering, ConstantOpLowering, MulOpLowering,
+  patterns.add<AddOpLowering, ConstantOpLowering, MulOpLowering, OrOpLowering,
                ReturnOpLowering, TransposeOpLowering>(&getContext());
 
   // With the target and rewrite patterns defined, we can now attempt the

mlir/mycode/Ch6/toyc.cpp

@@ -87,7 +87,7 @@ std::unique_ptr<toy::ModuleAST> parseInputFile(llvm::StringRef filename) {
   llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> fileOrErr =
       llvm::MemoryBuffer::getFileOrSTDIN(filename);
   if (std::error_code ec = fileOrErr.getError()) {
-    llvm::errs() << "Could not open input file: " << ec.message() << "\n";
+    llvm::errs() << "Could not open input file: " << filename << ec.message() << "\n";
     return nullptr;
   }
   auto buffer = fileOrErr.get()->getBuffer();
@@ -111,7 +111,7 @@ int loadMLIR(mlir::MLIRContext &context, mlir::OwningModuleRef &module) {
   llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> fileOrErr =
       llvm::MemoryBuffer::getFileOrSTDIN(inputFilename);
   if (std::error_code EC = fileOrErr.getError()) {
-    llvm::errs() << "Could not open input file: " << EC.message() << "\n";
+    llvm::errs() << "Could not open input file: " << inputFilename << ":" << EC.message() << "\n";
     return -1;
   }