backend changes updates

Author: anchuraj

mlir/include/mlir/Dialect/OpenMP/OpenMPAttrDefs.td

@@ -69,21 +69,6 @@ def FlagsAttr : OpenMP_Attr<"Flags", "flags"> {
   let assemblyFormat = "`<` struct(params) `>`";
 }
 
-//===----------------------------------------------------------------------===//
-// AtomicControlAttr
-//===----------------------------------------------------------------------===//
-
-// Atomic control attributes hold information about architectural
-// characteristics which are required for lowering atomic operations.
-def AtomicControlAttr : OpenMP_Attr<"AtomicControl", "atomic_control"> {
-  let parameters =
-      (ins DefaultValuedParameter<"bool", "false">:$amdgpu_ignore_denormal_mode,
-          DefaultValuedParameter<"bool", "false">:$amdgpu_fine_grained_memory,
-          DefaultValuedParameter<"bool", "false">:$amdgpu_remote_memory);
-
-  let assemblyFormat = "`<` struct(params) `>`";
-}
-
 //===----------------------------------------------------------------------===//
 // TaskDependArrayAttr
 //===----------------------------------------------------------------------===//

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

@@ -1546,7 +1546,7 @@ def AtomicUpdateOp : OpenMP_Op<"atomic.update", traits = [
   let arguments = !con(
       (ins Arg<OpenMP_PointerLikeType,
                "Address of variable to be updated", [MemRead, MemWrite]>:$x,
-          AtomicControlAttr:$atomic_control),
+          OptionalAttr<AtomicControlAttr>:$atomic_control),
       clausesArgs);
 
   // Override region definition.

mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp

@@ -3223,7 +3223,6 @@ convertOmpAtomicUpdate(omp::AtomicUpdateOp &opInst,
 
   llvm::AtomicOrdering atomicOrdering =
       convertAtomicOrdering(opInst.getMemoryOrder());
-
   // Generate update code.
   auto updateFn =
       [&opInst, &moduleTranslation](
@@ -3242,21 +3241,27 @@ convertOmpAtomicUpdate(omp::AtomicUpdateOp &opInst,
     return moduleTranslation.lookupValue(yieldop.getResults()[0]);
   };
 
-  mlir::omp::AtomicControlAttr atomicControlAttr =
-      opInst.getAtomicControlAttr();
-  bool isAmdgpuIgnoreDenormalMode =
-      atomicControlAttr.getAmdgpuIgnoreDenormalMode();
-  bool isAmdgpuNoFineGrainedMemory =
-      !atomicControlAttr.getAmdgpuFineGrainedMemory();
-  bool isAmdgpuNoRemoteMemory = !atomicControlAttr.getAmdgpuRemoteMemory();
+  bool isIgnoreDenormalMode = false;
+  bool isNoFineGrainedMemory = false;
+  bool isNoRemoteMemory = false;
+  if(opInst->hasAttr(opInst.getAtomicControlAttrName())) {
+    mlir::omp::AtomicControlAttr atomicControlAttr =
+        opInst.getAtomicControlAttr();
+    isIgnoreDenormalMode =
+        atomicControlAttr.getIgnoreDenormalMode();
+    isNoFineGrainedMemory =
+        !atomicControlAttr.getFineGrainedMemory();
+    isNoRemoteMemory = !atomicControlAttr.getRemoteMemory();
+    
+  }
   // Handle ambiguous alloca, if any.
   auto allocaIP = findAllocaInsertPoint(builder, moduleTranslation);
   llvm::OpenMPIRBuilder::LocationDescription ompLoc(builder);
   llvm::OpenMPIRBuilder::InsertPointOrErrorTy afterIP =
       ompBuilder->createAtomicUpdate(
           ompLoc, allocaIP, llvmAtomicX, llvmExpr, atomicOrdering, binop,
-          updateFn, isXBinopExpr, isAmdgpuIgnoreDenormalMode,
-          isAmdgpuNoFineGrainedMemory, isAmdgpuNoRemoteMemory);
+          updateFn, isXBinopExpr, isIgnoreDenormalMode,
+          isNoFineGrainedMemory, isNoRemoteMemory);
 
   if (failed(handleError(afterIP, *opInst)))
     return failure();
@@ -3346,17 +3351,17 @@ convertOmpAtomicCapture(omp::AtomicCaptureOp atomicCaptureOp,
     return moduleTranslation.lookupValue(yieldop.getResults()[0]);
   };
 
-  bool isAmdgpuIgnoreDenormalMode = false;
-  bool isAmdgpuNoFineGrainedMemory = true;
-  bool isAmdgpuNoRemoteMemory = true;
+  bool isIgnoreDenormalMode = false;
+  bool isNoFineGrainedMemory = true;
+  bool isNoRemoteMemory = true;
   if (atomicUpdateOp) {
     mlir::omp::AtomicControlAttr atomicControlAttr =
         atomicUpdateOp.getAtomicControlAttr();
-    isAmdgpuIgnoreDenormalMode =
-        atomicControlAttr.getAmdgpuIgnoreDenormalMode();
-    isAmdgpuNoFineGrainedMemory =
-        !atomicControlAttr.getAmdgpuFineGrainedMemory();
-    isAmdgpuNoRemoteMemory = !atomicControlAttr.getAmdgpuRemoteMemory();
+    isIgnoreDenormalMode =
+        atomicControlAttr.getIgnoreDenormalMode();
+    isNoFineGrainedMemory =
+        !atomicControlAttr.getFineGrainedMemory();
+    isNoRemoteMemory = !atomicControlAttr.getRemoteMemory();
   }
   // Handle ambiguous alloca, if any.
   auto allocaIP = findAllocaInsertPoint(builder, moduleTranslation);
@@ -3365,8 +3370,8 @@ convertOmpAtomicCapture(omp::AtomicCaptureOp atomicCaptureOp,
       ompBuilder->createAtomicCapture(
           ompLoc, allocaIP, llvmAtomicX, llvmAtomicV, llvmExpr, atomicOrdering,
           binop, updateFn, atomicUpdateOp, isPostfixUpdate, isXBinopExpr,
-          isAmdgpuIgnoreDenormalMode, isAmdgpuNoFineGrainedMemory,
-          isAmdgpuNoRemoteMemory);
+          isIgnoreDenormalMode, isNoFineGrainedMemory,
+          isNoRemoteMemory);
 
   if (failed(handleError(afterIP, *atomicCaptureOp)))
     return failure();

mlir/test/Dialect/OpenMP/ops.mlir

@@ -1371,7 +1371,7 @@ func.func @omp_atomic_update(%x : memref<i32>, %expr : i32, %xBool : memref<i1>,
   ^bb0(%xval: i32):
     %newval = llvm.add %xval, %expr : i32
     omp.yield(%newval : i32)
-  } {atomic_control = #omp.atomic_control<>}
+  }
   // CHECK: omp.atomic.update %[[XBOOL]] : memref<i1>
   // CHECK-NEXT: (%[[XVAL:.*]]: i1):
   // CHECK-NEXT:   %[[NEWVAL:.*]] = llvm.and %[[XVAL]], %[[EXPRBOOL]] : i1

mlir/test/Target/LLVMIR/openmp-llvm.mlir

@@ -1462,7 +1462,7 @@ llvm.func @omp_atomic_update(%x:!llvm.ptr, %expr: i32, %xbool: !llvm.ptr, %exprb
   ^bb0(%xval: i32):
     %newval = llvm.mul %xval, %expr : i32
     omp.yield(%newval : i32)
-  } {atomic_control = #omp.atomic_control<>}
+  }
   // CHECK: atomicrmw add ptr %[[x]], i32 %[[expr]] monotonic
   omp.atomic.update %x : !llvm.ptr {
   ^bb0(%xval: i32):