update llvmir lowering and tests

Author: skc7

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

@@ -5994,7 +5994,7 @@ static bool isTargetDeviceOp(Operation *op) {
   // by taking it in as an operand, so we must always lower these in
   // some manner or result in an ICE (whether they end up in a no-op
   // or otherwise).
-  if (mlir::isa<omp::ThreadprivateOp>(op))
+  if (mlir::isa<omp::ThreadprivateOp, omp::GroupprivateOp>(op))
     return true;
 
   if (mlir::isa<omp::TargetAllocMemOp>(op) ||
@@ -6095,8 +6095,7 @@ convertTargetFreeMemOp(Operation &opInst, llvm::IRBuilderBase &builder,
 /// Converts an OpenMP Groupprivate operation into LLVM IR.
 static LogicalResult
 convertOmpGroupprivate(Operation &opInst, llvm::IRBuilderBase &builder,
-                        LLVM::ModuleTranslation &moduleTranslation) {
-  llvm::OpenMPIRBuilder::LocationDescription ompLoc(builder);
+                       LLVM::ModuleTranslation &moduleTranslation) {
   llvm::OpenMPIRBuilder *ompBuilder = moduleTranslation.getOpenMPBuilder();
   auto groupprivateOp = cast<omp::GroupprivateOp>(opInst);
 
@@ -6117,12 +6116,20 @@ convertOmpGroupprivate(Operation &opInst, llvm::IRBuilderBase &builder,
       addressOfOp.getGlobal(moduleTranslation.symbolTable());
   llvm::GlobalValue *globalValue = moduleTranslation.lookupGlobal(global);
 
-  if (!ompBuilder->Config.isTargetDevice()) {
-    llvm_unreachable("NYI");
-  } else {
-    moduleTranslation.mapValue(opInst.getResult(0), globalValue);
-  }
-
+  // Get the size of the variable
+  llvm::Type *varType = globalValue->getValueType();
+  llvm::Module *llvmModule = moduleTranslation.getLLVMModule();
+  llvm::DataLayout DL = llvmModule->getDataLayout();
+  uint64_t typeSize = DL.getTypeAllocSize(varType);
+  // Call omp_alloc_shared to allocate memory for groupprivate variable.
+  llvm::FunctionCallee allocSharedFn = ompBuilder->getOrCreateRuntimeFunction(
+      *llvmModule, llvm::omp::OMPRTL___kmpc_alloc_shared);
+  // Call runtime to allocate shared memory for this group
+  llvm::Value *groupPrivatePtr =
+      builder.CreateCall(allocSharedFn, {builder.getInt64(typeSize)});
+  groupPrivatePtr =
+      builder.CreateBitCast(groupPrivatePtr, globalValue->getType());
+  moduleTranslation.mapValue(opInst.getResult(0), groupPrivatePtr);
   return success();
 }
 

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

@@ -3449,3 +3449,39 @@ llvm.func @nested_task_with_deps() {
 
 // CHECK:         ret void
 // CHECK:       }
+
+// -----
+
+// CHECK: @_QFsubEx = internal global i32 undef
+
+// CHECK-LABEL: @omp_groupprivate
+llvm.func @omp_groupprivate() {
+// CHECK:  [[TMP1:%.*]] = call ptr @__kmpc_alloc_shared(i64 4)
+// CHECK:  store i32 1, ptr [[TMP1]], align 4
+
+// CHECK-LABEL: omp.teams.region{{.*}}
+// CHECK:  [[TMP2:%.*]] = call ptr @__kmpc_alloc_shared(i64 4)
+// CHECK:  store i32 2, ptr [[TMP2]], align 4
+
+  %0 = llvm.mlir.constant(1 : i32) : i32
+  %1 = llvm.mlir.constant(2 : i32) : i32
+  %2 = llvm.mlir.constant(3 : i32) : i32
+
+  %3 = llvm.mlir.addressof @_QFsubEx : !llvm.ptr
+  %4 = omp.groupprivate %3 : !llvm.ptr -> !llvm.ptr
+
+  llvm.store %0, %4 : i32, !llvm.ptr
+
+  omp.teams  {
+    %5 = omp.groupprivate %3 : !llvm.ptr -> !llvm.ptr
+    llvm.store %1, %5 : i32, !llvm.ptr
+    omp.terminator
+  }
+
+  llvm.store %2, %4 : i32, !llvm.ptr
+  llvm.return
+}
+
+llvm.mlir.global internal @_QFsubEx() : i32
+
+// -----