Fix for SWDEV-533000, remove descriptor map type from has_device_addr clauses

Currently we apply OMP_MAP_DESCRIPTOR to has_device_addr, which we should avoid
as it doesn't require the same treatment as regular data maps from map clauses
and isn't actually mapped like the other descriptors either (it skips mapping
the base address data).

Ideally we'll cut out the runtime modifications from these descriptor flags that
affect the runtime correctness behaviour in the future, and leave them there for
downstream optimization toggles. I'll be looking into this in the near future.

Author: agozillon

flang/lib/Optimizer/OpenMP/MapInfoFinalization.cpp

@@ -262,17 +262,26 @@ class MapInfoFinalizationPass
   /// allowing `to` mappings, and `target update` not allowing both `to` and
   /// `from` simultaneously. We currently try to maintain the `implicit` flag
   /// where necessary, although it does not seem strictly required.
+  ///
+  /// Currently, if it is a has_device_addr clause, we opt to not apply the
+  /// descriptor tag to it as it's used differently to a regular mapping
+  /// and some of the runtime descriptor behaviour at the moment can cause
+  /// issues.
   unsigned long getDescriptorMapType(unsigned long mapTypeFlag,
-                                     mlir::Operation *target) {
+                                     mlir::Operation *target,
+                                     bool IsHasDeviceAddr) {
     using mapFlags = llvm::omp::OpenMPOffloadMappingFlags;
+ 
     if (llvm::isa_and_nonnull<mlir::omp::TargetExitDataOp,
-                              mlir::omp::TargetUpdateOp>(target))
-      return llvm::to_underlying(
-          mapFlags(mapTypeFlag) |
-          llvm::omp::OpenMPOffloadMappingFlags::OMP_MAP_DESCRIPTOR);
+                              mlir::omp::TargetUpdateOp>(target)) {
+      mapFlags flags = mapFlags(mapTypeFlag);
+       if (!IsHasDeviceAddr)
+        flags |= mapFlags::OMP_MAP_DESCRIPTOR;
+      return llvm::to_underlying(flags);
+    }
 
     mapFlags flags = mapFlags::OMP_MAP_TO |
-                     (mapFlags(mapTypeFlag) & mapFlags::OMP_MAP_IMPLICIT);
+            (mapFlags(mapTypeFlag) & mapFlags::OMP_MAP_IMPLICIT);
     // Descriptors for objects will always be copied. This is because the
     // descriptor can be rematerialized by the compiler, and so the addres
     // of the descriptor for a given object at one place in the code may
@@ -286,7 +295,8 @@ class MapInfoFinalizationPass
               mapFlags::OMP_MAP_CLOSE)
                  ? mapFlags::OMP_MAP_CLOSE
                  : mapFlags::OMP_MAP_ALWAYS;
-    flags |= mapFlags::OMP_MAP_DESCRIPTOR;
+    if (!IsHasDeviceAddr)
+      flags |= mapFlags::OMP_MAP_DESCRIPTOR;
     return llvm::to_underlying(flags);
   }
 
@@ -381,7 +391,7 @@ class MapInfoFinalizationPass
             mlir::TypeAttr::get(fir::unwrapRefType(descriptor.getType())),
             builder.getIntegerAttr(
                 builder.getIntegerType(64, false),
-                getDescriptorMapType(op.getMapType(), target)),
+                getDescriptorMapType(op.getMapType(), target, IsHasDeviceAddr)),
             op.getMapCaptureTypeAttr(), /*varPtrPtr=*/mlir::Value{}, newMembers,
             newMembersAttr, /*bounds=*/mlir::SmallVector<mlir::Value>{},
             /*mapperId*/ mlir::FlatSymbolRefAttr(), op.getNameAttr(),

flang/test/Lower/OpenMP/has_device_addr-mapinfo.f90

@@ -17,7 +17,7 @@ integer function s(a)
 
 ! Check that the map.info for `a` only takes a single parameter.
 
-!CHECK-DAG: %[[MAP_A:[0-9]+]] = "omp.map.info"(%[[STORAGE_A:[0-9#]+]]) <{map_capture_type = #omp<variable_capture_kind(ByRef)>, map_type = 16901 : ui64, name = "a", operandSegmentSizes = array<i32: 1, 0, 0, 0>, partial_map = false, var_type = !fir.box<!fir.array<?xi32>>}> : (!fir.ref<!fir.box<!fir.array<?xi32>>>) -> !fir.ref<!fir.array<?xi32>>
+!CHECK-DAG: %[[MAP_A:[0-9]+]] = "omp.map.info"(%[[STORAGE_A:[0-9#]+]]) <{map_capture_type = #omp<variable_capture_kind(ByRef)>, map_type = 517 : ui64, name = "a", operandSegmentSizes = array<i32: 1, 0, 0, 0>, partial_map = false, var_type = !fir.box<!fir.array<?xi32>>}> : (!fir.ref<!fir.box<!fir.array<?xi32>>>) -> !fir.ref<!fir.array<?xi32>>
 !CHECK-DAG: %[[MAP_T:[0-9]+]] = "omp.map.info"(%[[STORAGE_T:[0-9#]+]]) <{map_capture_type = #omp<variable_capture_kind(ByRef)>, map_type = 2 : ui64, name = "t", operandSegmentSizes = array<i32: 1, 0, 0, 0>, partial_map = false, var_type = i32}> : (!fir.ref<i32>) -> !fir.ref<i32>
 
 !CHECK: "omp.target"(%[[MAP_A]], %[[MAP_T]])