Allow affine.yield to have attrs (#17)

Author: Frank Laub

mlir/include/mlir/Dialect/Affine/IR/AffineOps.td

@@ -769,12 +769,14 @@ def AffineYieldOp : Affine_Op<"yield", [NoSideEffect, Terminator]> {
     yielded.
     ```
   }];
-  let arguments = (ins Variadic<AnyType>:$results);
-  let builders = [
-    OpBuilder<"OpBuilder &builder, OperationState &result",
-              [{ /* nothing to do */ }]>
-  ];
 
+  let arguments = (ins Variadic<AnyType>:$operands);
+
+  let builders = [OpBuilder<
+    "OpBuilder &b, OperationState &result", [{ build(b, result, llvm::None); }]
+  >];
+
+  let assemblyFormat = "attr-dict ($operands^ `:` type($operands))?";
 }
 
 def AffineVectorLoadOp : AffineLoadOpBase<"vector_load", []> {

mlir/lib/Dialect/Affine/IR/AffineOps.cpp

@@ -2451,7 +2451,7 @@ struct AffineParallelRank0LoopRemover
     auto &parentOps = rewriter.getInsertionBlock()->getOperations();
     auto &parallelBodyOps = op.region().front().getOperations();
     auto yield = mlir::cast<AffineYieldOp>(std::prev(parallelBodyOps.end()));
-    for (auto it : zip(op.getResults(), yield.results())) {
+    for (auto it : zip(op.getResults(), yield.operands())) {
       std::get<0>(it).replaceAllUsesWith(std::get<1>(it));
     }
     parentOps.splice(mlir::Block::iterator(op), parallelBodyOps,
@@ -2658,24 +2658,6 @@ static LogicalResult verify(AffineYieldOp op) {
   return success();
 }
 
-static ParseResult parseAffineYieldOp(OpAsmParser &parser,
-                                      OperationState &result) {
-  SmallVector<OpAsmParser::OperandType, 4> operands;
-  SmallVector<Type, 4> types;
-  llvm::SMLoc loc = parser.getCurrentLocation();
-  // Parse variadic operands list, their types, and resolve operands to SSA
-  // values.
-  return failure(parser.parseOperandList(operands) ||
-                 parser.parseOptionalColonTypeList(types) ||
-                 parser.resolveOperands(operands, types, loc, result.operands));
-}
-
-static void print(OpAsmPrinter &p, AffineYieldOp op) {
-  p << op.getOperationName();
-  if (op.getNumOperands() != 0)
-    p << ' ' << op.getOperands() << " : " << op.getOperandTypes();
-}
-
 //===----------------------------------------------------------------------===//
 // AffineVectorLoadOp
 //===----------------------------------------------------------------------===//