[Mlir-commits] [mlir] 551ba72 - [mlir] NFC - Use declarative assembly for scf::YieldOp

[Nicolas Vasilache]

Author: Nicolas Vasilache
Date: 2021-02-23T11:17:30Z
New Revision: 551ba727603cd6561af740fc3bc8ecfc5a126796

URL: https://github.com/llvm/llvm-project/commit/551ba727603cd6561af740fc3bc8ecfc5a126796
DIFF: https://github.com/llvm/llvm-project/commit/551ba727603cd6561af740fc3bc8ecfc5a126796.diff

LOG: [mlir] NFC - Use declarative assembly for scf::YieldOp

Added: 
    

Modified: 
    mlir/include/mlir/Dialect/SCF/SCFOps.td
    mlir/lib/Dialect/SCF/SCF.cpp

Removed: 
    


################################################################################
diff  --git a/mlir/include/mlir/Dialect/SCF/SCFOps.td b/mlir/include/mlir/Dialect/SCF/SCFOps.td
index 236586a39040..b4e158c618f9 100644
--- a/mlir/include/mlir/Dialect/SCF/SCFOps.td
+++ b/mlir/include/mlir/Dialect/SCF/SCFOps.td
@@ -583,6 +583,10 @@ def YieldOp : SCF_Op<"yield", [NoSideEffect, ReturnLike, Terminator,
 
   let arguments = (ins Variadic<AnyType>:$results);
   let builders = [OpBuilderDAG<(ins), [{ /* nothing to do */ }]>];
+
+  let assemblyFormat =
+      [{  attr-dict ($results^ `:` type($results))? }];
+
   // Override default verifier (defined in SCF_Op), no custom verification
   // needed.
   let verifier = ?;

diff  --git a/mlir/lib/Dialect/SCF/SCF.cpp b/mlir/lib/Dialect/SCF/SCF.cpp
index f8732581684a..f7b2c6e6f9bc 100644
--- a/mlir/lib/Dialect/SCF/SCF.cpp
+++ b/mlir/lib/Dialect/SCF/SCF.cpp
@@ -1334,29 +1334,6 @@ static LogicalResult verify(scf::WhileOp op) {
   return success(afterTerminator != nullptr);
 }
 
-//===----------------------------------------------------------------------===//
-// YieldOp
-//===----------------------------------------------------------------------===//
-
-static ParseResult parseYieldOp(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.
-  if (parser.parseOperandList(operands) ||
-      parser.parseOptionalColonTypeList(types) ||
-      parser.resolveOperands(operands, types, loc, result.operands))
-    return failure();
-  return success();
-}
-
-static void print(OpAsmPrinter &p, scf::YieldOp op) {
-  p << op.getOperationName();
-  if (op.getNumOperands() != 0)
-    p << ' ' << op.getOperands() << " : " << op.getOperandTypes();
-}
-
 //===----------------------------------------------------------------------===//
 // TableGen'd op method definitions
 //===----------------------------------------------------------------------===//