[OpenMP][IRBuilder][OpenACC] Move common code from OpenACCToLLVMIRTranslation to Utils/DirectiveToLLVMIRTranslation so that it can be used between OpenACC and OpenMP.

[raghavendhra]

Summary

Initial support for stand-alone omp target enter data directive without any clauses.

[shraiysh]

Please add testcase in llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp

[shraiysh]

llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h

623–624 ↗

(On Diff #434212)

[nit] The other parameters are not described here

[kiranchandramohan]

The OpenACC translation for enter data was implemented in the patch https://reviews.llvm.org/D101504. It was subsequently refactored and now is available as https://github.com/llvm/llvm-project/blob/369ce54bb302f209239b8ebc77ad824add9df089/mlir/lib/Target/LLVMIR/Dialect/OpenACC/OpenACCToLLVMIRTranslation.cpp#L510. From what I understand the implementation is more translation heavy and only uses the OpenMPIRBuilder (renamed as OpenACCIRBuilder) for creating the runtime calls. Would a good first step be to move more of the translation code (if possible) to the OpenMPIRBuilder and reuse that rather than starting to implement from scratch?

Also, I see that enter data should at least have one map clause and the OpenACC implementation and Clang (from a quick look) seems to use the tgt_target_data_begin_mapper function. I do not see that runtime function used in this patch.

[abidmalikwaterloo]

llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp

3676 ↗

(On Diff #434212)

Is this. specific to omp::EnterData operation? You are planning to write <OpenMPIRBuilder::createTargetExitData> for omp::ExitData as well?

[abidmalikwaterloo]

Do we need test cases for this patch?

[raghavendhra]

In D127037#3558172, @shraiysh wrote:

Please add testcase in llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp

In D127037#3558523, @abidmalikwaterloo wrote:

Do we need test cases for this patch?

Sure, I will add a test case.

In D127037#3558292, @kiranchandramohan wrote:

The OpenACC translation for enter data was implemented in the patch https://reviews.llvm.org/D101504. It was subsequently refactored and now is available as https://github.com/llvm/llvm-project/blob/369ce54bb302f209239b8ebc77ad824add9df089/mlir/lib/Target/LLVMIR/Dialect/OpenACC/OpenACCToLLVMIRTranslation.cpp#L510. From what I understand the implementation is more translation heavy and only uses the OpenMPIRBuilder (renamed as OpenACCIRBuilder) for creating the runtime calls. Would a good first step be to move more of the translation code (if possible) to the OpenMPIRBuilder and reuse that rather than starting to implement from scratch?

Also, I see that enter data should at least have one map clause and the OpenACC implementation and Clang (from a quick look) seems to use the tgt_target_data_begin_mapper function. I do not see that runtime function used in this patch.

From OpenMP spec map clause is not mandatory that is why I started without mapper function. Also, OMPRTL___tgt_target_data_begin was calling tgt_target_data_begin_mapper in it's definition. So I started with using OMPRTL___tgt_target_data_begin.

llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h

623–624 ↗

(On Diff #434212)

Thanks! I will fix it.

llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp

3676 ↗

(On Diff #434212)

Yes, I am planning to keep them as separate functions for separate directives.

[kiranchandramohan]

In D127037#3560272, @raghavendhra wrote:

In D127037#3558292, @kiranchandramohan wrote:

The OpenACC translation for enter data was implemented in the patch https://reviews.llvm.org/D101504. It was subsequently refactored and now is available as https://github.com/llvm/llvm-project/blob/369ce54bb302f209239b8ebc77ad824add9df089/mlir/lib/Target/LLVMIR/Dialect/OpenACC/OpenACCToLLVMIRTranslation.cpp#L510. From what I understand the implementation is more translation heavy and only uses the OpenMPIRBuilder (renamed as OpenACCIRBuilder) for creating the runtime calls. Would a good first step be to move more of the translation code (if possible) to the OpenMPIRBuilder and reuse that rather than starting to implement from scratch?

Also, I see that enter data should at least have one map clause and the OpenACC implementation and Clang (from a quick look) seems to use the tgt_target_data_begin_mapper function. I do not see that runtime function used in this patch.

From OpenMP spec map clause is not mandatory that is why I started without mapper function. Also, OMPRTL___tgt_target_data_begin was calling tgt_target_data_begin_mapper in it's definition. So I started with using OMPRTL___tgt_target_data_begin.

The restrictions of target enter data in https://www.openmp.org/spec-html/5.0/openmpsu58.html has the following entry,

• At least one map clause must appear on the directive.

[Meinersbur]

In D127037#3558523, @abidmalikwaterloo wrote:

Do we need test cases for this patch?

yes. At least a unittest that calls createTargetEnterData.

llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp

3681–3685 ↗

(On Diff #434212)

OpenMPIRBuilder is part of the llvm namespace, therefore llvm:: qualifiers are unnecessary.

3691–3692 ↗

(On Diff #434212)

[style] In the LLVM project, please use the LLVM coding style.

[raghavendhra]

Moving common OpenACC and OpenMP code to common place in Utils.

[clementval]

mlir/include/mlir/Target/LLVMIR/Dialect/Utils/CommonOpenMPOpenACCUtils.h

1 ↗

(On Diff #441475)

Update header

19 ↗

(On Diff #441475)

Is there something missing or do you want to support only acc::DataOp?

mlir/lib/Target/LLVMIR/Dialect/Utils/CommonOpenMPOpenACCUtils.cpp

268 ↗

(On Diff #441475)

Since this is for acc::DataOp it should be in the OpenACC file.

[raghavendhra]

mlir/include/mlir/Target/LLVMIR/Dialect/Utils/CommonOpenMPOpenACCUtils.h

19 ↗

(On Diff #441475)

I think this will be common for both OpenACC and OpenMP acc data is equivalent to omp target data directive which will be used in later patches.

[raghavendhra]

Moved common code for OpenMP and OpenACC to CommonOpenMPOpenACCUtils.

[clementval]

AFAICT this patch does not do what its title and description say ('omp target enter data' support). Can you update it to reflect what is actually done?

mlir/lib/Target/LLVMIR/Dialect/Utils/CommonOpenMPOpenACCUtils.cpp

1 ↗

(On Diff #442632)

Not a big fan of the name of this file. I think ToLLVMIRTranslation should be part of it.

maybe DiretiveToLLVMIRTranslation

79 ↗

(On Diff #442632)

The functions above are also utilities so I'm not sure this is really needed.

[Meinersbur]

Still working on a unittest for createTargetEnterData?

[raghavendhra]

In D127037#3633552, @Meinersbur wrote:

Still working on a unittest for createTargetEnterData?

Thanks for nit pick. I started with getting common code moved from OpenACC to LLVMIR translation to a common place so that it can be shared with both OpenACC and OpenMP.

[raghavendhra]

Move common code from OpenACCToLLVMIRTranslation to Utils/DirectiveToLLVMIRTranslation so that it can be used between OpenACC and OpenMP.

[raghavendhra]

Ping!

Can you please review this change?

[clementval]

mlir/include/mlir/Target/LLVMIR/Dialect/Utils/DirectiveToLLVMIRTranslation.h

14

Can you change it to reflect the new name?

33

Missing new line

mlir/lib/Target/LLVMIR/Dialect/Utils/DirectiveToLLVMIRTranslation.cpp

288

I'm not sure it makes sense to reuse the part where we process each operands. There is likely no 1 to 1 mapping between OpenMP and OpenACC so it's likely the part that will be specific for each operation.

491

Missing new line.

[shraiysh]

mlir/lib/Target/LLVMIR/Dialect/Utils/DirectiveToLLVMIRTranslation.cpp

288

how about adding a common data interface to both data operations and use that here?

[clementval]

mlir/lib/Target/LLVMIR/Dialect/Utils/DirectiveToLLVMIRTranslation.cpp

288

Not sure that will work either. We need to be able to fine tune the flags that are passed for each operands. This will not be common between the two languages for at least some of them.

[clementval]

mlir/lib/Target/LLVMIR/Dialect/Utils/DirectiveToLLVMIRTranslation.cpp

315

For example the kHoldFlag here is a specific OpenACC extension so it's wrong to use it for OpenMP. See https://reviews.llvm.org/D106509 and https://reviews.llvm.org/D106510 for references.

[raghavendhra]

mlir/lib/Target/LLVMIR/Dialect/Utils/DirectiveToLLVMIRTranslation.cpp

288

I tried moving entire mlir::convertDataOp() function and its supporting utilities back to OpenACCToLLVMIRTranslation.cpp and tried to maintain convertStandaloneDataOp() and some of it's utilities in DirectiveToLLVMIRTranslation.cpp but that change is causing cmake cyclic dependency as each library is dependent on other library.

[clementval]

mlir/lib/Target/LLVMIR/Dialect/Utils/DirectiveToLLVMIRTranslation.cpp

288

Utils should probably not depend on OpenACC/OpenMP translation but the opposite is more likely.

[abidmalikwaterloo]

@raghavendhra @kiranchandramohan After listening to your presentation today, I am inclined towards keeping it separate. There is a big assumption that OpenMP and OpenACC will move hand in hand which might be true now but in the future, it might not be true.

[clementval]

In D127037#3652389, @abidmalikwaterloo wrote:

@raghavendhra @kiranchandramohan After listening to your presentation today, I am inclined towards keeping it separate. There is a big assumption that OpenMP and OpenACC will move hand in hand which might be true now but in the future, it might not be true.

Any pointer to this presentation?

[shraiysh]

Any pointer to this presentation?

This was discussed today in the OpenMP work for llvm-flang call.

[clementval]

In D127037#3652586, @shraiysh wrote:

Any pointer to this presentation?

This was discussed today in the OpenMP work for llvm-flang call.

Yeah thank you I could guess that. His comment mentioned a presentation so maybe there is some material to be shared.

[raghavendhra]

@clementval I started a discourse thread https://discourse.llvm.org/t/rfc-for-refactoring-common-code-for-openacc-and-openmp/63833 regarding the same discussion which happened in bi-weekly OpenMP in flang technical call. Please let me know your thoughts. Thanks!

[kiranchandramohan]

What is the status here?

[raghavendhra]

In D127037#3728524, @kiranchandramohan wrote:

What is the status here?

Currently waiting for Abid Malik's MLIR Op support for these operations https://reviews.llvm.org/D131915 to land

[raghavendhra]

This is old and no longer needed as this is taken care by latest revision https://reviews.llvm.org/D142914

mlir/include/mlir/Target/LLVMIR/Dialect/Utils/DirectiveToLLVMIRTranslation.h

+//===- DirectiveToLLVMIRTranslation.h - Utils used by OpenMP and OpenACC -===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This header file defines utilities and common LLVMIR translation patterns for
+// OpenMP and OpenACC operations.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef MLIR_DIALECT_UTILS_COMMONOPENMPOPENACC_H
+#define MLIR_DIALECT_UTILS_COMMONOPENMPOPENACC_H
+
+#include "mlir/Dialect/OpenACC/OpenACC.h"
+#include "mlir/Target/LLVMIR/ModuleTranslation.h"
+
+namespace mlir {
+
+LogicalResult convertDataOp(Operation *op, llvm::IRBuilderBase &builder,
+                            LLVM::ModuleTranslation &moduleTranslation);
+
+template <typename OpTy>
+LogicalResult
+convertStandaloneDataOp(OpTy &op, llvm::IRBuilderBase &builder,
+                        LLVM::ModuleTranslation &moduleTranslation);
+
+} // namespace mlir
+
+#endif // MLIR_DIALECT_UTILS_COMMONOPENMPOPENACC_H
 No newline at end of file

mlir/lib/Target/LLVMIR/Dialect/CMakeLists.txt

 add_subdirectory(ArmNeon)
 add_subdirectory(ArmSVE)
 add_subdirectory(AMX)
 add_subdirectory(LLVMIR)
 add_subdirectory(NVVM)
 add_subdirectory(OpenACC)
 add_subdirectory(OpenMP)
 add_subdirectory(ROCDL)
+add_subdirectory(Utils)
 add_subdirectory(X86Vector)

mlir/lib/Target/LLVMIR/Dialect/OpenACC/CMakeLists.txt

-add_mlir_translation_library(MLIROpenACCToLLVMIRTranslation
+add_mlir_dialect_library(MLIROpenACCToLLVMIRTranslation
   OpenACCToLLVMIRTranslation.cpp
 
   LINK_COMPONENTS
   Core
 
   LINK_LIBS PUBLIC
+  MLIRDirectiveToLLVMIRTranslation
   MLIRIR
   MLIRLLVMDialect
   MLIROpenACCDialect
   MLIROpenACCToLLVM
   MLIRSupport
   MLIRTargetLLVMIRExport
   )

mlir/lib/Target/LLVMIR/Dialect/OpenACC/OpenACCToLLVMIRTranslation.cpp

 
 #include "mlir/Target/LLVMIR/Dialect/OpenACC/OpenACCToLLVMIRTranslation.h"
 #include "mlir/Conversion/OpenACCToLLVM/ConvertOpenACCToLLVM.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
 #include "mlir/Dialect/OpenACC/OpenACC.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/Operation.h"
 #include "mlir/Support/LLVM.h"
+#include "mlir/Target/LLVMIR/Dialect/Utils/DirectiveToLLVMIRTranslation.h"
 #include "mlir/Target/LLVMIR/ModuleTranslation.h"
 
 #include "llvm/ADT/TypeSwitch.h"
 #include "llvm/Frontend/OpenMP/OMPConstants.h"
 #include "llvm/Support/FormatVariadic.h"
 
 using namespace mlir;
 
 using OpenACCIRBuilder = llvm::OpenMPIRBuilder;
 
-//===----------------------------------------------------------------------===//
-// Utility functions
-//===----------------------------------------------------------------------===//
-
-/// Flag values are extracted from openmp/libomptarget/include/omptarget.h and
-/// mapped to corresponding OpenACC flags.
-static constexpr uint64_t kCreateFlag = 0x000;
-static constexpr uint64_t kDeviceCopyinFlag = 0x001;
-static constexpr uint64_t kHostCopyoutFlag = 0x002;
-static constexpr uint64_t kCopyFlag = kDeviceCopyinFlag | kHostCopyoutFlag;
-static constexpr uint64_t kPresentFlag = 0x1000;
-static constexpr uint64_t kDeleteFlag = 0x008;
-// Runtime extension to implement the OpenACC second reference counter.
-static constexpr uint64_t kHoldFlag = 0x2000;
-
-/// Default value for the device id
-static constexpr int64_t kDefaultDevice = -1;
-
-/// Create a constant string location from the MLIR Location information.
-static llvm::Constant *createSourceLocStrFromLocation(Location loc,
-                                                      OpenACCIRBuilder &builder,
-                                                      StringRef name,
-                                                      uint32_t &strLen) {
-  if (auto fileLoc = loc.dyn_cast<FileLineColLoc>()) {
-    StringRef fileName = fileLoc.getFilename();
-    unsigned lineNo = fileLoc.getLine();
-    unsigned colNo = fileLoc.getColumn();
-    return builder.getOrCreateSrcLocStr(name, fileName, lineNo, colNo, strLen);
-  }
-  std::string locStr;
-  llvm::raw_string_ostream locOS(locStr);
-  locOS << loc;
-  return builder.getOrCreateSrcLocStr(locOS.str(), strLen);
-}
-
-/// Create the location struct from the operation location information.
-static llvm::Value *createSourceLocationInfo(OpenACCIRBuilder &builder,
-                                             Operation *op) {
-  auto loc = op->getLoc();
-  auto funcOp = op->getParentOfType<LLVM::LLVMFuncOp>();
-  StringRef funcName = funcOp ? funcOp.getName() : "unknown";
-  uint32_t strLen;
-  llvm::Constant *locStr =
-      createSourceLocStrFromLocation(loc, builder, funcName, strLen);
-  return builder.getOrCreateIdent(locStr, strLen);
-}
-
-/// Create a constant string representing the mapping information extracted from
-/// the MLIR location information.
-static llvm::Constant *createMappingInformation(Location loc,
-                                                OpenACCIRBuilder &builder) {
-  uint32_t strLen;
-  if (auto nameLoc = loc.dyn_cast<NameLoc>()) {
-    StringRef name = nameLoc.getName();
-    return createSourceLocStrFromLocation(nameLoc.getChildLoc(), builder, name,
-                                          strLen);
-  }
-  return createSourceLocStrFromLocation(loc, builder, "unknown", strLen);
-}
-
-/// Return the runtime function used to lower the given operation.
-static llvm::Function *getAssociatedFunction(OpenACCIRBuilder &builder,
-                                             Operation *op) {
-  return llvm::TypeSwitch<Operation *, llvm::Function *>(op)
-      .Case([&](acc::EnterDataOp) {
-        return builder.getOrCreateRuntimeFunctionPtr(
-            llvm::omp::OMPRTL___tgt_target_data_begin_mapper);
-      })
-      .Case([&](acc::ExitDataOp) {
-        return builder.getOrCreateRuntimeFunctionPtr(
-            llvm::omp::OMPRTL___tgt_target_data_end_mapper);
-      })
-      .Case([&](acc::UpdateOp) {
-        return builder.getOrCreateRuntimeFunctionPtr(
-            llvm::omp::OMPRTL___tgt_target_data_update_mapper);
-      });
-  llvm_unreachable("Unknown OpenACC operation");
-}
-
-/// Computes the size of type in bytes.
-static llvm::Value *getSizeInBytes(llvm::IRBuilderBase &builder,
-                                   llvm::Value *basePtr) {
-  llvm::LLVMContext &ctx = builder.getContext();
-  llvm::Value *null =
-      llvm::Constant::getNullValue(basePtr->getType()->getPointerTo());
-  llvm::Value *sizeGep =
-      builder.CreateGEP(basePtr->getType(), null, builder.getInt32(1));
-  llvm::Value *sizePtrToInt =
-      builder.CreatePtrToInt(sizeGep, llvm::Type::getInt64Ty(ctx));
-  return sizePtrToInt;
-}
-
-/// Extract pointer, size and mapping information from operands
-/// to populate the future functions arguments.
-static LogicalResult
-processOperands(llvm::IRBuilderBase &builder,
-                LLVM::ModuleTranslation &moduleTranslation, Operation *op,
-                ValueRange operands, unsigned totalNbOperand,
-                uint64_t operandFlag, SmallVector<uint64_t> &flags,
-                SmallVectorImpl<llvm::Constant *> &names, unsigned &index,
-                struct OpenACCIRBuilder::MapperAllocas &mapperAllocas) {
-  OpenACCIRBuilder *accBuilder = moduleTranslation.getOpenMPBuilder();
-  llvm::LLVMContext &ctx = builder.getContext();
-  auto *i8PtrTy = llvm::Type::getInt8PtrTy(ctx);
-  auto *arrI8PtrTy = llvm::ArrayType::get(i8PtrTy, totalNbOperand);
-  auto *i64Ty = llvm::Type::getInt64Ty(ctx);
-  auto *arrI64Ty = llvm::ArrayType::get(i64Ty, totalNbOperand);
-
-  for (Value data : operands) {
-    llvm::Value *dataValue = moduleTranslation.lookupValue(data);
-
-    llvm::Value *dataPtrBase;
-    llvm::Value *dataPtr;
-    llvm::Value *dataSize;
-
-    // Handle operands that were converted to DataDescriptor.
-    if (DataDescriptor::isValid(data)) {
-      dataPtrBase =
-          builder.CreateExtractValue(dataValue, kPtrBasePosInDataDescriptor);
-      dataPtr = builder.CreateExtractValue(dataValue, kPtrPosInDataDescriptor);
-      dataSize =
-          builder.CreateExtractValue(dataValue, kSizePosInDataDescriptor);
-    } else if (data.getType().isa<LLVM::LLVMPointerType>()) {
-      dataPtrBase = dataValue;
-      dataPtr = dataValue;
-      dataSize = getSizeInBytes(builder, dataValue);
-    } else {
-      return op->emitOpError()
-             << "Data operand must be legalized before translation."
-             << "Unsupported type: " << data.getType();
-    }
-
-    // Store base pointer extracted from operand into the i-th position of
-    // argBase.
-    llvm::Value *ptrBaseGEP = builder.CreateInBoundsGEP(
-        arrI8PtrTy, mapperAllocas.ArgsBase,
-        {builder.getInt32(0), builder.getInt32(index)});
-    llvm::Value *ptrBaseCast = builder.CreateBitCast(
-        ptrBaseGEP, dataPtrBase->getType()->getPointerTo());
-    builder.CreateStore(dataPtrBase, ptrBaseCast);
-
-    // Store pointer extracted from operand into the i-th position of args.
-    llvm::Value *ptrGEP = builder.CreateInBoundsGEP(
-        arrI8PtrTy, mapperAllocas.Args,
-        {builder.getInt32(0), builder.getInt32(index)});
-    llvm::Value *ptrCast =
-        builder.CreateBitCast(ptrGEP, dataPtr->getType()->getPointerTo());
-    builder.CreateStore(dataPtr, ptrCast);
-
-    // Store size extracted from operand into the i-th position of argSizes.
-    llvm::Value *sizeGEP = builder.CreateInBoundsGEP(
-        arrI64Ty, mapperAllocas.ArgSizes,
-        {builder.getInt32(0), builder.getInt32(index)});
-    builder.CreateStore(dataSize, sizeGEP);
-
-    flags.push_back(operandFlag);
-    llvm::Constant *mapName =
-        createMappingInformation(data.getLoc(), *accBuilder);
-    names.push_back(mapName);
-    ++index;
-  }
-  return success();
-}
-
-/// Process data operands from acc::EnterDataOp
-static LogicalResult
-processDataOperands(llvm::IRBuilderBase &builder,
-                    LLVM::ModuleTranslation &moduleTranslation,
-                    acc::EnterDataOp op, SmallVector<uint64_t> &flags,
-                    SmallVectorImpl<llvm::Constant *> &names,
-                    struct OpenACCIRBuilder::MapperAllocas &mapperAllocas) {
-  // TODO add `create_zero` and `attach` operands
-
-  unsigned index = 0;
-
-  // Create operands are handled as `alloc` call.
-  if (failed(processOperands(builder, moduleTranslation, op,
-                             op.createOperands(), op.getNumDataOperands(),
-                             kCreateFlag, flags, names, index, mapperAllocas)))
-    return failure();
-
-  // Copyin operands are handled as `to` call.
-  if (failed(processOperands(builder, moduleTranslation, op,
-                             op.copyinOperands(), op.getNumDataOperands(),
-                             kDeviceCopyinFlag, flags, names, index,
-                             mapperAllocas)))
-    return failure();
-
-  return success();
-}
-
-/// Process data operands from acc::ExitDataOp
-static LogicalResult
-processDataOperands(llvm::IRBuilderBase &builder,
-                    LLVM::ModuleTranslation &moduleTranslation,
-                    acc::ExitDataOp op, SmallVector<uint64_t> &flags,
-                    SmallVectorImpl<llvm::Constant *> &names,
-                    struct OpenACCIRBuilder::MapperAllocas &mapperAllocas) {
-  // TODO add `detach` operands
-
-  unsigned index = 0;
-
-  // Delete operands are handled as `delete` call.
-  if (failed(processOperands(builder, moduleTranslation, op,
-                             op.deleteOperands(), op.getNumDataOperands(),
-                             kDeleteFlag, flags, names, index, mapperAllocas)))
-    return failure();
-
-  // Copyout operands are handled as `from` call.
-  if (failed(processOperands(builder, moduleTranslation, op,
-                             op.copyoutOperands(), op.getNumDataOperands(),
-                             kHostCopyoutFlag, flags, names, index,
-                             mapperAllocas)))
-    return failure();
-
-  return success();
-}
-
-/// Process data operands from acc::UpdateOp
-static LogicalResult
-processDataOperands(llvm::IRBuilderBase &builder,
-                    LLVM::ModuleTranslation &moduleTranslation,
-                    acc::UpdateOp op, SmallVector<uint64_t> &flags,
-                    SmallVectorImpl<llvm::Constant *> &names,
-                    struct OpenACCIRBuilder::MapperAllocas &mapperAllocas) {
-  unsigned index = 0;
-
-  // Host operands are handled as `from` call.
-  if (failed(processOperands(builder, moduleTranslation, op, op.hostOperands(),
-                             op.getNumDataOperands(), kHostCopyoutFlag, flags,
-                             names, index, mapperAllocas)))
-    return failure();
-
-  // Device operands are handled as `to` call.
-  if (failed(processOperands(builder, moduleTranslation, op,
-                             op.deviceOperands(), op.getNumDataOperands(),
-                             kDeviceCopyinFlag, flags, names, index,
-                             mapperAllocas)))
-    return failure();
-
-  return success();
-}
-
-//===----------------------------------------------------------------------===//
-// Conversion functions
-//===----------------------------------------------------------------------===//
-
-/// Converts an OpenACC data operation into LLVM IR.
-static LogicalResult convertDataOp(acc::DataOp &op,
-                                   llvm::IRBuilderBase &builder,
-                                   LLVM::ModuleTranslation &moduleTranslation) {
-  llvm::LLVMContext &ctx = builder.getContext();
-  auto enclosingFuncOp = op.getOperation()->getParentOfType<LLVM::LLVMFuncOp>();
-  llvm::Function *enclosingFunction =
-      moduleTranslation.lookupFunction(enclosingFuncOp.getName());
-
-  OpenACCIRBuilder *accBuilder = moduleTranslation.getOpenMPBuilder();
-
-  llvm::Value *srcLocInfo = createSourceLocationInfo(*accBuilder, op);
-
-  llvm::Function *beginMapperFunc = accBuilder->getOrCreateRuntimeFunctionPtr(
-      llvm::omp::OMPRTL___tgt_target_data_begin_mapper);
-
-  llvm::Function *endMapperFunc = accBuilder->getOrCreateRuntimeFunctionPtr(
-      llvm::omp::OMPRTL___tgt_target_data_end_mapper);
-
-  // Number of arguments in the data operation.
-  unsigned totalNbOperand = op.getNumDataOperands();
-
-  struct OpenACCIRBuilder::MapperAllocas mapperAllocas;
-  OpenACCIRBuilder::InsertPointTy allocaIP(
-      &enclosingFunction->getEntryBlock(),
-      enclosingFunction->getEntryBlock().getFirstInsertionPt());
-  accBuilder->createMapperAllocas(builder.saveIP(), allocaIP, totalNbOperand,
-                                  mapperAllocas);
-
-  SmallVector<uint64_t> flags;
-  SmallVector<llvm::Constant *> names;
-  unsigned index = 0;
-
-  // TODO handle no_create, deviceptr and attach operands.
-
-  if (failed(processOperands(builder, moduleTranslation, op, op.copyOperands(),
-                             totalNbOperand, kCopyFlag | kHoldFlag, flags,
-                             names, index, mapperAllocas)))
-    return failure();
-
-  if (failed(processOperands(
-          builder, moduleTranslation, op, op.copyinOperands(), totalNbOperand,
-          kDeviceCopyinFlag | kHoldFlag, flags, names, index, mapperAllocas)))
-    return failure();
-
-  // TODO copyin readonly currenlty handled as copyin. Update when extension
-  // available.
-  if (failed(processOperands(builder, moduleTranslation, op,
-                             op.copyinReadonlyOperands(), totalNbOperand,
-                             kDeviceCopyinFlag | kHoldFlag, flags, names, index,
-                             mapperAllocas)))
-    return failure();
-
-  if (failed(processOperands(
-          builder, moduleTranslation, op, op.copyoutOperands(), totalNbOperand,
-          kHostCopyoutFlag | kHoldFlag, flags, names, index, mapperAllocas)))
-    return failure();
-
-  // TODO copyout zero currenlty handled as copyout. Update when extension
-  // available.
-  if (failed(processOperands(builder, moduleTranslation, op,
-                             op.copyoutZeroOperands(), totalNbOperand,
-                             kHostCopyoutFlag | kHoldFlag, flags, names, index,
-                             mapperAllocas)))
-    return failure();
-
-  if (failed(processOperands(builder, moduleTranslation, op,
-                             op.createOperands(), totalNbOperand,
-                             kCreateFlag | kHoldFlag, flags, names, index,
-                             mapperAllocas)))
-    return failure();
-
-  // TODO create zero currenlty handled as create. Update when extension
-  // available.
-  if (failed(processOperands(builder, moduleTranslation, op,
-                             op.createZeroOperands(), totalNbOperand,
-                             kCreateFlag | kHoldFlag, flags, names, index,
-                             mapperAllocas)))
-    return failure();
-
-  if (failed(processOperands(builder, moduleTranslation, op,
-                             op.presentOperands(), totalNbOperand,
-                             kPresentFlag | kHoldFlag, flags, names, index,
-                             mapperAllocas)))
-    return failure();
-
-  llvm::GlobalVariable *maptypes =
-      accBuilder->createOffloadMaptypes(flags, ".offload_maptypes");
-  llvm::Value *maptypesArg = builder.CreateConstInBoundsGEP2_32(
-      llvm::ArrayType::get(llvm::Type::getInt64Ty(ctx), totalNbOperand),
-      maptypes, /*Idx0=*/0, /*Idx1=*/0);
-
-  llvm::GlobalVariable *mapnames =
-      accBuilder->createOffloadMapnames(names, ".offload_mapnames");
-  llvm::Value *mapnamesArg = builder.CreateConstInBoundsGEP2_32(
-      llvm::ArrayType::get(llvm::Type::getInt8PtrTy(ctx), totalNbOperand),
-      mapnames, /*Idx0=*/0, /*Idx1=*/0);
-
-  // Create call to start the data region.
-  accBuilder->emitMapperCall(builder.saveIP(), beginMapperFunc, srcLocInfo,
-                             maptypesArg, mapnamesArg, mapperAllocas,
-                             kDefaultDevice, totalNbOperand);
-
-  // Convert the region.
-  llvm::BasicBlock *entryBlock = nullptr;
-
-  for (Block &bb : op.region()) {
-    llvm::BasicBlock *llvmBB = llvm::BasicBlock::Create(
-        ctx, "acc.data", builder.GetInsertBlock()->getParent());
-    if (entryBlock == nullptr)
-      entryBlock = llvmBB;
-    moduleTranslation.mapBlock(&bb, llvmBB);
-  }
-
-  auto afterDataRegion = builder.saveIP();
-
-  llvm::BranchInst *sourceTerminator = builder.CreateBr(entryBlock);
-
-  builder.restoreIP(afterDataRegion);
-  llvm::BasicBlock *endDataBlock = llvm::BasicBlock::Create(
-      ctx, "acc.end_data", builder.GetInsertBlock()->getParent());
-
-  SetVector<Block *> blocks =
-      LLVM::detail::getTopologicallySortedBlocks(op.region());
-  for (Block *bb : blocks) {
-    llvm::BasicBlock *llvmBB = moduleTranslation.lookupBlock(bb);
-    if (bb->isEntryBlock()) {
-      assert(sourceTerminator->getNumSuccessors() == 1 &&
-             "provided entry block has multiple successors");
-      sourceTerminator->setSuccessor(0, llvmBB);
-    }
-
-    if (failed(
-            moduleTranslation.convertBlock(*bb, bb->isEntryBlock(), builder))) {
-      return failure();
-    }
-
-    if (isa<acc::TerminatorOp, acc::YieldOp>(bb->getTerminator()))
-      builder.CreateBr(endDataBlock);
-  }
-
-  // Create call to end the data region.
-  builder.SetInsertPoint(endDataBlock);
-  accBuilder->emitMapperCall(builder.saveIP(), endMapperFunc, srcLocInfo,
-                             maptypesArg, mapnamesArg, mapperAllocas,
-                             kDefaultDevice, totalNbOperand);
-
-  return success();
-}
-
-/// Converts an OpenACC standalone data operation into LLVM IR.
-template <typename OpTy>
-static LogicalResult
-convertStandaloneDataOp(OpTy &op, llvm::IRBuilderBase &builder,
-                        LLVM::ModuleTranslation &moduleTranslation) {
-  auto enclosingFuncOp =
-      op.getOperation()->template getParentOfType<LLVM::LLVMFuncOp>();
-  llvm::Function *enclosingFunction =
-      moduleTranslation.lookupFunction(enclosingFuncOp.getName());
-
-  OpenACCIRBuilder *accBuilder = moduleTranslation.getOpenMPBuilder();
-
-  auto *srcLocInfo = createSourceLocationInfo(*accBuilder, op);
-  auto *mapperFunc = getAssociatedFunction(*accBuilder, op);
-
-  // Number of arguments in the enter_data operation.
-  unsigned totalNbOperand = op.getNumDataOperands();
-
-  llvm::LLVMContext &ctx = builder.getContext();
-
-  struct OpenACCIRBuilder::MapperAllocas mapperAllocas;
-  OpenACCIRBuilder::InsertPointTy allocaIP(
-      &enclosingFunction->getEntryBlock(),
-      enclosingFunction->getEntryBlock().getFirstInsertionPt());
-  accBuilder->createMapperAllocas(builder.saveIP(), allocaIP, totalNbOperand,
-                                  mapperAllocas);
-
-  SmallVector<uint64_t> flags;
-  SmallVector<llvm::Constant *> names;
-
-  if (failed(processDataOperands(builder, moduleTranslation, op, flags, names,
-                                 mapperAllocas)))
-    return failure();
-
-  llvm::GlobalVariable *maptypes =
-      accBuilder->createOffloadMaptypes(flags, ".offload_maptypes");
-  llvm::Value *maptypesArg = builder.CreateConstInBoundsGEP2_32(
-      llvm::ArrayType::get(llvm::Type::getInt64Ty(ctx), totalNbOperand),
-      maptypes, /*Idx0=*/0, /*Idx1=*/0);
-
-  llvm::GlobalVariable *mapnames =
-      accBuilder->createOffloadMapnames(names, ".offload_mapnames");
-  llvm::Value *mapnamesArg = builder.CreateConstInBoundsGEP2_32(
-      llvm::ArrayType::get(llvm::Type::getInt8PtrTy(ctx), totalNbOperand),
-      mapnames, /*Idx0=*/0, /*Idx1=*/0);
-
-  accBuilder->emitMapperCall(builder.saveIP(), mapperFunc, srcLocInfo,
-                             maptypesArg, mapnamesArg, mapperAllocas,
-                             kDefaultDevice, totalNbOperand);
-
-  return success();
-}
-
 namespace {
 
 /// Implementation of the dialect interface that converts operations belonging
 /// to the OpenACC dialect to LLVM IR.
 class OpenACCDialectLLVMIRTranslationInterface
     : public LLVMTranslationDialectInterface {
 public:
   using LLVMTranslationDialectInterface::LLVMTranslationDialectInterface;

 /// Given an OpenACC MLIR operation, create the corresponding LLVM IR
 /// (including OpenACC runtime calls).
 LogicalResult OpenACCDialectLLVMIRTranslationInterface::convertOperation(
     Operation *op, llvm::IRBuilderBase &builder,
     LLVM::ModuleTranslation &moduleTranslation) const {
 
   return llvm::TypeSwitch<Operation *, LogicalResult>(op)
       .Case([&](acc::DataOp dataOp) {
-        return convertDataOp(dataOp, builder, moduleTranslation);
+        return convertDataOp(op, builder, moduleTranslation);
       })
       .Case([&](acc::EnterDataOp enterDataOp) {
         return convertStandaloneDataOp<acc::EnterDataOp>(enterDataOp, builder,
                                                          moduleTranslation);
       })
       .Case([&](acc::ExitDataOp exitDataOp) {
         return convertStandaloneDataOp<acc::ExitDataOp>(exitDataOp, builder,
                                                         moduleTranslation);

mlir/lib/Target/LLVMIR/Dialect/Utils/CMakeLists.txt

+add_mlir_dialect_library(MLIRDirectiveToLLVMIRTranslation
+DirectiveToLLVMIRTranslation.cpp
+
+ADDITIONAL_HEADER_DIRS
+  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Target/LLVMIR/Dialect/Utils/DirectiveToLLVMIRTranslation
+
+LINK_COMPONENTS
+Core
+
+LINK_LIBS PUBLIC
+MLIRIR
+MLIRLLVMDialect
+MLIROpenACCDialect
+MLIROpenACCToLLVM
+MLIROpenMPDialect
+MLIRSupport
+MLIRTargetLLVMIRExport
+)
 No newline at end of file

mlir/lib/Target/LLVMIR/Dialect/Utils/DirectiveToLLVMIRTranslation.cpp

-//===- OpenACCToLLVMIRTranslation.cpp -------------------------------------===//
+//===- DirectiveToLLVMIRTranslation.cpp - Utils used by OpenMP and OpenACC ==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-//
-// This file implements a translation between the MLIR OpenACC dialect and LLVM
-// IR.
-//
-//===----------------------------------------------------------------------===//
 
-#include "mlir/Target/LLVMIR/Dialect/OpenACC/OpenACCToLLVMIRTranslation.h"
+#include "mlir/Target/LLVMIR/Dialect/Utils/DirectiveToLLVMIRTranslation.h"
 #include "mlir/Conversion/OpenACCToLLVM/ConvertOpenACCToLLVM.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
 #include "mlir/Dialect/OpenACC/OpenACC.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/Operation.h"
 #include "mlir/Support/LLVM.h"
+#include "mlir/Target/LLVMIR/Dialect/OpenACC/OpenACCToLLVMIRTranslation.h"
 #include "mlir/Target/LLVMIR/ModuleTranslation.h"
 
 #include "llvm/ADT/TypeSwitch.h"
 #include "llvm/Frontend/OpenMP/OMPConstants.h"
 #include "llvm/Support/FormatVariadic.h"
 
 using namespace mlir;
 
-using OpenACCIRBuilder = llvm::OpenMPIRBuilder;
-
-//===----------------------------------------------------------------------===//
-// Utility functions
-//===----------------------------------------------------------------------===//
-
 /// Flag values are extracted from openmp/libomptarget/include/omptarget.h and
 /// mapped to corresponding OpenACC flags.
 static constexpr uint64_t kCreateFlag = 0x000;
 static constexpr uint64_t kDeviceCopyinFlag = 0x001;
 static constexpr uint64_t kHostCopyoutFlag = 0x002;
 static constexpr uint64_t kCopyFlag = kDeviceCopyinFlag | kHostCopyoutFlag;
 static constexpr uint64_t kPresentFlag = 0x1000;
 static constexpr uint64_t kDeleteFlag = 0x008;
 // Runtime extension to implement the OpenACC second reference counter.
 static constexpr uint64_t kHoldFlag = 0x2000;
 
 /// Default value for the device id
 static constexpr int64_t kDefaultDevice = -1;
 
 /// Create a constant string location from the MLIR Location information.
-static llvm::Constant *createSourceLocStrFromLocation(Location loc,
-                                                      OpenACCIRBuilder &builder,
-                                                      StringRef name,
-                                                      uint32_t &strLen) {
+static llvm::Constant *
+createSourceLocStrFromLocation(Location loc, llvm::OpenMPIRBuilder &builder,
+                               StringRef name, uint32_t &strLen) {
   if (auto fileLoc = loc.dyn_cast<FileLineColLoc>()) {
     StringRef fileName = fileLoc.getFilename();
     unsigned lineNo = fileLoc.getLine();
     unsigned colNo = fileLoc.getColumn();
     return builder.getOrCreateSrcLocStr(name, fileName, lineNo, colNo, strLen);
   }
   std::string locStr;
   llvm::raw_string_ostream locOS(locStr);
   locOS << loc;
   return builder.getOrCreateSrcLocStr(locOS.str(), strLen);
 }
 
 /// Create the location struct from the operation location information.
-static llvm::Value *createSourceLocationInfo(OpenACCIRBuilder &builder,
+static llvm::Value *createSourceLocationInfo(llvm::OpenMPIRBuilder &builder,
                                              Operation *op) {
   auto loc = op->getLoc();
   auto funcOp = op->getParentOfType<LLVM::LLVMFuncOp>();
   StringRef funcName = funcOp ? funcOp.getName() : "unknown";
   uint32_t strLen;
   llvm::Constant *locStr =
       createSourceLocStrFromLocation(loc, builder, funcName, strLen);
   return builder.getOrCreateIdent(locStr, strLen);
 }
 
 /// Create a constant string representing the mapping information extracted from
 /// the MLIR location information.
-static llvm::Constant *createMappingInformation(Location loc,
-                                                OpenACCIRBuilder &builder) {
+static llvm::Constant *
+createMappingInformation(Location loc, llvm::OpenMPIRBuilder &builder) {
   uint32_t strLen;
   if (auto nameLoc = loc.dyn_cast<NameLoc>()) {
     StringRef name = nameLoc.getName();
     return createSourceLocStrFromLocation(nameLoc.getChildLoc(), builder, name,
                                           strLen);
   }
   return createSourceLocStrFromLocation(loc, builder, "unknown", strLen);
 }
 
 /// Return the runtime function used to lower the given operation.
-static llvm::Function *getAssociatedFunction(OpenACCIRBuilder &builder,
+static llvm::Function *getAssociatedFunction(llvm::OpenMPIRBuilder &builder,
                                              Operation *op) {
   return llvm::TypeSwitch<Operation *, llvm::Function *>(op)
       .Case([&](acc::EnterDataOp) {
         return builder.getOrCreateRuntimeFunctionPtr(
             llvm::omp::OMPRTL___tgt_target_data_begin_mapper);
       })
       .Case([&](acc::ExitDataOp) {
         return builder.getOrCreateRuntimeFunctionPtr(

 /// Extract pointer, size and mapping information from operands
 /// to populate the future functions arguments.
 static LogicalResult
 processOperands(llvm::IRBuilderBase &builder,
                 LLVM::ModuleTranslation &moduleTranslation, Operation *op,
                 ValueRange operands, unsigned totalNbOperand,
                 uint64_t operandFlag, SmallVector<uint64_t> &flags,
                 SmallVectorImpl<llvm::Constant *> &names, unsigned &index,
-                struct OpenACCIRBuilder::MapperAllocas &mapperAllocas) {
-  OpenACCIRBuilder *accBuilder = moduleTranslation.getOpenMPBuilder();
+                struct llvm::OpenMPIRBuilder::MapperAllocas &mapperAllocas) {
+  llvm::OpenMPIRBuilder *ompBuilder = moduleTranslation.getOpenMPBuilder();
   llvm::LLVMContext &ctx = builder.getContext();
   auto *i8PtrTy = llvm::Type::getInt8PtrTy(ctx);
   auto *arrI8PtrTy = llvm::ArrayType::get(i8PtrTy, totalNbOperand);
   auto *i64Ty = llvm::Type::getInt64Ty(ctx);
   auto *arrI64Ty = llvm::ArrayType::get(i64Ty, totalNbOperand);
 
-  for (Value data : operands) {
+  for (mlir::Value data : operands) {
     llvm::Value *dataValue = moduleTranslation.lookupValue(data);
 
     llvm::Value *dataPtrBase;
     llvm::Value *dataPtr;
     llvm::Value *dataSize;
 
     // Handle operands that were converted to DataDescriptor.
     if (DataDescriptor::isValid(data)) {
for (mlir::Value data : operands) {
     // Store size extracted from operand into the i-th position of argSizes.
     llvm::Value *sizeGEP = builder.CreateInBoundsGEP(
         arrI64Ty, mapperAllocas.ArgSizes,
         {builder.getInt32(0), builder.getInt32(index)});
     builder.CreateStore(dataSize, sizeGEP);
 
     flags.push_back(operandFlag);
     llvm::Constant *mapName =
-        createMappingInformation(data.getLoc(), *accBuilder);
+        createMappingInformation(data.getLoc(), *ompBuilder);
     names.push_back(mapName);
     ++index;
   }
   return success();
 }
 
 /// Process data operands from acc::EnterDataOp
-static LogicalResult
-processDataOperands(llvm::IRBuilderBase &builder,
-                    LLVM::ModuleTranslation &moduleTranslation,
-                    acc::EnterDataOp op, SmallVector<uint64_t> &flags,
-                    SmallVectorImpl<llvm::Constant *> &names,
-                    struct OpenACCIRBuilder::MapperAllocas &mapperAllocas) {
+static LogicalResult processDataOperands(
+    llvm::IRBuilderBase &builder, LLVM::ModuleTranslation &moduleTranslation,
+    struct llvm::OpenMPIRBuilder::MapperAllocas &mapperAllocas) {
   // TODO add `create_zero` and `attach` operands
 
   unsigned index = 0;
 
   // Create operands are handled as `alloc` call.
   if (failed(processOperands(builder, moduleTranslation, op,
                              op.createOperands(), op.getNumDataOperands(),
                              kCreateFlag, flags, names, index, mapperAllocas)))
     return failure();
 
   // Copyin operands are handled as `to` call.
   if (failed(processOperands(builder, moduleTranslation, op,
                              op.copyinOperands(), op.getNumDataOperands(),
                              kDeviceCopyinFlag, flags, names, index,
                              mapperAllocas)))
     return failure();
 
   return success();
 }
 
 /// Process data operands from acc::ExitDataOp
-static LogicalResult
-processDataOperands(llvm::IRBuilderBase &builder,
-                    LLVM::ModuleTranslation &moduleTranslation,
-                    acc::ExitDataOp op, SmallVector<uint64_t> &flags,
-                    SmallVectorImpl<llvm::Constant *> &names,
-                    struct OpenACCIRBuilder::MapperAllocas &mapperAllocas) {
+static LogicalResult processDataOperands(
+    llvm::IRBuilderBase &builder, LLVM::ModuleTranslation &moduleTranslation,
+    struct llvm::OpenMPIRBuilder::MapperAllocas &mapperAllocas) {
   // TODO add `detach` operands
 
   unsigned index = 0;
 
   // Delete operands are handled as `delete` call.
   if (failed(processOperands(builder, moduleTranslation, op,
                              op.deleteOperands(), op.getNumDataOperands(),
                              kDeleteFlag, flags, names, index, mapperAllocas)))
     return failure();
 
   // Copyout operands are handled as `from` call.
   if (failed(processOperands(builder, moduleTranslation, op,
                              op.copyoutOperands(), op.getNumDataOperands(),
                              kHostCopyoutFlag, flags, names, index,
                              mapperAllocas)))
     return failure();
 
   return success();
 }
 
 /// Process data operands from acc::UpdateOp
-static LogicalResult
-processDataOperands(llvm::IRBuilderBase &builder,
-                    LLVM::ModuleTranslation &moduleTranslation,
-                    acc::UpdateOp op, SmallVector<uint64_t> &flags,
-                    SmallVectorImpl<llvm::Constant *> &names,
-                    struct OpenACCIRBuilder::MapperAllocas &mapperAllocas) {
+static LogicalResult processDataOperands(
+    llvm::IRBuilderBase &builder, LLVM::ModuleTranslation &moduleTranslation,
+    struct llvm::OpenMPIRBuilder::MapperAllocas &mapperAllocas) {
   unsigned index = 0;
 
   // Host operands are handled as `from` call.
   if (failed(processOperands(builder, moduleTranslation, op, op.hostOperands(),
                              op.getNumDataOperands(), kHostCopyoutFlag, flags,
                              names, index, mapperAllocas)))
     return failure();
 
   // Device operands are handled as `to` call.
   if (failed(processOperands(builder, moduleTranslation, op,
                              op.deviceOperands(), op.getNumDataOperands(),
                              kDeviceCopyinFlag, flags, names, index,
                              mapperAllocas)))
     return failure();
 
   return success();
 }
 
 //===----------------------------------------------------------------------===//
 // Conversion functions
 //===----------------------------------------------------------------------===//
 
 /// Converts an OpenACC data operation into LLVM IR.
-static LogicalResult convertDataOp(acc::DataOp &op,
-                                   llvm::IRBuilderBase &builder,
-                                   LLVM::ModuleTranslation &moduleTranslation) {
+LogicalResult mlir::convertDataOp(Operation *op, llvm::IRBuilderBase &builder,
   llvm::LLVMContext &ctx = builder.getContext();
-  auto enclosingFuncOp = op.getOperation()->getParentOfType<LLVM::LLVMFuncOp>();
+  auto enclosingFuncOp = op->getParentOfType<LLVM::LLVMFuncOp>();
   llvm::Function *enclosingFunction =
       moduleTranslation.lookupFunction(enclosingFuncOp.getName());
 
-  OpenACCIRBuilder *accBuilder = moduleTranslation.getOpenMPBuilder();
+  llvm::OpenMPIRBuilder *ompBuilder = moduleTranslation.getOpenMPBuilder();
 
-  llvm::Value *srcLocInfo = createSourceLocationInfo(*accBuilder, op);
+  llvm::Value *srcLocInfo = createSourceLocationInfo(*ompBuilder, op);
 
-  llvm::Function *beginMapperFunc = accBuilder->getOrCreateRuntimeFunctionPtr(
+  llvm::Function *beginMapperFunc = ompBuilder->getOrCreateRuntimeFunctionPtr(
       llvm::omp::OMPRTL___tgt_target_data_begin_mapper);
 
-  llvm::Function *endMapperFunc = accBuilder->getOrCreateRuntimeFunctionPtr(
+  llvm::Function *endMapperFunc = ompBuilder->getOrCreateRuntimeFunctionPtr(
       llvm::omp::OMPRTL___tgt_target_data_end_mapper);
 
   // Number of arguments in the data operation.
-  unsigned totalNbOperand = op.getNumDataOperands();
+  unsigned totalNbOperand = 0;
+  ValueRange copyOperands, copyinOperands, copyinReadonlyOperands;
+  ValueRange copyoutOperands, copyoutZeroOperands, createOperands;
+  ValueRange createZeroOperands, presentOperands;
+
+  if(isa<acc::DataOp>(op)){
+    acc::DataOp dataOp = dyn_cast<acc::DataOp>(op);
+    totalNbOperand = dataOp.getNumDataOperands();
+    copyOperands = dataOp.copyOperands();
+    copyinOperands = dataOp.copyinOperands();
+    copyinReadonlyOperands = dataOp.copyinReadonlyOperands();
+    copyoutOperands = dataOp.copyoutOperands();
+    copyoutZeroOperands = dataOp.copyoutZeroOperands();
+    createOperands = dataOp.createOperands();
+    createZeroOperands = dataOp.createZeroOperands();
+    presentOperands = dataOp.presentOperands();
+  }
 
-  struct OpenACCIRBuilder::MapperAllocas mapperAllocas;
-  OpenACCIRBuilder::InsertPointTy allocaIP(
+  struct llvm::OpenMPIRBuilder::MapperAllocas mapperAllocas;
+  llvm::OpenMPIRBuilder::InsertPointTy allocaIP(
       &enclosingFunction->getEntryBlock(),
       enclosingFunction->getEntryBlock().getFirstInsertionPt());
-  accBuilder->createMapperAllocas(builder.saveIP(), allocaIP, totalNbOperand,
+  ompBuilder->createMapperAllocas(builder.saveIP(), allocaIP, totalNbOperand,
                                   mapperAllocas);
 
   SmallVector<uint64_t> flags;
   SmallVector<llvm::Constant *> names;
   unsigned index = 0;
 
   // TODO handle no_create, deviceptr and attach operands.
 
-  if (failed(processOperands(builder, moduleTranslation, op, op.copyOperands(),
+  if (failed(processOperands(builder, moduleTranslation, op, copyOperands,
                              totalNbOperand, kCopyFlag | kHoldFlag, flags,
                              names, index, mapperAllocas)))
     return failure();
 
   if (failed(processOperands(
-          builder, moduleTranslation, op, op.copyinOperands(), totalNbOperand,
+          builder, moduleTranslation, op, copyinOperands, totalNbOperand,
           kDeviceCopyinFlag | kHoldFlag, flags, names, index, mapperAllocas)))
     return failure();
 
   // TODO copyin readonly currenlty handled as copyin. Update when extension
   // available.
   if (failed(processOperands(builder, moduleTranslation, op,
-                             op.copyinReadonlyOperands(), totalNbOperand,
+                             copyinReadonlyOperands, totalNbOperand,
                              kDeviceCopyinFlag | kHoldFlag, flags, names, index,
                              mapperAllocas)))
     return failure();
 
   if (failed(processOperands(
-          builder, moduleTranslation, op, op.copyoutOperands(), totalNbOperand,
+          builder, moduleTranslation, op, copyoutOperands, totalNbOperand,
           kHostCopyoutFlag | kHoldFlag, flags, names, index, mapperAllocas)))
     return failure();
 
   // TODO copyout zero currenlty handled as copyout. Update when extension
   // available.
   if (failed(processOperands(builder, moduleTranslation, op,
-                             op.copyoutZeroOperands(), totalNbOperand,
+                             copyoutZeroOperands, totalNbOperand,
                              kHostCopyoutFlag | kHoldFlag, flags, names, index,
                              mapperAllocas)))
     return failure();
 
-  if (failed(processOperands(builder, moduleTranslation, op,
-                             op.createOperands(), totalNbOperand,
-                             kCreateFlag | kHoldFlag, flags, names, index,
-                             mapperAllocas)))
+  if (failed(processOperands(
+          builder, moduleTranslation, op, createOperands, totalNbOperand,
+          kCreateFlag | kHoldFlag, flags, names, index, mapperAllocas)))
     return failure();
 
   // TODO create zero currenlty handled as create. Update when extension
   // available.
   if (failed(processOperands(builder, moduleTranslation, op,
-                             op.createZeroOperands(), totalNbOperand,
+                             createZeroOperands, totalNbOperand,
                              kCreateFlag | kHoldFlag, flags, names, index,
                              mapperAllocas)))
     return failure();
 
-  if (failed(processOperands(builder, moduleTranslation, op,
-                             op.presentOperands(), totalNbOperand,
-                             kPresentFlag | kHoldFlag, flags, names, index,
-                             mapperAllocas)))
+  if (failed(processOperands(
+          builder, moduleTranslation, op, presentOperands, totalNbOperand,
+          kPresentFlag | kHoldFlag, flags, names, index, mapperAllocas)))
     return failure();
 
   llvm::GlobalVariable *maptypes =
-      accBuilder->createOffloadMaptypes(flags, ".offload_maptypes");
+      ompBuilder->createOffloadMaptypes(flags, ".offload_maptypes");
   llvm::Value *maptypesArg = builder.CreateConstInBoundsGEP2_32(
       llvm::ArrayType::get(llvm::Type::getInt64Ty(ctx), totalNbOperand),
       maptypes, /*Idx0=*/0, /*Idx1=*/0);
 
   llvm::GlobalVariable *mapnames =
-      accBuilder->createOffloadMapnames(names, ".offload_mapnames");
+      ompBuilder->createOffloadMapnames(names, ".offload_mapnames");
   llvm::Value *mapnamesArg = builder.CreateConstInBoundsGEP2_32(
       llvm::ArrayType::get(llvm::Type::getInt8PtrTy(ctx), totalNbOperand),
       mapnames, /*Idx0=*/0, /*Idx1=*/0);
 
   // Create call to start the data region.
-  accBuilder->emitMapperCall(builder.saveIP(), beginMapperFunc, srcLocInfo,
+  ompBuilder->emitMapperCall(builder.saveIP(), beginMapperFunc, srcLocInfo,
                              maptypesArg, mapnamesArg, mapperAllocas,
                              kDefaultDevice, totalNbOperand);
 
   // Convert the region.
   llvm::BasicBlock *entryBlock = nullptr;
 
-  for (Block &bb : op.region()) {
+  for (Block &bb : op->getRegion(0)) {
     llvm::BasicBlock *llvmBB = llvm::BasicBlock::Create(
         ctx, "acc.data", builder.GetInsertBlock()->getParent());
     if (entryBlock == nullptr)
       entryBlock = llvmBB;
     moduleTranslation.mapBlock(&bb, llvmBB);
   }
 
   auto afterDataRegion = builder.saveIP();
 
   llvm::BranchInst *sourceTerminator = builder.CreateBr(entryBlock);
 
   builder.restoreIP(afterDataRegion);
   llvm::BasicBlock *endDataBlock = llvm::BasicBlock::Create(
       ctx, "acc.end_data", builder.GetInsertBlock()->getParent());
 
   SetVector<Block *> blocks =
-      LLVM::detail::getTopologicallySortedBlocks(op.region());
+      LLVM::detail::getTopologicallySortedBlocks(op->getRegion(0));
   for (Block *bb : blocks) {
     llvm::BasicBlock *llvmBB = moduleTranslation.lookupBlock(bb);
     if (bb->isEntryBlock()) {
       assert(sourceTerminator->getNumSuccessors() == 1 &&
              "provided entry block has multiple successors");
       sourceTerminator->setSuccessor(0, llvmBB);
     }
 
     if (failed(
             moduleTranslation.convertBlock(*bb, bb->isEntryBlock(), builder))) {
       return failure();
     }
 
     if (isa<acc::TerminatorOp, acc::YieldOp>(bb->getTerminator()))
       builder.CreateBr(endDataBlock);
   }
 
   // Create call to end the data region.
   builder.SetInsertPoint(endDataBlock);
-  accBuilder->emitMapperCall(builder.saveIP(), endMapperFunc, srcLocInfo,
+  ompBuilder->emitMapperCall(builder.saveIP(), endMapperFunc, srcLocInfo,
                              maptypesArg, mapnamesArg, mapperAllocas,
                              kDefaultDevice, totalNbOperand);
 
   return success();
 }
-
+namespace mlir {
 /// Converts an OpenACC standalone data operation into LLVM IR.
 template <typename OpTy>
-static LogicalResult
+LogicalResult
 convertStandaloneDataOp(OpTy &op, llvm::IRBuilderBase &builder,
                         LLVM::ModuleTranslation &moduleTranslation) {
   auto enclosingFuncOp =
       op.getOperation()->template getParentOfType<LLVM::LLVMFuncOp>();
   llvm::Function *enclosingFunction =
       moduleTranslation.lookupFunction(enclosingFuncOp.getName());
 
-  OpenACCIRBuilder *accBuilder = moduleTranslation.getOpenMPBuilder();
+  llvm::OpenMPIRBuilder *accBuilder = moduleTranslation.getOpenMPBuilder();
 
   auto *srcLocInfo = createSourceLocationInfo(*accBuilder, op);
   auto *mapperFunc = getAssociatedFunction(*accBuilder, op);
 
   // Number of arguments in the enter_data operation.
   unsigned totalNbOperand = op.getNumDataOperands();
 
   llvm::LLVMContext &ctx = builder.getContext();
 
-  struct OpenACCIRBuilder::MapperAllocas mapperAllocas;
-  OpenACCIRBuilder::InsertPointTy allocaIP(
+  struct llvm::OpenMPIRBuilder::MapperAllocas mapperAllocas;
+  llvm::OpenMPIRBuilder::InsertPointTy allocaIP(
       &enclosingFunction->getEntryBlock(),
       enclosingFunction->getEntryBlock().getFirstInsertionPt());
   accBuilder->createMapperAllocas(builder.saveIP(), allocaIP, totalNbOperand,
                                   mapperAllocas);
 
   SmallVector<uint64_t> flags;
   SmallVector<llvm::Constant *> names;
 
convertStandaloneDataOp(OpTy &op, llvm::IRBuilderBase &builder,
 
   accBuilder->emitMapperCall(builder.saveIP(), mapperFunc, srcLocInfo,
                              maptypesArg, mapnamesArg, mapperAllocas,
                              kDefaultDevice, totalNbOperand);
 
   return success();
 }
 
-namespace {
+template LogicalResult convertStandaloneDataOp<acc::EnterDataOp>(
+    acc::EnterDataOp &op, llvm::IRBuilderBase &builder,
+    LLVM::ModuleTranslation &moduleTranslation);
+template LogicalResult convertStandaloneDataOp<acc::ExitDataOp>(
+    acc::ExitDataOp &op, llvm::IRBuilderBase &builder,
+    LLVM::ModuleTranslation &moduleTranslation);
+template LogicalResult convertStandaloneDataOp<acc::UpdateOp>(
+    acc::UpdateOp &op, llvm::IRBuilderBase &builder,
+    LLVM::ModuleTranslation &moduleTranslation);
 
-/// Implementation of the dialect interface that converts operations belonging
-/// to the OpenACC dialect to LLVM IR.
-class OpenACCDialectLLVMIRTranslationInterface
-    : public LLVMTranslationDialectInterface {
-public:
-  using LLVMTranslationDialectInterface::LLVMTranslationDialectInterface;
-
-  /// Translates the given operation to LLVM IR using the provided IR builder
-  /// and saving the state in `moduleTranslation`.
-  LogicalResult
-  convertOperation(Operation *op, llvm::IRBuilderBase &builder,
-                   LLVM::ModuleTranslation &moduleTranslation) const final;
-};
-
-} // namespace
-
-/// Given an OpenACC MLIR operation, create the corresponding LLVM IR
-/// (including OpenACC runtime calls).
-LogicalResult OpenACCDialectLLVMIRTranslationInterface::convertOperation(
-    Operation *op, llvm::IRBuilderBase &builder,
-    LLVM::ModuleTranslation &moduleTranslation) const {
-
-  return llvm::TypeSwitch<Operation *, LogicalResult>(op)
-      .Case([&](acc::DataOp dataOp) {
-        return convertDataOp(dataOp, builder, moduleTranslation);
-      })
-      .Case([&](acc::EnterDataOp enterDataOp) {
-        return convertStandaloneDataOp<acc::EnterDataOp>(enterDataOp, builder,
-                                                         moduleTranslation);
-      })
-      .Case([&](acc::ExitDataOp exitDataOp) {
-        return convertStandaloneDataOp<acc::ExitDataOp>(exitDataOp, builder,
-                                                        moduleTranslation);
-      })
-      .Case([&](acc::UpdateOp updateOp) {
-        return convertStandaloneDataOp<acc::UpdateOp>(updateOp, builder,
-                                                      moduleTranslation);
-      })
-      .Case<acc::TerminatorOp, acc::YieldOp>([](auto op) {
-        // `yield` and `terminator` can be just omitted. The block structure was
-        // created in the function that handles their parent operation.
-        assert(op->getNumOperands() == 0 &&
-               "unexpected OpenACC terminator with operands");
-        return success();
-      })
-      .Default([&](Operation *op) {
-        return op->emitError("unsupported OpenACC operation: ")
-               << op->getName();
-      });
-}
-
-void mlir::registerOpenACCDialectTranslation(DialectRegistry &registry) {
-  registry.insert<acc::OpenACCDialect>();
-  registry.addExtension(+[](MLIRContext *ctx, acc::OpenACCDialect *dialect) {
-    dialect->addInterfaces<OpenACCDialectLLVMIRTranslationInterface>();
-  });
-}
-
-void mlir::registerOpenACCDialectTranslation(MLIRContext &context) {
-  DialectRegistry registry;
-  registerOpenACCDialectTranslation(registry);
-  context.appendDialectRegistry(registry);
-}
+} // namespace mlir