Add region to DeclMapperOp. Move map clause to new DeclMapperInfoOp.

Author: TIFitis

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

@@ -622,7 +622,7 @@ def DistributeOp : OpenMP_Op<"distribute", traits = [
     will be executed in parallel by threads in the current context. These
     iterations are spread across threads that already exist in the enclosing
     region.
-    
+
     The body region can only contain a single block which must contain a single
     operation. This operation must be another compatible loop wrapper or an
     `omp.loop_nest`.
@@ -1655,28 +1655,32 @@ def CancellationPointOp : OpenMP_Op<"cancellation_point", clauses = [
 //===----------------------------------------------------------------------===//
 // 2.19.7.3 Declare Mapper Directive
 //===----------------------------------------------------------------------===//
-def DeclareMapperOp : OpenMP_Op<"declare_mapper", traits = [
-  Symbol], clauses = [
-    OpenMP_MapClause
-  ]> {
+def DeclareMapperOp : OpenMP_Op<"declare_mapper", singleRegion = 1> {
   let summary = "declare mapper directive";
   let description = [{
     The declare mapper directive declares a user-defined mapper for a given
     type, and defines a mapper-identifier that can be used in a map clause.
   }] # clausesDescription;
 
-  let arguments = !con((ins SymbolNameAttr:$sym_name,
-                            OpenMP_PointerLikeType:$var_ptr,
-                            TypeAttr:$var_type), clausesArgs);
+  let arguments = (ins  SymbolNameAttr:$sym_name,
+                        TypeAttr:$var_type);
+
+  let assemblyFormat = "$sym_name `:` $var_type $region attr-dict";
+}
+
+def DeclareMapperInfoOp : OpenMP_Op<"declare_mapper_info", clauses = [
+    OpenMP_MapClause
+    ]> {
+  let summary = "declare mapper info";
+  let description = [{
+    This Op is used to capture the map information related to it's
+    parent DeclareMapperOp.]>
+  }] # clausesDescription;
 
   let builders = [
-    OpBuilder<(ins CArg<"const DeclareMapperOperands &">:$clauses)>
+    OpBuilder<(ins CArg<"const DeclareMapperInfoOperands &">:$clauses)>
   ];
 
-  // Override clause-based assemblyFormat.
-  let assemblyFormat = "$sym_name `:` $var_ptr `:` type($var_ptr) `:` $var_type" # " oilist(" #
-    clausesOptAssemblyFormat # ")  attr-dict";
-
   let hasVerifier = 1;
 }
 
@@ -1792,7 +1796,7 @@ def MaskedOp : OpenMP_Op<"masked", clauses = [
   ], singleRegion = 1> {
   let summary = "masked construct";
   let description = [{
-    Masked construct allows to specify a structured block to be executed by a subset of 
+    Masked construct allows to specify a structured block to be executed by a subset of
     threads of the current team.
   }] # clausesDescription;
 

mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp

@@ -2138,10 +2138,10 @@ LogicalResult DistributeOp::verifyRegions() {
 }
 
 //===----------------------------------------------------------------------===//
-// DeclareMapperOp
+// DeclareMapperInfoOp
 //===----------------------------------------------------------------------===//
 
-LogicalResult DeclareMapperOp::verify() {
+LogicalResult DeclareMapperInfoOp::verify() {
   return verifyMapClause(*this, getMapVars());
 }
 

mlir/test/Dialect/OpenMP/ops.mlir

@@ -879,13 +879,15 @@ cleanup {
   omp.yield
 }
 
-// CHECK: %[[DECL_VAR:.*]] = llvm.alloca %{{.*}}
-// CHECK: %[[DECL_MAP_INFO:.*]] = omp.map.info var_ptr(%[[DECL_VAR]] : !llvm.ptr, !llvm.struct<"my_type", (i32)>) map_clauses(tofrom) capture(ByRef) -> !llvm.ptr {name = ""}
-// CHECK: omp.declare_mapper @my_mapper : %[[DECL_VAR]] : !llvm.ptr : !llvm.struct<"my_type", (i32)> map_entries(%[[DECL_MAP_INFO]] : !llvm.ptr)
-%decl_c1 = arith.constant 1 : i64
-%decl_var = llvm.alloca %decl_c1 x !llvm.struct<"my_type", (i32)> : (i64) -> !llvm.ptr
-%decl_map_info = omp.map.info var_ptr(%decl_var : !llvm.ptr, !llvm.struct<"my_type", (i32)>) map_clauses(tofrom) capture(ByRef) -> !llvm.ptr {name = ""}
-omp.declare_mapper @my_mapper : %decl_var : !llvm.ptr : !llvm.struct<"my_type", (i32)> map_entries(%decl_map_info : !llvm.ptr)
+// CHECK: omp.declare_mapper @my_mapper : !llvm.struct<"my_type", (i32)>
+omp.declare_mapper @my_mapper : !llvm.struct<"my_type", (i32)> {
+^bb0(%arg: !llvm.ptr):
+  // CHECK: %[[DECL_MAP_INFO:.*]] = omp.map.info var_ptr(%{{.*}} : !llvm.ptr, !llvm.struct<"my_type", (i32)>) map_clauses(tofrom) capture(ByRef) -> !llvm.ptr {name = ""}
+  %decl_map_info = omp.map.info var_ptr(%arg : !llvm.ptr, !llvm.struct<"my_type", (i32)>) map_clauses(tofrom) capture(ByRef) -> !llvm.ptr {name = ""}
+  // CHECK: omp.declare_mapper_info map_entries(%[[DECL_MAP_INFO]] : !llvm.ptr)
+  omp.declare_mapper_info map_entries(%decl_map_info : !llvm.ptr)
+  omp.terminator
+}
 
 // CHECK-LABEL: func @wsloop_reduction
 func.func @wsloop_reduction(%lb : index, %ub : index, %step : index) {