Make changes requested by reviewers - Formatting changes requested by meinersbur - Use the first heap-allocated private as fakeDependVar as suggested by tblah.

Author: bhandarkar-pranav

mlir/include/mlir/Dialect/OpenMP/Transforms/OpenMPOffloadPrivatizationPrepare.h

@@ -1,4 +1,4 @@
-//===- OpenMPOffloadPrivatizationPrepare.h -*- C++ -*-===//
+//===- OpenMPOffloadPrivatizationPrepare.h ----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

mlir/include/mlir/Dialect/OpenMP/Transforms/Passes.h

@@ -1,4 +1,4 @@
-//===- Passes.h - LLVM Pass Construction and Registration -----------------===//
+//===- Passes.h - LLVM Pass Construction and Registration -------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

mlir/lib/Dialect/OpenMP/Transforms/OpenMPOffloadPrivatizationPrepare.cpp

@@ -121,17 +121,10 @@ class PrepareForOMPOffloadPrivatizationPass
         //   /*cleanup_code*/
         //   omp.terminator
         // }
+        // fakeDependVar is the address of the first heap-allocated copy of the
+        // host variable being privatized.
+
         bool needsCleanupTask = !privatizer.getDeallocRegion().empty();
-        if (needsCleanupTask && !fakeDependVar) {
-          Region *targetParentRegion = targetOp->getParentRegion();
-          rewriter.setInsertionPointToStart(&*targetParentRegion->begin());
-          Location loc = targetParentRegion->getLoc();
-          Type i32Ty = rewriter.getI32Type();
-          Type llvmPtrTy = LLVM::LLVMPointerType::get(targetOp->getContext());
-          Value constOne = rewriter.create<LLVM::ConstantOp>(loc, i32Ty, 1);
-          fakeDependVar =
-              LLVM::AllocaOp::create(rewriter, loc, llvmPtrTy, i32Ty, constOne);
-        }
 
         // Allocate heap memory that corresponds to the type of memory
         // pointed to by varPtr
@@ -153,6 +146,9 @@ class PrepareForOMPOffloadPrivatizationPass
               "a private variable out of the stack and into the "
               "heap for use by a deferred target task");
 
+        if (needsCleanupTask && !fakeDependVar)
+          fakeDependVar = heapMem;
+
         // The types of private vars should match before and after the
         // transformation. In particular, if the type is a pointer,
         // simply record the newly allocated malloc location as the