Using custom<> instead of using using complete custom assembly format + use setInsertionPoint()

Author: JDPailleux

flang/include/flang/Optimizer/Dialect/MIF/MIFOps.td

@@ -23,9 +23,7 @@ class mif_Op<string mnemonic, list<Trait> traits>
 
 class region_Op<string mnemonic, list<Trait> traits = []>
     : mif_Op<mnemonic, !listconcat(traits, [RecursivelySpeculatable,
-                                            RecursiveMemoryEffects])> {
-  let hasCustomAssemblyFormat = 1;
-}
+                                            RecursiveMemoryEffects])> {}
 
 //===----------------------------------------------------------------------===//
 // Initialization and Finalization
@@ -382,6 +380,13 @@ def mif_ChangeTeamOp
     /// Get the body of the CHANGE TEAM construct 
     mlir::Block *getBody() { return &getRegion().front(); }
   }];
+
+  let assemblyFormat = [{
+    $team (`stat` $stat^)?
+    (`errmsg` $errmsg^)?
+    attr-dict `:` `(` type(operands) `)`
+    custom<ChangeTeamOpBody>($region)
+  }];
 }
 
 def mif_GetTeamOp : mif_Op<"get_team", []> {

flang/lib/Optimizer/Dialect/MIF/MIFOps.cpp

@@ -15,9 +15,6 @@
 #include "mlir/IR/PatternMatch.h"
 #include "llvm/ADT/SmallVector.h"
 
-#define GET_OP_CLASSES
-#include "flang/Optimizer/Dialect/MIF/MIFOps.cpp.inc"
-
 //===----------------------------------------------------------------------===//
 // NumImagesOp
 //===----------------------------------------------------------------------===//
@@ -190,71 +187,21 @@ void mif::ChangeTeamOp::build(mlir::OpBuilder &builder,
   result.addAttributes(attributes);
 }
 
-mlir::ParseResult mif::ChangeTeamOp::parse(mlir::OpAsmParser &parser,
-                                           mlir::OperationState &result) {
-  auto &builder = parser.getBuilder();
-  llvm::SmallVector<mlir::OpAsmParser::UnresolvedOperand> opers;
-  llvm::SmallVector<mlir::Type> types;
-  int32_t statArg = 0, errmsgArg = 0;
-  if (parser.parseOperand(opers.emplace_back()))
-    return mlir::failure();
-
-  if (mlir::succeeded(parser.parseOptionalKeyword("stat"))) {
-    if (*parser.parseOptionalOperand(opers.emplace_back()))
-      return mlir::failure();
-    statArg++;
-  }
-  if (mlir::succeeded(parser.parseOptionalKeyword("errmsg"))) {
-    if (*parser.parseOptionalOperand(opers.emplace_back()))
-      return mlir::failure();
-    errmsgArg++;
-  }
-
-  // Set the operandSegmentSizes attribute
-  result.addAttribute(getOperandSegmentSizeAttr(),
-                      builder.getDenseI32ArrayAttr({1, statArg, errmsgArg}));
-
-  if (parser.parseColon())
-    return mlir::failure();
-
-  if (parser.parseLParen())
-    return mlir::failure();
-  if (parser.parseTypeList(types))
-    return mlir::failure();
-  if (parser.parseRParen())
-    return mlir::failure();
-
-  if (opers.size() != types.size())
-    return mlir::failure();
-
-  if (parser.resolveOperands(opers, types, parser.getCurrentLocation(),
-                             result.operands))
-    return mlir::failure();
-
-  auto *body = result.addRegion();
-  if (parser.parseRegion(*body))
-    return mlir::failure();
-
-  ChangeTeamOp::ensureTerminator(*body, builder, result.location);
-
-  if (parser.parseOptionalAttrDictWithKeyword(result.attributes))
+static mlir::ParseResult parseChangeTeamOpBody(mlir::OpAsmParser &parser,
+                                               mlir::Region &body) {
+  if (parser.parseRegion(body))
     return mlir::failure();
 
+  auto &builder = parser.getBuilder();
+  mif::ChangeTeamOp::ensureTerminator(body, builder, builder.getUnknownLoc());
   return mlir::success();
 }
 
-void mif::ChangeTeamOp::print(mlir::OpAsmPrinter &p) {
-  p << ' ' << getTeam();
-  if (getStat())
-    p << " stat " << getStat();
-  if (getErrmsg())
-    p << " errmsg " << getErrmsg();
-  p << " : (";
-  llvm::interleaveComma(getOperands(), p,
-                        [&](mlir::Value v) { p << v.getType(); });
-  p << ") ";
-  p.printRegion(getRegion(), /*printEntryBlockArgs=*/true,
+static void printChangeTeamOpBody(mlir::OpAsmPrinter &p, mif::ChangeTeamOp op,
+                                  mlir::Region &body) {
+  p.printRegion(op.getRegion(), /*printEntryBlockArgs=*/true,
                 /*printBlockTerminators=*/true);
-  p.printOptionalAttrDict((*this)->getAttrs(),
-                          {ChangeTeamOp::getOperandSegmentSizeAttr()});
 }
+
+#define GET_OP_CLASSES
+#include "flang/Optimizer/Dialect/MIF/MIFOps.cpp.inc"

flang/lib/Optimizer/Transforms/MIFOpConversion.cpp

@@ -529,6 +529,7 @@ struct MIFChangeTeamOpConversion
                   mlir::PatternRewriter &rewriter) const override {
     auto mod = op->template getParentOfType<mlir::ModuleOp>();
     fir::FirOpBuilder builder(rewriter, mod);
+    builder.setInsertionPoint(op);
 
     mlir::Location loc = op.getLoc();
     mlir::Type errmsgTy = getPRIFErrmsgType(builder);
@@ -545,13 +546,12 @@ struct MIFChangeTeamOpConversion
         genErrmsgPRIF(builder, loc, op.getErrmsg());
     llvm::SmallVector<mlir::Value> args = fir::runtime::createArguments(
         builder, loc, ftype, op.getTeam(), stat, errmsgArg, errmsgAllocArg);
-    fir::CallOp callOp = fir::CallOp::create(builder, loc, funcOp, args);
+    fir::CallOp::create(builder, loc, funcOp, args);
 
     mlir::Operation *changeOp = op.getOperation();
     auto &bodyRegion = op.getRegion();
     mlir::Block &bodyBlock = bodyRegion.front();
 
-    rewriter.moveOpBefore(callOp.getOperation(), changeOp);
     rewriter.inlineBlockBefore(&bodyBlock, changeOp);
     rewriter.eraseOp(op);
     return mlir::success();