[MLIR][OpenMP] Defined master operation in OpenMP Dialect

[anchu-rajendran]

Summary

Implemented the basic changes for defining master operation in OpenMP.
It uses the generic parser and printer.

[anchu-rajendran]

Formatting changes : removed an extra newline

[kiranchandramohan]

It uses the custom parser and printer.

Do you mean the generic parser and printer?

[anchu-rajendran]

Summary of the change is modified.

[anchu-rajendran]

In D80689#2060706, @kiranchandramohan wrote:

It uses the custom parser and printer.

Do you mean the generic parser and printer?

Hi, Yes, I have meant to state that. Thank You! I have modified the summary.

[kiranchandramohan]

LGTM.

mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td

let arguments = (ins Optional<I1>:$if_expr_var,
              Variadic<AnyType>:$shared_vars,
              Variadic<AnyType>:$copyin_vars,
              OptionalAttr<ClauseProcBind>:$proc_bind_val);
 
   let regions = (region AnyRegion:$region);
 }
 
 def TerminatorOp : OpenMP_Op<"terminator", [Terminator]> {
-  let summary = "terminator for OpenMP regions.";
+  let summary = "terminator for OpenMP regions";
   let description = [{
     A terminator operation for regions that appear in the body of OpenMP
     operation.  These regions are not expected to return any value so the
     terminator takes no operands. The terminator op returns control to the
     enclosing op.
   }];
 
-  let parser = [{ return success(); }];
-  let printer = [{ p << getOperationName(); }];
+  let assemblyFormat = "attr-dict";
 }
 
 //===----------------------------------------------------------------------===//
 // 2.10.4 taskyield Construct
 //===----------------------------------------------------------------------===//
 
 def TaskyieldOp : OpenMP_Op<"taskyield"> {
   let summary = "taskyield construct";
def FlushOp : OpenMP_Op<"flush"> {
   }];
 
   let arguments = (ins Variadic<AnyType>:$varList);
 
   let assemblyFormat = "attr-dict ($varList^ `:` type($varList))?";
 }
 
 //===----------------------------------------------------------------------===//
+// 2.16 master Construct
+//===----------------------------------------------------------------------===//
+def MasterOp : OpenMP_Op<"master"> {
+  let summary = "master construct";
+  let description = [{
+    The master construct specifies a structured block that is executed by
+    the master thread of the team.
+  }];
+
+  let regions = (region AnyRegion:$region);
+}
+
+//===----------------------------------------------------------------------===//
 // 2.17.2 barrier Construct
 //===----------------------------------------------------------------------===//
 
 def BarrierOp : OpenMP_Op<"barrier"> {
   let summary = "barrier construct";
   let description = [{
     The barrier construct specifies an explicit barrier at the point at which
     the construct appears.
def TaskwaitOp : OpenMP_Op<"taskwait"> {
   let description = [{
     The taskwait construct specifies a wait on the completion of child tasks
     of the current task.
   }];
 
   let assemblyFormat = "attr-dict";
 }
 
+
 #endif // OPENMP_OPS

mlir/test/Dialect/OpenMP/ops.mlir

 // RUN: mlir-opt -verify-diagnostics %s | FileCheck %s
 
 func @omp_barrier() -> () {
   // CHECK: omp.barrier
   omp.barrier
   return
 }
 
+func @omp_master() -> () {
+  // CHECK: omp.master
+  "omp.master" ()({
+    // CHECK: omp.terminator
+    omp.terminator
+  }):()->()
+  return
+}
+
 func @omp_taskwait() -> () {
   // CHECK: omp.taskwait
   omp.taskwait
   return
 }
 
 func @omp_taskyield() -> () {
   // CHECK: omp.taskyield

 }
 
 func @omp_terminator() -> () {
   // CHECK: omp.terminator
   omp.terminator
 }
 
 func @omp_parallel(%data_var : memref<i32>, %if_cond : i1, %num_threads : si32) -> () {
-  // CHECK: omp_parallel
+  // CHECK: omp.parallel
   "omp.parallel" (%if_cond, %num_threads, %data_var, %data_var, %data_var, %data_var) ({
 
   // test without if condition
   // CHECK: omp.parallel
     "omp.parallel"(%num_threads, %data_var, %data_var, %data_var, %data_var) ({
       omp.terminator
     }) {operand_segment_sizes = dense<[0,1,1,1,1,1]>: vector<6xi32>, default_val = "defshared"} : (si32, memref<i32>, memref<i32>, memref<i32>, memref<i32>) -> ()