Add the necesary OpTraits to hoist the DeclareMapperOp to the ModuleOp's region.

Author: TIFitis

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

@@ -1752,7 +1752,14 @@ def ScanOp : OpenMP_Op<"scan", [
 //===----------------------------------------------------------------------===//
 // 2.19.7.3 Declare Mapper Directive
 //===----------------------------------------------------------------------===//
-def DeclareMapperOp : OpenMP_Op<"declare_mapper", singleRegion = 1> {
+def DeclareMapperOp : OpenMP_Op<"declare_mapper", [
+    AffineScope,
+    AutomaticAllocationScope,
+    IsolatedFromAbove,
+    OutlineableOpenMPOpInterface,
+    RecipeInterface,
+    Symbol
+  ]> {
   let summary = "declare mapper directive";
   let description = [{
     The declare mapper directive declares a user-defined mapper for a given
@@ -1762,12 +1769,16 @@ def DeclareMapperOp : OpenMP_Op<"declare_mapper", singleRegion = 1> {
   let arguments = (ins  SymbolNameAttr:$sym_name,
                         TypeAttr:$var_type);
 
-  let assemblyFormat = "$sym_name `:` $var_type $region attr-dict";
+  let regions = (region AnyRegion:$body);
+
+  let assemblyFormat = "$sym_name `:` $var_type $body attr-dict";
 }
 
-def DeclareMapperInfoOp : OpenMP_Op<"declare_mapper_info", clauses = [
+def DeclareMapperInfoOp : OpenMP_Op<"declare_mapper_info", [
+    Terminator
+  ], clauses = [
     OpenMP_MapClause
-    ]> {
+  ]> {
   let summary = "declare mapper info";
   let description = [{
     This Op is used to capture the map information related to it's

mlir/test/Dialect/OpenMP/ops.mlir

@@ -886,7 +886,6 @@ omp.declare_mapper @my_mapper : !llvm.struct<"my_type", (i32)> {
   %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