Address reviewer commits.

Author: TIFitis

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

@@ -1753,11 +1753,9 @@ def ScanOp : OpenMP_Op<"scan", [
 // 2.19.7.3 Declare Mapper Directive
 //===----------------------------------------------------------------------===//
 def DeclareMapperOp : OpenMP_Op<"declare_mapper", [
-    AffineScope,
-    AutomaticAllocationScope,
     IsolatedFromAbove,
-    OutlineableOpenMPOpInterface,
     RecipeInterface,
+    SingleBlock,
     Symbol
   ]> {
   let summary = "declare mapper directive";
@@ -1767,22 +1765,23 @@ def DeclareMapperOp : OpenMP_Op<"declare_mapper", [
   }] # clausesDescription;
 
   let arguments = (ins  SymbolNameAttr:$sym_name,
-                        TypeAttr:$var_type);
+                        TypeAttr:$type);
 
   let regions = (region AnyRegion:$body);
 
-  let assemblyFormat = "$sym_name `:` $var_type $body attr-dict";
+  let assemblyFormat = "$sym_name `:` $type $body attr-dict";
 }
 
-def DeclareMapperInfoOp : OpenMP_Op<"declare_mapper_info", [
+def DeclareMapperInfoOp : OpenMP_Op<"declare_mapper.info", [
+    HasParent<"DeclareMapperOp">,
     Terminator
   ], 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.]>
+    parent DeclareMapperOp.
   }] # clausesDescription;
 
   let builders = [

mlir/test/Dialect/OpenMP/ops.mlir

@@ -884,8 +884,8 @@ 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)
+  // CHECK: omp.declare_mapper.info map_entries(%[[DECL_MAP_INFO]] : !llvm.ptr)
+  omp.declare_mapper.info map_entries(%decl_map_info : !llvm.ptr)
 }
 
 // CHECK-LABEL: func @wsloop_reduction